WAN: Add IXP4xx HSS HDLC driver.

Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>

diff --git a/drivers/net/wan/Kconfig b/drivers/net/wan/Kconfig
index 0725161..d08ce6a 100644 (file)
--- a/drivers/net/wan/Kconfig
+++ b/drivers/net/wan/Kconfig
@@ -335,6 +335,13 @@ config DSCC4_PCI_RST
 
          Say Y if your card supports this feature.
 
+config IXP4XX_HSS
+       tristate "Intel IXP4xx HSS (synchronous serial port) support"
+       depends on HDLC && ARM && ARCH_IXP4XX && IXP4XX_NPE && IXP4XX_QMGR
+       help
+         Say Y here if you want to use built-in HSS ports
+         on IXP4xx processor.
+
 config DLCI
        tristate "Frame Relay DLCI support"
        ---help---

diff --git a/drivers/net/wan/Makefile b/drivers/net/wan/Makefile
index cec1681..19d14bc 100644 (file)
--- a/drivers/net/wan/Makefile
+++ b/drivers/net/wan/Makefile
@@ -41,6 +41,7 @@ obj-$(CONFIG_C101)            += c101.o
 obj-$(CONFIG_WANXL)            += wanxl.o
 obj-$(CONFIG_PCI200SYN)                += pci200syn.o
 obj-$(CONFIG_PC300TOO)         += pc300too.o
+obj-$(CONFIG_IXP4XX_HSS)       += ixp4xx_hss.o
 
 clean-files := wanxlfw.inc
 $(obj)/wanxl.o:        $(obj)/wanxlfw.inc

diff --cc drivers/net/wan/ixp4xx_hss.c
Simple merge