Merge branches 'pm-sleep', 'pm-cpufreq', 'pm-core' and 'pm-opp'

[cascardo/linux.git] / drivers / macintosh / Kconfig

diff --git a/drivers/macintosh/Kconfig b/drivers/macintosh/Kconfig
index 3e8b29e..d28690f 100644 (file)
--- a/drivers/macintosh/Kconfig
+++ b/drivers/macintosh/Kconfig
@@ -96,19 +96,18 @@ config ADB_PMU_LED
          Support the front LED on Power/iBooks as a generic LED that can
          be triggered by any of the supported triggers. To get the
          behaviour of the old CONFIG_BLK_DEV_IDE_PMAC_BLINK, select this
-         and the ide-disk LED trigger and configure appropriately through
-         sysfs.
+         and the disk LED trigger and configure appropriately through sysfs.
 
-config ADB_PMU_LED_IDE
-       bool "Use front LED as IDE LED by default"
+config ADB_PMU_LED_DISK
+       bool "Use front LED as DISK LED by default"
        depends on ADB_PMU_LED
        depends on LEDS_CLASS
        depends on IDE_GD_ATA
        select LEDS_TRIGGERS
-       select LEDS_TRIGGER_IDE_DISK
+       select LEDS_TRIGGER_DISK
        help
-         This option makes the front LED default to the IDE trigger
-         so that it blinks on IDE activity.
+         This option makes the front LED default to the disk trigger
+         so that it blinks on disk activity.
 
 config PMAC_SMU
        bool "Support for SMU  based PowerMacs"