projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
[powerpc.git]
/
drivers
/
scsi
/
a100u2w.c
diff --git
a/drivers/scsi/a100u2w.c
b/drivers/scsi/a100u2w.c
index
3dce21c
..
7f4241b
100644
(file)
--- a/
drivers/scsi/a100u2w.c
+++ b/
drivers/scsi/a100u2w.c
@@
-1013,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;
@@
-1067,7
+1067,7
@@
static int __devinit inia100_probe_one(struct pci_dev *pdev,
goto out_disable_device;
}
goto out_disable_device;
}
- /* <02> read from base address + 0x50 offset to get the bios
b
alue. */
+ /* <02> read from base address + 0x50 offset to get the bios
v
alue. */
bios = ORC_RDWORD(port, 0x50);
bios = ORC_RDWORD(port, 0x50);
@@
-1120,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",
@@
-1187,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)