diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2010-10-12 16:41:22 +0200 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2010-10-12 16:41:26 +0200 |
commit | 7c5f13519a67aa7ba3a99155f128d4bdef87d087 (patch) | |
tree | e4d0537092930a53a85932de83a7861990c58607 /arch/mn10300/Kconfig | |
parent | 5e62feabcc3e4127a084701ec54ffe891985b7e8 (diff) | |
parent | 021989622810b02aab4b24f91e1f5ada2b654579 (diff) | |
download | kernel_samsung_smdk4412-7c5f13519a67aa7ba3a99155f128d4bdef87d087.zip kernel_samsung_smdk4412-7c5f13519a67aa7ba3a99155f128d4bdef87d087.tar.gz kernel_samsung_smdk4412-7c5f13519a67aa7ba3a99155f128d4bdef87d087.tar.bz2 |
Merge branch 'x86/urgent' of into irq/sparseirq
Reason: Pull in the latest io_apic bugfixes
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/mn10300/Kconfig')
-rw-r--r-- | arch/mn10300/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mn10300/Kconfig b/arch/mn10300/Kconfig index 444b9f9..7c2a2f7 100644 --- a/arch/mn10300/Kconfig +++ b/arch/mn10300/Kconfig @@ -8,7 +8,6 @@ mainmenu "Linux Kernel Configuration" config MN10300 def_bool y select HAVE_OPROFILE - select HAVE_ARCH_TRACEHOOK config AM33 def_bool y |