[oe-commits] org.oe.dev merge of '46ca801f1efcaa636eaa43837f3587c7c90a93ec'

[hrw commit]

merge of '46ca801f1efcaa636eaa43837f3587c7c90a93ec'
     and 'c4f0fa8168863feb54d1292280f576d79b26222f'

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: ebc8f071882d86211c31527fd3723d5da9368543
ViewMTN: http://monotone.openembedded.org/revision/info/ebc8f071882d86211c31527fd3723d5da9368543
Files:
1
packages/linux/linux_2.6.23+2.6.24-rc5.bb
packages/linux/linux_2.6.25.bb
packages/linux/linux-omap2_git.bb
Diffs:

#
# mt diff -r46ca801f1efcaa636eaa43837f3587c7c90a93ec -rebc8f071882d86211c31527fd3723d5da9368543
#
#
#
# patch "packages/linux/linux_2.6.23+2.6.24-rc5.bb"
#  from [801134850169bd093cb2c9401f2e93bbd3acc903]
#    to [9e64614b2b4500887ff09f7ff53ffccb90a7ff0a]
# 
# patch "packages/linux/linux_2.6.25.bb"
#  from [ed037c79f846e5b7c53db483560819488aadcdcf]
#    to [908bd7f32af38ac35b5fed1ed57e60c950bcb8c9]
#
============================================================
--- packages/linux/linux_2.6.23+2.6.24-rc5.bb	801134850169bd093cb2c9401f2e93bbd3acc903
+++ packages/linux/linux_2.6.23+2.6.24-rc5.bb	9e64614b2b4500887ff09f7ff53ffccb90a7ff0a
@@ -2,7 +2,6 @@ DEFAULT_PREFERENCE = "-1"
 
 # Mark archs/machines that this kernel supports
 DEFAULT_PREFERENCE = "-1"
-DEFAULT_PREFERENCE_alix = "1"
 
 PR = "r3"
 
============================================================
--- packages/linux/linux_2.6.25.bb	ed037c79f846e5b7c53db483560819488aadcdcf
+++ packages/linux/linux_2.6.25.bb	908bd7f32af38ac35b5fed1ed57e60c950bcb8c9
@@ -6,6 +6,7 @@ DEFAULT_PREFERENCE_cm-x270 = "1"
 DEFAULT_PREFERENCE_kilauea = "1"
 DEFAULT_PREFERENCE_sequoia = "1"
 DEFAULT_PREFERENCE_cm-x270 = "1"
+DEFAULT_PREFERENCE_alix = "1"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.25.tar.bz2 \
            file://defconfig"


#
# mt diff -rc4f0fa8168863feb54d1292280f576d79b26222f -rebc8f071882d86211c31527fd3723d5da9368543
#
#
#
# patch "packages/linux/linux-omap2_git.bb"
#  from [573a35cf42a27118c23921862fcdcd0aec378794]
#    to [8e7d4cb4e84b3d94fa459bf62dd4892ff2e7ae9f]
#
============================================================
--- packages/linux/linux-omap2_git.bb	573a35cf42a27118c23921862fcdcd0aec378794
+++ packages/linux/linux-omap2_git.bb	8e7d4cb4e84b3d94fa459bf62dd4892ff2e7ae9f
@@ -2,8 +2,7 @@ FILESDIR = "${@os.path.dirname(bb.data.g
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-omap2-git/${MACHINE}"
 
-SRCREV = "a59e04f09caf72992577775c89849a821f839858"
-#cb170dcdce58de20b045ae964a4ccfc29aad1647"
+SRCREV = "74c89552b4a5f9b5b066f74fa265248f9b5d3f1d"
 
 PV = "2.6.25+2.6.26-rc2+git${SRCREV}"
 PR = "r12"
@@ -15,10 +14,7 @@ SRC_URI_append_beagleboard = " file://no
 SRC_URI_append_beagleboard = " file://no-harry-potter.diff;patch=1 \
 			       file://usb-timout.patch;patch=1 \
 			       file://l2-cache.patch;patch=1 \ 	
-			       file://0001-This-patch-adds-RTC-support-to-the-omap3-based-beagl.patch;patch=1 \	
 			       file://0001-omap3beagle-add-driver-to-turn-on-the-TFP410-framer.patch;patch=1 \
-			       file://l2-cache-check.patch;patch=1 \
-			       file://convert-rwsem-to-rwclock.patch;patch=1 \
 "
 
 COMPATIBLE_MACHINE = "omap2430sdp|omap2420h4|beagleboard"