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/ppc | |
| 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/ppc')
| -rw-r--r-- | arch/ppc/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig index c3d941345e..ff04dcd302 100644 --- a/arch/ppc/Kconfig +++ b/arch/ppc/Kconfig | |||
| @@ -1079,6 +1079,10 @@ source kernel/power/Kconfig | |||
| 1079 | 1079 | ||
| 1080 | endmenu | 1080 | endmenu |
| 1081 | 1081 | ||
| 1082 | config ISA_DMA_API | ||
| 1083 | bool | ||
| 1084 | default y | ||
| 1085 | |||
| 1082 | menu "Bus options" | 1086 | menu "Bus options" |
| 1083 | 1087 | ||
| 1084 | config ISA | 1088 | config ISA |