aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorKelly Daly <kelly@au.ibm.com>2005-11-02 15:13:57 +1100
committerKelly Daly <kelly@au.ibm.com>2005-11-02 15:13:57 +1100
commitb420677870e53b9b76ced91da207431f687eaed1 (patch)
tree1469e4a0dfb537d0a192ffd6ffd74e8faf1e8e78 /drivers/char
parentbbc8b628b07e191624a74ce99fe36681cd70af37 (diff)
downloadkernel_samsung_smdk4412-b420677870e53b9b76ced91da207431f687eaed1.zip
kernel_samsung_smdk4412-b420677870e53b9b76ced91da207431f687eaed1.tar.gz
kernel_samsung_smdk4412-b420677870e53b9b76ced91da207431f687eaed1.tar.bz2
merge filename and modify references to iseries/vio.h
Signed-off-by: Kelly Daly <kelly@au.ibm.com>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/viocons.c2
-rw-r--r--drivers/char/viotape.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/char/viocons.c b/drivers/char/viocons.c
index 694bab3..98601c7 100644
--- a/drivers/char/viocons.c
+++ b/drivers/char/viocons.c
@@ -44,7 +44,7 @@
#include <linux/tty_flip.h>
#include <linux/sysrq.h>
-#include <asm/iSeries/vio.h>
+#include <asm/iseries/vio.h>
#include <asm/iseries/hv_lp_event.h>
#include <asm/iseries/hv_call_event.h>
diff --git a/drivers/char/viotape.c b/drivers/char/viotape.c
index 3242b24..867cc4e 100644
--- a/drivers/char/viotape.c
+++ b/drivers/char/viotape.c
@@ -29,7 +29,7 @@
*
* All tape operations are performed by sending messages back and forth to
* the OS/400 partition. The format of the messages is defined in
- * iSeries/vio.h
+ * iseries/vio.h
*/
#include <linux/config.h>
#include <linux/version.h>
@@ -54,7 +54,7 @@
#include <asm/ioctls.h>
#include <asm/vio.h>
-#include <asm/iSeries/vio.h>
+#include <asm/iseries/vio.h>
#include <asm/iseries/hv_lp_event.h>
#include <asm/iseries/hv_call_event.h>
#include <asm/iseries/hv_lp_config.h>