summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Spaeth <Sebastian@SSpaeth.de>2009-11-20 15:39:31 +0100
committerSebastian Spaeth <Sebastian@SSpaeth.de>2009-11-20 15:39:31 +0100
commit849cd3aa310e581710a6b0718fdc7e826f9dee88 (patch)
treee614a44ca5f1f0d93e808fb2baed47c5dcf006c3
parent66d1101a0a4cf4e8e03c58dfc4404f4949179a5a (diff)
Revert "om-gta0{1, 2}.conf task-shr-minimal: remove apm from machine
features and add fso-apm to task-shr-minimal-base" * Will do it distro specific.... * This reverts commit 1bfa409a3a28cee60c4800d3caf33ce3f100d4ca.
-rw-r--r--conf/machine/om-gta01.conf2
-rw-r--r--conf/machine/om-gta02.conf2
-rw-r--r--recipes/tasks/task-shr-minimal.bb2
3 files changed, 3 insertions, 3 deletions
diff --git a/conf/machine/om-gta01.conf b/conf/machine/om-gta01.conf
index 501d97968b..5bdeba01f3 100644
--- a/conf/machine/om-gta01.conf
+++ b/conf/machine/om-gta01.conf
@@ -19,7 +19,7 @@ UBOOT_ENTRYPOINT = "30008000"
OLDEST_KERNEL_linux-gnueabi = "2.6.24"
-MACHINE_FEATURES = "kernel26 alsa bluetooth gps usbgadget usbhost phone vfat ext2"
+MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone vfat ext2"
MACHINE_DISPLAY_WIDTH_PIXELS = "480"
MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
MACHINE_DISPLAY_ORIENTATION = "0"
diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf
index 48e8119000..d47320e59d 100644
--- a/conf/machine/om-gta02.conf
+++ b/conf/machine/om-gta02.conf
@@ -24,7 +24,7 @@ UBOOT_ENTRYPOINT = "30008000"
OLDEST_KERNEL_linux-gnueabi = "2.6.24"
-MACHINE_FEATURES = "kernel26 alsa bluetooth gps usbgadget usbhost phone wifi vfat ext2"
+MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone wifi vfat ext2"
MACHINE_DISPLAY_WIDTH_PIXELS = "480"
MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
MACHINE_DISPLAY_ORIENTATION = "0"
diff --git a/recipes/tasks/task-shr-minimal.bb b/recipes/tasks/task-shr-minimal.bb
index 6239ef993a..c2eb32ad00 100644
--- a/recipes/tasks/task-shr-minimal.bb
+++ b/recipes/tasks/task-shr-minimal.bb
@@ -1,5 +1,5 @@
DESCRIPTION = "SHR Lite Image Feed"
-PR = "r17"
+PR = "r16"
PV = "2.0"
LICENSE = "GPL"