Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

staging: r8712u: Merging Realtek's latest (v2.6.6). Updated include directives.

These are the new include directives for header files.
The following were (somehow!) not explicity in Realtek's, but proved necessary:
"linux/usb.h" is needed for usb_alloc_urb();
"linux/interrupt.h" is needed for tasklet_struct. It was often a nested
include.

Signed-off-by: Ali Bahar <ali@internetDog.org>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

authored by

Ali Bahar and committed by
Greg Kroah-Hartman
359140aa 99f5ff39

+82 -23
+5
drivers/staging/rtl8712/hal_init.c
··· 28 28 29 29 #define _HAL_INIT_C_ 30 30 31 + #include <linux/usb.h> 32 + #include <linux/device.h> 33 + #include <linux/usb/ch9.h> 34 + #include <linux/firmware.h> 35 + 31 36 #include "osdep_service.h" 32 37 #include "drv_types.h" 33 38 #include "rtl871x_byteorder.h"
+7 -23
drivers/staging/rtl8712/osdep_service.h
··· 29 29 #define _SUCCESS 1 30 30 #define _FAIL 0 31 31 32 - #include "basic_types.h" 32 + #include <linux/version.h> 33 33 #include <linux/spinlock.h> 34 + 35 + #include <linux/interrupt.h> 34 36 #include <linux/semaphore.h> 37 + #include <linux/sched.h> 35 38 #include <linux/sem.h> 36 39 #include <linux/netdevice.h> 37 40 #include <linux/etherdevice.h> 38 41 #include <net/iw_handler.h> 39 - #include <linux/proc_fs.h> /* Necessary because we use the proc fs */ 40 - #include <linux/compiler.h> 41 - #include <linux/kernel.h> 42 - #include <linux/errno.h> 43 - #include <linux/init.h> 44 - #include <linux/slab.h> 45 - #include <linux/module.h> 46 - #include <linux/sched.h> 47 - #include <linux/kref.h> 48 - #include <linux/skbuff.h> 49 - #include <linux/usb.h> 50 - #include <linux/usb/ch9.h> 51 - #include <linux/io.h> 52 - #include <linux/circ_buf.h> 53 - #include <linux/uaccess.h> 54 - #include <asm/byteorder.h> 55 - #include <linux/atomic.h> 56 - #include <linux/wireless.h> 57 - #include <linux/rtnetlink.h> 58 - #include "ethernet.h" 59 - #include <linux/if_arp.h> 60 - #include <linux/firmware.h> 42 + #include <linux/proc_fs.h> /* Necessary because we use the proc fs */ 43 + 44 + #include "basic_types.h" 61 45 62 46 struct __queue { 63 47 struct list_head queue;
+4
drivers/staging/rtl8712/recv_linux.c
··· 28 28 29 29 #define _RECV_OSDEP_C_ 30 30 31 + #include <linux/usb.h> 32 + 31 33 #include "osdep_service.h" 32 34 #include "drv_types.h" 33 35 #include "wifi.h" 34 36 #include "recv_osdep.h" 35 37 #include "osdep_intf.h" 38 + #include "ethernet.h" 39 + #include <linux/if_arp.h> 36 40 #include "usb_ops.h" 37 41 38 42 /*init os related resource in struct recv_priv*/
+18
drivers/staging/rtl8712/rtl8712_cmd.c
··· 28 28 29 29 #define _RTL8712_CMD_C_ 30 30 31 + #include <linux/compiler.h> 32 + #include <linux/kernel.h> 33 + #include <linux/errno.h> 34 + #include <linux/init.h> 35 + #include <linux/slab.h> 36 + #include <linux/module.h> 37 + #include <linux/kref.h> 38 + #include <linux/netdevice.h> 39 + #include <linux/skbuff.h> 40 + #include <linux/usb.h> 41 + #include <linux/usb/ch9.h> 42 + #include <linux/circ_buf.h> 43 + #include <linux/uaccess.h> 44 + #include <asm/byteorder.h> 45 + #include <linux/atomic.h> 46 + #include <linux/semaphore.h> 47 + #include <linux/rtnetlink.h> 48 + 31 49 #include "osdep_service.h" 32 50 #include "drv_types.h" 33 51 #include "recv_osdep.h"
+18
drivers/staging/rtl8712/rtl871x_cmd.c
··· 28 28 29 29 #define _RTL871X_CMD_C_ 30 30 31 + #include <linux/compiler.h> 32 + #include <linux/kernel.h> 33 + #include <linux/errno.h> 34 + #include <linux/init.h> 35 + #include <linux/slab.h> 36 + #include <linux/module.h> 37 + #include <linux/kref.h> 38 + #include <linux/netdevice.h> 39 + #include <linux/skbuff.h> 40 + #include <linux/usb.h> 41 + #include <linux/usb/ch9.h> 42 + #include <linux/circ_buf.h> 43 + #include <linux/uaccess.h> 44 + #include <asm/byteorder.h> 45 + #include <linux/atomic.h> 46 + #include <linux/semaphore.h> 47 + #include <linux/rtnetlink.h> 48 + 31 49 #include "osdep_service.h" 32 50 #include "drv_types.h" 33 51 #include "recv_osdep.h"
+9
drivers/staging/rtl8712/rtl871x_ioctl_linux.c
··· 39 39 #include "rtl871x_ioctl_set.h" 40 40 #include "rtl871x_mp_ioctl.h" 41 41 #include "mlme_osdep.h" 42 + #include <linux/wireless.h> 43 + #include <linux/module.h> 44 + #include <linux/kernel.h> 45 + #include <linux/init.h> 46 + #include <linux/version.h> 47 + #include <linux/io.h> 48 + #include <linux/semaphore.h> 49 + #include <net/iw_handler.h> 50 + #include <linux/if_arp.h> 42 51 43 52 #define RTL_IOCTL_WPA_SUPPLICANT (SIOCIWFIRSTPRIV + 30) 44 53
+15
drivers/staging/rtl8712/rtl871x_security.c
··· 28 28 29 29 #define _RTL871X_SECURITY_C_ 30 30 31 + #include <linux/compiler.h> 32 + #include <linux/kernel.h> 33 + #include <linux/errno.h> 34 + #include <linux/init.h> 35 + #include <linux/slab.h> 36 + #include <linux/module.h> 37 + #include <linux/kref.h> 38 + #include <linux/netdevice.h> 39 + #include <linux/skbuff.h> 40 + #include <linux/circ_buf.h> 41 + #include <linux/uaccess.h> 42 + #include <asm/byteorder.h> 43 + #include <linux/atomic.h> 44 + #include <linux/semaphore.h> 45 + 31 46 #include "osdep_service.h" 32 47 #include "drv_types.h" 33 48 #include "wifi.h"
+2
drivers/staging/rtl8712/usb_intf.c
··· 28 28 29 29 #define _HCI_INTF_C_ 30 30 31 + #include <linux/usb.h> 32 + 31 33 #include "osdep_service.h" 32 34 #include "drv_types.h" 33 35 #include "recv_osdep.h"
+2
drivers/staging/rtl8712/usb_ops_linux.c
··· 28 28 29 29 #define _HCI_OPS_OS_C_ 30 30 31 + #include <linux/usb.h> 32 + 31 33 #include "osdep_service.h" 32 34 #include "drv_types.h" 33 35 #include "osdep_intf.h"
+2
drivers/staging/rtl8712/xmit_linux.c
··· 28 28 29 29 #define _XMIT_OSDEP_C_ 30 30 31 + #include <linux/usb.h> 32 + 31 33 #include "osdep_service.h" 32 34 #include "drv_types.h" 33 35