diff options
author | Ali Bahar <ali@internetdog.org> | 2011-09-04 03:14:11 +0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-09-06 17:00:32 -0700 |
commit | 359140aaea5bc3123356d46d0daa9dac8cfb12bc (patch) | |
tree | 3c855e61bbbed499736bc90e2d5bc105719349ef /drivers/staging/rtl8712 | |
parent | 99f5ff39d24915533d5bcf557e75116c706bd6dd (diff) |
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>
Diffstat (limited to 'drivers/staging/rtl8712')
-rw-r--r-- | drivers/staging/rtl8712/hal_init.c | 5 | ||||
-rw-r--r-- | drivers/staging/rtl8712/osdep_service.h | 30 | ||||
-rw-r--r-- | drivers/staging/rtl8712/recv_linux.c | 4 | ||||
-rw-r--r-- | drivers/staging/rtl8712/rtl8712_cmd.c | 18 | ||||
-rw-r--r-- | drivers/staging/rtl8712/rtl871x_cmd.c | 18 | ||||
-rw-r--r-- | drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 9 | ||||
-rw-r--r-- | drivers/staging/rtl8712/rtl871x_security.c | 15 | ||||
-rw-r--r-- | drivers/staging/rtl8712/usb_intf.c | 2 | ||||
-rw-r--r-- | drivers/staging/rtl8712/usb_ops_linux.c | 2 | ||||
-rw-r--r-- | drivers/staging/rtl8712/xmit_linux.c | 2 |
10 files changed, 82 insertions, 23 deletions
diff --git a/drivers/staging/rtl8712/hal_init.c b/drivers/staging/rtl8712/hal_init.c index 1411c7bf0d4..1bd9c374a5f 100644 --- a/drivers/staging/rtl8712/hal_init.c +++ b/drivers/staging/rtl8712/hal_init.c @@ -28,6 +28,11 @@ #define _HAL_INIT_C_ +#include <linux/usb.h> +#include <linux/device.h> +#include <linux/usb/ch9.h> +#include <linux/firmware.h> + #include "osdep_service.h" #include "drv_types.h" #include "rtl871x_byteorder.h" diff --git a/drivers/staging/rtl8712/osdep_service.h b/drivers/staging/rtl8712/osdep_service.h index 66195601e71..1ee943a58c4 100644 --- a/drivers/staging/rtl8712/osdep_service.h +++ b/drivers/staging/rtl8712/osdep_service.h @@ -29,35 +29,19 @@ #define _SUCCESS 1 #define _FAIL 0 -#include "basic_types.h" +#include <linux/version.h> #include <linux/spinlock.h> + +#include <linux/interrupt.h> #include <linux/semaphore.h> +#include <linux/sched.h> #include <linux/sem.h> #include <linux/netdevice.h> #include <linux/etherdevice.h> #include <net/iw_handler.h> -#include <linux/proc_fs.h> /* Necessary because we use the proc fs */ -#include <linux/compiler.h> -#include <linux/kernel.h> -#include <linux/errno.h> -#include <linux/init.h> -#include <linux/slab.h> -#include <linux/module.h> -#include <linux/sched.h> -#include <linux/kref.h> -#include <linux/skbuff.h> -#include <linux/usb.h> -#include <linux/usb/ch9.h> -#include <linux/io.h> -#include <linux/circ_buf.h> -#include <linux/uaccess.h> -#include <asm/byteorder.h> -#include <linux/atomic.h> -#include <linux/wireless.h> -#include <linux/rtnetlink.h> -#include "ethernet.h" -#include <linux/if_arp.h> -#include <linux/firmware.h> +#include <linux/proc_fs.h> /* Necessary because we use the proc fs */ + +#include "basic_types.h" struct __queue { struct list_head queue; diff --git a/drivers/staging/rtl8712/recv_linux.c b/drivers/staging/rtl8712/recv_linux.c index 1e5c59be3a2..0e26d5f6cf2 100644 --- a/drivers/staging/rtl8712/recv_linux.c +++ b/drivers/staging/rtl8712/recv_linux.c @@ -28,11 +28,15 @@ #define _RECV_OSDEP_C_ +#include <linux/usb.h> + #include "osdep_service.h" #include "drv_types.h" #include "wifi.h" #include "recv_osdep.h" #include "osdep_intf.h" +#include "ethernet.h" +#include <linux/if_arp.h> #include "usb_ops.h" /*init os related resource in struct recv_priv*/ diff --git a/drivers/staging/rtl8712/rtl8712_cmd.c b/drivers/staging/rtl8712/rtl8712_cmd.c index 26c605e8cd6..9f6ebc419b0 100644 --- a/drivers/staging/rtl8712/rtl8712_cmd.c +++ b/drivers/staging/rtl8712/rtl8712_cmd.c @@ -28,6 +28,24 @@ #define _RTL8712_CMD_C_ +#include <linux/compiler.h> +#include <linux/kernel.h> +#include <linux/errno.h> +#include <linux/init.h> +#include <linux/slab.h> +#include <linux/module.h> +#include <linux/kref.h> +#include <linux/netdevice.h> +#include <linux/skbuff.h> +#include <linux/usb.h> +#include <linux/usb/ch9.h> +#include <linux/circ_buf.h> +#include <linux/uaccess.h> +#include <asm/byteorder.h> +#include <linux/atomic.h> +#include <linux/semaphore.h> +#include <linux/rtnetlink.h> + #include "osdep_service.h" #include "drv_types.h" #include "recv_osdep.h" diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c index ba92762dbb1..e188d8dcfde 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.c +++ b/drivers/staging/rtl8712/rtl871x_cmd.c @@ -28,6 +28,24 @@ #define _RTL871X_CMD_C_ +#include <linux/compiler.h> +#include <linux/kernel.h> +#include <linux/errno.h> +#include <linux/init.h> +#include <linux/slab.h> +#include <linux/module.h> +#include <linux/kref.h> +#include <linux/netdevice.h> +#include <linux/skbuff.h> +#include <linux/usb.h> +#include <linux/usb/ch9.h> +#include <linux/circ_buf.h> +#include <linux/uaccess.h> +#include <asm/byteorder.h> +#include <linux/atomic.h> +#include <linux/semaphore.h> +#include <linux/rtnetlink.h> + #include "osdep_service.h" #include "drv_types.h" #include "recv_osdep.h" diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c index ba700815ead..ec58b6636fa 100644 --- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c +++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c @@ -39,6 +39,15 @@ #include "rtl871x_ioctl_set.h" #include "rtl871x_mp_ioctl.h" #include "mlme_osdep.h" +#include <linux/wireless.h> +#include <linux/module.h> +#include <linux/kernel.h> +#include <linux/init.h> +#include <linux/version.h> +#include <linux/io.h> +#include <linux/semaphore.h> +#include <net/iw_handler.h> +#include <linux/if_arp.h> #define RTL_IOCTL_WPA_SUPPLICANT (SIOCIWFIRSTPRIV + 30) diff --git a/drivers/staging/rtl8712/rtl871x_security.c b/drivers/staging/rtl8712/rtl871x_security.c index 65321bed4d5..7b92927a04d 100644 --- a/drivers/staging/rtl8712/rtl871x_security.c +++ b/drivers/staging/rtl8712/rtl871x_security.c @@ -28,6 +28,21 @@ #define _RTL871X_SECURITY_C_ +#include <linux/compiler.h> +#include <linux/kernel.h> +#include <linux/errno.h> +#include <linux/init.h> +#include <linux/slab.h> +#include <linux/module.h> +#include <linux/kref.h> +#include <linux/netdevice.h> +#include <linux/skbuff.h> +#include <linux/circ_buf.h> +#include <linux/uaccess.h> +#include <asm/byteorder.h> +#include <linux/atomic.h> +#include <linux/semaphore.h> + #include "osdep_service.h" #include "drv_types.h" #include "wifi.h" diff --git a/drivers/staging/rtl8712/usb_intf.c b/drivers/staging/rtl8712/usb_intf.c index 263a4b510ed..3447d755a60 100644 --- a/drivers/staging/rtl8712/usb_intf.c +++ b/drivers/staging/rtl8712/usb_intf.c @@ -28,6 +28,8 @@ #define _HCI_INTF_C_ +#include <linux/usb.h> + #include "osdep_service.h" #include "drv_types.h" #include "recv_osdep.h" diff --git a/drivers/staging/rtl8712/usb_ops_linux.c b/drivers/staging/rtl8712/usb_ops_linux.c index 54757dd2114..b796c6bb593 100644 --- a/drivers/staging/rtl8712/usb_ops_linux.c +++ b/drivers/staging/rtl8712/usb_ops_linux.c @@ -28,6 +28,8 @@ #define _HCI_OPS_OS_C_ +#include <linux/usb.h> + #include "osdep_service.h" #include "drv_types.h" #include "osdep_intf.h" diff --git a/drivers/staging/rtl8712/xmit_linux.c b/drivers/staging/rtl8712/xmit_linux.c index 6b7987d3a1c..d3535ba5dd4 100644 --- a/drivers/staging/rtl8712/xmit_linux.c +++ b/drivers/staging/rtl8712/xmit_linux.c @@ -28,6 +28,8 @@ #define _XMIT_OSDEP_C_ +#include <linux/usb.h> + #include "osdep_service.h" #include "drv_types.h" |