aboutsummaryrefslogtreecommitdiffstats
path: root/conf/machine/include
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2011-05-05 12:39:03 +0200
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2011-05-05 12:39:03 +0200
commit432afcca6c4e0ff89fb72772e3ea47a6d617b428 (patch)
tree4a6e393f22e6dfaac1babd13ab890b342144d9f9 /conf/machine/include
parent36f10acc0e01bfa7fe5a79f41e66e880b68cb873 (diff)
parent085dc5e99abf98772bfb44f3f25320418d500740 (diff)
downloadopenembedded-432afcca6c4e0ff89fb72772e3ea47a6d617b428.tar.gz
Merge remote-tracking branch 'origin/master' into aldot/fixes
Diffstat (limited to 'conf/machine/include')
-rw-r--r--conf/machine/include/palmpre.inc1
1 files changed, 0 insertions, 1 deletions
diff --git a/conf/machine/include/palmpre.inc b/conf/machine/include/palmpre.inc
index 3132ba8e8c..64f2ebd1fe 100644
--- a/conf/machine/include/palmpre.inc
+++ b/conf/machine/include/palmpre.inc
@@ -34,7 +34,6 @@ MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa phone blueto
MACHINE_EXTRA_RDEPENDS = " \
tsmd \
read-tokens \
- tellbootie \
lvm2 \
palmpre-audio-scripts \
compat-wireless-2.6-old \