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/m68knommu/Kconfig | |
| parent | 325a479c4c110db278ef3361460a48c4093252cc (diff) | |
| parent | 1016888fb69662936b32ab767c7419a3be9a69d3 (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'arch/m68knommu/Kconfig')
| -rw-r--r-- | arch/m68knommu/Kconfig | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/m68knommu/Kconfig b/arch/m68knommu/Kconfig index fc4615b6d3a9..e729bd280623 100644 --- a/arch/m68knommu/Kconfig +++ b/arch/m68knommu/Kconfig | |||
| @@ -534,6 +534,11 @@ endchoice | |||
| 534 | 534 | ||
| 535 | endmenu | 535 | endmenu |
| 536 | 536 | ||
| 537 | config ISA_DMA_API | ||
| 538 | bool | ||
| 539 | depends on !M5272 | ||
| 540 | default y | ||
| 541 | |||
| 537 | menu "Bus options (PCI, PCMCIA, EISA, MCA, ISA)" | 542 | menu "Bus options (PCI, PCMCIA, EISA, MCA, ISA)" |
| 538 | 543 | ||
| 539 | config PCI | 544 | config PCI |