From 80739fde7f5be56aae0b5981ce50cfe21ff94113 Mon Sep 17 00:00:00 2001
From: Sebastian Spaeth <Sebastian@SSpaeth.de>
Date: Fri, 4 Dec 2009 08:30:46 +0100
Subject: Revert Introduce DISTRO_apm patch until I get permission

* This was committed accidentally
* This reverts commit 49d5f70658ab0386bee5869656d0405a6d416e35.
---
 recipes/tasks/task-base.bb | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'recipes/tasks')

diff --git a/recipes/tasks/task-base.bb b/recipes/tasks/task-base.bb
index 6aad8730e2..ed561b802e 100644
--- a/recipes/tasks/task-base.bb
+++ b/recipes/tasks/task-base.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r87"
+PR = "r86"
 
 inherit task
 
@@ -60,9 +60,6 @@ HOTPLUG ?= "${@base_contains("MACHINE_FEATURES", "kernel24",  "linux-hotplug",""
 #
 DISTRO_SSH_DAEMON ?= "dropbear"
 
-# Distro can override apm provider
-DISTRO_apm ?= "apm"
-
 #
 # bluetooth manager
 #
@@ -193,7 +190,7 @@ RDEPENDS_task-base-acpi = "\
     acpid"
 
 RDEPENDS_task-base-apm = "\
-    "${DISTRO_apm}" \
+    apm \
     apmd \
     ${@base_contains('MACHINE_FEATURES', 'kernel24', 'network-suspend-scripts', '',d)}"
 
-- 
cgit v1.2.3