diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-17 18:46:21 -0400 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-17 18:46:21 -0400 |
| commit | 2625cd52b6eafb63b72f2e53f933f41ba9e34dff (patch) | |
| tree | 1d104d623465a7c566dfa886ef1a77d43bb17970 /drivers/ide/Makefile | |
| parent | ce9b248bb451134fcb41e189e83e3838fb57caf0 (diff) | |
ide: fix ide_find_port()
* Instead of checking for '->io_ports[IDE_DATA_OFFSET] == 0' check for
'->chipset == ide_unknown' when looking for an empty ide_hwifs[] slot.
* Do ide-pnp initialization after ide-generic when IDE is built-in
(ide-pnp is the only user of ide_find_port() which needs such fixup).
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/Makefile')
| -rw-r--r-- | drivers/ide/Makefile | 2 |
1 files changed, 1 insertions, 1 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) | |||
| 36 | endif | 36 | endif |
| 37 | 37 | ||
| 38 | obj-$(CONFIG_BLK_DEV_IDE) += cris/ ppc/ | 38 | obj-$(CONFIG_BLK_DEV_IDE) += cris/ ppc/ |
| 39 | obj-$(CONFIG_BLK_DEV_IDEPNP) += ide-pnp.o | ||
| 40 | obj-$(CONFIG_IDE_H8300) += h8300/ | 39 | obj-$(CONFIG_IDE_H8300) += h8300/ |
| 41 | obj-$(CONFIG_IDE_GENERIC) += ide-generic.o | 40 | obj-$(CONFIG_IDE_GENERIC) += ide-generic.o |
| 41 | obj-$(CONFIG_BLK_DEV_IDEPNP) += ide-pnp.o | ||
| 42 | 42 | ||
| 43 | ide-cd_mod-y += ide-cd.o ide-cd_ioctl.o ide-cd_verbose.o | 43 | ide-cd_mod-y += ide-cd.o ide-cd_ioctl.o ide-cd_verbose.o |
| 44 | 44 | ||