1 Rename config names for usbnet to deactivate them also if activated in
2 the main kernel configuration. This is needed because
3 usb_autopm_put_interface_async and usb_autopm_get_interface_async are
4 not backported to kernel 2.6.28 and earlier.
5 Remove this patch if these symbols are backported.
7 --- a/drivers/net/usb/Makefile
8 +++ b/drivers/net/usb/Makefile
9 @@ -8,18 +8,18 @@ obj-$(CONFIG_USB_PEGASUS) += pegasus.o
10 obj-$(CONFIG_USB_RTL8150) += rtl8150.o
11 obj-$(CONFIG_USB_HSO) += hso.o
12 obj-$(CONFIG_USB_NET_AX8817X) += asix.o
13 -obj-$(CONFIG_USB_NET_CDCETHER) += cdc_ether.o
14 +obj-$(CONFIG_USB_NET_COMPAT_CDCETHER) += cdc_ether.o
15 obj-$(CONFIG_USB_NET_CDC_EEM) += cdc_eem.o
16 obj-$(CONFIG_USB_NET_DM9601) += dm9601.o
17 obj-$(CONFIG_USB_NET_SMSC95XX) += smsc95xx.o
18 obj-$(CONFIG_USB_NET_GL620A) += gl620a.o
19 obj-$(CONFIG_USB_NET_NET1080) += net1080.o
20 obj-$(CONFIG_USB_NET_PLUSB) += plusb.o
21 -obj-$(CONFIG_USB_NET_RNDIS_HOST) += rndis_host.o
22 +obj-$(CONFIG_USB_NET_COMPAT_RNDIS_HOST) += rndis_host.o
23 obj-$(CONFIG_USB_NET_CDC_SUBSET) += cdc_subset.o
24 obj-$(CONFIG_USB_NET_ZAURUS) += zaurus.o
25 obj-$(CONFIG_USB_NET_MCS7830) += mcs7830.o
26 -obj-$(CONFIG_USB_USBNET) += usbnet.o
27 +obj-$(CONFIG_USB_COMPAT_USBNET) += usbnet.o
28 obj-$(CONFIG_USB_NET_INT51X1) += int51x1.o
29 obj-$(CONFIG_USB_CDC_PHONET) += cdc-phonet.o
31 --- a/drivers/net/usb/cdc_ether.c
32 +++ b/drivers/net/usb/cdc_ether.c
34 #include <linux/usb/usbnet.h>
37 -#if defined(CONFIG_USB_NET_RNDIS_HOST) || defined(CONFIG_USB_NET_RNDIS_HOST_MODULE)
38 +#if defined(CONFIG_USB_NET_COMPAT_RNDIS_HOST) || defined(CONFIG_USB_NET_COMPAT_RNDIS_HOST_MODULE)
40 static int is_rndis(struct usb_interface_descriptor *desc)
42 --- a/drivers/net/wireless/Makefile
43 +++ b/drivers/net/wireless/Makefile
44 @@ -29,7 +29,7 @@ obj-$(CONFIG_RTL8187) += rtl818x/
45 obj-$(CONFIG_PCMCIA_RAYCS) += ray_cs.o
46 obj-$(CONFIG_PCMCIA_WL3501) += wl3501_cs.o
48 -obj-$(CONFIG_USB_NET_RNDIS_WLAN) += rndis_wlan.o
49 +obj-$(CONFIG_USB_NET_COMPAT_RNDIS_WLAN) += rndis_wlan.o
51 obj-$(CONFIG_USB_ZD1201) += zd1201.o
52 obj-$(CONFIG_LIBERTAS) += libertas/