diff options
Diffstat (limited to 'drivers/serial')
-rw-r--r-- | drivers/serial/Kconfig | 9 | ||||
-rw-r--r-- | drivers/serial/Makefile | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index 6a15703f1cb9..25fcef2c42de 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig | |||
@@ -843,4 +843,13 @@ config SERIAL_JSM | |||
843 | To compile this driver as a module, choose M here: the | 843 | To compile this driver as a module, choose M here: the |
844 | module will be called jsm. | 844 | module will be called jsm. |
845 | 845 | ||
846 | config SERIAL_SGI_IOC4 | ||
847 | tristate "SGI IOC4 controller serial support" | ||
848 | depends on (IA64_GENERIC || IA64_SGI_SN2) && SGI_IOC4 | ||
849 | select SERIAL_CORE | ||
850 | help | ||
851 | If you have an SGI Altix with an IOC4 based Base IO card | ||
852 | and wish to use the serial ports on this card, say Y. | ||
853 | Otherwise, say N. | ||
854 | |||
846 | endmenu | 855 | endmenu |
diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile index 81b77d769b84..8f1cdde7dbed 100644 --- a/drivers/serial/Makefile +++ b/drivers/serial/Makefile | |||
@@ -51,4 +51,4 @@ obj-$(CONFIG_ETRAX_SERIAL) += crisv10.o | |||
51 | obj-$(CONFIG_SERIAL_JSM) += jsm/ | 51 | obj-$(CONFIG_SERIAL_JSM) += jsm/ |
52 | obj-$(CONFIG_SERIAL_TXX9) += serial_txx9.o | 52 | obj-$(CONFIG_SERIAL_TXX9) += serial_txx9.o |
53 | obj-$(CONFIG_SERIAL_VR41XX) += vr41xx_siu.o | 53 | obj-$(CONFIG_SERIAL_VR41XX) += vr41xx_siu.o |
54 | obj-$(CONFIG_BLK_DEV_SGIIOC4) += ioc4_serial.o | 54 | obj-$(CONFIG_SERIAL_SGI_IOC4) += ioc4_serial.o |