diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-01-11 05:10:08 +0100 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-01-11 05:10:08 +0100 |
commit | eed0ba0b4ab2d1668588219a8efa81bf8636a12d (patch) | |
tree | f5aa3c732e7830a1b24e6071f8bed0f799881187 /drivers/macintosh | |
parent | powerpc/powermac: Make auto-loading of therm_pm72 possible (diff) | |
parent | powerpc/83xx: add mpc8308_p1m DMA controller device-tree node (diff) | |
download | linux-eed0ba0b4ab2d1668588219a8efa81bf8636a12d.tar.xz linux-eed0ba0b4ab2d1668588219a8efa81bf8636a12d.zip |
Merge remote branch 'gcl/next' into next
Diffstat (limited to 'drivers/macintosh')
-rw-r--r-- | drivers/macintosh/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/macintosh/Kconfig b/drivers/macintosh/Kconfig index 3d7355ff7308..fa51af11c6f1 100644 --- a/drivers/macintosh/Kconfig +++ b/drivers/macintosh/Kconfig @@ -102,6 +102,7 @@ config ADB_PMU_LED config ADB_PMU_LED_IDE bool "Use front LED as IDE LED by default" depends on ADB_PMU_LED + depends on LEDS_CLASS select LEDS_TRIGGERS select LEDS_TRIGGER_IDE_DISK help |