diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2006-02-28 12:25:22 -0500 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2006-02-28 12:25:22 -0500 |
| commit | 9585da3729e7e27bf22818625c10ac6c64ebb609 (patch) | |
| tree | 8c8d46f7f2cc933fdf75a6a75cf593a63f7b8717 /arch/sh | |
| parent | 8080d5497146d5d27d9e8e78229d1adc7fe280cf (diff) | |
| parent | 6749c5507388f3fc3719f57a54b540ee83f6661a (diff) | |
Merge branch 'master' of git+ssh://galak@master.kernel.org/pub/scm/linux/kernel/git/galak/powerpc
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 504d56f8ca..e73621d03a 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig | |||
| @@ -446,7 +446,7 @@ endmenu | |||
| 446 | 446 | ||
| 447 | config ISA_DMA_API | 447 | config ISA_DMA_API |
| 448 | bool | 448 | bool |
| 449 | depends on MPC1211 | 449 | depends on SH_MPC1211 |
| 450 | default y | 450 | default y |
| 451 | 451 | ||
| 452 | menu "Kernel features" | 452 | menu "Kernel features" |