[oe-commits] org.oe.dev slugos.inc: Update to 2.6.20

[rwhitby commit]

slugos.inc: Update to 2.6.20

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: d7d5cb097f959159a7ba2d55828e3be38f7830dd
ViewMTN: http://monotone.openembedded.org/revision.psp?id=d7d5cb097f959159a7ba2d55828e3be38f7830dd
Files:
1
conf/distro/include/slugos.inc
Diffs:

#
# mt diff -reba77e7686dfad7e715b2de7d521c34d5a09e0ac -rd7d5cb097f959159a7ba2d55828e3be38f7830dd
#
# 
# 
# patch "conf/distro/include/slugos.inc"
#  from [922e58c624b4eaca6f6a143d90b1d3d10eae653c]
#    to [6abb2fb0d8d1098937ba6ffc9e0d0841a0cd4569]
# 
============================================================
--- conf/distro/include/slugos.inc	922e58c624b4eaca6f6a143d90b1d3d10eae653c
+++ conf/distro/include/slugos.inc	6abb2fb0d8d1098937ba6ffc9e0d0841a0cd4569
@@ -169,18 +169,12 @@ PREFERRED_PROVIDER_virtual/kernel ?= "ix
 # Select the correct versions of the kernel and modules (these are the
 # defaults, override in the conf/distro top-level distro file).
 PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel"
-PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.19"
+PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.20"
 
 # Select the smallest provider of x11 libraries
 PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11"
 SRCDATE_diet-x11 ?= "20060106"
 
-# Latest wpa-supplicant which supports madwifi-ng
-PREFERRED_VERSION_wpa-supplicant ?= "0.5.1"
-
-# Latest linphone supports yeaphone
-PREFERRED_VERSION_linphone ?= "1.6.0"
-
 # Ensure consistency across all SlugOS builds for the provider of a
 # relational database - use the latest version of the SleepyCat
 # Berkeley database