summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin@juszkiewicz.com.pl>2009-09-08 18:39:05 +0200
committerMarcin Juszkiewicz <marcin@juszkiewicz.com.pl>2009-09-08 18:55:48 +0200
commit51ddada3f458e9a3553cf0d952490af651ae3e7d (patch)
tree3a9ddbac5d9c36b7f6bc468e5283c91983178b95
parente9ee201981bbdb939bd1c4081962dff3f118167c (diff)
linux-kirkwood: use proper branch for 2.6.30 (thx Koen for spotting)
-rw-r--r--conf/machine/include/kirkwood.inc2
-rw-r--r--recipes/linux/linux-kirkwood_2.6.30.5.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/conf/machine/include/kirkwood.inc b/conf/machine/include/kirkwood.inc
index c185deb555..64ef38b16c 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 = "r8"
+MACHINE_KERNEL_PR = "r9"
IMAGE_FSTYPES += "tar.gz ubi"
SERIAL_CONSOLE = "ttyS0 115200"
diff --git a/recipes/linux/linux-kirkwood_2.6.30.5.bb b/recipes/linux/linux-kirkwood_2.6.30.5.bb
index d47b8e4537..43898c81eb 100644
--- a/recipes/linux/linux-kirkwood_2.6.30.5.bb
+++ b/recipes/linux/linux-kirkwood_2.6.30.5.bb
@@ -9,7 +9,7 @@ require linux.inc
PV = "2.6.30.5"
SRCREV = "6fa23e56edcb79a348c968aada8190944f4f3633"
-SRC_URI = "git://git.marvell.com/orion.git;protocol=git;branch=stable-2.6.29 \
+SRC_URI = "git://git.marvell.com/orion.git;protocol=git;branch=stable-2.6.30 \
file://defconfig \
"