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/pas16.c | |
parent | d985c1088146607532093d9eaaaf99758f6a4d21 (diff) | |
parent | 88026842b0a760145aa71d69e74fbc9ec118ca44 (diff) |
drm: merge in Linus mainline
Diffstat (limited to 'drivers/scsi/pas16.c')
-rw-r--r-- | drivers/scsi/pas16.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/pas16.c b/drivers/scsi/pas16.c index 72bc947e45b6..f09e94af9ade 100644 --- a/drivers/scsi/pas16.c +++ b/drivers/scsi/pas16.c | |||
@@ -369,7 +369,7 @@ void __init pas16_setup(char *str, int *ints) | |||
369 | } | 369 | } |
370 | 370 | ||
371 | /* | 371 | /* |
372 | * Function : int pas16_detect(Scsi_Host_Template * tpnt) | 372 | * Function : int pas16_detect(struct scsi_host_template * tpnt) |
373 | * | 373 | * |
374 | * Purpose : detects and initializes PAS16 controllers | 374 | * Purpose : detects and initializes PAS16 controllers |
375 | * that were autoprobed, overridden on the LILO command line, | 375 | * that were autoprobed, overridden on the LILO command line, |
@@ -381,7 +381,7 @@ void __init pas16_setup(char *str, int *ints) | |||
381 | * | 381 | * |
382 | */ | 382 | */ |
383 | 383 | ||
384 | int __init pas16_detect(Scsi_Host_Template * tpnt) | 384 | int __init pas16_detect(struct scsi_host_template * tpnt) |
385 | { | 385 | { |
386 | static int current_override = 0; | 386 | static int current_override = 0; |
387 | static unsigned short current_base = 0; | 387 | static unsigned short current_base = 0; |
@@ -615,7 +615,7 @@ static int pas16_release(struct Scsi_Host *shost) | |||
615 | return 0; | 615 | return 0; |
616 | } | 616 | } |
617 | 617 | ||
618 | static Scsi_Host_Template driver_template = { | 618 | static struct scsi_host_template driver_template = { |
619 | .name = "Pro Audio Spectrum-16 SCSI", | 619 | .name = "Pro Audio Spectrum-16 SCSI", |
620 | .detect = pas16_detect, | 620 | .detect = pas16_detect, |
621 | .release = pas16_release, | 621 | .release = pas16_release, |