Merge master.kernel.org:/home/rmk/linux-2.6-i2c manually

[linux-2.6-omap-h63xx.git] / drivers / sn / Kconfig

diff --git a/drivers/sn/Kconfig b/drivers/sn/Kconfig
index 20f7515ab830eeb3313ec188e17c9472ae980204..13b8d249da5c7d7d3f4eb60fee24a8525e951d2d 100644 (file)
--- a/drivers/sn/Kconfig
+++ b/drivers/sn/Kconfig
@@ -6,7 +6,7 @@ menu "SN Devices"
 
 config SGI_IOC4
        tristate "SGI IOC4 Base IO support"
-       depends on IA64_GENERIC || IA64_SGI_SN2
+       depends on (IA64_GENERIC || IA64_SGI_SN2) && MMTIMER
        default m
        ---help---
        This option enables basic support for the SGI IOC4-based Base IO