From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Michael Neuling To: benh@kernel.crashing.org, Paul Mackerras , linuxppc-dev@ozlabs.org, sfr@canb.auug.org.au, Paul Gortmaker , torvalds@linux-foundation.org Subject: [PATCH] powerpc: fix building hvc_opal.c In-reply-to: <26327.1320645941@neuling.org> References: <26327.1320645941@neuling.org> Date: Mon, 07 Nov 2011 17:12:28 +1100 Message-ID: <26601.1320646348@neuling.org> List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Fix building following build error: drivers/tty/hvc/hvc_opal.c:244:12: error: 'THIS_MODULE' undeclared here (not in a function) Signed-off-by: Michael Neuling -- Actually, this is the right fix. sfr says this was a merge conflict between the module.h split up and the powerpc tree, which were both merged by Linus today. 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 #include #include +#include #include #include