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
/
aic7xxx
/
aic79xx_osm_pci.c
diff --git
a/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
b/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
index
ebbf7e4
..
1a3ab6a
100644
(file)
--- a/
drivers/scsi/aic7xxx/aic79xx_osm_pci.c
+++ b/
drivers/scsi/aic7xxx/aic79xx_osm_pci.c
@@
-62,6
+62,7
@@
static struct pci_device_id ahd_linux_pci_id_table[] = {
/* aic7901 based controllers */
ID(ID_AHA_29320A),
ID(ID_AHA_29320ALP),
/* aic7901 based controllers */
ID(ID_AHA_29320A),
ID(ID_AHA_29320ALP),
+ ID(ID_AHA_29320LPE),
/* aic7902 based controllers */
ID(ID_AHA_29320),
ID(ID_AHA_29320B),
/* aic7902 based controllers */
ID(ID_AHA_29320),
ID(ID_AHA_29320B),
@@
-82,7
+83,7
@@
static struct pci_device_id ahd_linux_pci_id_table[] = {
MODULE_DEVICE_TABLE(pci, ahd_linux_pci_id_table);
MODULE_DEVICE_TABLE(pci, ahd_linux_pci_id_table);
-struct pci_driver aic79xx_pci_driver = {
+st
atic st
ruct pci_driver aic79xx_pci_driver = {
.name = "aic79xx",
.probe = ahd_linux_pci_dev_probe,
.remove = ahd_linux_pci_dev_remove,
.name = "aic79xx",
.probe = ahd_linux_pci_dev_probe,
.remove = ahd_linux_pci_dev_remove,
@@
-198,7
+199,7
@@
ahd_linux_pci_dev_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
int
ahd_linux_pci_init(void)
{
int
ahd_linux_pci_init(void)
{
- return
(pci_module_init(&aic79xx_pci_driver)
);
+ return
pci_register_driver(&aic79xx_pci_driver
);
}
void
}
void
@@
-342,7
+343,7
@@
ahd_pci_map_int(struct ahd_softc *ahd)
int error;
error = request_irq(ahd->dev_softc->irq, ahd_linux_isr,
int error;
error = request_irq(ahd->dev_softc->irq, ahd_linux_isr,
-
SA_SHIRQ
, "aic79xx", ahd);
+
IRQF_SHARED
, "aic79xx", ahd);
if (!error)
ahd->platform_data->irq = ahd->dev_softc->irq;
if (!error)
ahd->platform_data->irq = ahd->dev_softc->irq;