summaryrefslogtreecommitdiff
path: root/drivers/macintosh
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2007-06-02 19:13:44 +1000
committerPaul Mackerras <paulus@samba.org>2007-06-02 21:01:56 +1000
commite358ae4dd4ca823abc5ee06c61e3915636e60191 (patch)
tree4c086145d2858fd4a1f8d2274f53d8d3822b8970 /drivers/macintosh
parentf5921697cf5cae68dcbfa881d9e08f3cebef47eb (diff)
downloadlinux-3.10-e358ae4dd4ca823abc5ee06c61e3915636e60191.tar.gz
linux-3.10-e358ae4dd4ca823abc5ee06c61e3915636e60191.tar.bz2
linux-3.10-e358ae4dd4ca823abc5ee06c61e3915636e60191.zip
[POWERPC] Don't allow PMAC_APM_EMU for 64-bit
In b302887854d6f0c6f9fc3f1080535e7c1bd53134 I switched the apm emulation code to use the generic code but accidentally dropped the PPC32 dependency from the configuration symbol. This adds it back. 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/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/macintosh/Kconfig b/drivers/macintosh/Kconfig
index f44c94abd88..ee699a7d621 100644
--- a/drivers/macintosh/Kconfig
+++ b/drivers/macintosh/Kconfig
@@ -114,7 +114,7 @@ config PMAC_SMU
config PMAC_APM_EMU
tristate "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"