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/parisc/Kconfig | |
| parent | 325a479c4c110db278ef3361460a48c4093252cc (diff) | |
| parent | 1016888fb69662936b32ab767c7419a3be9a69d3 (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'arch/parisc/Kconfig')
| -rw-r--r-- | arch/parisc/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig index 5b5cd00d98ca..e7e7c56fc212 100644 --- a/arch/parisc/Kconfig +++ b/arch/parisc/Kconfig | |||
| @@ -45,6 +45,10 @@ config GENERIC_IRQ_PROBE | |||
| 45 | config PM | 45 | config PM |
| 46 | bool | 46 | bool |
| 47 | 47 | ||
| 48 | config ISA_DMA_API | ||
| 49 | bool | ||
| 50 | default y | ||
| 51 | |||
| 48 | source "init/Kconfig" | 52 | source "init/Kconfig" |
| 49 | 53 | ||
| 50 | 54 | ||