diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-05 08:59:37 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-05 08:59:37 -0400 |
| commit | bfd4bda097f8758d28e632ff2035e25577f6b060 (patch) | |
| tree | 022276b3625a432c7132e39776e7e448445087ac /arch/sh/Kconfig | |
| parent | 488f2eaca1b0831a5a5e6a66e33bad2cdeff7238 (diff) | |
| parent | b2d84f078a8be40f5ae3b4d2ac001e2a7f45fe4f (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
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 | ||