summaryrefslogtreecommitdiff
path: root/conf/machine/jornada56x.conf
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2006-10-16 14:35:49 +0000
committerMichael Lauer <mickey@vanille-media.de>2006-10-16 14:35:49 +0000
commit7905194bf3b24e9d1f805e5539549c99b08f3e70 (patch)
tree305efa573f1a53d9eebd8cea85c5424de860cc06 /conf/machine/jornada56x.conf
parent2ee602ad04a5d5edfbe1e80486ecbe43785668b4 (diff)
parent03356f0b58aae756f4e45a505252a549cfb17af5 (diff)
merge of '593b9e6f5ea7ab1790ec54c7599baf883f22f12b'
and '748258dba4c326c803882128fbda7609d96e2709'
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