git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
scsi
/
arm
/
cumana_2.c
diff --git
a/drivers/scsi/arm/cumana_2.c
b/drivers/scsi/arm/cumana_2.c
index
0ef0644
..
fad2109
100644
(file)
--- a/
drivers/scsi/arm/cumana_2.c
+++ b/
drivers/scsi/arm/cumana_2.c
@@
-31,7
+31,6
@@
#include <asm/dma.h>
#include <asm/ecard.h>
#include <asm/io.h>
#include <asm/dma.h>
#include <asm/ecard.h>
#include <asm/io.h>
-#include <asm/irq.h>
#include <asm/pgtable.h>
#include "../scsi.h"
#include <asm/pgtable.h>
#include "../scsi.h"
@@
-157,7
+156,7
@@
cumanascsi_2_intr(int irq, void *dev_id, struct pt_regs *regs)
* Returns : type of transfer to be performed
*/
static fasdmatype_t
* Returns : type of transfer to be performed
*/
static fasdmatype_t
-cumanascsi_2_dma_setup(struct Scsi_Host *host,
Scsi_P
ointer *SCp,
+cumanascsi_2_dma_setup(struct Scsi_Host *host,
struct scsi_p
ointer *SCp,
fasdmadir_t direction, fasdmatype_t min_type)
{
struct cumanascsi2_info *info = (struct cumanascsi2_info *)host->hostdata;
fasdmadir_t direction, fasdmatype_t min_type)
{
struct cumanascsi2_info *info = (struct cumanascsi2_info *)host->hostdata;
@@
-209,7
+208,7
@@
cumanascsi_2_dma_setup(struct Scsi_Host *host, Scsi_Pointer *SCp,
* transfer - minimum number of bytes we expect to transfer
*/
static void
* transfer - minimum number of bytes we expect to transfer
*/
static void
-cumanascsi_2_dma_pseudo(struct Scsi_Host *host,
Scsi_P
ointer *SCp,
+cumanascsi_2_dma_pseudo(struct Scsi_Host *host,
struct scsi_p
ointer *SCp,
fasdmadir_t direction, int transfer)
{
struct cumanascsi2_info *info = (struct cumanascsi2_info *)host->hostdata;
fasdmadir_t direction, int transfer)
{
struct cumanascsi2_info *info = (struct cumanascsi2_info *)host->hostdata;
@@
-283,7
+282,7
@@
cumanascsi_2_dma_pseudo(struct Scsi_Host *host, Scsi_Pointer *SCp,
* SCpnt - command
*/
static void
* SCpnt - command
*/
static void
-cumanascsi_2_dma_stop(struct Scsi_Host *host,
Scsi_P
ointer *SCp)
+cumanascsi_2_dma_stop(struct Scsi_Host *host,
struct scsi_p
ointer *SCp)
{
struct cumanascsi2_info *info = (struct cumanascsi2_info *)host->hostdata;
if (info->info.scsi.dma != NO_DMA) {
{
struct cumanascsi2_info *info = (struct cumanascsi2_info *)host->hostdata;
if (info->info.scsi.dma != NO_DMA) {
@@
-381,7
+380,7
@@
int cumanascsi_2_proc_info (struct Scsi_Host *host, char *buffer, char **start,
return pos;
}
return pos;
}
-static
Scsi_Host_T
emplate cumanascsi2_template = {
+static
struct scsi_host_t
emplate cumanascsi2_template = {
.module = THIS_MODULE,
.proc_info = cumanascsi_2_proc_info,
.name = "Cumana SCSI II",
.module = THIS_MODULE,
.proc_info = cumanascsi_2_proc_info,
.name = "Cumana SCSI II",
@@
-551,6
+550,6
@@
module_exit(cumanascsi2_exit);
MODULE_AUTHOR("Russell King");
MODULE_DESCRIPTION("Cumana SCSI-2 driver for Acorn machines");
MODULE_AUTHOR("Russell King");
MODULE_DESCRIPTION("Cumana SCSI-2 driver for Acorn machines");
-
MODULE_PARM(term, "1-8i"
);
+
module_param_array(term, int, NULL, 0
);
MODULE_PARM_DESC(term, "SCSI bus termination");
MODULE_LICENSE("GPL");
MODULE_PARM_DESC(term, "SCSI bus termination");
MODULE_LICENSE("GPL");