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 core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
scsi
/
eata.c
diff --git
a/drivers/scsi/eata.c
b/drivers/scsi/eata.c
index
b3f9de8
..
2d38025
100644
(file)
--- a/
drivers/scsi/eata.c
+++ b/
drivers/scsi/eata.c
@@
-477,7
+477,6
@@
* the driver sets host->wish_block = 1 for all ISA boards.
*/
* the driver sets host->wish_block = 1 for all ISA boards.
*/
-#include <linux/config.h>
#include <linux/string.h>
#include <linux/kernel.h>
#include <linux/ioport.h>
#include <linux/string.h>
#include <linux/kernel.h>
#include <linux/ioport.h>
@@
-490,6
+489,7
@@
#include <linux/init.h>
#include <linux/ctype.h>
#include <linux/spinlock.h>
#include <linux/init.h>
#include <linux/ctype.h>
#include <linux/spinlock.h>
+#include <linux/dma-mapping.h>
#include <asm/byteorder.h>
#include <asm/dma.h>
#include <asm/io.h>
#include <asm/byteorder.h>
#include <asm/dma.h>
#include <asm/io.h>
@@
-875,7
+875,7
@@
static unsigned long io_port[] = {
/* But transfer orientation from the 16 bit data register is Little Endian */
#define REG2H(x) le16_to_cpu(x)
/* But transfer orientation from the 16 bit data register is Little Endian */
#define REG2H(x) le16_to_cpu(x)
-static irqreturn_t do_interrupt_handler(int, void *
, struct pt_regs *
);
+static irqreturn_t do_interrupt_handler(int, void *);
static void flush_dev(struct scsi_device *, unsigned long, struct hostdata *,
unsigned int);
static int do_trace = 0;
static void flush_dev(struct scsi_device *, unsigned long, struct hostdata *,
unsigned int);
static int do_trace = 0;
@@
-1221,7
+1221,7
@@
static int port_detect(unsigned long port_base, unsigned int j,
/* Board detected, allocate its IRQ */
if (request_irq(irq, do_interrupt_handler,
/* Board detected, allocate its IRQ */
if (request_irq(irq, do_interrupt_handler,
-
SA_INTERRUPT | ((subversion == ESA) ? SA_SHIRQ
: 0),
+
IRQF_DISABLED | ((subversion == ESA) ? IRQF_SHARED
: 0),
driver_name, (void *)&sha[j])) {
printk("%s: unable to allocate IRQ %u, detaching.\n", name,
irq);
driver_name, (void *)&sha[j])) {
printk("%s: unable to allocate IRQ %u, detaching.\n", name,
irq);
@@
-1426,7
+1426,7
@@
static int port_detect(unsigned long port_base, unsigned int j,
if (ha->pdev) {
pci_set_master(ha->pdev);
if (ha->pdev) {
pci_set_master(ha->pdev);
- if (pci_set_dma_mask(ha->pdev,
0xffffffff
))
+ if (pci_set_dma_mask(ha->pdev,
DMA_32BIT_MASK
))
printk("%s: warning, pci_set_dma_mask failed.\n",
ha->board_name);
}
printk("%s: warning, pci_set_dma_mask failed.\n",
ha->board_name);
}
@@
-2555,8
+2555,7
@@
static irqreturn_t ihdlr(int irq, struct Scsi_Host *shost)
return IRQ_NONE;
}
return IRQ_NONE;
}
-static irqreturn_t do_interrupt_handler(int irq, void *shap,
- struct pt_regs *regs)
+static irqreturn_t do_interrupt_handler(int irq, void *shap)
{
struct Scsi_Host *shost;
unsigned int j;
{
struct Scsi_Host *shost;
unsigned int j;