Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64...

[linux-2.6-microblaze.git] / drivers / char / Kconfig

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 8102ee7..ccd239a 100644 (file)
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -541,15 +541,6 @@ config HANGCHECK_TIMER
          out to lunch past a certain margin.  It can reboot the system
          or merely print a warning.
 
-config MMTIMER
-       tristate "MMTIMER Memory mapped RTC for SGI Altix"
-       depends on IA64_GENERIC || IA64_SGI_SN2
-       depends on POSIX_TIMERS
-       default y
-       help
-         The mmtimer device allows direct userspace access to the
-         Altix system timer.
-
 config UV_MMTIMER
        tristate "UV_MMTIMER Memory mapped RTC for SGI UV"
        depends on X86_UV