[PATCH] md: tidyup some issues with raid1 resync and prepare for catching read errors

[powerpc.git] / drivers / char / hvcs.c

diff --git a/drivers/char/hvcs.c b/drivers/char/hvcs.c
index 3236d24..53dc77c 100644 (file)
--- a/drivers/char/hvcs.c
+++ b/drivers/char/hvcs.c
@@ -527,7 +527,7 @@ static int khvcsd(void *unused)
 
 static struct vio_device_id hvcs_driver_table[] __devinitdata= {
        {"serial-server", "hvterm2"},
-       { NULL, }
+       { "", "" }
 };
 MODULE_DEVICE_TABLE(vio, hvcs_driver_table);
 
@@ -720,10 +720,13 @@ static int __devexit hvcs_remove(struct vio_dev *dev)
 };
 
 static struct vio_driver hvcs_vio_driver = {
-       .name           = hvcs_driver_name,
        .id_table       = hvcs_driver_table,
        .probe          = hvcs_probe,
        .remove         = hvcs_remove,
+       .driver         = {
+               .name   = hvcs_driver_name,
+               .owner  = THIS_MODULE,
+       }
 };
 
 /* Only called from hvcs_get_pi please */