aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/m68k/include/asm/dma-mapping_no.h4
-rw-r--r--arch/m68knommu/Kconfig17
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 @@
1#ifndef _M68KNOMMU_DMA_MAPPING_H 1#ifndef _M68KNOMMU_DMA_MAPPING_H
2#define _M68KNOMMU_DMA_MAPPING_H 2#define _M68KNOMMU_DMA_MAPPING_H
3 3
4#ifdef CONFIG_PCI
5#include <asm-generic/dma-mapping.h>
6#else
7#include <asm-generic/dma-mapping-broken.h> 4#include <asm-generic/dma-mapping-broken.h>
8#endif
9 5
10#endif /* _M68KNOMMU_DMA_MAPPING_H */ 6#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
695 depends on !M5272 695 depends on !M5272
696 default y 696 default y
697 697
698menu "Bus options (PCI, PCMCIA, EISA, MCA, ISA)"
699
700config PCI
701 bool "PCI support"
702 help
703 Support for PCI bus.
704
705config COMEMPCI
706 bool "CO-MEM lite PCI controller support"
707 depends on (M5307 || M5407)
708
709source "drivers/pci/Kconfig"
710
711source "drivers/pcmcia/Kconfig" 698source "drivers/pcmcia/Kconfig"
712 699
713source "drivers/pci/hotplug/Kconfig"
714
715endmenu
716
717menu "Executable file formats" 700menu "Executable file formats"
718 701
719source "fs/Kconfig.binfmt" 702source "fs/Kconfig.binfmt"