linux-rp: 2.6.22-rc6 -> 2.6.22-rc7, fix defconfig entries, add patch to fix suspend/resume problems

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2073 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie
2007-07-02 09:15:39 +00:00
parent 0fadc1e4a4
commit c705da4f93
18 changed files with 23 additions and 6 deletions

View File

@@ -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

View File

@@ -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 \