diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2011-08-24 16:20:36 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-08-24 19:23:42 -0700 |
commit | f5cddf955d7f8a2bf3a3fadf26219a4ddcdf6279 (patch) | |
tree | ddaf767f83a2ca2e8946140b4b0ff0d53b6e5c9e /meta/recipes-kernel | |
parent | f34001139b8a0dad6f318858a0c601a86c021101 (diff) | |
download | poky-f5cddf955d7f8a2bf3a3fadf26219a4ddcdf6279.tar.gz |
linux-yocto/2.6.37: apmd + get time of day fixes
Fixes [YOCTO #916]
Fixes [YOCTO #900]
Merging:
[
commit 4ae8f8605c81c39b959948e23f7123294a5dfb3f
Author: Liming Wang <liming.wang@windriver.com>
Date: Wed Aug 24 10:45:19 2011 +0800
x86: use vdso gettime fallback versus returning an error
__vdso_clock_gettime should fall back to call vdso_fallback_gettime function
if no clockid is selected, not just return error.
(From OE-Core rev: 8069549937f8d1e266eb0a2d6b4c1321b08ed69b)
Signed-off-by: Liming Wang <liming.wang@windriver.com
]
[
commit aeea99683c7283f1f3320bf2ee7085ee252d4e7e
Author: Liming Wang <liming.wang@windriver.com>
Date: Fri Aug 19 17:43:49 2011 +0800
meta: add APM Emulation option to beagleboard
apmd daemon needs this option to work, so add this to beagleboard
kernel config file.
Signed-off-by: Liming Wang <liming.wang@windriver.com>
]
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_2.6.37.bb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb b/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb index 145abe1e3d..419913728a 100644 --- a/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb +++ b/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb | |||
@@ -14,12 +14,12 @@ KMETA = meta | |||
14 | LINUX_VERSION ?= "2.6.37" | 14 | LINUX_VERSION ?= "2.6.37" |
15 | LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE}" | 15 | LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE}" |
16 | 16 | ||
17 | SRCREV_machine_qemuarm = "f5aaddc24d0866ac12e924c4cee1382cce4cdb44" | 17 | SRCREV_machine_qemuarm = "b3e53a090eaa23aa82e64fa0a563a93a2b4dbb5d" |
18 | SRCREV_machine_qemumips = "f988df822335de0e463056f8c43f2984c29e2bd1" | 18 | SRCREV_machine_qemumips = "91f2eb4a3b447476b36aac8e6e198d08c98e0680" |
19 | SRCREV_machine_qemuppc = "b03682b7db2f21c7dcabbbe4073061b601ad5ee9" | 19 | SRCREV_machine_qemuppc = "862faf3666b3a4e4bc1d469ff5fb3fb90c25f621" |
20 | SRCREV_machine_qemux86 = "ff1a08b4f5a0c4afa04160460421d67f37299f2c" | 20 | SRCREV_machine_qemux86 = "27ad78e1f6378da554775a7d6760730c92f8c5a7" |
21 | SRCREV_machine_qemux86-64 = "be49445d1504c3d4021c01471223208cd3cc9c4f" | 21 | SRCREV_machine_qemux86-64 = "af2bfbe5f757361b5b027a24d67a93bfdfaaf33c" |
22 | SRCREV_machine = "ffd73d6b2a9bfa0de5710b90a2237f4be66ae9a7" | 22 | SRCREV_machine = "4ae8f8605c81c39b959948e23f7123294a5dfb3f" |
23 | SRCREV_meta = "aeea99683c7283f1f3320bf2ee7085ee252d4e7e" | 23 | SRCREV_meta = "aeea99683c7283f1f3320bf2ee7085ee252d4e7e" |
24 | 24 | ||
25 | PR = "r20" | 25 | PR = "r20" |