diff options
| author | Andrzej Pietrasiewicz <andrzej.p@samsung.com> | 2013-12-03 18:15:29 +0400 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2013-12-12 23:43:38 +0400 |
| commit | 9c2b85f4f99cb5c5f4b8e29ef15e344f93ec5be1 (patch) | |
| tree | 2bf23fc517695312880e0b61a9744703a91ac87d /drivers/usb/gadget/rndis.c | |
| parent | 31f89db1b81ea1c54ca7d186a0c0ebab0d4988f0 (diff) | |
| download | linux-9c2b85f4f99cb5c5f4b8e29ef15e344f93ec5be1.tar.xz | |
usb: gadget: rndis: merge u_rndis.ko with usb_f_rndis.ko
The rndis function's users use only the new interface, so the two modules
can be merged.
Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Acked-by: Michal Nazarewicz <mina86@mina86.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/gadget/rndis.c')
| -rw-r--r-- | drivers/usb/gadget/rndis.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/usb/gadget/rndis.c b/drivers/usb/gadget/rndis.c index a3ad732bc812..1ffbdb4659f2 100644 --- a/drivers/usb/gadget/rndis.c +++ b/drivers/usb/gadget/rndis.c @@ -1142,7 +1142,7 @@ static struct proc_dir_entry *rndis_connect_state [RNDIS_MAX_CONFIGS]; #endif /* CONFIG_USB_GADGET_DEBUG_FILES */ -static int rndis_init(void) +int rndis_init(void) { u8 i; @@ -1174,9 +1174,8 @@ static int rndis_init(void) return 0; } -module_init(rndis_init); -static void rndis_exit(void) +void rndis_exit(void) { #ifdef CONFIG_USB_GADGET_DEBUG_FILES u8 i; @@ -1188,6 +1187,4 @@ static void rndis_exit(void) } #endif } -module_exit(rndis_exit); -MODULE_LICENSE("GPL"); |