Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=e358ae4dd4ca823abc5ee06c61e3915636e60191
Commit:     e358ae4dd4ca823abc5ee06c61e3915636e60191
Parent:     f5921697cf5cae68dcbfa881d9e08f3cebef47eb
Author:     Johannes Berg <[EMAIL PROTECTED]>
AuthorDate: Sat Jun 2 19:13:44 2007 +1000
Committer:  Paul Mackerras <[EMAIL PROTECTED]>
CommitDate: Sat Jun 2 21:01:56 2007 +1000

    [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 <[EMAIL PROTECTED]>
    Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]>
---
 drivers/macintosh/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/macintosh/Kconfig b/drivers/macintosh/Kconfig
index f44c94a..ee699a7 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"
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to