aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/ide/Makefile2
-rw-r--r--drivers/ide/ide.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ide/Makefile b/drivers/ide/Makefile
index a4a4323be911..571544c37bb2 100644
--- a/drivers/ide/Makefile
+++ b/drivers/ide/Makefile
@@ -36,9 +36,9 @@ ifeq ($(CONFIG_BLK_DEV_CMD640), y)
36endif 36endif
37 37
38obj-$(CONFIG_BLK_DEV_IDE) += cris/ ppc/ 38obj-$(CONFIG_BLK_DEV_IDE) += cris/ ppc/
39obj-$(CONFIG_BLK_DEV_IDEPNP) += ide-pnp.o
40obj-$(CONFIG_IDE_H8300) += h8300/ 39obj-$(CONFIG_IDE_H8300) += h8300/
41obj-$(CONFIG_IDE_GENERIC) += ide-generic.o 40obj-$(CONFIG_IDE_GENERIC) += ide-generic.o
41obj-$(CONFIG_BLK_DEV_IDEPNP) += ide-pnp.o
42 42
43ide-cd_mod-y += ide-cd.o ide-cd_ioctl.o ide-cd_verbose.o 43ide-cd_mod-y += ide-cd.o ide-cd_ioctl.o ide-cd_verbose.o
44 44
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 5f545153391a..67ce697a9d51 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -255,7 +255,7 @@ ide_hwif_t * ide_find_port(unsigned long base)
255 255
256 for (i = 0; i < MAX_HWIFS; i++) { 256 for (i = 0; i < MAX_HWIFS; i++) {
257 hwif = &ide_hwifs[i]; 257 hwif = &ide_hwifs[i];
258 if (hwif->io_ports[IDE_DATA_OFFSET] == 0) 258 if (hwif->chipset == ide_unknown)
259 goto found; 259 goto found;
260 } 260 }
261 261