Merge branch 'master' of git://git.kernel.org/pub/scm/fs/xfs/xfs

[pandora-kernel.git] / arch / mips / txx9 / Kconfig

diff --git a/arch/mips/txx9/Kconfig b/arch/mips/txx9/Kconfig
index 17052db..0db7cf3 100644 (file)
--- 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"
@@ -46,9 +45,10 @@ config TOSHIBA_RBTX4938
          support this machine type
 
 config TOSHIBA_RBTX4939
-       bool "Toshiba RBTX4939 bobard"
+       bool "Toshiba RBTX4939 board"
        depends on MACH_TX49XX
        select SOC_TX4939
+       select TXX9_7SEGLED
        help
          This Toshiba board is based on the TX4939 processor. Say Y here to
          support this machine type
@@ -86,6 +86,9 @@ config SOC_TX4939
        select HW_HAS_PCI
        select PCI_TX4927
 
+config TXX9_7SEGLED
+       bool
+
 config TOSHIBA_FPCIB0
        bool "FPCIB0 Backplane Support"
        depends on PCI && MACH_TXX9