git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ACPI: replace acpi_integer by u64
[safe/jmp/linux-2.6]
/
drivers
/
ide
/
delkin_cb.c
diff --git
a/drivers/ide/delkin_cb.c
b/drivers/ide/delkin_cb.c
index
bacb119
..
1e10eba
100644
(file)
--- a/
drivers/ide/delkin_cb.c
+++ b/
drivers/ide/delkin_cb.c
@@
-66,7
+66,9
@@
static const struct ide_port_info delkin_cb_port_info = {
.port_ops = &delkin_cb_port_ops,
.host_flags = IDE_HFLAG_IO_32BIT | IDE_HFLAG_UNMASK_IRQS |
IDE_HFLAG_NO_DMA,
.port_ops = &delkin_cb_port_ops,
.host_flags = IDE_HFLAG_IO_32BIT | IDE_HFLAG_UNMASK_IRQS |
IDE_HFLAG_NO_DMA,
+ .irq_flags = IRQF_SHARED,
.init_chipset = delkin_cb_init_chipset,
.init_chipset = delkin_cb_init_chipset,
+ .chipset = ide_pci,
};
static int __devinit
};
static int __devinit
@@
-75,7
+77,7
@@
delkin_cb_probe (struct pci_dev *dev, const struct pci_device_id *id)
struct ide_host *host;
unsigned long base;
int rc;
struct ide_host *host;
unsigned long base;
int rc;
-
hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL
};
+
struct ide_hw hw, *hws[] = { &hw
};
rc = pci_enable_device(dev);
if (rc) {
rc = pci_enable_device(dev);
if (rc) {
@@
-96,9
+98,8
@@
delkin_cb_probe (struct pci_dev *dev, const struct pci_device_id *id)
ide_std_init_ports(&hw, base + 0x10, base + 0x1e);
hw.irq = dev->irq;
hw.dev = &dev->dev;
ide_std_init_ports(&hw, base + 0x10, base + 0x1e);
hw.irq = dev->irq;
hw.dev = &dev->dev;
- hw.chipset = ide_pci; /* this enables IRQ sharing */
- rc = ide_host_add(&delkin_cb_port_info, hws, &host);
+ rc = ide_host_add(&delkin_cb_port_info, hws,
1,
&host);
if (rc)
goto out_disable;
if (rc)
goto out_disable;