summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuis Henriques <luis.henriques@canonical.com>2015-07-17 14:20:31 +0100
committerMichael Ellerman <mpe@ellerman.id.au>2015-07-23 20:00:35 +1000
commit120d200a86273d1840d091959dca65617cd9eff2 (patch)
treeaa7977f22e917a7aae288de3ff1377b620dd6436
parent3ba3a73e9f204ce7904cae7d14be399b467c4fef (diff)
downloadop-kernel-dev-120d200a86273d1840d091959dca65617cd9eff2.zip
op-kernel-dev-120d200a86273d1840d091959dca65617cd9eff2.tar.gz
macintosh/ans-lcd: fix build failure after module_init/exit relocation
After commit 0fd972a7d91d ("module: relocate module_init from init.h to module.h") ans-lcd module fails to build with: drivers/macintosh/ans-lcd.c:201:1: warning: data definition has no type or storage class [enabled by default] module_init(anslcd_init); ^ drivers/macintosh/ans-lcd.c:201:1: error: type defaults to 'int' in declaration of 'module_init' [-Werror=implicit-int] drivers/macintosh/ans-lcd.c:201:1: warning: parameter names (without types) in function declaration [enabled by default] drivers/macintosh/ans-lcd.c:202:1: warning: data definition has no type or storage class [enabled by default] module_exit(anslcd_exit); ^ drivers/macintosh/ans-lcd.c:202:1: error: type defaults to 'int' in declaration of 'module_exit' [-Werror=implicit-int] drivers/macintosh/ans-lcd.c:202:1: warning: parameter names (without types) in function declaration [enabled by default] drivers/macintosh/ans-lcd.c:155:1: warning: 'anslcd_init' defined but not used [-Wunused-function] anslcd_init(void) ^ drivers/macintosh/ans-lcd.c:195:1: warning: 'anslcd_exit' defined but not used [-Wunused-function] anslcd_exit(void) ^ This commit fixes it by replacing linux/init.h by linux/module.h. Fixes: 0fd972a7d91d ("module: relocate module_init from init.h to module.h") Signed-off-by: Luis Henriques <luis.henriques@canonical.com> Acked-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
-rw-r--r--drivers/macintosh/ans-lcd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/macintosh/ans-lcd.c b/drivers/macintosh/ans-lcd.c
index 1a57e88..cd35079 100644
--- a/drivers/macintosh/ans-lcd.c
+++ b/drivers/macintosh/ans-lcd.c
@@ -7,7 +7,7 @@
#include <linux/kernel.h>
#include <linux/miscdevice.h>
#include <linux/fcntl.h>
-#include <linux/init.h>
+#include <linux/module.h>
#include <linux/delay.h>
#include <linux/fs.h>
OpenPOWER on IntegriCloud