git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-apic-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux...
[pandora-kernel.git]
/
drivers
/
ata
/
sata_uli.c
diff --git
a/drivers/ata/sata_uli.c
b/drivers/ata/sata_uli.c
index
d8dac17
..
b8578c3
100644
(file)
--- a/
drivers/ata/sata_uli.c
+++ b/
drivers/ata/sata_uli.c
@@
-242,7
+242,7
@@
static int uli_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
pci_set_master(pdev);
pci_intx(pdev, 1);
- return ata_host_activate(host, pdev->irq, ata_
sff
_interrupt,
+ return ata_host_activate(host, pdev->irq, ata_
bmdma
_interrupt,
IRQF_SHARED, &uli_sht);
}