summaryrefslogtreecommitdiffstats
path: root/arch/mips/txx9/Kconfig
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2009-04-05 08:14:15 +0200
committerLen Brown <len.brown@intel.com>2009-04-05 08:14:15 +0200
commit478c6a43fcbc6c11609f8cee7c7b57223907754f (patch)
treea7f7952099da60d33032aed6de9c0c56c9f8779e /arch/mips/txx9/Kconfig
parentMerge branch 'misc' into release (diff)
parentMerge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff)
downloadlinux-478c6a43fcbc6c11609f8cee7c7b57223907754f.tar.xz
linux-478c6a43fcbc6c11609f8cee7c7b57223907754f.zip
Merge branch 'linus' into release
Conflicts: arch/x86/kernel/cpu/cpufreq/longhaul.c Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'arch/mips/txx9/Kconfig')
-rw-r--r--arch/mips/txx9/Kconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mips/txx9/Kconfig b/arch/mips/txx9/Kconfig
index 226e8bb2f0a1..0db7cf38ed8b 100644
--- a/arch/mips/txx9/Kconfig
+++ b/arch/mips/txx9/Kconfig
@@ -20,7 +20,6 @@ config MACH_TXX9
select SYS_SUPPORTS_32BIT_KERNEL
select SYS_SUPPORTS_LITTLE_ENDIAN
select SYS_SUPPORTS_BIG_ENDIAN
- select GENERIC_HARDIRQS_NO__DO_IRQ
config TOSHIBA_JMR3927
bool "Toshiba JMR-TX3927 board"