summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-06-03 12:29:15 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-06-03 12:29:15 -0700
commit20c4856b1d1939647f71dce5e54fe69fde80013f (patch)
treebfd8e91ad10acf867934d74c1cf9448f38c9fcd2 /drivers
parentc4d36a822e7c51cd6ffcf9133854d5e32489d269 (diff)
parent627aa944a17ba82ca3ba87dc1d6ee85bd314ec79 (diff)
downloadlinux-stable-20c4856b1d1939647f71dce5e54fe69fde80013f.tar.gz
linux-stable-20c4856b1d1939647f71dce5e54fe69fde80013f.tar.bz2
linux-stable-20c4856b1d1939647f71dce5e54fe69fde80013f.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [POWERPC] Fix zImage.coff generation for 32-bit pmac [POWERPC] Fix compile breakage for IBM/AMCC 4xx arch/ppc platforms [POWERPC] Don't allow PMAC_APM_EMU for 64-bit [POWERPC] Compare irq numbers with NO_IRQ not IRQ_NONE [POWERPC] Fix return from pte_alloc_one() in out-of-memory case [POWERPC] Fix compile warning in pseries xics code [POWERPC] Don't use HOSTCFLAGS in BOOTCFLAGS [POWERPC] Create a zImage for legacy iSeries [POWERPC] pasemi idle uses hard_smp_processor_id [POWERPC] ps3/interrupt.c uses get_hard_smp_processor_id [POWERPC] Fix possible access to free pages [POWERPC] Fix compiler/assembler flags for Ebony platform boot files [POWERPC] Fix ppc32 single-stepping out of syscalls [POWERPC] Update documentation for of_find_node_by_type()
Diffstat (limited to 'drivers')
-rw-r--r--drivers/macintosh/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/macintosh/Kconfig b/drivers/macintosh/Kconfig
index f44c94abd883..ee699a7d6214 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"