aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r--arch/arm/Kconfig7
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 4b15f5f1e254..16a5d522b2f2 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -154,6 +154,7 @@ config ARCH_RPC
154 select FIQ 154 select FIQ
155 select TIMER_ACORN 155 select TIMER_ACORN
156 select ARCH_MAY_HAVE_PC_FDC 156 select ARCH_MAY_HAVE_PC_FDC
157 select ISA_DMA_API
157 help 158 help
158 On the Acorn Risc-PC, Linux can support the internal IDE disk and 159 On the Acorn Risc-PC, Linux can support the internal IDE disk and
159 CD-ROM interface, serial and parallel port, and the floppy drive. 160 CD-ROM interface, serial and parallel port, and the floppy drive.
@@ -206,6 +207,7 @@ config ARCH_IMX
206 207
207config ARCH_H720X 208config ARCH_H720X
208 bool "Hynix-HMS720x-based" 209 bool "Hynix-HMS720x-based"
210 select ISA_DMA_API
209 help 211 help
210 This enables support for systems based on the Hynix HMS720x 212 This enables support for systems based on the Hynix HMS720x
211 213
@@ -290,12 +292,14 @@ config ISA
290 (MCA) or VESA. ISA is an older system, now being displaced by PCI; 292 (MCA) or VESA. ISA is an older system, now being displaced by PCI;
291 newer boards don't support it. If you have ISA, say Y, otherwise N. 293 newer boards don't support it. If you have ISA, say Y, otherwise N.
292 294
295# Select ISA DMA controller support
293config ISA_DMA 296config ISA_DMA
294 bool 297 bool
298 select ISA_DMA_API
295 299
300# Select ISA DMA interface
296config ISA_DMA_API 301config ISA_DMA_API
297 bool 302 bool
298 default y
299 303
300config PCI 304config PCI
301 bool "PCI support" if ARCH_INTEGRATOR_AP || ARCH_VERSATILE_PB 305 bool "PCI support" if ARCH_INTEGRATOR_AP || ARCH_VERSATILE_PB
@@ -656,7 +660,6 @@ source "kernel/power/Kconfig"
656 660
657config APM 661config APM
658 tristate "Advanced Power Management Emulation" 662 tristate "Advanced Power Management Emulation"
659 depends on PM_LEGACY
660 ---help--- 663 ---help---
661 APM is a BIOS specification for saving power using several different 664 APM is a BIOS specification for saving power using several different
662 techniques. This is mostly useful for battery powered laptops with 665 techniques. This is mostly useful for battery powered laptops with