aboutsummaryrefslogtreecommitdiff
path: root/drivers/block
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-08-29 21:44:33 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-08-29 21:44:33 -0700
commit8bc2bee26bc7ba77eb1ffc3e3282002d9893cf09 (patch)
treee7c85eca8d55007b0a467b99820820cd40ef4963 /drivers/block
parent826509f8110049663799bc20f2b5b6170e2f78ca (diff)
parent8913ca1c9ccb5eb6471afd419159729eef6e2730 (diff)
Merge HEAD from master.kernel.org:/pub/scm/linux/kernel/git/paulus/ppc64-2.6
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/viodasd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/viodasd.c b/drivers/block/viodasd.c
index 46e56a25d2c..e46ecd23b3a 100644
--- a/drivers/block/viodasd.c
+++ b/drivers/block/viodasd.c
@@ -776,7 +776,7 @@ static int viodasd_remove(struct vio_dev *vdev)
*/
static struct vio_device_id viodasd_device_table[] __devinitdata = {
{ "viodasd", "" },
- { 0, }
+ { "", "" }
};
MODULE_DEVICE_TABLE(vio, viodasd_device_table);