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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi Paul,

After merging the moduleh tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

drivers/tty/hvc/hvc_opal.c:244:12: error: 'THIS_MODULE' undeclared here (not in a function)

Caused by commit daea1175a9f0 ("powerpc/powernv: Support for OPAL
console") from the powerpc tree interacting with the module.h split up.

I have applied the below patch for today (and will carry it as a merge
fix up as necessary).

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Wed, 28 Sep 2011 17:07:24 +1000
Subject: [PATCH] powerpc/powernv: include export.h in hvc_opal.h for
 THIS_MODULE

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 drivers/tty/hvc/hvc_opal.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/tty/hvc/hvc_opal.c b/drivers/tty/hvc/hvc_opal.c
index 7b38512..ced26c8 100644
--- a/drivers/tty/hvc/hvc_opal.c
+++ b/drivers/tty/hvc/hvc_opal.c
@@ -28,6 +28,7 @@
 #include <linux/console.h>
 #include <linux/of.h>
 #include <linux/of_platform.h>
+#include <linux/export.h>
 
 #include <asm/hvconsole.h>
 #include <asm/prom.h>
-- 
1.7.6.3


-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel]     [Linux USB Development]     [Yosemite News]     [Linux SCSI]

  Powered by Linux