diff options
| author | Adrian Bunk <bunk@kernel.org> | 2009-01-13 14:21:33 +1000 |
|---|---|---|
| committer | Greg Ungerer <gerg@uclinux.org> | 2009-01-27 16:42:02 +1000 |
| commit | e81588517db93b0edb853c5b7187c0f2e9fed9aa (patch) | |
| tree | 3d2e21d51ccd32541661b9c08b1101377ce48251 | |
| parent | 3947fca786dcd8ee6255a8bed7963357b3d984f6 (diff) | |
| download | linux-stable-e81588517db93b0edb853c5b7187c0f2e9fed9aa.tar.gz linux-stable-e81588517db93b0edb853c5b7187c0f2e9fed9aa.tar.bz2 linux-stable-e81588517db93b0edb853c5b7187c0f2e9fed9aa.zip | |
m68knommu: remove the no longer used PCI support option
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| -rw-r--r-- | arch/m68k/include/asm/dma-mapping_no.h | 4 | ||||
| -rw-r--r-- | arch/m68knommu/Kconfig | 17 |
2 files changed, 0 insertions, 21 deletions
diff --git a/arch/m68k/include/asm/dma-mapping_no.h b/arch/m68k/include/asm/dma-mapping_no.h index 6aeab18e58bd..1748f2bca940 100644 --- a/arch/m68k/include/asm/dma-mapping_no.h +++ b/arch/m68k/include/asm/dma-mapping_no.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 */ diff --git a/arch/m68knommu/Kconfig b/arch/m68knommu/Kconfig index 2c70ca45aeab..4beb59dfc6ec 100644 --- a/arch/m68knommu/Kconfig +++ b/arch/m68knommu/Kconfig @@ -695,25 +695,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. - -config COMEMPCI - bool "CO-MEM lite PCI controller support" - depends on (M5307 || M5407) - -source "drivers/pci/Kconfig" - source "drivers/pcmcia/Kconfig" -source "drivers/pci/hotplug/Kconfig" - -endmenu - menu "Executable file formats" source "fs/Kconfig.binfmt" |