18 files changed, 23 insertions, 6 deletions

diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/connectplus-remove-ide-HACK.patch b/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/connectplus-remove-ide-HACK.patch
index 4414b21191..4414b21191 100644
--- a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/connectplus-remove-ide-HACK.patch
+++ b/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/connectplus-remove-ide-HACK.patch
diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/defconfig-akita b/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-akita
index 748ab41d22..748ab41d22 100644
--- a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/defconfig-akita
+++ b/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-akita
diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/defconfig-bootcdx86 b/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-bootcdx86
index d439d89813..d439d89813 100644
--- a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/defconfig-bootcdx86
+++ b/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-bootcdx86
diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/defconfig-c7x0 b/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-c7x0
index e8efdd4de2..e8efdd4de2 100644
--- a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/defconfig-c7x0
+++ b/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-c7x0
diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/defconfig-collie b/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-collie
index 422ed94df3..422ed94df3 100644
--- a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/defconfig-collie
+++ b/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-collie
diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/defconfig-hx2000 b/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-hx2000
index 2a67a2d045..2a67a2d045 100644
--- a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/defconfig-hx2000
+++ b/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-hx2000
diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/defconfig-poodle b/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-poodle
index 13616c08f1..13616c08f1 100644
--- a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/defconfig-poodle
+++ b/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-poodle
diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/defconfig-qemuarm b/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-qemuarm
index f70b6db7c7..f70b6db7c7 100644
--- a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/defconfig-qemuarm
+++ b/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-qemuarm
diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/defconfig-qemux86 b/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-qemux86
index 08e0a0c6c7..08e0a0c6c7 100644
--- a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/defconfig-qemux86
+++ b/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-qemux86
diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/defconfig-spitz b/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-spitz
index fb81164c0b..11cad5c911 100644
--- a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/defconfig-spitz
+++ b/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-spitz
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.22-rc6
-# Sun Jul  1 18:49:40 2007
+# Sun Jul  1 22:44:06 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -707,8 +707,24 @@ CONFIG_NETDEV_10000=y
 #
 # Wireless LAN
 #
-# CONFIG_WLAN_PRE80211 is not set
-# CONFIG_WLAN_80211 is not set
+CONFIG_WLAN_PRE80211=y
+# CONFIG_STRIP is not set
+# CONFIG_PCMCIA_WAVELAN is not set
+# CONFIG_PCMCIA_NETWAVE is not set
+CONFIG_WLAN_80211=y
+# CONFIG_PCMCIA_RAYCS is not set
+# CONFIG_LIBERTAS is not set
+CONFIG_HERMES=m
+# CONFIG_ATMEL is not set
+CONFIG_PCMCIA_HERMES=m
+CONFIG_PCMCIA_SPECTRUM=m
+CONFIG_AIRO_CS=m
+# CONFIG_PCMCIA_WL3501 is not set
+# CONFIG_USB_ZD1201 is not set
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
+CONFIG_HOSTAP_CS=m
 
 #
 # USB Network Adapters
diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/defconfig-tosa b/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-tosa
index 4360f7a179..4360f7a179 100644
--- a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/defconfig-tosa
+++ b/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-tosa
diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/hostap-monitor-mode.patch b/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/hostap-monitor-mode.patch
index 641fd19e50..641fd19e50 100644
--- a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/hostap-monitor-mode.patch
+++ b/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/hostap-monitor-mode.patch
diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/pxa-serial-hack.patch b/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/pxa-serial-hack.patch
index bf20f46a05..bf20f46a05 100644
--- a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/pxa-serial-hack.patch
+++ b/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/pxa-serial-hack.patch
diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch b/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
index b513ba1466..b513ba1466 100644
--- a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
+++ b/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/squashfs3.0-2.6.15.patch b/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/squashfs3.0-2.6.15.patch
index 6312efe46a..6312efe46a 100644
--- a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/squashfs3.0-2.6.15.patch
+++ b/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/squashfs3.0-2.6.15.patch
diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/vesafb-tng-1.0-rc2-2.6.20-rc2.patch b/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/vesafb-tng-1.0-rc2-2.6.20-rc2.patch
index b1b0fc3549..b1b0fc3549 100644
--- a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/vesafb-tng-1.0-rc2-2.6.20-rc2.patch
+++ b/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/vesafb-tng-1.0-rc2-2.6.20-rc2.patch
diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/wm97xx-lcdnoise-r0.patch b/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/wm97xx-lcdnoise-r0.patch
index 191de3af22..191de3af22 100644
--- a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/wm97xx-lcdnoise-r0.patch
+++ b/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/wm97xx-lcdnoise-r0.patch
diff --git a/meta/packages/linux/linux-rp_2.6.21+2.6.22-rc6.bb b/meta/packages/linux/linux-rp_2.6.21+2.6.22-rc7.bb
index 902494a49f..12881c869c 100644
--- a/meta/packages/linux/linux-rp_2.6.21+2.6.22-rc6.bb
+++ b/meta/packages/linux/linux-rp_2.6.21+2.6.22-rc7.bb
@@ -1,6 +1,6 @@
 require linux-rp.inc
 
-PR = "r0"
+PR = "r2"
 
 DEFAULT_PREFERENCE = "-1"
 
@@ -16,7 +16,7 @@ DEFAULT_PREFERENCE = "-1"
 # 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/linux-2.6.21.tar.bz2 \
-           http://www.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.22-rc6.bz2;patch=1 \
+           http://www.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.22-rc7.bz2;patch=1 \
            ${RPSRC}/lzo_kernel-r3.patch;patch=1 \
            ${RPSRC}/lzo_jffs2-r2.patch;patch=1 \
            ${RPSRC}/lzo_crypto-r2.patch;patch=1 \
@@ -29,7 +29,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.21.tar.bz2 \
            ${RPSRC}/tsc2101-r16.patch;patch=1 \
            ${RPSRC}/hx2750_test1-r6.patch;patch=1 \
            ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \
-           ${RPSRC}/input_power-r8.patch;patch=1 \
+           ${RPSRC}/input_power-r9.patch;patch=1 \
            ${RPSRC}/pxa25x_cpufreq-r2.patch;patch=1 \
            ${RPSRC}/sharpsl_pm_fixes1-r0.patch;patch=1 \
            ${RPSRC}/pm_changes-r1.patch;patch=1 \
@@ -40,6 +40,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.21.tar.bz2 \
            ${RPSRC}/pxa27x_overlay-r5.patch;patch=1 \
            ${RPSRC}/w100_extaccel-r1.patch;patch=1 \
            ${RPSRC}/qemuarm_scsi_fix-r0.patch;patch=1 \
+           ${RPSRC}/pxa_cken_fixes-r0.patch;patch=1 \
            file://hostap-monitor-mode.patch;patch=1 \
            file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \
            ${RPSRC}/logo_oh-r0.patch.bz2;patch=1;status=unmergable \