summaryrefslogtreecommitdiffstats
path: root/drivers/usb/gadget/rndis.h
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2010-09-24 14:03:37 +0200
committerJiri Kosina <jkosina@suse.cz>2010-09-24 14:03:37 +0200
commit73e6d6c6467771838c1fc6949e6768a12ed72464 (patch)
tree94dd60891869a0a275cd332c4e675cf0b101fcfa /drivers/usb/gadget/rndis.h
parent12e5272585901217e919da810c801e5084ee0cb1 (diff)
parenta850ea30374ebed32a0724742601861853fde869 (diff)
downloadop-kernel-dev-73e6d6c6467771838c1fc6949e6768a12ed72464.zip
op-kernel-dev-73e6d6c6467771838c1fc6949e6768a12ed72464.tar.gz
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/usb/gadget/rndis.h')
-rw-r--r--drivers/usb/gadget/rndis.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/rndis.h b/drivers/usb/gadget/rndis.h
index c236aaa..907c330 100644
--- a/drivers/usb/gadget/rndis.h
+++ b/drivers/usb/gadget/rndis.h
@@ -262,7 +262,7 @@ int rndis_signal_disconnect (int configNr);
int rndis_state (int configNr);
extern void rndis_set_host_mac (int configNr, const u8 *addr);
-int __devinit rndis_init (void);
+int rndis_init(void);
void rndis_exit (void);
#endif /* _LINUX_RNDIS_H */
OpenPOWER on IntegriCloud