Merge HEAD from master.kernel.org:/pub/scm/linux/kernel/git/paulus/ppc64-2.6

2005-08-29 21:44:33 -07:00
parent 826509f811 8913ca1c9c
commit 8bc2bee26b
75 changed files with 206 additions and 575 deletions
--- 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);