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
/
a100u2w.c
diff --git
a/drivers/scsi/a100u2w.c
b/drivers/scsi/a100u2w.c
index
9f45ae1
..
2650a5d
100644
(file)
--- a/
drivers/scsi/a100u2w.c
+++ b/
drivers/scsi/a100u2w.c
@@
-89,6
+89,7
@@
#include <linux/string.h>
#include <linux/ioport.h>
#include <linux/slab.h>
#include <linux/string.h>
#include <linux/ioport.h>
#include <linux/slab.h>
+#include <linux/dma-mapping.h>
#include <asm/io.h>
#include <asm/irq.h>
#include <asm/io.h>
#include <asm/irq.h>
@@
-1012,7
+1013,7
@@
static void inia100SCBPost(BYTE * pHcb, BYTE * pScb)
/*
* Interrupt handler (main routine of the driver)
*/
/*
* Interrupt handler (main routine of the driver)
*/
-static irqreturn_t inia100_intr(int irqno, void *devid
, struct pt_regs *regs
)
+static irqreturn_t inia100_intr(int irqno, void *devid)
{
struct Scsi_Host *host = (struct Scsi_Host *)devid;
ORC_HCS *pHcb = (ORC_HCS *)host->hostdata;
{
struct Scsi_Host *host = (struct Scsi_Host *)devid;
ORC_HCS *pHcb = (ORC_HCS *)host->hostdata;
@@
-1052,7
+1053,7
@@
static int __devinit inia100_probe_one(struct pci_dev *pdev,
if (pci_enable_device(pdev))
goto out;
if (pci_enable_device(pdev))
goto out;
- if (pci_set_dma_mask(pdev,
0xffffffffULL
)) {
+ if (pci_set_dma_mask(pdev,
DMA_32BIT_MASK
)) {
printk(KERN_WARNING "Unable to set 32bit DMA "
"on inia100 adapter, ignoring.\n");
goto out_disable_device;
printk(KERN_WARNING "Unable to set 32bit DMA "
"on inia100 adapter, ignoring.\n");
goto out_disable_device;
@@
-1119,7
+1120,7
@@
static int __devinit inia100_probe_one(struct pci_dev *pdev,
shost->sg_tablesize = TOTAL_SG_ENTRY;
/* Initial orc chip */
shost->sg_tablesize = TOTAL_SG_ENTRY;
/* Initial orc chip */
- error = request_irq(pdev->irq, inia100_intr,
SA_SHIRQ
,
+ error = request_irq(pdev->irq, inia100_intr,
IRQF_SHARED
,
"inia100", shost);
if (error < 0) {
printk(KERN_WARNING "inia100: unable to get irq %d\n",
"inia100", shost);
if (error < 0) {
printk(KERN_WARNING "inia100: unable to get irq %d\n",
@@
-1186,7
+1187,7
@@
static struct pci_driver inia100_pci_driver = {
static int __init inia100_init(void)
{
static int __init inia100_init(void)
{
- return pci_
module_init
(&inia100_pci_driver);
+ return pci_
register_driver
(&inia100_pci_driver);
}
static void __exit inia100_exit(void)
}
static void __exit inia100_exit(void)