diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-04 07:56:17 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-04 07:56:17 -0800 |
commit | 519cb688072008363e091be3f291c1b5779e2ba8 (patch) | |
tree | dc5e251ff0eac8ae2f022858c0d7526299235f1d /arch/avr32 | |
parent | 2f98735c9c24ea1f0d40a364d4e63611b689b795 (diff) | |
parent | 8891fec65ac5b5a74b50c705e31b66c92c3eddeb (diff) | |
download | op-kernel-dev-519cb688072008363e091be3f291c1b5779e2ba8.zip op-kernel-dev-519cb688072008363e091be3f291c1b5779e2ba8.tar.gz |
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/avr32')
-rw-r--r-- | arch/avr32/Kconfig | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig index e34e2c9..0e56e96 100644 --- a/arch/avr32/Kconfig +++ b/arch/avr32/Kconfig @@ -10,6 +10,8 @@ config AVR32 # With EMBEDDED=n, we get lots of stuff automatically selected # that we usually don't need on AVR32. select EMBEDDED + select HAVE_OPROFILE + select HAVE_KPROBES help AVR32 is a high-performance 32-bit RISC microprocessor core, designed for cost-sensitive embedded applications, with particular @@ -54,9 +56,6 @@ config ARCH_HAS_ILOG2_U32 config ARCH_HAS_ILOG2_U64 def_bool n -config ARCH_SUPPORTS_OPROFILE - def_bool y - config GENERIC_HWEIGHT def_bool y |