linux: move 2.6.33 from rc2 to rc3

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

3 files changed, 30 insertions, 25 deletions

diff --git a/recipes/linux/linux-2.6.32+2.6.33-rc2/0001-pxafb-fix-regression-from-d2a34c13e7ccec5d06eafd60e6.patch b/recipes/linux/linux-2.6.32+2.6.33-rc3/0001-pxafb-fix-regression-from-d2a34c13e7ccec5d06eafd60e6.patch
index 3d79409233..3d79409233 100644
--- a/recipes/linux/linux-2.6.32+2.6.33-rc2/0001-pxafb-fix-regression-from-d2a34c13e7ccec5d06eafd60e6.patch
+++ b/recipes/linux/linux-2.6.32+2.6.33-rc3/0001-pxafb-fix-regression-from-d2a34c13e7ccec5d06eafd60e6.patch
diff --git a/recipes/linux/linux-2.6.32+2.6.33-rc2/spitz/defconfig b/recipes/linux/linux-2.6.32+2.6.33-rc3/spitz/defconfig
index f87008738f..7aefa71a2d 100644
--- a/recipes/linux/linux-2.6.32+2.6.33-rc2/spitz/defconfig
+++ b/recipes/linux/linux-2.6.32+2.6.33-rc3/spitz/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.33-rc2
-# Tue Dec 29 04:10:19 2009
+# Mon Jan  4 10:49:17 2010
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -678,9 +678,9 @@ CONFIG_CFG80211=m
 # CONFIG_NL80211_TESTMODE is not set
 # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
 # CONFIG_CFG80211_REG_DEBUG is not set
-CONFIG_CFG80211_DEFAULT_PS=y
+# CONFIG_CFG80211_DEFAULT_PS is not set
 # CONFIG_CFG80211_DEBUGFS is not set
-# CONFIG_WIRELESS_OLD_REGULATORY is not set
+CONFIG_WIRELESS_OLD_REGULATORY=y
 CONFIG_CFG80211_WEXT=y
 CONFIG_WIRELESS_EXT_SYSFS=y
 CONFIG_LIB80211=m
@@ -690,10 +690,10 @@ CONFIG_LIB80211_CRYPT_TKIP=m
 # CONFIG_LIB80211_DEBUG is not set
 CONFIG_MAC80211=m
 # CONFIG_MAC80211_RC_PID is not set
-CONFIG_MAC80211_RC_MINSTREL=y
+# CONFIG_MAC80211_RC_MINSTREL is not set
 # CONFIG_MAC80211_RC_DEFAULT_PID is not set
-CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
-CONFIG_MAC80211_RC_DEFAULT="minstrel"
+# CONFIG_MAC80211_RC_DEFAULT_MINSTREL is not set
+CONFIG_MAC80211_RC_DEFAULT=""
 # CONFIG_MAC80211_MESH is not set
 # CONFIG_MAC80211_LEDS is not set
 # CONFIG_MAC80211_DEBUGFS is not set
@@ -1391,6 +1391,9 @@ CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_FB_SYS_COPYAREA is not set
 # CONFIG_FB_SYS_IMAGEBLIT is not set
 # CONFIG_FB_FOREIGN_ENDIAN is not set
+# CONFIG_FB_BOTH_ENDIAN is not set
+# CONFIG_FB_BIG_ENDIAN is not set
+# CONFIG_FB_LITTLE_ENDIAN is not set
 # CONFIG_FB_SYS_FOPS is not set
 # CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
@@ -1403,9 +1406,9 @@ CONFIG_FB_CFB_IMAGEBLIT=y
 #
 # CONFIG_FB_S1D13XXX is not set
 CONFIG_FB_PXA=y
-# CONFIG_FB_PXA_OVERLAY is not set
-# CONFIG_FB_PXA_SMARTPANEL is not set
-# CONFIG_FB_PXA_PARAMETERS is not set
+CONFIG_FB_PXA_OVERLAY=y
+CONFIG_FB_PXA_SMARTPANEL=y
+CONFIG_FB_PXA_PARAMETERS=y
 # CONFIG_FB_MBX is not set
 # CONFIG_FB_W100 is not set
 # CONFIG_FB_VIRTUAL is not set
@@ -1562,8 +1565,8 @@ CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 # CONFIG_USB_ARCH_HAS_EHCI is not set
 CONFIG_USB=m
-# CONFIG_USB_DEBUG is not set
-# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
+CONFIG_USB_DEBUG=y
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 
 #
 # Miscellaneous USB options
@@ -1572,7 +1575,7 @@ CONFIG_USB_DEVICEFS=y
 CONFIG_USB_DEVICE_CLASS=y
 # CONFIG_USB_DYNAMIC_MINORS is not set
 # CONFIG_USB_OTG is not set
-# CONFIG_USB_OTG_WHITELIST is not set
+CONFIG_USB_OTG_WHITELIST=y
 # CONFIG_USB_OTG_BLACKLIST_HUB is not set
 CONFIG_USB_MON=m
 # CONFIG_USB_WUSB is not set
@@ -1721,8 +1724,8 @@ CONFIG_USB_IDMOUSE=m
 # CONFIG_USB_ISIGHTFW is not set
 # CONFIG_USB_VST is not set
 CONFIG_USB_GADGET=m
-# CONFIG_USB_GADGET_DEBUG_FILES is not set
-# CONFIG_USB_GADGET_DEBUG_FS is not set
+CONFIG_USB_GADGET_DEBUG_FILES=y
+CONFIG_USB_GADGET_DEBUG_FS=y
 CONFIG_USB_GADGET_VBUS_DRAW=2
 CONFIG_USB_GADGET_SELECTED=y
 # CONFIG_USB_GADGET_AT91 is not set
@@ -1750,24 +1753,26 @@ CONFIG_USB_ZERO=m
 # CONFIG_USB_AUDIO is not set
 CONFIG_USB_ETH=m
 CONFIG_USB_ETH_RNDIS=y
-# CONFIG_USB_ETH_EEM is not set
+CONFIG_USB_ETH_EEM=y
 CONFIG_USB_GADGETFS=m
 CONFIG_USB_FILE_STORAGE=m
 # CONFIG_USB_FILE_STORAGE_TEST is not set
-# CONFIG_USB_MASS_STORAGE is not set
+CONFIG_USB_MASS_STORAGE=m
 CONFIG_USB_G_SERIAL=m
 # CONFIG_USB_MIDI_GADGET is not set
 # CONFIG_USB_G_PRINTER is not set
-# CONFIG_USB_CDC_COMPOSITE is not set
-# CONFIG_USB_G_MULTI is not set
+CONFIG_USB_CDC_COMPOSITE=m
+CONFIG_USB_G_MULTI=m
+CONFIG_USB_G_MULTI_RNDIS=y
+CONFIG_USB_G_MULTI_CDC=y
 
 #
 # OTG and related infrastructure
 #
 CONFIG_USB_OTG_UTILS=y
-# CONFIG_USB_GPIO_VBUS is not set
-# CONFIG_USB_ULPI is not set
-# CONFIG_NOP_USB_XCEIV is not set
+CONFIG_USB_GPIO_VBUS=m
+CONFIG_USB_ULPI=y
+CONFIG_NOP_USB_XCEIV=m
 CONFIG_MMC=y
 # CONFIG_MMC_DEBUG is not set
 CONFIG_MMC_UNSAFE_RESUME=y
diff --git a/recipes/linux/linux_2.6.32+2.6.33-rc2.bb b/recipes/linux/linux_2.6.32+2.6.33-rc3.bb
index a1ed8402e1..c4593127a4 100644
--- a/recipes/linux/linux_2.6.32+2.6.33-rc2.bb
+++ b/recipes/linux/linux_2.6.32+2.6.33-rc3.bb
@@ -1,6 +1,6 @@
 require linux.inc
 
-KERNEL_RELEASE = "2.6.33-rc2"
+KERNEL_RELEASE = "2.6.33-rc3"
 OLD_KERNEL_RELEASE = "2.6.32"
 PV = "${OLD_KERNEL_RELEASE}+${KERNEL_RELEASE}"
 PR = "r1"
@@ -18,12 +18,12 @@ DEFAULT_PREFERENCE_spitz = "-1"
 DEFAULT_PREFERENCE_tosa = "-1"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${OLD_KERNEL_RELEASE}.tar.bz2;name=kernel \
-           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-${KERNEL_RELEASE}.bz2;name=rc2;patch=1 \
+           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-${KERNEL_RELEASE}.bz2;name=rc3;patch=1 \
 	   file://0001-pxafb-fix-regression-from-d2a34c13e7ccec5d06eafd60e6.patch;patch=1 \
            file://defconfig"
 
-SRC_URI[rc2.md5sum] = "9819596106c930b7d173cafed57bf34d"
-SRC_URI[rc2.sha256sum] = "4471d692061f1e62f83b02ff3af773f3ae62da02cd668a12ed3687703e12546c"
+SRC_URI[rc3.md5sum] = "35defe2029ae5652efa74c6c28a5d0b9"
+SRC_URI[rc3.sha256sum] = "437e39d06e6f51b2beb089a83f6671f9bd1d6fac0252a4adff9cff6f0592040e"
 SRC_URI[kernel.md5sum] = "260551284ac224c3a43c4adac7df4879"
 SRC_URI[kernel.sha256sum] = "5099786d80b8407d98a619df00209c2353517f22d804fdd9533b362adcb4504e"