diff options
| author | Forest Bond | 2010-04-17 17:03:47 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2010-05-11 20:35:56 +0200 |
| commit | ecf739e695d5aa404326100c0ba93c211e87a0fe (patch) | |
| tree | 1e7ad5592e559b952376372a0344ab96724c2c18 /drivers/staging/vt6655/ioctl.c | |
| parent | Staging: vt6656: Rename hostap_set_hostapd, hostap_iotctl. (diff) | |
| download | kernel-qcow2-linux-ecf739e695d5aa404326100c0ba93c211e87a0fe.tar.gz kernel-qcow2-linux-ecf739e695d5aa404326100c0ba93c211e87a0fe.tar.xz kernel-qcow2-linux-ecf739e695d5aa404326100c0ba93c211e87a0fe.zip | |
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/ioctl.c')
| -rw-r--r-- | drivers/staging/vt6655/ioctl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/vt6655/ioctl.c b/drivers/staging/vt6655/ioctl.c index 38577ca841ea..37928e844010 100644 --- a/drivers/staging/vt6655/ioctl.c +++ b/drivers/staging/vt6655/ioctl.c @@ -429,7 +429,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { break; }; if (sValue.dwValue == 1) { - if (hostap_set_hostapd(pDevice, 1, 1) == 0){ + if (vt6655_hostap_set_hostapd(pDevice, 1, 1) == 0){ DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Enable HOSTAP\n"); } else { @@ -438,7 +438,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { } } else { - hostap_set_hostapd(pDevice, 0, 1); + vt6655_hostap_set_hostapd(pDevice, 0, 1); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Disable HOSTAP\n"); } |