diff options
| author | Lukasz Dalek <luk0104@gmail.com> | 2012-10-02 17:04:30 +0200 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-10-15 11:54:01 -0700 |
| commit | 4c43cd5a632ea43cab0cdce08d35d6752913504a (patch) | |
| tree | 343c1a3ade64d8bb14d3c6d97a3042de39aac98e | |
| parent | 563aed25395777b55835c9cf7f72bb50ce753398 (diff) | |
| download | talos-obmc-uboot-4c43cd5a632ea43cab0cdce08d35d6752913504a.tar.gz talos-obmc-uboot-4c43cd5a632ea43cab0cdce08d35d6752913504a.zip | |
usbether: Define CONFIG_USB_ETH_{CDC,SUBSET}
Introduced CONFIG_USB_ETH_CDC and CONFIG_USB_ETH_SUBSET as preparation
for removal DEV_CONFIG_CDC and DEV_CONFIG_SUBSET
Signed-off-by: Lukasz Dalek <luk0104@gmail.com>
| -rw-r--r-- | drivers/usb/gadget/ether.c | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c index 9ce2c17603..7e6491d0aa 100644 --- a/drivers/usb/gadget/ether.c +++ b/drivers/usb/gadget/ether.c @@ -44,12 +44,21 @@ extern struct platform_data brd; unsigned packet_received, packet_sent; -#ifdef CONFIG_USB_GADGET_PXA2XX -# undef DEV_CONFIG_CDC -# define DEV_CONFIG_SUBSET 1 -#else -# define DEV_CONFIG_CDC 1 +#undef DEV_CONFIG_CDC +#undef DEV_CONFIG_SUBSET + +#if !defined(CONFIG_USB_ETH_CDC) && !defined(CONFIG_USB_ETH_SUBSET) +# define DEV_CONFIG_CDC 1 /* preserve default behavior */ +#endif + +#if defined(CONFIG_USB_ETH_CDC) +# define DEV_CONFIG_CDC 1 #endif + +#if defined(CONFIG_USB_ETH_SUBSET) +# define DEV_CONFIG_SUBSET 1 +#endif + #define GFP_ATOMIC ((gfp_t) 0) #define GFP_KERNEL ((gfp_t) 0) |
