[kernel] update to 2.6.26.5 and 2.6.25.17

[openwrt.git] / target / linux / ixp4xx / patches-2.6.25 / 210-npe_hss.patch

diff --git a/target/linux/ixp4xx/patches-2.6.25/210-npe_hss.patch b/target/linux/ixp4xx/patches-2.6.25/210-npe_hss.patch
index 3950456bdbe03a0288e1b50670241d4036d3e21a..86949c30bd89c39a8675e1beec7155bbac3842bf 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.25/210-npe_hss.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/210-npe_hss.patch
@@ -1,8 +1,6 @@
-diff --git a/drivers/net/wan/Kconfig b/drivers/net/wan/Kconfig
-index a3df09e..94e7aa7 100644
 --- a/drivers/net/wan/Kconfig
 +++ b/drivers/net/wan/Kconfig
-@@ -334,6 +334,15 @@ config DSCC4_PCI_RST
+@@ -338,6 +338,15 @@
  
          Say Y if your card supports this feature.
  
@@ -18,11 +16,9 @@ index a3df09e..94e7aa7 100644
  config DLCI
        tristate "Frame Relay DLCI support"
        ---help---
-diff --git a/drivers/net/wan/Makefile b/drivers/net/wan/Makefile
-index d61fef3..1b1d116 100644
 --- a/drivers/net/wan/Makefile
 +++ b/drivers/net/wan/Makefile
-@@ -42,6 +42,7 @@ obj-$(CONFIG_C101)           += c101.o
+@@ -42,6 +42,7 @@
  obj-$(CONFIG_WANXL)           += wanxl.o
  obj-$(CONFIG_PCI200SYN)               += pci200syn.o
  obj-$(CONFIG_PC300TOO)                += pc300too.o
@@ -30,9 +26,6 @@ index d61fef3..1b1d116 100644
  
  clean-files := wanxlfw.inc
  $(obj)/wanxl.o:       $(obj)/wanxlfw.inc
-diff --git a/drivers/net/wan/ixp4xx_hss.c b/drivers/net/wan/ixp4xx_hss.c
-new file mode 100644
-index 0000000..cf971b3
 --- /dev/null
 +++ b/drivers/net/wan/ixp4xx_hss.c
 @@ -0,0 +1,2886 @@