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
/
arxescsi.c
diff --git
a/drivers/scsi/arm/arxescsi.c
b/drivers/scsi/arm/arxescsi.c
index
29811f5
..
a289401
100644
(file)
--- a/
drivers/scsi/arm/arxescsi.c
+++ b/
drivers/scsi/arm/arxescsi.c
@@
-33,7
+33,6
@@
#include <asm/dma.h>
#include <asm/io.h>
#include <asm/dma.h>
#include <asm/io.h>
-#include <asm/irq.h>
#include <asm/ecard.h>
#include "../scsi.h"
#include <asm/ecard.h>
#include "../scsi.h"
@@
-65,7
+64,7
@@
struct arxescsi_info {
* Returns : 0 if we should not set CMD_WITHDMA for transfer info command
*/
static fasdmatype_t
* Returns : 0 if we should not set CMD_WITHDMA for transfer info command
*/
static fasdmatype_t
-arxescsi_dma_setup(struct Scsi_Host *host,
Scsi_P
ointer *SCp,
+arxescsi_dma_setup(struct Scsi_Host *host,
struct scsi_p
ointer *SCp,
fasdmadir_t direction, fasdmatype_t min_type)
{
/*
fasdmadir_t direction, fasdmatype_t min_type)
{
/*
@@
-111,7
+110,7
@@
static void arxescsi_pseudo_dma_write(unsigned char *addr, void __iomem *base)
* transfer - minimum number of bytes we expect to transfer
*/
static void
* transfer - minimum number of bytes we expect to transfer
*/
static void
-arxescsi_dma_pseudo(struct Scsi_Host *host,
Scsi_P
ointer *SCp,
+arxescsi_dma_pseudo(struct Scsi_Host *host,
struct scsi_p
ointer *SCp,
fasdmadir_t direction, int transfer)
{
struct arxescsi_info *info = (struct arxescsi_info *)host->hostdata;
fasdmadir_t direction, int transfer)
{
struct arxescsi_info *info = (struct arxescsi_info *)host->hostdata;
@@
-197,7
+196,7
@@
arxescsi_dma_pseudo(struct Scsi_Host *host, Scsi_Pointer *SCp,
* Params : host - host
* SCpnt - command
*/
* Params : host - host
* SCpnt - command
*/
-static void arxescsi_dma_stop(struct Scsi_Host *host,
Scsi_P
ointer *SCp)
+static void arxescsi_dma_stop(struct Scsi_Host *host,
struct scsi_p
ointer *SCp)
{
/*
* no DMA to stop
{
/*
* no DMA to stop
@@
-261,7
+260,7
@@
arxescsi_proc_info(struct Scsi_Host *host, char *buffer, char **start, off_t off
return pos;
}
return pos;
}
-static
Scsi_Host_T
emplate arxescsi_template = {
+static
struct scsi_host_t
emplate arxescsi_template = {
.proc_info = arxescsi_proc_info,
.name = "ARXE SCSI card",
.info = arxescsi_info,
.proc_info = arxescsi_proc_info,
.name = "ARXE SCSI card",
.info = arxescsi_info,