On Fri, Aug 29, 2008 at 02:13:24PM +1000, Greg Ungerer wrote: > Hi Adrian, Hi Greg, > Adrian Bunk wrote: >... >> But COMEMPCI fails with a different error - this init/main.o build >> error is present for CONFIG_PCI=y, CONFIG_COMEMPCI=n, so the dependency >> of PCI on BROKEN is still required (unless it gets fixed). > > Unless I am mistaken there is now no need for the CONFIG_PCI option > if selecting m68knommu. The only m68knommu platforms that had PCI > as far as I know where those that use the comempci part. >... Patch to remove the few PCI bits (on top of the comempci removal) is below. > Regards > Greg cu Adrian <-- snip --> This patch removes the no longer used PCI option. Signed-off-by: Adrian Bunk <bunk@xxxxxxxxxx> --- arch/m68knommu/Kconfig | 13 ------------- arch/m68knommu/include/asm/dma-mapping.h | 4 ---- 2 files changed, 17 deletions(-) diff --git a/arch/m68knommu/Kconfig b/arch/m68knommu/Kconfig index f43d50f..46b9c43 100644 --- a/arch/m68knommu/Kconfig +++ b/arch/m68knommu/Kconfig @@ -692,21 +692,8 @@ config ISA_DMA_API depends on !M5272 default y -menu "Bus options (PCI, PCMCIA, EISA, MCA, ISA)" - -config PCI - bool "PCI support" - help - Support for PCI bus. - -source "drivers/pci/Kconfig" - source "drivers/pcmcia/Kconfig" -source "drivers/pci/hotplug/Kconfig" - -endmenu - menu "Executable file formats" source "fs/Kconfig.binfmt" diff --git a/arch/m68knommu/include/asm/dma-mapping.h b/arch/m68knommu/include/asm/dma-mapping.h index 6aeab18..1748f2b 100644 --- a/arch/m68knommu/include/asm/dma-mapping.h +++ b/arch/m68knommu/include/asm/dma-mapping.h @@ -1,10 +1,6 @@ #ifndef _M68KNOMMU_DMA_MAPPING_H #define _M68KNOMMU_DMA_MAPPING_H -#ifdef CONFIG_PCI -#include <asm-generic/dma-mapping.h> -#else #include <asm-generic/dma-mapping-broken.h> -#endif #endif /* _M68KNOMMU_DMA_MAPPING_H */ -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
