diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-10 21:03:30 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-10 21:03:30 -0500 |
| commit | f45ac22ae2b8fc5b4c32d9b8d17ea419a8701d89 (patch) | |
| tree | 8e05bccd7b85fc3dd2fbd33ec3286de27e152819 /arch/avr32/configs/atstk1003_defconfig | |
| parent | 79f3b3cb7a2586b319a43a7f29924c6c555e4357 (diff) | |
| parent | c59765042f53a79a7a65585042ff463b69cb248c (diff) | |
Merge commit 'v2.6.29-rc1' into x86/urgent
Diffstat (limited to 'arch/avr32/configs/atstk1003_defconfig')
| -rw-r--r-- | arch/avr32/configs/atstk1003_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/avr32/configs/atstk1003_defconfig b/arch/avr32/configs/atstk1003_defconfig index 5477ed3183b4..29ea1327b498 100644 --- a/arch/avr32/configs/atstk1003_defconfig +++ b/arch/avr32/configs/atstk1003_defconfig | |||
| @@ -882,7 +882,7 @@ CONFIG_DMA_ENGINE=y | |||
| 882 | # DMA Clients | 882 | # DMA Clients |
| 883 | # | 883 | # |
| 884 | # CONFIG_NET_DMA is not set | 884 | # CONFIG_NET_DMA is not set |
| 885 | CONFIG_DMATEST=m | 885 | # CONFIG_DMATEST is not set |
| 886 | # CONFIG_UIO is not set | 886 | # CONFIG_UIO is not set |
| 887 | 887 | ||
| 888 | # | 888 | # |