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/frv/Kconfig | |
| 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/frv/Kconfig')
| -rw-r--r-- | arch/frv/Kconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig index e3f965c91e22..68380cb2ff88 100644 --- a/arch/frv/Kconfig +++ b/arch/frv/Kconfig | |||
| @@ -375,8 +375,6 @@ source "drivers/Kconfig" | |||
| 375 | 375 | ||
| 376 | source "fs/Kconfig" | 376 | source "fs/Kconfig" |
| 377 | 377 | ||
| 378 | source "kernel/Kconfig.instrumentation" | ||
| 379 | |||
| 380 | source "arch/frv/Kconfig.debug" | 378 | source "arch/frv/Kconfig.debug" |
| 381 | 379 | ||
| 382 | source "security/Kconfig" | 380 | source "security/Kconfig" |