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/sh/Kconfig | |
| parent | 325a479c4c110db278ef3361460a48c4093252cc (diff) | |
| parent | 1016888fb69662936b32ab767c7419a3be9a69d3 (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'arch/sh/Kconfig')
| -rw-r--r-- | arch/sh/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 722ea1d63c94..3468d5127223 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig | |||
| @@ -693,6 +693,10 @@ config RTC_9701JE | |||
| 693 | 693 | ||
| 694 | endmenu | 694 | endmenu |
| 695 | 695 | ||
| 696 | config ISA_DMA_API | ||
| 697 | bool | ||
| 698 | depends on MPC1211 | ||
| 699 | default y | ||
| 696 | 700 | ||
| 697 | menu "Bus options (PCI, PCMCIA, EISA, MCA, ISA)" | 701 | menu "Bus options (PCI, PCMCIA, EISA, MCA, ISA)" |
| 698 | 702 | ||