diff options
author | Tony Luck <tony.luck@intel.com> | 2005-06-15 17:06:48 -0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2005-06-15 17:06:48 -0400 |
commit | f2cbb4f01936a3e4225692e03b084b78c56d386d (patch) | |
tree | f89f3d8baa250589a38a4dd2df56f84cddae3c76 /arch/arm26/Kconfig | |
parent | 325a479c4c110db278ef3361460a48c4093252cc (diff) | |
parent | 1016888fb69662936b32ab767c7419a3be9a69d3 (diff) |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'arch/arm26/Kconfig')
-rw-r--r-- | arch/arm26/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm26/Kconfig b/arch/arm26/Kconfig index 3955de5af4c0..6caed90661fc 100644 --- a/arch/arm26/Kconfig +++ b/arch/arm26/Kconfig | |||
@@ -89,6 +89,10 @@ config PAGESIZE_16 | |||
89 | machine with 4MB of memory. | 89 | machine with 4MB of memory. |
90 | endmenu | 90 | endmenu |
91 | 91 | ||
92 | config ISA_DMA_API | ||
93 | bool | ||
94 | default y | ||
95 | |||
92 | menu "General setup" | 96 | menu "General setup" |
93 | 97 | ||
94 | # Compressed boot loader in ROM. Yes, we really want to ask about | 98 | # Compressed boot loader in ROM. Yes, we really want to ask about |