aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorKelly Daly <kelly@au.ibm.com>2005-11-01 00:59:20 -0500
committerKelly Daly <kelly@au.ibm.com>2005-11-01 00:59:20 -0500
commit1da44037883c0405154d53fe76da27e078456664 (patch)
treedb6f579831b89c55e0e0c095345b4d1e5bdd0500 /drivers/char
parente2f2e58e7968f8446b1078a20a18bf8ea12b4fbc (diff)
merge filename and modify references to iseries/hv_call.h
Signed-off-by: Kelly Daly <kelly@au.ibm.com>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/viocons.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/viocons.c b/drivers/char/viocons.c
index 44f5fb4a46ef..180507ae590f 100644
--- a/drivers/char/viocons.c
+++ b/drivers/char/viocons.c
@@ -49,7 +49,7 @@
49#include <asm/iSeries/HvLpEvent.h> 49#include <asm/iSeries/HvLpEvent.h>
50#include <asm/iSeries/HvCallEvent.h> 50#include <asm/iSeries/HvCallEvent.h>
51#include <asm/iSeries/HvLpConfig.h> 51#include <asm/iSeries/HvLpConfig.h>
52#include <asm/iSeries/HvCall.h> 52#include <asm/iseries/hv_call.h>
53 53
54#ifdef CONFIG_VT 54#ifdef CONFIG_VT
55#error You must turn off CONFIG_VT to use CONFIG_VIOCONS 55#error You must turn off CONFIG_VT to use CONFIG_VIOCONS