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/cdrom/viocd.c | |
| parent | 0bbacc402e67abca8794a8401c1621dc0c0202e9 (diff) | |
| parent | c51e3a417bb0f295e13a5bad86302b5212eafdf3 (diff) | |
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 @@ | |||
| 46 | 46 | ||
| 47 | #include <asm/vio.h> | 47 | #include <asm/vio.h> |
| 48 | #include <asm/scatterlist.h> | 48 | #include <asm/scatterlist.h> |
| 49 | #include <asm/iSeries/HvTypes.h> | 49 | #include <asm/iseries/hv_types.h> |
| 50 | #include <asm/iSeries/HvLpEvent.h> | 50 | #include <asm/iseries/hv_lp_event.h> |
| 51 | #include <asm/iSeries/vio.h> | 51 | #include <asm/iseries/vio.h> |
| 52 | 52 | ||
| 53 | #define VIOCD_DEVICE "iseries/vcd" | 53 | #define VIOCD_DEVICE "iseries/vcd" |
| 54 | #define VIOCD_DEVICE_DEVFS "iseries/vcd" | 54 | #define VIOCD_DEVICE_DEVFS "iseries/vcd" |