summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2008-07-14 16:54:19 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2008-07-14 16:54:19 +0000
commitca51addf2f301ad1809dc15a2e4c525865bd6b31 (patch)
tree414aed33782444da33f09c271d69848bb3a8a43b /packages
parent71505e393bea9e322d5b8863ec2d93b735dbd461 (diff)
parenta98f27b0cb171675d2eba5be2b3fb6e94df3184e (diff)
merge of 'b82d34d538132713ba10d59d0209f562e276f44b'
and 'fa252fa4613643090cf4875e44edac9246d3fcd0'
Diffstat (limited to 'packages')
-rw-r--r--packages/linux/linux-omap2-git/beagleboard/serialfix.diff18
-rw-r--r--packages/linux/linux-omap2_git.bb3
2 files changed, 20 insertions, 1 deletions
diff --git a/packages/linux/linux-omap2-git/beagleboard/serialfix.diff b/packages/linux/linux-omap2-git/beagleboard/serialfix.diff
new file mode 100644
index 0000000000..74c2ebaa69
--- /dev/null
+++ b/packages/linux/linux-omap2-git/beagleboard/serialfix.diff
@@ -0,0 +1,18 @@
+--- /tmp/pm34xx.c 2008-07-14 18:09:08.000000000 +0200
++++ git/arch/arm/mach-omap2/pm34xx.c 2008-07-14 18:09:42.453198000 +0200
+@@ -398,13 +398,13 @@
+ INT_34XX_PRCM_MPU_IRQ);
+ goto err1;
+ }
+-
++/*
+ ret = pwrdm_for_each(pwrdms_setup);
+ if (ret) {
+ printk(KERN_ERR "Failed to setup powerdomains\n");
+ goto err2;
+ }
+-
++*/
+ mpu_pwrdm = pwrdm_lookup("mpu_pwrdm");
+ if (mpu_pwrdm == NULL) {
+ printk(KERN_ERR "Failed to get mpu_pwrdm\n");
diff --git a/packages/linux/linux-omap2_git.bb b/packages/linux/linux-omap2_git.bb
index 69d3415faf..53bcd297d9 100644
--- a/packages/linux/linux-omap2_git.bb
+++ b/packages/linux/linux-omap2_git.bb
@@ -5,7 +5,7 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-omap2-git/${MA
SRCREV = "7786cd7a00ae0b18923185789380a88052f4eee7"
PV = "2.6.25+2.6.26-rc9+${PR}+git${SRCREV}"
-PR = "r43"
+PR = "r44"
SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \
file://defconfig"
@@ -29,6 +29,7 @@ SRC_URI_append_beagleboard = " file://no-harry-potter.diff;patch=1 \
file://06-ensure-fclk.diff;patch=1 \
file://07-set-burst-size.diff;patch=1 \
file://cache-display-fix.patch;patch=1 \
+ file://serialfix.diff;patch=1 \
"
SRC_URI_append_omap3evm = " file://no-harry-potter.diff;patch=1 \