git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'drm-reorg' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
[safe/jmp/linux-2.6]
/
drivers
/
macintosh
/
Kconfig
diff --git
a/drivers/macintosh/Kconfig
b/drivers/macintosh/Kconfig
index
be9cdf0
..
b526596
100644
(file)
--- a/
drivers/macintosh/Kconfig
+++ b/
drivers/macintosh/Kconfig
@@
-1,6
+1,15
@@
-menu "Macintosh device drivers"
+menuconfig MACINTOSH_DRIVERS
+ bool "Macintosh device drivers"
depends on PPC || MAC || X86
depends on PPC || MAC || X86
+ default y if (PPC_PMAC || MAC)
+ ---help---
+ Say Y here to get to see options for devices used with Macintosh
+ computers. This option alone does not add any kernel code.
+
+ If you say N, all options in this submenu will be skipped and disabled.
+
+if MACINTOSH_DRIVERS
config ADB
bool "Apple Desktop Bus (ADB) support"
config ADB
bool "Apple Desktop Bus (ADB) support"
@@
-109,9
+118,8
@@
config PMAC_SMU
config PMAC_APM_EMU
tristate "APM emulation"
config PMAC_APM_EMU
tristate "APM emulation"
- select SYS_SUPPORTS_APM_EMULATION
select APM_EMULATION
select APM_EMULATION
- depends on ADB_PMU && PM
+ depends on ADB_PMU && PM
&& PPC32
config PMAC_MEDIABAY
bool "Support PowerBook hotswap media bay"
config PMAC_MEDIABAY
bool "Support PowerBook hotswap media bay"
@@
-164,6
+172,7
@@
config INPUT_ADBHID
config MAC_EMUMOUSEBTN
bool "Support for mouse button 2+3 emulation"
config MAC_EMUMOUSEBTN
bool "Support for mouse button 2+3 emulation"
+ select INPUT
help
This provides generic support for emulating the 2nd and 3rd mouse
button with keypresses. If you say Y here, the emulation is still
help
This provides generic support for emulating the 2nd and 3rd mouse
button with keypresses. If you say Y here, the emulation is still
@@
-225,6
+234,14
@@
config WINDFARM_PM112
which are the recent dual and quad G5 machines using the
970MP dual-core processor.
which are the recent dual and quad G5 machines using the
970MP dual-core processor.
+config WINDFARM_PM121
+ tristate "Support for thermal management on PowerMac12,1"
+ depends on WINDFARM && I2C && PMAC_SMU
+ select I2C_POWERMAC
+ help
+ This driver provides thermal control for the PowerMac12,1
+ which is the iMac G5 (iSight).
+
config ANSLCD
tristate "Support for ANS LCD display"
depends on ADB_CUDA && PPC_PMAC
config ANSLCD
tristate "Support for ANS LCD display"
depends on ADB_CUDA && PPC_PMAC
@@
-233,7
+250,7
@@
config PMAC_RACKMETER
tristate "Support for Apple XServe front panel LEDs"
depends on PPC_PMAC
help
tristate "Support for Apple XServe front panel LEDs"
depends on PPC_PMAC
help
- This driver pro
c
ides some support to control the front panel
+ This driver pro
v
ides some support to control the front panel
blue LEDs "vu-meter" of the XServer macs.
blue LEDs "vu-meter" of the XServer macs.
-end
menu
+end
if # MACINTOSH_DRIVERS