diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-31 22:39:52 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-31 22:39:52 +0200 |
| commit | 49b1e3ea19b1c95c2f012b8331ffb3b169e4c042 (patch) | |
| tree | 4ccf519a20c9b5bb3701c8b4d38b01af8bef854e /drivers/macintosh/Kconfig | |
| parent | [PATCH] rivafb/nvidiafb: race between register_framebuffer and *_bl_init (diff) | |
| parent | [POWERPC] Minor comment fix for misc_64.S (diff) | |
| download | linux-49b1e3ea19b1c95c2f012b8331ffb3b169e4c042.tar.xz linux-49b1e3ea19b1c95c2f012b8331ffb3b169e4c042.zip | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] Minor comment fix for misc_64.S
[POWERPC] Use H_CEDE on non-SMT
[POWERPC] force 64bit mode in fwnmi handlers to workaround firmware bugs
[POWERPC] PMAC_APM_EMU should depend on ADB_PMU
[POWERPC] Fix new interrupt code (MPIC detection)
[POWERPC] Fix new interrupt code (MPIC endianness)
[POWERPC] Add cpufreq support for Xserve G5
[POWERPC] Xserve G5 thermal control fixes
[POWERPC] Fix mem= handling when the memory limit is > RMO size
[POWERPC] More offb/bootx fixes
[POWERPC] Fix legacy_serial.c error handling on 32 bits
[POWERPC] Fix default clock for udbg_16550
[POWERPC] Fix non-MPIC CHRPs with CONFIG_SMP set
[POWERPC] Fix 32 bits warning in prom_init.c
[POWERPC] Workaround Pegasos incorrect ISA "ranges"
[POWERPC] fix up front-LED Kconfig
Diffstat (limited to 'drivers/macintosh/Kconfig')
| -rw-r--r-- | drivers/macintosh/Kconfig | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/macintosh/Kconfig b/drivers/macintosh/Kconfig index d162307e309f..d5d649f5ccdb 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 @@ -100,7 +109,7 @@ config PMAC_SMU config PMAC_APM_EMU tristate "APM emulation" - depends on PPC_PMAC && PPC32 && PM + depends on PPC_PMAC && PPC32 && PM && ADB_PMU config PMAC_MEDIABAY bool "Support PowerBook hotswap media bay" |