diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-30 00:44:33 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-30 00:44:33 -0400 |
| commit | 8bc2bee26bc7ba77eb1ffc3e3282002d9893cf09 (patch) | |
| tree | e7c85eca8d55007b0a467b99820820cd40ef4963 /drivers/block | |
| parent | 826509f8110049663799bc20f2b5b6170e2f78ca (diff) | |
| parent | 8913ca1c9ccb5eb6471afd419159729eef6e2730 (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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/viodasd.c b/drivers/block/viodasd.c index 46e56a25d2c8..e46ecd23b3ac 100644 --- a/drivers/block/viodasd.c +++ b/drivers/block/viodasd.c | |||
| @@ -776,7 +776,7 @@ static int viodasd_remove(struct vio_dev *vdev) | |||
| 776 | */ | 776 | */ |
| 777 | static struct vio_device_id viodasd_device_table[] __devinitdata = { | 777 | static struct vio_device_id viodasd_device_table[] __devinitdata = { |
| 778 | { "viodasd", "" }, | 778 | { "viodasd", "" }, |
| 779 | { 0, } | 779 | { "", "" } |
| 780 | }; | 780 | }; |
| 781 | 781 | ||
| 782 | MODULE_DEVICE_TABLE(vio, viodasd_device_table); | 782 | MODULE_DEVICE_TABLE(vio, viodasd_device_table); |