diff options
| author | Andrzej Pietrasiewicz <andrzej.p@samsung.com> | 2014-01-22 14:58:04 +0100 |
|---|---|---|
| committer | Chanho Park <chanho61.park@samsung.com> | 2014-03-20 17:43:35 +0900 |
| commit | ff56fa3c66886461295b4eacb97fdbe60ab7a4a3 (patch) | |
| tree | f505ed1916b6be0b708e717efbefa152a89316a8 /drivers/usb | |
| parent | d40d1607fd75626c02d9ca8069cc7b178558a854 (diff) | |
| download | linux-3.10-ff56fa3c66886461295b4eacb97fdbe60ab7a4a3.tar.gz linux-3.10-ff56fa3c66886461295b4eacb97fdbe60ab7a4a3.tar.bz2 linux-3.10-ff56fa3c66886461295b4eacb97fdbe60ab7a4a3.zip | |
usb: gadget: temporarily turn off rndis from slp gadget
This fixes build break caused by recently merged removal
of compatibility layer in rndis.
Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
Change-Id: I11c2d02e2d491f30f8c9936916f627389787a1e5
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/gadget/slp.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/usb/gadget/slp.c b/drivers/usb/gadget/slp.c index 45536b40195..06ac80136bd 100644 --- a/drivers/usb/gadget/slp.c +++ b/drivers/usb/gadget/slp.c @@ -154,7 +154,7 @@ struct slp_multi_dev { }; /* TODO: only enabled 'rndis' and 'sdb'. need to verify more functions */ -static const char *default_funcs[] = {"rndis", "sdb"}; +static const char *default_funcs[] = {"sdb"}; static unsigned slp_multi_nluns; static struct class *slp_multi_class; static struct slp_multi_dev *_slp_multi_dev; @@ -372,6 +372,7 @@ static struct slp_multi_usb_function acm_function = { .attributes = acm_function_attributes, }; +#if 0 struct rndis_function_config { u8 ethaddr[ETH_ALEN]; u32 vendorID; @@ -612,14 +613,16 @@ static struct slp_multi_usb_function rndis_function = { .unbind_config = rndis_function_unbind_config, .attributes = rndis_function_attributes, }; - +#endif /*-------------------------------------------------------------------------*/ /* Supported functions initialization */ static struct slp_multi_usb_function *supported_functions[] = { &sdb_function, &acm_function, +#if 0 &rndis_function, +#endif NULL, }; |