projects
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
[linux-2.6]
/
arch
/
avr32
/
configs
/
atstk1002_defconfig
diff --git
a/arch/avr32/configs/atstk1002_defconfig
b/arch/avr32/configs/atstk1002_defconfig
index
69fce6b
..
c9dc648
100644
(file)
--- 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
#