diff options
| author | Forest Bond <forest@alittletooquiet.net> | 2010-04-17 11:03:38 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-11 11:35:56 -0700 |
| commit | c30d7973f22ea3f8b3e5d1d7215b3f2ff8f5e934 (patch) | |
| tree | f837a864bfd1909e52c15244d8a3109865826f9e /drivers/staging/vt6656/main_usb.c | |
| parent | 9a0e756c5280750c23bd44d2b855a1f5442ea7b4 (diff) | |
| download | kernel_samsung_smdk4412-c30d7973f22ea3f8b3e5d1d7215b3f2ff8f5e934.zip kernel_samsung_smdk4412-c30d7973f22ea3f8b3e5d1d7215b3f2ff8f5e934.tar.gz kernel_samsung_smdk4412-c30d7973f22ea3f8b3e5d1d7215b3f2ff8f5e934.tar.bz2 | |
Staging: vt6656: 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_VT6655=y.
Signed-off-by: Forest Bond <forest@alittletooquiet.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/vt6656/main_usb.c')
| -rw-r--r-- | drivers/staging/vt6656/main_usb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c index c0bad4f..ebd7a1e 100644 --- a/drivers/staging/vt6656/main_usb.c +++ b/drivers/staging/vt6656/main_usb.c @@ -2069,7 +2069,7 @@ static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { rc = 0; } - rc = hostap_ioctl(pDevice, &wrq->u.data); + rc = vt6656_hostap_ioctl(pDevice, &wrq->u.data); break; case IOCTL_CMD_WPA: |