summaryrefslogtreecommitdiff
path: root/conf/machine/include/kirkwood.inc
diff options
context:
space:
mode:
authorGraeme Gregory <dp@xora.org.uk>2009-11-04 11:48:39 +0000
committerGraeme Gregory <dp@xora.org.uk>2009-11-04 11:48:39 +0000
commit4b5a2ca27aeadda74fc48931e2a0e66ddb4ced5b (patch)
treeb88a6875af3ddbc7c61d90e3302f21e1221214f8 /conf/machine/include/kirkwood.inc
parent6ccc0b7bd8208c36ed7f581c0f9e45df7e686468 (diff)
parent2f0ed0594046903fb8033852e05a0de6b1f02914 (diff)
Merge branch 'org.openembedded.dev' of git+ssh://git@git.openembedded.org/openembedded into org.openembedded.dev
Diffstat (limited to 'conf/machine/include/kirkwood.inc')
-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 20f53bf643..f91607cf76 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 = "r11"
+MACHINE_KERNEL_PR = "r12"
IMAGE_FSTYPES += "tar.gz ubi"
SERIAL_CONSOLE = "ttyS0 115200"