diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-08 10:50:18 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-08 10:50:18 (GMT) |
| commit | b9af5643fdc5365a23f9752a1181fef374425217 (patch) | |
| tree | 6a808c54db2c8296c2706f6e546b3ac4fcbde1d5 /drivers/staging/vt6655/hostap.h | |
| parent | 463311960e9312245418af98dce8c0161fd6b827 (diff) | |
| parent | e603984823a9218857c599195aaa514c5343de03 (diff) | |
| download | linux-b9af5643fdc5365a23f9752a1181fef374425217.tar.xz | |
Merge tag 'staging-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging updates from Greg KH:
"Here is the big staging patch set for 3.18-rc1.
Once again, we are deleting more code than we added, with something
like 150000 lines deleted overall. Some of this is due to drivers
being added to the networking tree, so the old versions are removed
here, but even then, the overall difference is quite good.
Other than driver deletions, lots and lots and lots of minor cleanups
all over the place. Full details are in the changelog"
* tag 'staging-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1481 commits)
staging: et131x: Remove et131x driver from drivers/staging
staging: emxx_udc: Use min_t instead of min
staging: emxx_udc: Fix replace printk(KERN_DEBUG ..) with dev_dbg
staging: media: Fixed else after return or break warning
staging: media: omap4iss: Fixed else after return or break warning
staging: rtl8712: Fixed else not required after return
staging: rtl8712: Fix missing blank line warning
staging: rtl8192e: rtl8192e: Remove spaces before the semicolons
staging: rtl8192e: rtl8192e: Remove unnecessary return statements
staging: rtl8192e: Remove unneeded void return
staging: rtl8192e: Fix void function return statements style
staging: rtl8712: Fix unnecessary parentheses style warning
staging: rtl8192e: Fix unnecessary space before function pointer arguments
staging: rtl8192e: Array was made static const char * const
staging: ft1000: ft1000-usb: Removed unnecessary else statement.
staging: ft1000: ft1000-usb: Removed unnecessary else statement.
staging: ft1000: ft1000-usb: Removed unnecessary parentheses.
staging: ft1000: ft1000-usb: Added new line after declarations.
staging: vt6655: Fixed C99 // comment errors in wpactl.c
staging: speakup: Fixed warning <linux/serial.h> instead of <asm/serial.h>
...
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 6e801a4..17df4e4 100644 --- a/drivers/staging/vt6655/hostap.h +++ b/drivers/staging/vt6655/hostap.h @@ -52,7 +52,7 @@ #define ARPHRD_IEEE80211 801 #endif -int vt6655_hostap_set_hostapd(PSDevice pDevice, int val, int rtnl_locked); -int vt6655_hostap_ioctl(PSDevice pDevice, struct iw_point *p); +int vt6655_hostap_set_hostapd(struct vnt_private *, int val, int rtnl_locked); +int vt6655_hostap_ioctl(struct vnt_private *, struct iw_point *p); #endif // __HOSTAP_H__ |