diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-04 10:56:17 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-04 10:56:17 -0500 |
commit | 519cb688072008363e091be3f291c1b5779e2ba8 (patch) | |
tree | dc5e251ff0eac8ae2f022858c0d7526299235f1d /arch/powerpc | |
parent | 2f98735c9c24ea1f0d40a364d4e63611b689b795 (diff) | |
parent | 8891fec65ac5b5a74b50c705e31b66c92c3eddeb (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild:
scsi: fix dependency bug in aic7 Makefile
kbuild: add svn revision information to setlocalversion
kbuild: do not warn about __*init/__*exit symbols being exported
Move Kconfig.instrumentation to arch/Kconfig and init/Kconfig
Add HAVE_KPROBES
Add HAVE_OPROFILE
Create arch/Kconfig
Fix ARM to play nicely with generic Instrumentation menu
kconfig: ignore select of unknown symbol
kconfig: mark config as changed when loading an alternate config
kbuild: Spelling/grammar fixes for config DEBUG_SECTION_MISMATCH
Remove __INIT_REFOK and __INITDATA_REFOK
kbuild: print only total number of section mismatces found
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 4a22c9928618..b94d4502a477 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
@@ -87,6 +87,8 @@ config ARCH_NO_VIRT_TO_BUS | |||
87 | config PPC | 87 | config PPC |
88 | bool | 88 | bool |
89 | default y | 89 | default y |
90 | select HAVE_OPROFILE | ||
91 | select HAVE_KPROBES | ||
90 | 92 | ||
91 | config EARLY_PRINTK | 93 | config EARLY_PRINTK |
92 | bool | 94 | bool |
@@ -713,8 +715,6 @@ source "arch/powerpc/sysdev/qe_lib/Kconfig" | |||
713 | 715 | ||
714 | source "lib/Kconfig" | 716 | source "lib/Kconfig" |
715 | 717 | ||
716 | source "kernel/Kconfig.instrumentation" | ||
717 | |||
718 | source "arch/powerpc/Kconfig.debug" | 718 | source "arch/powerpc/Kconfig.debug" |
719 | 719 | ||
720 | source "security/Kconfig" | 720 | source "security/Kconfig" |