diff options
| author | Dave Airlie <airlied@starflyer.(none)> | 2006-01-03 18:18:01 +1100 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2006-01-03 18:18:01 +1100 |
| commit | 97f2aab6698f3ab2552c41c1024a65ffd0763a6d (patch) | |
| tree | bb6e3b2949459f54f884c710fc74d40eef00d834 /drivers/scsi/psi240i.c | |
| parent | d985c1088146607532093d9eaaaf99758f6a4d21 (diff) | |
| parent | 88026842b0a760145aa71d69e74fbc9ec118ca44 (diff) | |
| download | kernel_goldelico_gta04-97f2aab6698f3ab2552c41c1024a65ffd0763a6d.zip kernel_goldelico_gta04-97f2aab6698f3ab2552c41c1024a65ffd0763a6d.tar.gz kernel_goldelico_gta04-97f2aab6698f3ab2552c41c1024a65ffd0763a6d.tar.bz2 | |
drm: merge in Linus mainline
Diffstat (limited to 'drivers/scsi/psi240i.c')
| -rw-r--r-- | drivers/scsi/psi240i.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/psi240i.c b/drivers/scsi/psi240i.c index 4322c95..5c2cdf5 100644 --- a/drivers/scsi/psi240i.c +++ b/drivers/scsi/psi240i.c @@ -538,7 +538,7 @@ static void ReadChipMemory (void *pdata, USHORT base, USHORT length, USHORT port * Returns: Number of adapters found. * ****************************************************************/ -static int Psi240i_Detect (Scsi_Host_Template *tpnt) +static int Psi240i_Detect (struct scsi_host_template *tpnt) { int board; int count = 0; @@ -669,7 +669,7 @@ static int Psi240i_BiosParam (struct scsi_device *sdev, struct block_device *dev MODULE_LICENSE("GPL"); -static Scsi_Host_Template driver_template = { +static struct scsi_host_template driver_template = { .proc_name = "psi240i", .name = "PSI-240I EIDE Disk Controller", .detect = Psi240i_Detect, |