diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2006-07-03 14:28:14 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-07-26 01:26:08 +1000 |
| commit | d1a8df9136ff55e554e11ce65854c282965be8f5 (patch) | |
| tree | c6e5c7293da0c753869342fc3a838dcc52b5ef28 /drivers/macintosh | |
| parent | b4e54de8d34afe7fcf08bfe91070d9dfeae6ed27 (diff) | |
| download | op-kernel-dev-d1a8df9136ff55e554e11ce65854c282965be8f5.zip op-kernel-dev-d1a8df9136ff55e554e11ce65854c282965be8f5.tar.gz | |
[POWERPC] fix up front-LED Kconfig
This patch fixes the front-LED Kconfig issues I introduced while
creating it. Apparently having a dependency isn't enough to have the
select not evaluated or something like that.
The patch also changes the default configuration for pmac32 select the
default for the LED to be the IDE trigger. While I was at it, I
completely updated the defconfig and also added snd-aoa to it.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'drivers/macintosh')
| -rw-r--r-- | drivers/macintosh/Kconfig | 9 | ||||
| -rw-r--r-- | drivers/macintosh/via-pmu-led.c | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/drivers/macintosh/Kconfig b/drivers/macintosh/Kconfig index f5fe7fb..f18c956 100644 --- a/drivers/macintosh/Kconfig +++ b/drivers/macintosh/Kconfig @@ -90,6 +90,15 @@ config ADB_PMU_LED and the ide-disk LED trigger and configure appropriately through sysfs. +config ADB_PMU_LED_IDE + bool "Use front LED as IDE LED by default" + depends on ADB_PMU_LED + select LEDS_TRIGGERS + select LEDS_TRIGGER_IDE_DISK + help + This option makes the front LED default to the IDE trigger + so that it blinks on IDE activity. + config PMAC_SMU bool "Support for SMU based PowerMacs" depends on PPC_PMAC64 diff --git a/drivers/macintosh/via-pmu-led.c b/drivers/macintosh/via-pmu-led.c index af8375ed..5189d54 100644 --- a/drivers/macintosh/via-pmu-led.c +++ b/drivers/macintosh/via-pmu-led.c @@ -74,7 +74,7 @@ static void pmu_led_set(struct led_classdev *led_cdev, static struct led_classdev pmu_led = { .name = "pmu-front-led", -#ifdef CONFIG_BLK_DEV_IDE_PMAC_BLINK +#ifdef CONFIG_ADB_PMU_LED_IDE .default_trigger = "ide-disk", #endif .brightness_set = pmu_led_set, |
