Staging: otus: fix name clash
authorJ.R. Mauro <jrm8005@gmail.com>
Fri, 7 Nov 2008 22:49:07 +0000 (17:49 -0500)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 6 Jan 2009 21:52:10 +0000 (13:52 -0800)
Make p80211wext_handler_def in the otus driver static. It's not used outside
this file and causes name clashes if it's visible.

Signed-off by: J.R. Mauro <jrm8005@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/otus/usbdrv.c

index 2bef4f9..2f9d06e 100644 (file)
@@ -287,7 +287,7 @@ static const iw_handler usbdrv_private_handler[] =
     NULL,               /* SIOCIWFIRSTPRIV */
 };
 
-struct iw_handler_def p80211wext_handler_def = {
+static struct iw_handler_def p80211wext_handler_def = {
     .num_standard = sizeof(usbdrvwext_handler) / sizeof(iw_handler),
     .num_private = sizeof(usbdrv_private_handler)/sizeof(iw_handler),
     .num_private_args = sizeof(usbdrv_private_args)/sizeof(struct iw_priv_args),
@@ -948,7 +948,6 @@ int zfLnxUnregisterVapDev(struct net_device* parentDev, u16_t vapId)
 #endif
 
 //extern void zfiWlanQueryMacAddress(zdev_t* dev, u8_t* addr);
-extern struct iw_handler_def p80211wext_handler_def;
 
 extern int usbdrv_open(struct net_device *dev);
 extern int usbdrv_close(struct net_device *dev);