diff options
| author | Roland McGrath <roland@gnu.org> | 2004-01-16 22:41:26 +0000 |
|---|---|---|
| committer | Thomas Schwinge <tschwinge@gnu.org> | 2009-06-18 00:15:24 +0200 |
| commit | 5d8cb8ac726370a97d64f148dc9b5ecbb3c95287 (patch) | |
| tree | 614ca7db2811403d5ee9c3136348947c330d50ce /linux/src/drivers/scsi/scsicam.c | |
| parent | 1b22096c705804128876bb6dfcc79e7ca47a7cbb (diff) | |
2004-01-15 Alfred M. Szmidt <ams@kemisten.nu>
* linux/src/drivers/scsi/aic7xxx.c: Updated from Linux 2.0.39
* linux/src/drivers/scsi/aic7xxx.h: Likewise.
* linux/src/drivers/scsi/aic7xxx_proc.c: Likewise.
* linux/src/drivers/scsi/scsicam.c: Likewise.
* linux/src/include/linux/pci.h: Likewise.
Diffstat (limited to 'linux/src/drivers/scsi/scsicam.c')
| -rw-r--r-- | linux/src/drivers/scsi/scsicam.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/linux/src/drivers/scsi/scsicam.c b/linux/src/drivers/scsi/scsicam.c index 2c6f637..c3fb879 100644 --- a/linux/src/drivers/scsi/scsicam.c +++ b/linux/src/drivers/scsi/scsicam.c @@ -26,9 +26,8 @@ #include "scsi.h" #include "hosts.h" #include "sd.h" +#include <scsi/scsicam.h> -static int partsize(struct buffer_head *bh, unsigned long capacity, - unsigned int *cyls, unsigned int *hds, unsigned int *secs); static int setsize(unsigned long capacity,unsigned int *cyls,unsigned int *hds, unsigned int *secs); @@ -56,7 +55,7 @@ int scsicam_bios_param (Disk *disk, /* SCSI disk */ return -1; /* try to infer mapping from partition table */ - ret_code = partsize (bh, (unsigned long) size, (unsigned int *) ip + 2, + ret_code = scsi_partsize (bh, (unsigned long) size, (unsigned int *) ip + 2, (unsigned int *) ip + 0, (unsigned int *) ip + 1); brelse (bh); @@ -85,7 +84,7 @@ int scsicam_bios_param (Disk *disk, /* SCSI disk */ } /* - * Function : static int partsize(struct buffer_head *bh, unsigned long + * Function : static int scsi_partsize(struct buffer_head *bh, unsigned long * capacity,unsigned int *cyls, unsigned int *hds, unsigned int *secs); * * Purpose : to determine the BIOS mapping used to create the partition @@ -95,7 +94,7 @@ int scsicam_bios_param (Disk *disk, /* SCSI disk */ * */ -static int partsize(struct buffer_head *bh, unsigned long capacity, +int scsi_partsize(struct buffer_head *bh, unsigned long capacity, unsigned int *cyls, unsigned int *hds, unsigned int *secs) { struct partition *p, *largest = NULL; int i, largest_cyl; |