diff options
| author | Rod Whitby <rod@whitby.id.au> | 2008-03-24 14:53:44 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2008-03-24 14:53:44 +0000 |
| commit | 20d8a68bbc98fc6697efe063b8df1bdca084e412 (patch) | |
| tree | e4828c9ff143716427028781514b7a7fff38158a /conf | |
| parent | 22e0cee8679cc8ae75a6b5f99891a5b410e5c346 (diff) | |
| parent | b2fbe441d12551766370dfb4f76f221091bbe01d (diff) | |
merge of '18a835c49f98aebf12d1299f14d6e62e8358e6a4'
and '224361c92f343abb72e0ab516a332f63dace3f78'
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 2 | ||||
| -rw-r--r-- | conf/machine/include/ixp4xx.inc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index cb960d5168..6f9568c9c0 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -56,7 +56,7 @@ SRCREV_pn-libxosd ?= "627" SRCREV_pn-lightmediascanner ?= "68" SRCREV_pn-linux-bfin ?= "3758" SRCREV_pn-linux-hackndev-2.6 ?= "1308" -SRCREV_pn-linux-ixp4xx ?= "1039" +SRCREV_pn-linux-ixp4xx ?= "1056" SRCREV_pn-linux-openmoko ?= "4194" SRCREV_pn-llvm-gcc4 ?= "374" SRCREV_pn-llvm-gcc4-cross ?= "374" diff --git a/conf/machine/include/ixp4xx.inc b/conf/machine/include/ixp4xx.inc index da1e8b7557..4696d7906d 100644 --- a/conf/machine/include/ixp4xx.inc +++ b/conf/machine/include/ixp4xx.inc @@ -7,7 +7,7 @@ MACHINE_FEATURES ?= "kernel26 usbhost ext2 vfat redboot apex" # Select an appropriate default kernel PREFERRED_PROVIDER_virtual/kernel ?= "linux-ixp4xx" -PREFERRED_VERSION_linux-ixp4xx ?= "2.6.24+svnr${SRCREV}" +PREFERRED_VERSION_linux-ixp4xx ?= "2.6.24.3+svnr${SRCREV}" # Add packages required for basic networking support MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "ixp4xx-npe" |