From: Johannes Berg Date: Sat, 2 Jun 2007 09:13:44 +0000 (+1000) Subject: [POWERPC] Don't allow PMAC_APM_EMU for 64-bit X-Git-Tag: v2.6.22-rc4~12^2~2 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e358ae4dd4ca823abc5ee06c61e3915636e60191;p=linux-2.6-omap-h63xx.git [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 Signed-off-by: Paul Mackerras --- 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"