aboutsummaryrefslogtreecommitdiffstats
path: root/conf/machine
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2009-05-18 04:06:45 +0400
committerDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2009-05-18 04:06:45 +0400
commit1ba4e6beb3482625dfa65c4d12b84c41fa3b1eb1 (patch)
treea71beeca5787742501d41cebd07c8adcf2780390 /conf/machine
parent41a385a587cb693894c966e58b4e88b4dc11023c (diff)
parentb90bc146cdd0db2f49e52a27a158cc617ff28562 (diff)
downloadopenembedded-1ba4e6beb3482625dfa65c4d12b84c41fa3b1eb1.tar.gz
Merge branch 'org.openembedded.dev' of git://git.openembedded.org/openembedded into org.openembedded.dev
Diffstat (limited to 'conf/machine')
-rw-r--r--conf/machine/include/kirkwood.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/machine/include/kirkwood.inc b/conf/machine/include/kirkwood.inc
index f58feb686c..9e6f130c35 100644
--- a/conf/machine/include/kirkwood.inc
+++ b/conf/machine/include/kirkwood.inc
@@ -11,7 +11,7 @@ USE_DEVFS = "0"
PREFERRED_PROVIDER_virtual/bootloader = ""
PREFERRED_PROVIDER_virtual/kernel = "linux-kirkwood"
-MACHINE_KERNEL_PR = "r1"
+MACHINE_KERNEL_PR = "r5"
IMAGE_FSTYPES += "tar.gz ubi"
SERIAL_CONSOLE = "ttyS0 115200"