Ignore:
Timestamp:
Oct 25, 2006, 1:51:57 AM (13 years ago)
Author:
bruno
Message:

merge -r890:902 $SVN_M/branches/stable

Location:
trunk/mindi-busybox/miscutils
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/mindi-busybox/miscutils/Makefile.in

    r821 r904  
    2121MISCUTILS-$(CONFIG_HDPARM)      += hdparm.o
    2222MISCUTILS-$(CONFIG_LAST)        += last.o
    23 MISCUTILS-${CONFIG_LESS}        += less.o
     23MISCUTILS-$(CONFIG_LESS)        += less.o
    2424MISCUTILS-$(CONFIG_MAKEDEVS)    += makedevs.o
    2525MISCUTILS-$(CONFIG_MOUNTPOINT)  += mountpoint.o
  • trunk/mindi-busybox/miscutils/hdparm.c

    r821 r904  
    14961496    unsigned int t;
    14971497
    1498 
     1498    printf(" (");
    14991499    if (standby == 0)
    15001500        printf("off");
     
    20972097    USE_FEATURE_HDPARM_HDIO_GETSET_DMA("d::")
    20982098#ifdef HDIO_DRIVE_CMD
    2099                                     "S::D::P::X::K::A::L::W::CyYzZ"
     2099                                    "S:D:P:X:K:A:L:W:CyYzZ"
    21002100#endif
    21012101    USE_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF("U:")
Note: See TracChangeset for help on using the changeset viewer.