aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-11-04 19:27:50 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-04 19:27:50 -0500
commit602d4a7e2f4b843d1a67375d4d7104073495b758 (patch)
tree0b9f184e54fa693c27bd5986c114bdcf6949f788 /drivers/block
parent0bbacc402e67abca8794a8401c1621dc0c0202e9 (diff)
parentc51e3a417bb0f295e13a5bad86302b5212eafdf3 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/viodasd.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/block/viodasd.c b/drivers/block/viodasd.c
index 709f809f79f1..2d518aa2720a 100644
--- a/drivers/block/viodasd.c
+++ b/drivers/block/viodasd.c
@@ -45,10 +45,10 @@
45 45
46#include <asm/uaccess.h> 46#include <asm/uaccess.h>
47#include <asm/vio.h> 47#include <asm/vio.h>
48#include <asm/iSeries/HvTypes.h> 48#include <asm/iseries/hv_types.h>
49#include <asm/iSeries/HvLpEvent.h> 49#include <asm/iseries/hv_lp_event.h>
50#include <asm/iSeries/HvLpConfig.h> 50#include <asm/iseries/hv_lp_config.h>
51#include <asm/iSeries/vio.h> 51#include <asm/iseries/vio.h>
52 52
53MODULE_DESCRIPTION("iSeries Virtual DASD"); 53MODULE_DESCRIPTION("iSeries Virtual DASD");
54MODULE_AUTHOR("Dave Boutcher"); 54MODULE_AUTHOR("Dave Boutcher");