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/scsi/ibmvscsi/ibmvscsi.c | |
| 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/scsi/ibmvscsi/ibmvscsi.c')
| -rw-r--r-- | drivers/scsi/ibmvscsi/ibmvscsi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.c b/drivers/scsi/ibmvscsi/ibmvscsi.c index fe09d145542a..2cb3c8340ca8 100644 --- a/drivers/scsi/ibmvscsi/ibmvscsi.c +++ b/drivers/scsi/ibmvscsi/ibmvscsi.c | |||
| @@ -1442,7 +1442,7 @@ static int ibmvscsi_remove(struct vio_dev *vdev) | |||
| 1442 | */ | 1442 | */ |
| 1443 | static struct vio_device_id ibmvscsi_device_table[] __devinitdata = { | 1443 | static struct vio_device_id ibmvscsi_device_table[] __devinitdata = { |
| 1444 | {"vscsi", "IBM,v-scsi"}, | 1444 | {"vscsi", "IBM,v-scsi"}, |
| 1445 | {0,} | 1445 | { "", "" } |
| 1446 | }; | 1446 | }; |
| 1447 | 1447 | ||
| 1448 | MODULE_DEVICE_TABLE(vio, ibmvscsi_device_table); | 1448 | MODULE_DEVICE_TABLE(vio, ibmvscsi_device_table); |