diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-05 01:27:50 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-05 01:27:50 +0100 |
| commit | 602d4a7e2f4b843d1a67375d4d7104073495b758 (patch) | |
| tree | 0b9f184e54fa693c27bd5986c114bdcf6949f788 /drivers/cdrom/viocd.c | |
| parent | NFS,SUNRPC,NLM: fix unused variable warnings when CONFIG_SYSCTL is disabled (diff) | |
| parent | powerpc: Fix vmlinux.lds.S for 32-bit (diff) | |
| download | linux-602d4a7e2f4b843d1a67375d4d7104073495b758.tar.xz linux-602d4a7e2f4b843d1a67375d4d7104073495b758.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'drivers/cdrom/viocd.c')
| -rw-r--r-- | drivers/cdrom/viocd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/cdrom/viocd.c b/drivers/cdrom/viocd.c index 36f31d202223..b5191780ecca 100644 --- a/drivers/cdrom/viocd.c +++ b/drivers/cdrom/viocd.c @@ -46,9 +46,9 @@ #include <asm/vio.h> #include <asm/scatterlist.h> -#include <asm/iSeries/HvTypes.h> -#include <asm/iSeries/HvLpEvent.h> -#include <asm/iSeries/vio.h> +#include <asm/iseries/hv_types.h> +#include <asm/iseries/hv_lp_event.h> +#include <asm/iseries/vio.h> #define VIOCD_DEVICE "iseries/vcd" #define VIOCD_DEVICE_DEVFS "iseries/vcd" |