diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-04 19:27:50 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-04 19:27:50 -0500 |
| commit | 602d4a7e2f4b843d1a67375d4d7104073495b758 (patch) | |
| tree | 0b9f184e54fa693c27bd5986c114bdcf6949f788 /drivers/char | |
| parent | 0bbacc402e67abca8794a8401c1621dc0c0202e9 (diff) | |
| parent | c51e3a417bb0f295e13a5bad86302b5212eafdf3 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/viocons.c | 10 | ||||
| -rw-r--r-- | drivers/char/viotape.c | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/drivers/char/viocons.c b/drivers/char/viocons.c index 44f5fb4a46ef..98601c7d04a9 100644 --- a/drivers/char/viocons.c +++ b/drivers/char/viocons.c | |||
| @@ -44,12 +44,12 @@ | |||
| 44 | #include <linux/tty_flip.h> | 44 | #include <linux/tty_flip.h> |
| 45 | #include <linux/sysrq.h> | 45 | #include <linux/sysrq.h> |
| 46 | 46 | ||
| 47 | #include <asm/iSeries/vio.h> | 47 | #include <asm/iseries/vio.h> |
| 48 | 48 | ||
| 49 | #include <asm/iSeries/HvLpEvent.h> | 49 | #include <asm/iseries/hv_lp_event.h> |
| 50 | #include <asm/iSeries/HvCallEvent.h> | 50 | #include <asm/iseries/hv_call_event.h> |
| 51 | #include <asm/iSeries/HvLpConfig.h> | 51 | #include <asm/iseries/hv_lp_config.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 |
diff --git a/drivers/char/viotape.c b/drivers/char/viotape.c index 51abd3defc1c..867cc4e418c7 100644 --- a/drivers/char/viotape.c +++ b/drivers/char/viotape.c | |||
| @@ -29,7 +29,7 @@ | |||
| 29 | * | 29 | * |
| 30 | * All tape operations are performed by sending messages back and forth to | 30 | * All tape operations are performed by sending messages back and forth to |
| 31 | * the OS/400 partition. The format of the messages is defined in | 31 | * the OS/400 partition. The format of the messages is defined in |
| 32 | * iSeries/vio.h | 32 | * iseries/vio.h |
| 33 | */ | 33 | */ |
| 34 | #include <linux/config.h> | 34 | #include <linux/config.h> |
| 35 | #include <linux/version.h> | 35 | #include <linux/version.h> |
| @@ -54,10 +54,10 @@ | |||
| 54 | #include <asm/ioctls.h> | 54 | #include <asm/ioctls.h> |
| 55 | 55 | ||
| 56 | #include <asm/vio.h> | 56 | #include <asm/vio.h> |
| 57 | #include <asm/iSeries/vio.h> | 57 | #include <asm/iseries/vio.h> |
| 58 | #include <asm/iSeries/HvLpEvent.h> | 58 | #include <asm/iseries/hv_lp_event.h> |
| 59 | #include <asm/iSeries/HvCallEvent.h> | 59 | #include <asm/iseries/hv_call_event.h> |
| 60 | #include <asm/iSeries/HvLpConfig.h> | 60 | #include <asm/iseries/hv_lp_config.h> |
| 61 | 61 | ||
| 62 | #define VIOTAPE_VERSION "1.2" | 62 | #define VIOTAPE_VERSION "1.2" |
| 63 | #define VIOTAPE_MAXREQ 1 | 63 | #define VIOTAPE_MAXREQ 1 |