diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-08-25 14:51:42 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-08-25 14:51:42 -0400 |
| commit | e569aa78ba01f7f66e016a4d57310fd041524d17 (patch) | |
| tree | eaedc03d42ee2bf6200fc07b080a99bad103def3 /drivers/net/wireless/prism54/isl_ioctl.c | |
| parent | 4562487a00445eab96311365ba15c41dc4d043cd (diff) | |
| parent | 268bae0b6879f238ba57f5f801958d1254e136f7 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
drivers/net/wireless/libertas/if_sdio.c
Diffstat (limited to 'drivers/net/wireless/prism54/isl_ioctl.c')
| -rw-r--r-- | drivers/net/wireless/prism54/isl_ioctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/prism54/isl_ioctl.c b/drivers/net/wireless/prism54/isl_ioctl.c index 77cd65db850..d97a2caf582 100644 --- a/drivers/net/wireless/prism54/isl_ioctl.c +++ b/drivers/net/wireless/prism54/isl_ioctl.c @@ -3234,7 +3234,7 @@ prism54_ioctl(struct net_device *ndev, struct ifreq *rq, int cmd) switch (cmd) { case PRISM54_HOSTAPD: if (!capable(CAP_NET_ADMIN)) - return -EPERM; + return -EPERM; ret = prism54_hostapd(ndev, &wrq->u.data); return ret; } |