Merge to Fedora kernel-2.6.7-1.492

[linux-2.6.git] / drivers / scsi / NCR_Q720.c

diff --git a/drivers/scsi/NCR_Q720.c b/drivers/scsi/NCR_Q720.c
index 6141faa..d47a86e 100644 (file)
--- a/drivers/scsi/NCR_Q720.c
+++ b/drivers/scsi/NCR_Q720.c
@@ -22,10 +22,8 @@
 
 #include "NCR_Q720.h"
 
-static ncr_chip q720_chip __initdata = {
-       .device_id =    PSEUDO_720_ID,
+static struct ncr_chip q720_chip __initdata = {
        .revision_id =  0x0f,
-       .name =         "720",
        .burst_max =    3,
        .offset_max =   8,
        .nr_divisor =   4,
@@ -50,7 +48,7 @@ struct NCR_Q720_private {
        struct Scsi_Host        *hosts[4];
 };
 
-Scsi_Host_Template NCR_Q720_tpnt = {
+struct scsi_host_template NCR_Q720_tpnt = {
        .module                 = THIS_MODULE,
        .proc_name              = "NCR_Q720",
 };