diff options
| author | Dave Airlie <airlied@starflyer.(none)> | 2006-01-03 02:18:01 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2006-01-03 02:18:01 -0500 |
| commit | 97f2aab6698f3ab2552c41c1024a65ffd0763a6d (patch) | |
| tree | bb6e3b2949459f54f884c710fc74d40eef00d834 /drivers/scsi/arm/cumana_1.c | |
| parent | d985c1088146607532093d9eaaaf99758f6a4d21 (diff) | |
| parent | 88026842b0a760145aa71d69e74fbc9ec118ca44 (diff) | |
drm: merge in Linus mainline
Diffstat (limited to 'drivers/scsi/arm/cumana_1.c')
| -rw-r--r-- | drivers/scsi/arm/cumana_1.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/arm/cumana_1.c b/drivers/scsi/arm/cumana_1.c index 26498553a7cc..81e266be26d0 100644 --- a/drivers/scsi/arm/cumana_1.c +++ b/drivers/scsi/arm/cumana_1.c | |||
| @@ -238,7 +238,7 @@ static void cumanascsi_write(struct Scsi_Host *instance, int reg, int value) | |||
| 238 | 238 | ||
| 239 | #include "../NCR5380.c" | 239 | #include "../NCR5380.c" |
| 240 | 240 | ||
| 241 | static Scsi_Host_Template cumanascsi_template = { | 241 | static struct scsi_host_template cumanascsi_template = { |
| 242 | .module = THIS_MODULE, | 242 | .module = THIS_MODULE, |
| 243 | .name = "Cumana 16-bit SCSI", | 243 | .name = "Cumana 16-bit SCSI", |
| 244 | .info = cumanascsi_info, | 244 | .info = cumanascsi_info, |