summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2007-09-09 11:41:44 +0000
committerMichael Lauer <mickey@vanille-media.de>2007-09-09 11:41:44 +0000
commite4ef6eacfb2280a4d63cd569d691280fdf6b0e8f (patch)
tree08350103aa1a9fad46a2858ea49b014afddd70aa /conf
parent5fff1e40328e6ab7967b55fbcd717c29d68a1d3f (diff)
parentd6833d3ab6f6b0c4078c9d0c46cb9d5dd0faea58 (diff)
merge of '3025e5e7a53ca716304775ca0ca1dc45ca4b0524'
and '60271e29029910207b8512833d049fad50fb282b'
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/include/sane-srcrevs.inc1
-rw-r--r--conf/machine/include/motorola-ezx-base.inc4
2 files changed, 2 insertions, 3 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 27ce277965..de00bfb30a 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -68,7 +68,6 @@ SRCREV_pn-openmoko-theme-standard-qvga="2370"
SRCREV_pn-openmoko-today="2556"
SRCREV_pn-openmoko-today2="2919"
SRCREV_pn-openmoko-today2-folders="2680"
-SRCREV_pn-opentapi="2012"
SRCREV_pn-sphyrna="43"
SRCREV_pn-webkit-gtk="webcore"
SRCREV_pn-xoo="1623"
diff --git a/conf/machine/include/motorola-ezx-base.inc b/conf/machine/include/motorola-ezx-base.inc
index 52b9ccc65d..95496b3266 100644
--- a/conf/machine/include/motorola-ezx-base.inc
+++ b/conf/machine/include/motorola-ezx-base.inc
@@ -15,7 +15,7 @@ EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth usbgadget usbhost keyboard screen"
-# the EZX phones need a userspace daemon to stop the BP from shutting down the phone
+# the EZX phones need a userspace daemon to stop the BP from shutting down the phone
MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "ezxd"
MACHINE_DISPLAY_WIDTH_PIXELS = "240"
@@ -27,7 +27,7 @@ ROOT_FLASH_SIZE = "24"
EXTRA_IMAGEDEPENDS += "ezx-boot-usb-native"
-# Opentapi needs to be started very early so we need the mux devices in static /dev
+# Ezxd needs to be started very early so we need the mux devices in static /dev
IMAGE_DEVICE_TABLES = "files/device_table-minimal.txt \
files/device_table-ezx.txt"