diff options
| author | Kristoffer Ericson <kristoffer_e1@hotmail.com> | 2006-06-28 15:11:34 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-06-28 15:11:34 +0000 |
| commit | f8c3fadf79c2e3d84dcff874719984ea6f3a4450 (patch) | |
| tree | 1ce65e0e38fbe406a38a3c1ce2c6356c5085ded5 /conf | |
| parent | 57d8d19e4c48be55bf0cdfffd85ca89a8d8a2bf4 (diff) | |
| parent | 9943bed1ee00a137de0b3ae9d30abe4a63ce5d82 (diff) | |
merge of 0c68cd9f7176bca16daf6bc374bbe0adcb6f7736
and 9e7bb196edb79eecad7d7ed9e5be82a0489356f6
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/machine/include/handheld-common.conf | 2 | ||||
| -rw-r--r-- | conf/machine/include/zaurus-clamshell-2.4.conf | 2 | ||||
| -rw-r--r-- | conf/machine/include/zaurus-clamshell-2.6.conf | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/conf/machine/include/handheld-common.conf b/conf/machine/include/handheld-common.conf index f8767d2ddf..9ac43d84e9 100644 --- a/conf/machine/include/handheld-common.conf +++ b/conf/machine/include/handheld-common.conf @@ -18,6 +18,6 @@ input uinput \ # Configuration bits for "generic handheld" BOOTSTRAP_EXTRA_RDEPENDS += "${PCMCIA_MANAGER} apm apmd network-suspend-scripts" -BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin ${@linux_module_packages('${HANDHELD_MODULES}', d)}" +BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils wpa-supplicant-nossl lrzsz ppp-dialin ${@linux_module_packages('${HANDHELD_MODULES}', d)}" INHERIT += "linux_modules" diff --git a/conf/machine/include/zaurus-clamshell-2.4.conf b/conf/machine/include/zaurus-clamshell-2.4.conf index b2ca8370e7..5c8fce4398 100644 --- a/conf/machine/include/zaurus-clamshell-2.4.conf +++ b/conf/machine/include/zaurus-clamshell-2.4.conf @@ -11,7 +11,7 @@ PREFERRED_VERSION_orinoco-modules = "0.13e" BOOTSTRAP_EXTRA_RDEPENDS += "kernel hostap-modules-cs orinoco-modules-cs sharp-sdmmc-support \ pcmcia-cs apmd apm wireless-tools keymaps irda-utils hostap-utils prism3-firmware prism3-support \ -wpa-supplicant-nossl ppp ppp-dialin openswan" +wpa-supplicant-nossl ppp ppp-dialin " # Misc Modules BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-net-fd kernel-module-registers" diff --git a/conf/machine/include/zaurus-clamshell-2.6.conf b/conf/machine/include/zaurus-clamshell-2.6.conf index 97030e66a7..8c91a7b29a 100644 --- a/conf/machine/include/zaurus-clamshell-2.6.conf +++ b/conf/machine/include/zaurus-clamshell-2.6.conf @@ -8,7 +8,7 @@ PCMCIA_MANAGER ?= "pcmciautils" BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils spectrum-fw \ ${PCMCIA_MANAGER} apm wireless-tools irda-utils udev-utils keymaps hostap-utils prism3-firmware prism3-support \ -ppp ppp-dialin openswan wpa-supplicant-nossl alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf zaurusd" +ppp ppp-dialin wpa-supplicant-nossl alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf zaurusd" # Ethernet modules BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcnet-cs" |