summaryrefslogtreecommitdiff
path: root/drivers/ide/ide-pnp.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-07 10:07:35 +0400
committerIngo Molnar <mingo@elte.hu>2008-07-07 10:07:35 +0400
commitd763d5edf945eec47bd443b699f174976f0afc13 (patch)
tree3e5cd46b9a783999716bf92176854f4f1215d930 /drivers/ide/ide-pnp.c
parent790e2a290b499b0400254e6870ec27969065d122 (diff)
parent1b40a895df6c7d5a80e71f65674060b03d84bbef (diff)
downloadlinux-d763d5edf945eec47bd443b699f174976f0afc13.tar.xz
Merge branch 'linus' into tracing/mmiotrace
Diffstat (limited to 'drivers/ide/ide-pnp.c')
-rw-r--r--drivers/ide/ide-pnp.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ide/ide-pnp.c b/drivers/ide/ide-pnp.c
index 6a8953f68e9f..adbd01784162 100644
--- 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);
+ hw.chipset = ide_generic;
hwif = ide_find_port();
if (hwif) {