summaryrefslogtreecommitdiff
path: root/conf/machine/colibri-pxa.conf
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2014-07-19 14:08:37 +0200
committerMax Krummenacher <max.krummenacher@toradex.com>2014-08-04 11:12:26 +0200
commit853f11f247b96a0cd34c9fe876588b591c86070b (patch)
tree3a2e378c4fb8d5c68fdb0aead40160f312bc59bb /conf/machine/colibri-pxa.conf
parent8c798848c4d1140b529bc3e54950e4cd738d1636 (diff)
machine.conf: unify MACHINE_FEATURES
unify the features between machines kernel26 is deprecated and unused apm does not make sense on ARM While at it remove some commented stuff
Diffstat (limited to 'conf/machine/colibri-pxa.conf')
-rw-r--r--conf/machine/colibri-pxa.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/machine/colibri-pxa.conf b/conf/machine/colibri-pxa.conf
index 677c0e5..8428862 100644
--- a/conf/machine/colibri-pxa.conf
+++ b/conf/machine/colibri-pxa.conf
@@ -25,7 +25,7 @@ PREFERRED_PROVIDER_lxsession-lite_colibri-pxa = "lxsession"
PREFERRED_PROVIDER_virtual/psplash = "psplash-angstrom"
PREFERRED_PROVIDER_psplash-support = "psplash-angstrom"
-MACHINE_FEATURES = "kernel26 screen usbgadget usbhost vfat ext2 alsa touchscreen ethernet"
+MACHINE_FEATURES = "screen usbgadget usbhost vfat ext2 alsa touchscreen wifi bluetooth 3g "
EXTRA_IMAGEDEPENDS += "u-boot"
# used by sysvinit_2