linux-next: build failure after merge of the moduleh tree

[Stephen Rothwell]

Hi Paul,

After merging the moduleh tree, today's linux-next build (x86_64
allmodconfig) produced these errors/warnings:

drivers/staging/rtl8712/usb_intf.c:172:1: warning: data definition has no type or storage class [enabled by default]
drivers/staging/rtl8712/usb_intf.c:172:1: warning: type defaults to 'int' in declaration of 'MODULE_DEVICE_TABLE' [-Wimplicit-int]
drivers/staging/rtl8712/usb_intf.c:172:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/staging/rtl8712/usb_intf.c: In function 'r8712u_drv_entry':
drivers/staging/rtl8712/usb_intf.c:649:9: error: 'THIS_MODULE' undeclared (first use in this function)
drivers/staging/rtl8712/hal_init.c:66:17: error: expected declaration specifiers or '...' before string constant

Caused by various commits in the staging tree interacting with the
module.h split.

I have added the following patch:

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Tue, 4 Oct 2011 18:30:10 +1100
Subject: [PATCH] staging: r8712u:  include module.h where needed

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 drivers/staging/rtl8712/hal_init.c |    1 +
 drivers/staging/rtl8712/usb_intf.c |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/staging/rtl8712/hal_init.c b/drivers/staging/rtl8712/hal_init.c
index 1bd9c37..d0029aa 100644
--- a/drivers/staging/rtl8712/hal_init.c
+++ b/drivers/staging/rtl8712/hal_init.c
@@ -32,6 +32,7 @@
 #include <linux/device.h>
 #include <linux/usb/ch9.h>
 #include <linux/firmware.h>
+#include <linux/module.h>
 
 #include "osdep_service.h"
 #include "drv_types.h"
diff --git a/drivers/staging/rtl8712/usb_intf.c b/drivers/staging/rtl8712/usb_intf.c
index 0a2f274..fb2e89c 100644
--- a/drivers/staging/rtl8712/usb_intf.c
+++ b/drivers/staging/rtl8712/usb_intf.c
@@ -29,6 +29,7 @@
 #define _HCI_INTF_C_
 
 #include <linux/usb.h>
+#include <linux/module.h>
 
 #include "osdep_service.h"
 #include "drv_types.h"
-- 
1.7.6.3

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature