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/ether.c | |
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/ether.c')
-rw-r--r-- | drivers/usb/gadget/ether.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c index 167cb2a8ece..141372b6e7a 100644 --- a/drivers/usb/gadget/ether.c +++ b/drivers/usb/gadget/ether.c | |||
@@ -25,6 +25,14 @@ | |||
25 | #include <linux/kernel.h> | 25 | #include <linux/kernel.h> |
26 | #include <linux/utsname.h> | 26 | #include <linux/utsname.h> |
27 | 27 | ||
28 | |||
29 | #if defined USB_ETH_RNDIS | ||
30 | # undef USB_ETH_RNDIS | ||
31 | #endif | ||
32 | #ifdef CONFIG_USB_ETH_RNDIS | ||
33 | # define USB_ETH_RNDIS y | ||
34 | #endif | ||
35 | |||
28 | #include "u_ether.h" | 36 | #include "u_ether.h" |
29 | 37 | ||
30 | 38 | ||
@@ -66,7 +74,7 @@ | |||
66 | #define DRIVER_DESC "Ethernet Gadget" | 74 | #define DRIVER_DESC "Ethernet Gadget" |
67 | #define DRIVER_VERSION "Memorial Day 2008" | 75 | #define DRIVER_VERSION "Memorial Day 2008" |
68 | 76 | ||
69 | #ifdef CONFIG_USB_ETH_RNDIS | 77 | #ifdef USB_ETH_RNDIS |
70 | #define PREFIX "RNDIS/" | 78 | #define PREFIX "RNDIS/" |
71 | #else | 79 | #else |
72 | #define PREFIX "" | 80 | #define PREFIX "" |
@@ -87,7 +95,7 @@ | |||
87 | 95 | ||
88 | static inline bool has_rndis(void) | 96 | static inline bool has_rndis(void) |
89 | { | 97 | { |
90 | #ifdef CONFIG_USB_ETH_RNDIS | 98 | #ifdef USB_ETH_RNDIS |
91 | return true; | 99 | return true; |
92 | #else | 100 | #else |
93 | return false; | 101 | return false; |
@@ -110,7 +118,7 @@ static inline bool has_rndis(void) | |||
110 | 118 | ||
111 | #include "f_ecm.c" | 119 | #include "f_ecm.c" |
112 | #include "f_subset.c" | 120 | #include "f_subset.c" |
113 | #ifdef CONFIG_USB_ETH_RNDIS | 121 | #ifdef USB_ETH_RNDIS |
114 | #include "f_rndis.c" | 122 | #include "f_rndis.c" |
115 | #include "rndis.c" | 123 | #include "rndis.c" |
116 | #endif | 124 | #endif |
@@ -251,7 +259,7 @@ static struct usb_configuration rndis_config_driver = { | |||
251 | 259 | ||
252 | /*-------------------------------------------------------------------------*/ | 260 | /*-------------------------------------------------------------------------*/ |
253 | 261 | ||
254 | #ifdef CONFIG_USB_ETH_EEM | 262 | #ifdef USB_ETH_EEM |
255 | static int use_eem = 1; | 263 | static int use_eem = 1; |
256 | #else | 264 | #else |
257 | static int use_eem; | 265 | static int use_eem; |