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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
[pandora-kernel.git]
/
drivers
/
ide
/
ide-pnp.c
diff --git
a/drivers/ide/ide-pnp.c
b/drivers/ide/ide-pnp.c
index
6a8953f
..
adbd017
100644
(file)
--- a/
drivers/ide/ide-pnp.c
+++ b/
drivers/ide/ide-pnp.c
@@
-55,6
+55,7
@@
static int idepnp_probe(struct pnp_dev *dev, const struct pnp_device_id *dev_id)
memset(&hw, 0, sizeof(hw));
ide_std_init_ports(&hw, base, ctl);
hw.irq = pnp_irq(dev, 0);
memset(&hw, 0, sizeof(hw));
ide_std_init_ports(&hw, base, ctl);
hw.irq = pnp_irq(dev, 0);
+ hw.chipset = ide_generic;
hwif = ide_find_port();
if (hwif) {
hwif = ide_find_port();
if (hwif) {