Merge branch 'for-rmk-fixes' of git://aeryn.fluff.org.uk/bjdooks/linux

[linux-2.6] / drivers / char / Kconfig

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index caff851..1222541 100644 (file)
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -350,7 +350,7 @@ config STALDRV
 
 config STALLION
        tristate "Stallion EasyIO or EC8/32 support"
-       depends on STALDRV && BROKEN_ON_SMP && (ISA || EISA || PCI)
+       depends on STALDRV && (ISA || EISA || PCI)
        help
          If you have an EasyIO or EasyConnection 8/32 multiport Stallion
          card, then this is for you; say Y.  Make sure to read
@@ -361,7 +361,7 @@ config STALLION
 
 config ISTALLION
        tristate "Stallion EC8/64, ONboard, Brumby support"
-       depends on STALDRV && BROKEN_ON_SMP && (ISA || EISA || PCI)
+       depends on STALDRV && (ISA || EISA || PCI)
        help
          If you have an EasyConnection 8/64, ONboard, Brumby or Stallion
          serial multiport card, say Y here. Make sure to read
@@ -1043,15 +1043,6 @@ config HPET
          open selects one of the timers supported by the HPET.  The timers are
          non-periodic and/or periodic.
 
-config HPET_RTC_IRQ
-       bool
-       default HPET_EMULATE_RTC
-       depends on RTC && HPET
-       help
-         If you say Y here, you will disable RTC_IRQ in drivers/char/rtc.c. It
-         is assumed the platform called hpet_alloc with the RTC IRQ values for
-         the HPET timers.
-
 config HPET_MMAP
        bool "Allow mmap of HPET"
        default y