diff options
| author | Oyvind Repvik <nail@nslu2-linux.org> | 2005-08-30 21:12:08 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-08-30 21:12:08 +0000 |
| commit | 25a5fe03d4a8eabdf41ac0489659da3ac2909fbd (patch) | |
| tree | 2ce499c4ac26b85838c1d0747debcc4b9d9a536a /conf | |
| parent | 92cb889db9fab6cb42485e687946ba4907d8353b (diff) | |
| parent | 53c47d8a86fb60b25e0a5e10174a5104fb449c3d (diff) | |
merge of 7241b1d9470fba9a059677122babf829bc53e3d6
and 8fc2532eab5aa18bfb78e2d7db01f371bf7f1383
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/preferred-gpe-versions-2.7.inc | 4 | ||||
| -rw-r--r-- | conf/machine/zaurus-clamshell-2.6.conf | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/conf/distro/preferred-gpe-versions-2.7.inc b/conf/distro/preferred-gpe-versions-2.7.inc index 24ee5c0e13..eff175d098 100644 --- a/conf/distro/preferred-gpe-versions-2.7.inc +++ b/conf/distro/preferred-gpe-versions-2.7.inc @@ -38,8 +38,8 @@ PREFERRED_VERSION_xst ?= "0.15" PREFERRED_VERSION_xprop ?= "0.0cvs${CVSDATE}" PREFERRED_VERSION_xhost ?= "0.0cvs20040413" PREFERRED_VERSION_xrdb ?= "0.0cvs${CVSDATE}" -PREFERRED_VERSION_gpe-login ?= "0.81" -PREFERRED_VERSION_gpe-session-scripts ?= "0.63" +PREFERRED_VERSION_gpe-login ?= "0.82" +PREFERRED_VERSION_gpe-session-scripts ?= "0.65" PREFERRED_VERSION_gpe-soundserver ?= "0.4-1" PREFERRED_VERSION_gpe-todo ?= "0.54" PREFERRED_VERSION_gpe-calendar ?= "0.64" diff --git a/conf/machine/zaurus-clamshell-2.6.conf b/conf/machine/zaurus-clamshell-2.6.conf index b3e0a50bc6..516b07ee15 100644 --- a/conf/machine/zaurus-clamshell-2.6.conf +++ b/conf/machine/zaurus-clamshell-2.6.conf @@ -27,10 +27,10 @@ BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluetooth kernel-module-l2cap kernel- kernel-module-bnep kernel-module-hidp kernel-module-hci-uart kernel-module-sco \ kernel-module-bt3c-cs kernel-module-bluecard-cs kernel-module-btuart-cs kernel-module-dtl1-cs" # Infrared Modules -#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pxaficp-ir kernel-module-irda kernel-module-ircomm -# kernel-module-ircomm-tty kernel-module-irlan kernel-module-irnet kernel-module-ir-usb" +BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pxaficp-ir kernel-module-irda kernel-module-ircomm \ + kernel-module-ircomm-tty kernel-module-irlan kernel-module-irnet kernel-module-ir-usb" # USB Gadget Modules -#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage \ -# kernel-module-g-serial kernel-module-g-ether" +BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage \ + kernel-module-g-serial kernel-module-g-ether" |