summaryrefslogtreecommitdiff
path: root/recipes/linux/linux-omap-2.6.29/omapzoom
diff options
context:
space:
mode:
authorLukas Gorris <lukas.gorris@gmail.com>2009-04-02 21:23:17 +0200
committerLukas Gorris <lukas.gorris@gmail.com>2009-04-02 21:23:17 +0200
commitc1bc969ba3030b6c421cc5d8facc8e1b281d8b9b (patch)
treeeb11b688cc03f3e5efdf5823bda6ac497db5c11c /recipes/linux/linux-omap-2.6.29/omapzoom
parent052a3fba741a0b82204c93a37caaee17b32b6115 (diff)
parent4af6bdcda04ee551a4b07cd6e14c250d207b3266 (diff)
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/linux/linux-omap-2.6.29/omapzoom')
-rw-r--r--recipes/linux/linux-omap-2.6.29/omapzoom/defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes/linux/linux-omap-2.6.29/omapzoom/defconfig b/recipes/linux/linux-omap-2.6.29/omapzoom/defconfig
index d2d2ee59a4..aa11eb04fc 100644
--- a/recipes/linux/linux-omap-2.6.29/omapzoom/defconfig
+++ b/recipes/linux/linux-omap-2.6.29/omapzoom/defconfig
@@ -291,7 +291,7 @@ CONFIG_ZONE_DMA_FLAG=0
CONFIG_VIRT_TO_BUS=y
CONFIG_UNEVICTABLE_LRU=y
# CONFIG_LEDS is not set
-CONFIG_ALIGNMENT_TRAP=y
+CONFIG_ALIGNMENT_TRAP=n
#
# Boot options