diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-11-15 16:49:04 -0800 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-11-15 16:49:04 -0800 |
| commit | c12489ad40a9db6b17225e0f38151d41c6175fe8 (patch) | |
| tree | cf7ea08c0b3bf106975047c66b8bb0b560cc4e3e /arch/powerpc/Kconfig | |
| parent | ff7feac9638e162263463edaeb342b4f3b1ce90e (diff) | |
| parent | 1e185b97b4364063f1135604b87f8d8469944233 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/powerpc/Kconfig')
| -rw-r--r-- | arch/powerpc/Kconfig | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index c523029674e..94df74bcc0e 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -261,7 +261,7 @@ config PPC_ISERIES config EMBEDDED6xx bool "Embedded 6xx/7xx/7xxx-based board" - depends on PPC32 + depends on PPC32 && BROKEN config APUS bool "Amiga-APUS" @@ -305,7 +305,7 @@ config PPC_PMAC64 config PPC_PREP bool " PowerPC Reference Platform (PReP) based machines" - depends on PPC_MULTIPLATFORM && PPC32 + depends on PPC_MULTIPLATFORM && PPC32 && BROKEN select PPC_I8259 select PPC_INDIRECT_PCI default y @@ -932,6 +932,7 @@ source "arch/powerpc/oprofile/Kconfig" config KPROBES bool "Kprobes (EXPERIMENTAL)" + depends on PPC64 help Kprobes allows you to trap at almost any kernel address and execute a callback function. register_kprobe() establishes |