diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-11-02 16:06:03 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-11-02 16:06:03 +1100 |
| commit | aaf8a7a2949481482200686c7bd3852e5be2e093 (patch) | |
| tree | 76d4dde7c42cd3a3a9dea94f7f18a0817bb9b644 /drivers/char | |
| parent | 104dd65fef378773ec0510c788bd4b5ad6ea1121 (diff) | |
| parent | ecb3ca2783d6e54d30dbf70a42fe995c27eeb212 (diff) | |
Merge iSeries include file move
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 44f5fb4a46e..98601c7d04a 100644 --- a/drivers/char/viocons.c +++ b/drivers/char/viocons.c @@ -44,12 +44,12 @@ #include <linux/tty_flip.h> #include <linux/sysrq.h> -#include <asm/iSeries/vio.h> +#include <asm/iseries/vio.h> -#include <asm/iSeries/HvLpEvent.h> -#include <asm/iSeries/HvCallEvent.h> -#include <asm/iSeries/HvLpConfig.h> -#include <asm/iSeries/HvCall.h> +#include <asm/iseries/hv_lp_event.h> +#include <asm/iseries/hv_call_event.h> +#include <asm/iseries/hv_lp_config.h> +#include <asm/iseries/hv_call.h> #ifdef CONFIG_VT #error You must turn off CONFIG_VT to use CONFIG_VIOCONS diff --git a/drivers/char/viotape.c b/drivers/char/viotape.c index 51abd3defc1..867cc4e418c 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,10 +54,10 @@ #include <asm/ioctls.h> #include <asm/vio.h> -#include <asm/iSeries/vio.h> -#include <asm/iSeries/HvLpEvent.h> -#include <asm/iSeries/HvCallEvent.h> -#include <asm/iSeries/HvLpConfig.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> #define VIOTAPE_VERSION "1.2" #define VIOTAPE_MAXREQ 1 |