[PATCH] ioc4: Remove SN2 feature and config dependencies

The SGI PCI-RT card, based on the SGI IOC4 chip, will be made available on
Altix XE (x86_64) platforms in the near future.  As such dependencies on
SN2-specific features and config dependencies need to be removed.

This patch updates the Kconfig files to remove the config dependency, and
updates the IOC4 bus speed detection routine to use universally available
time interfaces instead of mmtimer.

Signed-off-by: Brent Casavant <bcasavan@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 6 insertions, 7 deletions

diff --git a/drivers/sn/Kconfig b/drivers/sn/Kconfig
index a34731625877..34d4fde51a79 100644
--- a/drivers/sn/Kconfig
+++ b/drivers/sn/Kconfig
@@ -7,16 +7,15 @@ menu "SN Devices"
 
 config SGI_IOC4
         tristate "SGI IOC4 Base IO support"
-        depends on MMTIMER
         default m
         ---help---
-        This option enables basic support for the SGI IOC4-based Base IO
-        controller card.  This option does not enable any specific
-        functions on such a card, but provides necessary infrastructure
-        for other drivers to utilize.
+        This option enables basic support for the IOC4 chip on certain
+        SGI IO controller cards (IO9, IO10, and PCI-RT).  This option
+        does not enable any specific functions on such a card, but provides
+        necessary infrastructure for other drivers to utilize.
 
-        If you have an SGI Altix with an IOC4-based
-        I/O controller say Y.  Otherwise say N.
+        If you have an SGI Altix with an IOC4-based card say Y.
+        Otherwise say N.
 
 config SGI_IOC3
         tristate "SGI IOC3 Base IO support"