diff options
| author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-07-03 12:52:11 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-07-03 12:52:11 +0000 |
| commit | 05db31fa1307cec7691be6f83d927fe8f3d74317 (patch) | |
| tree | 5306377356f1f6be895f91bf42c78b7b00b5df90 /packages/linux | |
| parent | 8dfedb7131d2aea7829ae4c0640ce388dfa8d582 (diff) | |
| parent | 0658c11da759d064ff8a43e70bfcd4c002045074 (diff) | |
merge of 'af851f4509aae0ba4c539361ee5e09b515f331f8'
and 'b43a21b343fe9c1dc9cb8c83379234f15bc53f72'
Diffstat (limited to 'packages/linux')
| -rw-r--r-- | packages/linux/linux-omap2-git/beagleboard/defconfig | 4 | ||||
| -rw-r--r-- | packages/linux/linux-omap2_git.bb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/packages/linux/linux-omap2-git/beagleboard/defconfig b/packages/linux/linux-omap2-git/beagleboard/defconfig index 3ef03cf5d5..7fc46c9113 100644 --- a/packages/linux/linux-omap2-git/beagleboard/defconfig +++ b/packages/linux/linux-omap2-git/beagleboard/defconfig @@ -4,7 +4,7 @@ # Tue Jun 24 20:16:52 2008 # CONFIG_ARM=y -CONFIG_SYS_SUPPORTS_APM_EMULATION=y +CONFIG_SYS_SUPPORTS_APM_EMULATION=n CONFIG_GENERIC_GPIO=y CONFIG_GENERIC_TIME=y CONFIG_GENERIC_CLOCKEVENTS=y @@ -346,7 +346,7 @@ CONFIG_PM=y CONFIG_PM_SLEEP=y CONFIG_SUSPEND=y CONFIG_SUSPEND_FREEZER=y -CONFIG_APM_EMULATION=y +CONFIG_APM_EMULATION=n CONFIG_ARCH_SUSPEND_POSSIBLE=y # diff --git a/packages/linux/linux-omap2_git.bb b/packages/linux/linux-omap2_git.bb index 4ccf527bae..7042cab3db 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 = "050684c18f2ea0b08fdd5233a0cd3c7f96e00a0e" PV = "2.6.25+2.6.26-rc8+${PR}+git${SRCREV}" -PR = "r32" +PR = "r34" SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \ |