Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

[sfrench/cifs-2.6.git] / arch / mips / Kconfig

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 72baa1a70fcbcd354030ce32fc577f31c128e1ba..d21df5f1b1f3a4eff9ce168a4116bb2e0dd9c6ca 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -385,6 +385,8 @@ config SGI_IP28
        select SGI_HAS_DS1286
        select SGI_HAS_I8042
        select SGI_HAS_INDYDOG
+       select SGI_HAS_HAL2
+       select SGI_HAS_HAL2
        select SGI_HAS_SEEQ
        select SGI_HAS_WD93
        select SGI_HAS_ZILOG
@@ -868,6 +870,9 @@ config SGI_HAS_DS1286
 config SGI_HAS_INDYDOG
        bool
 
+config SGI_HAS_HAL2
+       bool
+
 config SGI_HAS_SEEQ
        bool
 
@@ -1652,6 +1657,7 @@ config SMP
        bool "Multi-Processing support"
        depends on SYS_SUPPORTS_SMP
        select IRQ_PER_CPU
+       select USE_GENERIC_SMP_HELPERS
        help
          This enables support for systems with more than one CPU. If you have
          a system with only one CPU, like most personal computers, say N. If