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
/
dmx3191d.c
diff --git
a/drivers/scsi/dmx3191d.c
b/drivers/scsi/dmx3191d.c
index
7905b90
..
fa738ec
100644
(file)
--- a/
drivers/scsi/dmx3191d.c
+++ b/
drivers/scsi/dmx3191d.c
@@
-94,7
+94,7
@@
static int __devinit dmx3191d_probe_one(struct pci_dev *pdev,
NCR5380_init(shost, FLAG_NO_PSEUDO_DMA | FLAG_DTC3181E);
NCR5380_init(shost, FLAG_NO_PSEUDO_DMA | FLAG_DTC3181E);
- if (request_irq(pdev->irq, NCR5380_intr,
SA_SHIRQ
,
+ if (request_irq(pdev->irq, NCR5380_intr,
IRQF_SHARED
,
DMX3191D_DRIVER_NAME, shost)) {
/*
* Steam powered scsi controllers run without an IRQ anyway
DMX3191D_DRIVER_NAME, shost)) {
/*
* Steam powered scsi controllers run without an IRQ anyway
@@
-116,7
+116,7
@@
static int __devinit dmx3191d_probe_one(struct pci_dev *pdev,
out_free_irq:
free_irq(shost->irq, shost);
out_release_region:
out_free_irq:
free_irq(shost->irq, shost);
out_release_region:
- release_region(
shost->io_port
, DMX3191D_REGION_LEN);
+ release_region(
io
, DMX3191D_REGION_LEN);
out_disable_device:
pci_disable_device(pdev);
out:
out_disable_device:
pci_disable_device(pdev);
out:
@@
-155,7
+155,7
@@
static struct pci_driver dmx3191d_pci_driver = {
static int __init dmx3191d_init(void)
{
static int __init dmx3191d_init(void)
{
- return pci_
module_init
(&dmx3191d_pci_driver);
+ return pci_
register_driver
(&dmx3191d_pci_driver);
}
static void __exit dmx3191d_exit(void)
}
static void __exit dmx3191d_exit(void)