diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-11 03:43:52 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-11 03:43:52 +0100 |
| commit | 99cd7074891f87c49660e3b2880564324a4733ac (patch) | |
| tree | 903d2665bcb445f1f265d1adf7a99f265bcefc15 /arch/avr32/configs/atstk1002_defconfig | |
| parent | e8a9cbf6ae620d9e5ba9cb42001c033287a284a3 (diff) | |
| parent | c59765042f53a79a7a65585042ff463b69cb248c (diff) | |
Merge commit 'v2.6.29-rc1' into tracing/urgent
Diffstat (limited to 'arch/avr32/configs/atstk1002_defconfig')
| -rw-r--r-- | arch/avr32/configs/atstk1002_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/avr32/configs/atstk1002_defconfig b/arch/avr32/configs/atstk1002_defconfig index 69fce6b6a783..c9dc64832a19 100644 --- a/arch/avr32/configs/atstk1002_defconfig +++ b/arch/avr32/configs/atstk1002_defconfig @@ -964,7 +964,7 @@ CONFIG_DMA_ENGINE=y # DMA Clients # # CONFIG_NET_DMA is not set -CONFIG_DMATEST=m +# CONFIG_DMATEST is not set # CONFIG_UIO is not set # |