diff options
author | Michal Nazarewicz <m.nazarewicz@samsung.com> | 2009-11-30 04:55:40 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-12-11 14:55:27 -0500 |
commit | 396cda90d228d0851f3d64c7c85a1ecf6b8ae1e8 (patch) | |
tree | 9fc9df689e3d9e38b51d2a50d7bf0feb2978e1d8 /drivers/usb/gadget/u_ether.h | |
parent | 3f0479e00a3fca9590ae8d9edc4e9c47b7fa0610 (diff) |
USB: Added USB_ETH_RNDIS to use instead of CONFIG_USB_ETH_RNDIS
If g_ether and g_multi are both built CONFIG_USB_ETH_RNDIS symbol
may be redefined in the later and, whats even worse, g_ether's settings
may affect g_multi's. This adds a USB_ETH_RNDIS symbol defined at the
beginning of ether.c and multi.c according toproper KConfig settings.
Signed-off-by: Michal Nazarewicz <m.nazarewicz@samsung.com>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/gadget/u_ether.h')
-rw-r--r-- | drivers/usb/gadget/u_ether.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/u_ether.h b/drivers/usb/gadget/u_ether.h index 91b39ffdf6ea..fd55f450bc0e 100644 --- a/drivers/usb/gadget/u_ether.h +++ b/drivers/usb/gadget/u_ether.h | |||
@@ -112,7 +112,7 @@ int geth_bind_config(struct usb_configuration *c, u8 ethaddr[ETH_ALEN]); | |||
112 | int ecm_bind_config(struct usb_configuration *c, u8 ethaddr[ETH_ALEN]); | 112 | int ecm_bind_config(struct usb_configuration *c, u8 ethaddr[ETH_ALEN]); |
113 | int eem_bind_config(struct usb_configuration *c); | 113 | int eem_bind_config(struct usb_configuration *c); |
114 | 114 | ||
115 | #ifdef CONFIG_USB_ETH_RNDIS | 115 | #ifdef USB_ETH_RNDIS |
116 | 116 | ||
117 | int rndis_bind_config(struct usb_configuration *c, u8 ethaddr[ETH_ALEN]); | 117 | int rndis_bind_config(struct usb_configuration *c, u8 ethaddr[ETH_ALEN]); |
118 | 118 | ||