Merge distro files from OE

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@389 311d38ba-8fff-0310-9ca6-ca027cbcb966

1 files changed, 0 insertions, 5 deletions

diff --git a/openembedded/conf/distro/familiar-unstable.conf b/openembedded/conf/distro/familiar-unstable.conf
index ab367378af..8b40c5811a 100644
--- a/openembedded/conf/distro/familiar-unstable.conf
+++ b/openembedded/conf/distro/familiar-unstable.conf
@@ -5,7 +5,6 @@ DISTRO_VERSION = "unstable-${DATE}"
 
 include conf/distro/familiar.conf
 
-
 DISTRO_TYPE = "debug"
 #DISTRO_TYPE = "release"
 #!!!!! DON'T FORGET TO ENABLE ZAPROOTPASSWD !!!!!
@@ -39,7 +38,6 @@ PREFERRED_VERSION_orinoco-modules_h2200 ?= "0.15"
 PREFERRED_VERSION_orinoco-modules_ipaq-pxa270 ?= "0.15"
 
 
-
 # The CSL compiler is unusable because
 # 1) certain programs stop to compile
 # 2) more programs segfault
@@ -57,9 +55,6 @@ PREFERRED_VERSION_binutils ?= "2.15.94.0.1"
 # Opie
 #
 
-PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie"
-PREFERRED_VERSION_qte = "2.3.10"
-
 #OPIE_VERSION = "1.2.1"
 #include conf/distro/preferred-opie-versions.inc