summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacek Bukarewicz <j.bukarewicz@samsung.com>2014-02-14 15:22:16 +0100
committerMarek Szyprowski <m.szyprowski@samsung.com>2014-05-15 07:27:16 +0200
commitc1e443b98267403e518e0f60c30e0701acbb805e (patch)
treef5982e7b076c08a4398a7ea57faeb7162a4fa6b6
parenta6f4c8afa79815f09d15ad603f5e0107100dca0d (diff)
downloadlinux-3.10-c1e443b98267403e518e0f60c30e0701acbb805e.tar.gz
linux-3.10-c1e443b98267403e518e0f60c30e0701acbb805e.tar.bz2
linux-3.10-c1e443b98267403e518e0f60c30e0701acbb805e.zip
usb: gadget: Enable rndis in the slp gadget driver
Rndis was disabled temporarily in commit 7ca93af to fix build break. It can be enabled now as commit 65c9d04 adapted slp driver to the new interface of rndis. Change-Id: Id28413de771818cf1a358664d637aa989615fe26 Signed-off-by: Jacek Bukarewicz <j.bukarewicz@samsung.com>
-rw-r--r--drivers/usb/gadget/slp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/slp.c b/drivers/usb/gadget/slp.c
index 70b7d2fd033..bc9649204cf 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[] = {"sdb"};
+static const char *default_funcs[] = {"rndis", "sdb"};
static unsigned slp_multi_nluns;
static struct class *slp_multi_class;
static struct slp_multi_dev *_slp_multi_dev;