diff options
| author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-06-11 23:17:50 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-06-11 23:17:50 +0000 |
| commit | d155644256cf2c33be2d70f1179e63291d229c7f (patch) | |
| tree | 7a596fae81c5a6a3e42b650867ad1df0a65a80f4 /conf | |
| parent | 842bca7716c1fcf1627b87d7b478805ac283ecfa (diff) | |
| parent | 077441a48b6313cbf3b2a81a7a263fa67c41150b (diff) | |
merge of '416f841049c84e97f18fad677688af32cbc68636'
and '8d96efde3687c41c8d5111e4be606b8b0946167d'
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/include/fso-autorev.inc | 1 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 1 | ||||
| -rw-r--r-- | conf/machine/neuros-osd2.conf | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/conf/distro/include/fso-autorev.inc b/conf/distro/include/fso-autorev.inc index 65a4543437..7035a05b23 100644 --- a/conf/distro/include/fso-autorev.inc +++ b/conf/distro/include/fso-autorev.inc @@ -1,4 +1,5 @@ SRCREV_pn-gsm0710muxd = "${AUTOREV}" +SRCREV_pn-gsmd2 = "${AUTOREV}" SRCREV_pn-pygsm = "${AUTOREV}" SRCREV_pn-mickeyterm = "${AUTOREV}" SRCREV_pn-pyneod = "${AUTOREV}" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index f2c9c195ed..3e461156f7 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -42,6 +42,7 @@ SRCREV_pn-gconf-dbus ?= "641" SRCREV_pn-gnuradio ?= "6377" SRCREV_pn-gpe-contacts ?= "9312" SRCREV_pn-gsm0710muxd ?= "6fecc78198dd821bbe29efd096bd8fecd855179d" +SRCREV_pn-gsmd2 ?= "963f34df8fa3ff4b301079dcf86e9acea6b6fe0f" SRCREV_pn-gtkhtml2 ?= "1158" SRCREV_pn-gypsy ?= "134" SRCREV_pn-hildon-1 ?= "14429" diff --git a/conf/machine/neuros-osd2.conf b/conf/machine/neuros-osd2.conf index b327d8f8b6..4a540270f4 100644 --- a/conf/machine/neuros-osd2.conf +++ b/conf/machine/neuros-osd2.conf @@ -7,7 +7,7 @@ TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4t armv5te" PREFERRED_PROVIDER_xserver = "xserver-kdrive" -PREFERRED_PROVIDER_virtual/kernel = "linux-davinci" +PREFERRED_PROVIDER_virtual/kernel = "linux-neuros" KERNEL_IMAGETYPE = "uImage" |