summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2014-04-04 16:43:15 +0100
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2014-04-04 16:43:15 +0100
commit5a9b14cc3d6bc4060cc55ed6e1d2b5565b201ad5 (patch)
tree78bf40f517c231abc4102b161e9774f019e21b2e
parent2a054e5708e376890693f71c3697c4a259a5e46f (diff)
parente5c40edc28c70168ccf23fee55dc3fea58c5037d (diff)
downloadlinux-5a9b14cc3d6bc4060cc55ed6e1d2b5565b201ad5.tar.gz
Merge branch 'baserock/pedroalvarez/weston-arm' into baserock/arm/versatilebaserock/arm/versatile
-rw-r--r--linux.morph1
1 files changed, 1 insertions, 0 deletions
diff --git a/linux.morph b/linux.morph
index 886bda365dd7..dc35196b2054 100644
--- a/linux.morph
+++ b/linux.morph
@@ -16,6 +16,7 @@
"scripts/config -e IKCONFIG_PROC",
"scripts/config -e SECCOMP",
"scripts/config -d DEBUG_STACK_TRACE",
+ "scripts/config -e FB_VESA",
"yes '' | make oldconfig"
],
"build-commands": [