update 2.6.30 generic config, resort symbols

[openwrt.git] / target / linux / generic-2.6 / patches-2.6.26 / 915-hso-backport.patch

diff --git a/target/linux/generic-2.6/patches-2.6.26/915-hso-backport.patch b/target/linux/generic-2.6/patches-2.6.26/915-hso-backport.patch
index 34c2d94..79843a1 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/915-hso-backport.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/915-hso-backport.patch
@@ -26,8 +26,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
 ---
 
 Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
 ---
 

-diff --git a/drivers/net/Makefile b/drivers/net/Makefile
-index c52738a..c96fe20 100644

 --- a/drivers/net/Makefile
 +++ b/drivers/net/Makefile
 @@ -237,6 +237,7 @@ obj-$(CONFIG_USB_CATC)          += usb/
 --- a/drivers/net/Makefile
 +++ b/drivers/net/Makefile
 @@ -237,6 +237,7 @@ obj-$(CONFIG_USB_CATC)          += usb/


@@ -38,8 +36,6 @@ index c52738a..c96fe20 100644
  obj-$(CONFIG_USB_USBNET)        += usb/
  obj-$(CONFIG_USB_ZD1201)        += usb/
  
  obj-$(CONFIG_USB_USBNET)        += usb/
  obj-$(CONFIG_USB_ZD1201)        += usb/
  

-diff --git a/drivers/net/usb/Kconfig b/drivers/net/usb/Kconfig
-index 0604f3f..68e198b 100644

 --- a/drivers/net/usb/Kconfig
 +++ b/drivers/net/usb/Kconfig
 @@ -154,6 +154,16 @@ config USB_NET_AX8817X
 --- a/drivers/net/usb/Kconfig
 +++ b/drivers/net/usb/Kconfig
 @@ -154,6 +154,16 @@ config USB_NET_AX8817X


@@ -59,8 +55,6 @@ index 0604f3f..68e198b 100644
  
  config USB_NET_CDCETHER
        tristate "CDC Ethernet support (smart devices such as cable modems)"
  
  config USB_NET_CDCETHER
        tristate "CDC Ethernet support (smart devices such as cable modems)"

-diff --git a/drivers/net/usb/Makefile b/drivers/net/usb/Makefile
-index 595a539..24800c1 100644

 --- a/drivers/net/usb/Makefile
 +++ b/drivers/net/usb/Makefile
 @@ -6,6 +6,7 @@ obj-$(CONFIG_USB_CATC)         += catc.o
 --- a/drivers/net/usb/Makefile
 +++ b/drivers/net/usb/Makefile
 @@ -6,6 +6,7 @@ obj-$(CONFIG_USB_CATC)         += catc.o


@@ -71,9 +65,6 @@ index 595a539..24800c1 100644
  obj-$(CONFIG_USB_NET_AX8817X) += asix.o
  obj-$(CONFIG_USB_NET_CDCETHER)        += cdc_ether.o
  obj-$(CONFIG_USB_NET_DM9601)  += dm9601.o
  obj-$(CONFIG_USB_NET_AX8817X) += asix.o
  obj-$(CONFIG_USB_NET_CDCETHER)        += cdc_ether.o
  obj-$(CONFIG_USB_NET_DM9601)  += dm9601.o

-diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
-new file mode 100644
-index 0000000..031d07b

 --- /dev/null
 +++ b/drivers/net/usb/hso.c
 @@ -0,0 +1,2836 @@
 --- /dev/null
 +++ b/drivers/net/usb/hso.c
 @@ -0,0 +1,2836 @@