diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-12-22 12:57:02 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-12-22 12:57:02 -0500 |
| commit | 4b7bd364700d9ac8372eff48832062b936d0793b (patch) | |
| tree | 0dbf78c95456a0b02d07fcd473281f04a87e266d /drivers/macintosh/Kconfig | |
| parent | c0d8768af260e2cbb4bf659ae6094a262c86b085 (diff) | |
| parent | 90a8a73c06cc32b609a880d48449d7083327e11a (diff) | |
Merge branch 'master' into for-next
Conflicts:
MAINTAINERS
arch/arm/mach-omap2/pm24xx.c
drivers/scsi/bfa/bfa_fcpim.c
Needed to update to apply fixes for which the old branch was too
outdated.
Diffstat (limited to 'drivers/macintosh/Kconfig')
| -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 | |||
| 102 | config ADB_PMU_LED_IDE | 102 | config ADB_PMU_LED_IDE |
| 103 | bool "Use front LED as IDE LED by default" | 103 | bool "Use front LED as IDE LED by default" |
| 104 | depends on ADB_PMU_LED | 104 | depends on ADB_PMU_LED |
| 105 | depends on LEDS_CLASS | ||
| 105 | select LEDS_TRIGGERS | 106 | select LEDS_TRIGGERS |
| 106 | select LEDS_TRIGGER_IDE_DISK | 107 | select LEDS_TRIGGER_IDE_DISK |
| 107 | help | 108 | help |