merge of 050df893918bae2f4a6a2cb3fcdc9f0ee8e8ee04

     and 1819e7c9879b392cfb2bdae2cd3d9d59c7e28a49

15 files changed, 13 insertions, 17 deletions

diff --git a/packages/linux/LAB-kernel_cvs.bb b/packages/linux/LAB-kernel_cvs.bb
index 2ea1cd758a..6258a113d6 100644
--- a/packages/linux/LAB-kernel_cvs.bb
+++ b/packages/linux/LAB-kernel_cvs.bb
@@ -2,7 +2,7 @@ SECTION = "kernel"
 DESCRIPTION = "Liux As Bootloader kernelm"
 MAINTAINER = "Koen Kooi <koen@handhelds.org>"
 LICENSE = "GPL"
-PV = "${K_MAJOR}.${K_MINOR}.${K_MICRO}-hh${HHV}+cvs${CVSDATE}"
+PV = "${K_MAJOR}.${K_MINOR}.${K_MICRO}-hh${HHV}+cvs${SRCDATE}"
 #
 KERNEL_CCSUFFIX = "-3.4.4"
 COMPATIBLE_HOST = "arm.*-linux"
diff --git a/packages/linux/handhelds-pxa-2.6_cvs.bb b/packages/linux/handhelds-pxa-2.6_cvs.bb
index dca6a8c254..031ae2748a 100644
--- a/packages/linux/handhelds-pxa-2.6_cvs.bb
+++ b/packages/linux/handhelds-pxa-2.6_cvs.bb
@@ -2,7 +2,7 @@ SECTION = "kernel"
 DESCRIPTION = "handhelds.org Linux kernel for PXA based devices."
 MAINTAINER = "Greg Gilbert <greg@treke.net>"
 LICENSE = "GPL"
-PV = "${K_MAJOR}.${K_MINOR}.${K_MICRO}-hh${HHV}+cvs${CVSDATE}"
+PV = "${K_MAJOR}.${K_MINOR}.${K_MICRO}-hh${HHV}+cvs${SRCDATE}"
 #
 KERNEL_CCSUFFIX = "-3.4.4"
 COMPATIBLE_HOST = "arm.*-linux"
diff --git a/packages/linux/handhelds-sa-2.6_cvs.bb b/packages/linux/handhelds-sa-2.6_cvs.bb
index bd3c120acd..5daabd127c 100644
--- a/packages/linux/handhelds-sa-2.6_cvs.bb
+++ b/packages/linux/handhelds-sa-2.6_cvs.bb
@@ -10,7 +10,7 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-sa-${PV}"
 SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26"
 
 S = "${WORKDIR}/kernel26"
-PV = "${K_MAJOR}.${K_MINOR}.${K_MICRO}-hh${HHV}+cvs${CVSDATE}"
+PV = "${K_MAJOR}.${K_MINOR}.${K_MICRO}-hh${HHV}+cvs${SRCDATE}"
 
 K_MAJOR = "2"
 K_MINOR = "6"
diff --git a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc7/.mtn2git_empty b/packages/linux/linux-openzaurus-2.6.15/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc7/.mtn2git_empty
+++ b/packages/linux/linux-openzaurus-2.6.15/.mtn2git_empty
diff --git a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc7/add-oz-release-string.patch b/packages/linux/linux-openzaurus-2.6.15/add-oz-release-string.patch
index 22a6fd3943..22a6fd3943 100644
--- a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc7/add-oz-release-string.patch
+++ b/packages/linux/linux-openzaurus-2.6.15/add-oz-release-string.patch
diff --git a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc7/connectplus-remove-ide-HACK.patch b/packages/linux/linux-openzaurus-2.6.15/connectplus-remove-ide-HACK.patch
index 4414b21191..4414b21191 100644
--- a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc7/connectplus-remove-ide-HACK.patch
+++ b/packages/linux/linux-openzaurus-2.6.15/connectplus-remove-ide-HACK.patch
diff --git a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc7/defconfig-c7x0 b/packages/linux/linux-openzaurus-2.6.15/defconfig-c7x0
index bbdc12f5f3..706726e60c 100644
--- a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc7/defconfig-c7x0
+++ b/packages/linux/linux-openzaurus-2.6.15/defconfig-c7x0
@@ -492,8 +492,8 @@ CONFIG_BT_HCIVHCI=m
 CONFIG_IEEE80211=m
 # CONFIG_IEEE80211_DEBUG is not set
 CONFIG_IEEE80211_CRYPT_WEP=m
-# CONFIG_IEEE80211_CRYPT_CCMP is not set
-# CONFIG_IEEE80211_CRYPT_TKIP is not set
+CONFIG_IEEE80211_CRYPT_CCMP=m
+CONFIG_IEEE80211_CRYPT_TKIP=m
 
 #
 # Device Drivers
diff --git a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc7/defconfig-collie b/packages/linux/linux-openzaurus-2.6.15/defconfig-collie
index cbe06f9c3a..cbe06f9c3a 100644
--- a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc7/defconfig-collie
+++ b/packages/linux/linux-openzaurus-2.6.15/defconfig-collie
diff --git a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc7/defconfig-cxx00 b/packages/linux/linux-openzaurus-2.6.15/defconfig-cxx00
index 698c98eeaa..9941367a3b 100644
--- a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc7/defconfig-cxx00
+++ b/packages/linux/linux-openzaurus-2.6.15/defconfig-cxx00
@@ -480,8 +480,8 @@ CONFIG_BT_HCIVHCI=m
 CONFIG_IEEE80211=m
 # CONFIG_IEEE80211_DEBUG is not set
 CONFIG_IEEE80211_CRYPT_WEP=m
-# CONFIG_IEEE80211_CRYPT_CCMP is not set
-# CONFIG_IEEE80211_CRYPT_TKIP is not set
+CONFIG_IEEE80211_CRYPT_CCMP=m
+CONFIG_IEEE80211_CRYPT_TKIP=m
 
 #
 # Device Drivers
diff --git a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc7/defconfig-ipaq-pxa270 b/packages/linux/linux-openzaurus-2.6.15/defconfig-ipaq-pxa270
index d826d06886..d826d06886 100644
--- a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc7/defconfig-ipaq-pxa270
+++ b/packages/linux/linux-openzaurus-2.6.15/defconfig-ipaq-pxa270
diff --git a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc7/defconfig-poodle b/packages/linux/linux-openzaurus-2.6.15/defconfig-poodle
index 646e08305a..646e08305a 100644
--- a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc7/defconfig-poodle
+++ b/packages/linux/linux-openzaurus-2.6.15/defconfig-poodle
diff --git a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc7/defconfig-tosa b/packages/linux/linux-openzaurus-2.6.15/defconfig-tosa
index 14acb3c56c..14acb3c56c 100644
--- a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc7/defconfig-tosa
+++ b/packages/linux/linux-openzaurus-2.6.15/defconfig-tosa
diff --git a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc7/pxa-serial-hack.patch b/packages/linux/linux-openzaurus-2.6.15/pxa-serial-hack.patch
index b3a7f786ea..b3a7f786ea 100644
--- a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc7/pxa-serial-hack.patch
+++ b/packages/linux/linux-openzaurus-2.6.15/pxa-serial-hack.patch
diff --git a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc7/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch b/packages/linux/linux-openzaurus-2.6.15/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
index 18bf4268fc..18bf4268fc 100644
--- a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc7/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
+++ b/packages/linux/linux-openzaurus-2.6.15/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
diff --git a/packages/linux/linux-openzaurus_2.6.14+2.6.15-rc7.bb b/packages/linux/linux-openzaurus_2.6.15.bb
index b8ba47e09a..13f682cb65 100644
--- a/packages/linux/linux-openzaurus_2.6.14+2.6.15-rc7.bb
+++ b/packages/linux/linux-openzaurus_2.6.15.bb
@@ -1,6 +1,6 @@
 include linux-openzaurus.inc
 
-PR = "r2"
+PR = "r0"
 
 # Handy URLs
 # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \
@@ -12,21 +12,17 @@ PR = "r2"
 
 # Patches submitted upstream are towards top of this list 
 # Hacks should clearly named and at the bottom
-SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/testing/linux-2.6.15-rc2.tar.bz2 \
-           http://www.kernel.org/pub/linux/kernel/v2.6/testing/incr/patch-2.6.15-rc2-rc3.bz2;patch=1 \
-           http://www.kernel.org/pub/linux/kernel/v2.6/testing/incr/patch-2.6.15-rc3-rc4.bz2;patch=1 \
-           http://www.kernel.org/pub/linux/kernel/v2.6/testing/incr/patch-2.6.15-rc4-rc5.bz2;patch=1 \
-           http://www.kernel.org/pub/linux/kernel/v2.6/testing/incr/patch-2.6.15-rc5-rc6.bz2;patch=1 \
-           http://www.kernel.org/pub/linux/kernel/v2.6/testing/incr/patch-2.6.15-rc6-rc7.bz2;patch=1 \
+SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.15.tar.bz2 \
            ${RPSRC}/pxa_ohci_platform-r5.patch;patch=1 \
            ${RPSRC}/pxa_ohci_suspend-r5.patch;patch=1 \
            ${RPSRC}/pxa_ohci_fixes-r0.patch;patch=1 \
            ${RPSRC}/spitz_ohci-r0.patch;patch=1 \
            ${RPSRC}/pxa_i2c_fixes-r5.patch;patch=1 \
            ${RPSRC}/scoop_cpr_fix-r1.patch;patch=1 \
-           ${RPSRC}/pxa2xx_release-r0.patch;patch=1 \
+           ${RPSRC}/pxa2xx_release-r1.patch;patch=1 \
            ${RPSRC}/ide_not_removable-r0.patch;patch=1 \
            ${RPSRC}/sharpsl_pm_move-r0.patch;patch=1 \
+           ${RPSRC}/sharpsl_pm_gcc4_fix-r0.patch;patch=1 \
            ${RPSRC}/pcmcia_dev_ids-r3.patch;patch=1 \
            ${RPSRC}/led_core-r10.patch;patch=1 \
            ${RPSRC}/led_triggers-r8.patch;patch=1 \
@@ -97,7 +93,7 @@ SRC_URI_append_tosa = "${DOSRC}/nand-readid-r1.patch;patch=1 \
                        ${DOSRC}/wm97xx-touch-lg2-r0.patch;patch=1 \
                        ${DOSRC}/wm9712-pm-r0.patch;patch=1 "
 
-S = "${WORKDIR}/linux-2.6.15-rc2"
+S = "${WORKDIR}/linux-2.6.15"
 
 # to get module dependencies working
-KERNEL_RELEASE = "2.6.15-rc7"
+KERNEL_RELEASE = "2.6.15"