diff options
| author | Forest Bond <forest@alittletooquiet.net> | 2010-04-17 11:03:47 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-11 11:35:56 -0700 |
| commit | ecf739e695d5aa404326100c0ba93c211e87a0fe (patch) | |
| tree | 1e7ad5592e559b952376372a0344ab96724c2c18 /drivers/staging/vt6655/hostap.h | |
| parent | c30d7973f22ea3f8b3e5d1d7215b3f2ff8f5e934 (diff) | |
Staging: vt6655: Rename hostap_set_hostapd, hostap_iotctl.
The functions hostap_set_hostapd, hostap_iotctl clashed with functions of the
same name with CONFIG_HOSTAP=y and/or CONFIG_VT6656=y.
Signed-off-by: Forest Bond <forest@alittletooquiet.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/vt6655/hostap.h')
| -rw-r--r-- | drivers/staging/vt6655/hostap.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/vt6655/hostap.h b/drivers/staging/vt6655/hostap.h index 8fd667b542b..55db55524d9 100644 --- a/drivers/staging/vt6655/hostap.h +++ b/drivers/staging/vt6655/hostap.h @@ -61,8 +61,8 @@ #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); +int vt6655_hostap_set_hostapd(PSDevice pDevice, int val, int rtnl_locked); +int vt6655_hostap_ioctl(PSDevice pDevice, struct iw_point *p); #endif // __HOSTAP_H__ |