diff options
| author | Rod Whitby <rod@whitby.id.au> | 2008-01-16 04:37:45 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2008-01-16 04:37:45 +0000 |
| commit | 3a5b423edc8916074c097d1e7dc2219f2c38228c (patch) | |
| tree | 186f20f8eaf5d2d19616b32ddd10a01ff92b8368 /conf | |
| parent | 9d00af25ddaebf2151f6dadbb48e1635d57ba16a (diff) | |
| parent | d4564caafe607d5474cac60f6d09a2b63738d80c (diff) | |
merge of '3caac13a21da93a3af0a8093fe60883fccd0399f'
and '3d85f32ae343659587f7a1f2da9e4a8ed3e568a1'
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 b612b2ffdf..29c04437dd 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -43,7 +43,7 @@ SRCREV_pn-libowl ?= "277" SRCREV_pn-libxosd ?= "627" SRCREV_pn-linux-bfin ?= "3758" SRCREV_pn-linux-hackndev-2.6 ?= "1308" -SRCREV_pn-linux-ixp4xx ?= "957" +SRCREV_pn-linux-ixp4xx ?= "983" SRCREV_pn-linux-openmoko ?= "3801" 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 bdf00d15c9..924fb54f1e 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.21.7+svnr${SRCREV}" +PREFERRED_VERSION_linux-ixp4xx ?= "2.6.23.14+svnr${SRCREV}" # Add packages required for basic networking support MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "ixp4xx-npe" |