Commit d1a8df91 authored by Johannes Berg's avatar Johannes Berg Committed by Paul Mackerras

[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: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent b4e54de8
This diff is collapsed.
...@@ -773,20 +773,6 @@ config BLK_DEV_IDEDMA_PMAC ...@@ -773,20 +773,6 @@ config BLK_DEV_IDEDMA_PMAC
to transfer data to and from memory. Saying Y is safe and improves to transfer data to and from memory. Saying Y is safe and improves
performance. performance.
config BLK_DEV_IDE_PMAC_BLINK
bool "Blink laptop LED on drive activity (DEPRECATED)"
depends on BLK_DEV_IDE_PMAC && ADB_PMU
select ADB_PMU_LED
select LEDS_TRIGGERS
select LEDS_TRIGGER_IDE_DISK
help
This option enables the use of the sleep LED as a hard drive
activity LED.
This option is deprecated, it only selects ADB_PMU_LED and
LEDS_TRIGGER_IDE_DISK and changes the code in the new led class
device to default to the ide-disk trigger (which should be set
from userspace via sysfs).
config BLK_DEV_IDE_SWARM config BLK_DEV_IDE_SWARM
tristate "IDE for Sibyte evaluation boards" tristate "IDE for Sibyte evaluation boards"
depends on SIBYTE_SB1xxx_SOC depends on SIBYTE_SB1xxx_SOC
......
...@@ -90,6 +90,15 @@ config ADB_PMU_LED ...@@ -90,6 +90,15 @@ config ADB_PMU_LED
and the ide-disk LED trigger and configure appropriately through and the ide-disk LED trigger and configure appropriately through
sysfs. 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 config PMAC_SMU
bool "Support for SMU based PowerMacs" bool "Support for SMU based PowerMacs"
depends on PPC_PMAC64 depends on PPC_PMAC64
......
...@@ -74,7 +74,7 @@ static void pmu_led_set(struct led_classdev *led_cdev, ...@@ -74,7 +74,7 @@ static void pmu_led_set(struct led_classdev *led_cdev,
static struct led_classdev pmu_led = { static struct led_classdev pmu_led = {
.name = "pmu-front-led", .name = "pmu-front-led",
#ifdef CONFIG_BLK_DEV_IDE_PMAC_BLINK #ifdef CONFIG_ADB_PMU_LED_IDE
.default_trigger = "ide-disk", .default_trigger = "ide-disk",
#endif #endif
.brightness_set = pmu_led_set, .brightness_set = pmu_led_set,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment