From 556e4887207a6a668fab7a8c44ae01261604074f Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Fri, 18 Apr 2008 00:46:21 +0200 Subject: [PATCH] --- yaml --- r: 89308 b: refs/heads/master c: 2625cd52b6eafb63b72f2e53f933f41ba9e34dff h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/ide/Makefile | 2 +- trunk/drivers/ide/ide.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index dec60e51c530..20b938a3200f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ce9b248bb451134fcb41e189e83e3838fb57caf0 +refs/heads/master: 2625cd52b6eafb63b72f2e53f933f41ba9e34dff diff --git a/trunk/drivers/ide/Makefile b/trunk/drivers/ide/Makefile index a4a4323be911..571544c37bb2 100644 --- a/trunk/drivers/ide/Makefile +++ b/trunk/drivers/ide/Makefile @@ -36,9 +36,9 @@ ifeq ($(CONFIG_BLK_DEV_CMD640), y) endif obj-$(CONFIG_BLK_DEV_IDE) += cris/ ppc/ -obj-$(CONFIG_BLK_DEV_IDEPNP) += ide-pnp.o obj-$(CONFIG_IDE_H8300) += h8300/ obj-$(CONFIG_IDE_GENERIC) += ide-generic.o +obj-$(CONFIG_BLK_DEV_IDEPNP) += ide-pnp.o ide-cd_mod-y += ide-cd.o ide-cd_ioctl.o ide-cd_verbose.o diff --git a/trunk/drivers/ide/ide.c b/trunk/drivers/ide/ide.c index 5f545153391a..67ce697a9d51 100644 --- a/trunk/drivers/ide/ide.c +++ b/trunk/drivers/ide/ide.c @@ -255,7 +255,7 @@ ide_hwif_t * ide_find_port(unsigned long base) for (i = 0; i < MAX_HWIFS; i++) { hwif = &ide_hwifs[i]; - if (hwif->io_ports[IDE_DATA_OFFSET] == 0) + if (hwif->chipset == ide_unknown) goto found; }