summaryrefslogtreecommitdiff
path: root/conf/machine/jornada56x.conf
diff options
context:
space:
mode:
authorPaul Sokolovsky <pmiscml@gmail.com>2006-10-16 14:18:06 +0000
committerPaul Sokolovsky <pmiscml@gmail.com>2006-10-16 14:18:06 +0000
commit0d709306cf6f0f428a6caa9233c581dd596974bb (patch)
tree32e6195e6e1469a1acd4ec27d1c03db0b3fb35f2 /conf/machine/jornada56x.conf
parent203719dad839e2eced14a5c8789f402d10e4b74e (diff)
parente20f26d7814ebcfccb5a02cd609bf9892c234c7e (diff)
merge of 'b8e69aa20c2c86ec586299ba3d7ce6ec57b7ef8e'
and 'e675e4bb719bb87881054209d7254e3eacd6f671'
Diffstat (limited to 'conf/machine/jornada56x.conf')
-rw-r--r--conf/machine/jornada56x.conf1
1 files changed, 0 insertions, 1 deletions
diff --git a/conf/machine/jornada56x.conf b/conf/machine/jornada56x.conf
index c1f918f662..a4a6af1f71 100644
--- a/conf/machine/jornada56x.conf
+++ b/conf/machine/jornada56x.conf
@@ -12,5 +12,4 @@ EXTRA_IMAGECMD_jornada56x_jffs2 = "-e 0x40000 -p"
SERIAL_CONSOLE = "115200 ttySA0"
-include conf/machine/include/handheld-common.conf
include conf/machine/include/tune-strongarm.conf