| Rename config names for usbnet to deactivate them also if activated in |
| the main kernel configuration. This is needed because |
| usb_autopm_put_interface_async and usb_autopm_get_interface_async are |
| not backported to kernel 2.6.28 and earlier. |
| Remove this patch if these symbols are backported. |
| |
| --- a/drivers/net/usb/Makefile |
| +++ b/drivers/net/usb/Makefile |
| @@ -8,7 +8,7 @@ obj-$(CONFIG_USB_PEGASUS) += pegasus.o |
| obj-$(CONFIG_USB_RTL8150) += rtl8150.o |
| obj-$(CONFIG_USB_HSO) += hso.o |
| obj-$(CONFIG_USB_NET_AX8817X) += asix.o |
| -obj-$(CONFIG_USB_NET_CDCETHER) += cdc_ether.o |
| +obj-$(CONFIG_USB_NET_COMPAT_CDCETHER) += cdc_ether.o |
| obj-$(CONFIG_USB_NET_CDC_EEM) += cdc_eem.o |
| obj-$(CONFIG_USB_NET_DM9601) += dm9601.o |
| obj-$(CONFIG_USB_NET_SMSC75XX) += smsc75xx.o |
| @@ -16,11 +16,11 @@ obj-$(CONFIG_USB_NET_SMSC95XX) += smsc95 |
| obj-$(CONFIG_USB_NET_GL620A) += gl620a.o |
| obj-$(CONFIG_USB_NET_NET1080) += net1080.o |
| obj-$(CONFIG_USB_NET_PLUSB) += plusb.o |
| -obj-$(CONFIG_USB_NET_RNDIS_HOST) += rndis_host.o |
| +obj-$(CONFIG_USB_NET_COMPAT_RNDIS_HOST) += rndis_host.o |
| obj-$(CONFIG_USB_NET_CDC_SUBSET) += cdc_subset.o |
| obj-$(CONFIG_USB_NET_ZAURUS) += zaurus.o |
| obj-$(CONFIG_USB_NET_MCS7830) += mcs7830.o |
| -obj-$(CONFIG_USB_USBNET) += usbnet.o |
| +obj-$(CONFIG_USB_COMPAT_USBNET) += usbnet.o |
| obj-$(CONFIG_USB_NET_INT51X1) += int51x1.o |
| obj-$(CONFIG_USB_CDC_PHONET) += cdc-phonet.o |
| obj-$(CONFIG_USB_NET_KALMIA) += kalmia.o |
| --- a/drivers/net/usb/cdc_ether.c |
| +++ b/drivers/net/usb/cdc_ether.c |
| @@ -33,7 +33,7 @@ |
| #include <linux/usb/usbnet.h> |
| |
| |
| -#if defined(CONFIG_USB_NET_RNDIS_HOST) || defined(CONFIG_USB_NET_RNDIS_HOST_MODULE) |
| +#if defined(CONFIG_USB_NET_COMPAT_RNDIS_HOST) || defined(CONFIG_USB_NET_COMPAT_RNDIS_HOST_MODULE) |
| |
| static int is_rndis(struct usb_interface_descriptor *desc) |
| { |
| --- a/drivers/net/wireless/Makefile |
| +++ b/drivers/net/wireless/Makefile |
| @@ -30,7 +30,7 @@ obj-$(CONFIG_RTLWIFI) += rtlwifi/ |
| obj-$(CONFIG_PCMCIA_RAYCS) += ray_cs.o |
| obj-$(CONFIG_PCMCIA_WL3501) += wl3501_cs.o |
| |
| -obj-$(CONFIG_USB_NET_RNDIS_WLAN) += rndis_wlan.o |
| +obj-$(CONFIG_USB_NET_COMPAT_RNDIS_WLAN) += rndis_wlan.o |
| |
| obj-$(CONFIG_USB_ZD1201) += zd1201.o |
| obj-$(CONFIG_LIBERTAS) += libertas/ |