diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-07 15:03:53 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-07 15:03:53 +1000 |
| commit | 8e4e9eca1099ba69893511d21bb09fa25163218a (patch) | |
| tree | ec6d6ac99bb1e854c1ebea5356f0f9be90142a65 /drivers/staging/vt6656/hostap.h | |
| parent | 8a95ccb08f38db0371634dbf1e34a5094ff00c6e (diff) | |
| parent | c1cfeb2b7e86543897b250717bcd4ae7c8f8a6b9 (diff) | |
Merge remote branch 'staging-next/staging-next'
Conflicts:
drivers/staging/arlan/arlan-main.c
drivers/staging/comedi/drivers/cb_das16_cs.c
drivers/staging/cx25821/cx25821-alsa.c
drivers/staging/dt3155/dt3155_drv.c
drivers/staging/hv/hv.c
drivers/staging/netwave/netwave_cs.c
drivers/staging/wavelan/wavelan.c
drivers/staging/wavelan/wavelan_cs.c
Diffstat (limited to 'drivers/staging/vt6656/hostap.h')
| -rw-r--r-- | drivers/staging/vt6656/hostap.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/staging/vt6656/hostap.h b/drivers/staging/vt6656/hostap.h index 8fd667b542be..b660aee1ca0e 100644 --- a/drivers/staging/vt6656/hostap.h +++ b/drivers/staging/vt6656/hostap.h @@ -61,10 +61,7 @@ #define ARPHRD_IEEE80211 801 #endif -int hostap_set_hostapd(PSDevice pDevice, int val, int rtnl_locked); -int hostap_ioctl(PSDevice pDevice, struct iw_point *p); - -#endif // __HOSTAP_H__ - - +int vt6656_hostap_set_hostapd(PSDevice pDevice, int val, int rtnl_locked); +int vt6656_hostap_ioctl(PSDevice pDevice, struct iw_point *p); +#endif /* __HOSTAP_H__ */ |