diff options
| author |   Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-01-14 20:39:47 +0100 |
|---|---|---|
| committer | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-01-14 20:39:47 +0100 |
| commit | 3fd04f71ad25d5df59c636986f741b9a36ce6501 (patch) | |
| tree | 995f4a15764d4196a92ecd966150e38d910d57d1 /recipes/linux/linux-omap_2.6.32.bb | |
| parent | b5b3d83a6f3b1c04a4ebe09f636683ef22495d09 (diff) | |
| parent | e426517ed76c7532434f0687f88fca1295530000 (diff) | |
| download | openembedded-3fd04f71ad25d5df59c636986f741b9a36ce6501.tar.gz | |
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
Conflicts:
recipes/linux/linux-kirkwood_2.6.33-rc1.bb
Diffstat (limited to 'recipes/linux/linux-omap_2.6.32.bb')
| -rw-r--r-- | recipes/linux/linux-omap_2.6.32.bb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/recipes/linux/linux-omap_2.6.32.bb b/recipes/linux/linux-omap_2.6.32.bb index 285c260c41..b0203d8068 100644 --- a/recipes/linux/linux-omap_2.6.32.bb +++ b/recipes/linux/linux-omap_2.6.32.bb @@ -8,7 +8,7 @@ COMPATIBLE_MACHINE = "omap5912osk|omap1710h3|omap2430sdp|omap2420h4|beagleboard| DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_cm-t35 = "1" -SRCREV = "6833f1a8cdcb65a370f898bde6b6af63f81962df" +SRCREV = "89c9eaeb92c97348dcabd6cb377b646c00855f6a" # The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc PV = "2.6.32" @@ -17,12 +17,15 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.g file://defconfig" SRC_URI_append = " \ -file://sctp-fix.patch;patch=1 \ +file://usb/ehci.patch;patch=1 \ +file://usb/ehci-omap.c-mach-to-plat.diff;patch=1 \ file://cm-t35/0001-omap3-cm-t35-add-mux-initialization.patch;patch=1 \ file://cm-t35/0001-OMAP-DSS2-add-Toppoly-TDO35S-panel.patch;patch=1 \ file://cm-t35/0002-omap3-cm-t35-add-DSS2-display-support.patch;patch=1 \ file://cm-t35/0003-omap3-cm-t35-update-defconfig-for-DSS2.patch;patch=1 \ +file://cm-t35/0004-omap3-cm-t35-add-cm-t35-mux-configs.patch;patch=1 \ file://cm-t35/0006-omap3-cm-t35-update-defconfig.patch;patch=1 \ +file://cm-t35/0001-backlight-tdo24m-ensure-chip-select-changes-between-.patch;patch=1 \ file://0001-ARM-OMAP-Overo-Add-support-for-second-ethernet-po.patch;patch=1 \ file://0003-drivers-net-smsc911x-return-ENODEV-if-device-is-n.patch;patch=1 \ file://0004-drivers-input-touchscreen-ads7846-return-ENODEV.patch;patch=1 \ @@ -35,9 +38,10 @@ file://madc/0010-ARM-OMAP-Add-twl4030-madc-support-to-Overo.patch;patch=1 \ file://madc/0011-ARM-OMAP-Add-twl4030-madc-support-to-Beagle.patch;patch=1 \ file://madc/0013-ARM-OMAP-Add-missing-twl4030-madc-header-file.patch;patch=1 \ file://dss2/0012-OMAP-DSS2-Add-support-for-LG-Philips-LB035Q02-pane.patch;patch=1 \ -#file://dss2/0014-OMAP-DSS-Add-DSS2-support-for-Overo.patch;patch=1 \ +file://dss2/0014-OMAP-DSS-Add-DSS2-support-for-Overo.patch;patch=1 \ file://dss2/0015-OMAP-DSS-Add-DSS2-support-for-Beagle.patch;patch=1 \ file://dss2/0016-video-add-timings-for-hd720.patch;patch=1 \ +file://holes.patch;patch=1 \ " SRC_URI_append_beagleboard = " file://logo_linux_clut224.ppm \ |