aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/iseries/ksyms.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-11-04 16:27:50 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-04 16:27:50 -0800
commit602d4a7e2f4b843d1a67375d4d7104073495b758 (patch)
tree0b9f184e54fa693c27bd5986c114bdcf6949f788 /arch/powerpc/platforms/iseries/ksyms.c
parentNFS,SUNRPC,NLM: fix unused variable warnings when CONFIG_SYSCTL is disabled (diff)
parentpowerpc: Fix vmlinux.lds.S for 32-bit (diff)
downloadlinux-dev-602d4a7e2f4b843d1a67375d4d7104073495b758.tar.xz
linux-dev-602d4a7e2f4b843d1a67375d4d7104073495b758.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'arch/powerpc/platforms/iseries/ksyms.c')
-rw-r--r--arch/powerpc/platforms/iseries/ksyms.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/iseries/ksyms.c b/arch/powerpc/platforms/iseries/ksyms.c
index f271b3539721..a2200842f4e5 100644
--- a/arch/powerpc/platforms/iseries/ksyms.c
+++ b/arch/powerpc/platforms/iseries/ksyms.c
@@ -9,7 +9,7 @@
#include <linux/module.h>
#include <asm/hw_irq.h>
-#include <asm/iSeries/HvCallSc.h>
+#include <asm/iseries/hv_call_sc.h>
EXPORT_SYMBOL(HvCall0);
EXPORT_SYMBOL(HvCall1);