Skip to contentSkip to conversation

go to drivers/ide/pci/ even for !CONFIG_BLK_DEV_IDEPCI

PATCH In review Adrian Bunk 2 participants 2 messages Jan 11, 2003

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 go to drivers/ide/pci/ even for !CONFIG_BLK_DEV_IDEPCI

Hi Alan,

I observed the following problem with the cmd640 driver in 2.5.56:

- cmd640.c is in the drivers/ide/pci/ subdirectory.
- BLK_DEV_CMD640 does not depend on BLK_DEV_IDEPCI
- drivers/ide/Makefile only goes to pci/ if BLK_DEV_IDEPCI is selected

If the .config contains the following legal configuration:

<-- snip -->

...
CONFIG_BLK_DEV_CMD640=y
...
# CONFIG_BLK_DEV_IDEPCI is not set
...

<-- snip -->

the cmd640 driver isn't built.

The following patch fixes this (similar to 2.4 where pci/ is already visited for !CONFIG_BLK_DEV_IDEPCI):

drivers/ide/Makefile renamed from drivers/ide/Makefile.old +1 -1
@@ -10,7 +10,7 @@
 export-objs := ide-iops.o ide-taskfile.o ide-proc.o ide.o ide-probe.o ide-dma.o ide-lib.o setup-pci.o ide-io.o
 
 # First come modules that register themselves with the core
-obj-$(CONFIG_BLK_DEV_IDEPCI)		+= pci/
+obj-$(CONFIG_BLK_DEV_IDE)		+= pci/
 
 # Core IDE code - must come before legacy
 

cu
Adrian

Signature · 4 lines
       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed
#1 lore raw
Quoted 1 line

I observed the following problem with the cmd640 driver in 2.5.56:

I know

Quoted 2 lines

- cmd640.c is in the drivers/ide/pci/ subdirectory.
- BLK_DEV_CMD640 does not depend on BLK_DEV_IDEPCI

This is correct

Quoted 2 lines

- drivers/ide/Makefile only goes to pci/ if BLK_DEV_IDEPCI is selected If the .config contains the following legal configuration:

There are a lot of configurations with this property.

drivers/ide/Makefile line 13

Quoted 11 lines

The following patch fixes this (similar to 2.4 where pci/ is already visited for !CONFIG_BLK_DEV_IDEPCI):

drivers/ide/Makefile renamed from drivers/ide/Makefile.old +1 -1
@@ -10,7 +10,7 @@
 export-objs := ide-iops.o ide-taskfile.o ide-proc.o ide.o ide-probe.o ide-dma.o ide-lib.o setup-pci.o ide-io.o
 
 # First come modules that register themselves with the core
-obj-$(CONFIG_BLK_DEV_IDEPCI)		+= pci/
+obj-$(CONFIG_BLK_DEV_IDE)		+= pci/

I think thats the best approach.