diff options
| author | Sergey Lapin <slapinid@gmail.com> | 2007-07-19 09:25:21 +0000 |
|---|---|---|
| committer | Sergey Lapin <slapinid@gmail.com> | 2007-07-19 09:25:21 +0000 |
| commit | e0f429dd3d266b453984aa2b86688301df8871f8 (patch) | |
| tree | 4d38d3c3d6c052bee6e7101532a1c390437dad9e /conf | |
| parent | e4ca3f5ed310d2f3730ff1e9e646716999a818eb (diff) | |
| parent | 658f5d69e4190e450b916577d89c3f77153fe286 (diff) | |
merge of '034cb4d5ba90b319f9a706faae008874ee15b7e9'
and '998f0f497d358b8816a0539ed794c21b62f0df02'
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/angstrom-2007.1.conf | 2 | ||||
| -rw-r--r-- | conf/distro/include/slugos.inc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 3273d6f329..34a02514d3 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -128,7 +128,7 @@ MACHINE_KERNEL_VERSION = "2.6" PCMCIA_MANAGER = "pcmciautils" #Preferred version for the kernel on various machines -PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh11" +PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh12" RDEPENDS_kernel-base_hx4700 = "" RDEPENDS_kernel-base_htcuniversal = "" diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index c2970d2b99..bb1605e41b 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -111,7 +111,7 @@ PREFERRED_VERSION_glibc ?= "2.3.5+cvs20050627" # 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.21.5" +PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.21.6" # Select the smallest provider of x11 libraries PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" |