[arch-commits] CVS update of unstable/kernels/kernel26mm (PKGBUILD config)

Tom Killian tom at archlinux.org
Sat Aug 4 10:59:27 UTC 2007


    Date: Saturday, August 4, 2007 @ 06:59:27
  Author: tom
    Path: /home/cvs-unstable/unstable/kernels/kernel26mm

Modified: PKGBUILD (1.11 -> 1.12) config (1.6 -> 1.7)

upgpkg: kernel26mm 2.6.23.rc1.mm2-1
git-wireless is back, so rt2x00 and iwlwifi are now in-tree


----------+
 PKGBUILD |   17 ++++++++++-
 config   |   88 ++++++++++++++++++++++++++++++++++++++++++++++++++-----------
 2 files changed, 88 insertions(+), 17 deletions(-)


Index: unstable/kernels/kernel26mm/PKGBUILD
diff -u unstable/kernels/kernel26mm/PKGBUILD:1.11 unstable/kernels/kernel26mm/PKGBUILD:1.12
--- unstable/kernels/kernel26mm/PKGBUILD:1.11	Fri Jul 27 05:27:16 2007
+++ unstable/kernels/kernel26mm/PKGBUILD	Sat Aug  4 06:59:26 2007
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD,v 1.11 2007/07/27 09:27:16 tom Exp $ 
+# $Id: PKGBUILD,v 1.12 2007/08/04 10:59:26 tom Exp $ 
 # Maintainer: Tom Killian <tom at archlinux.org>
+
 pkgname=kernel26mm
 _basekernel=2.6.22
 _basepatch=2.6.23-rc1
-_mmver=${_basepatch}-mm1
+_mmver=${_basepatch}-mm2
 pkgver=${_mmver//-/.}
 pkgrel=1
 pkgdesc="The Linux Kernel and modules, Andrew Morton's -mm tree"
@@ -12,6 +13,7 @@
 backup=(etc/mkinitcpio.d/kernel26mm-fallback.conf \
         etc/mkinitcpio.d/kernel26mm.preset)
 depends=('module-init-tools' 'mkinitcpio>=0.5.13')
+replaces=('rt2x00-cvs-mm' 'iwlwifi-mm')
 install=kernel26.install
 source=(http://www2.kernel.org/pub/linux/kernel/v2.6/linux-${_basekernel}.tar.bz2
         http://www2.kernel.org/pub/linux/kernel/v2.6/testing/patch-${_basepatch}.bz2
@@ -143,3 +145,14 @@
   sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" $startdir/kernel26.install || return 1
   echo -e "# NEVER EDIT THIS FILE\nALL_kver='${_kernver}'" > ${startdir}/pkg/etc/mkinitcpio.d/kernel26mm.kver || return 1
 }
+md5sums=('2e230d005c002fb3d38a3ca07c0200d0'
+         'e49b373ede3e8449cf9b1e17bb685110'
+         '27901a49ee7f7041c7d2969f85301dbd'
+         '493137566bc397ec762c86e64bd96849'
+         '0377418650d17a8f115c7650dc5a05d1'
+         '3f3666305b45b5fde82bb67b320f0840'
+         '5a62bcc7e96601052c7405459b483826'
+         'ed6b42fea2f5d27f7eb920746ccc1ebb'
+         'a995ec849ea43d3c89d607bbdd1e7d09'
+         '8c579c72a4f7187de6b496aec88250ed'
+         '55f6c2c0131cdbafc388ad1d9a3a37c3')
Index: unstable/kernels/kernel26mm/config
diff -u unstable/kernels/kernel26mm/config:1.6 unstable/kernels/kernel26mm/config:1.7
--- unstable/kernels/kernel26mm/config:1.6	Fri Jul 27 05:27:16 2007
+++ unstable/kernels/kernel26mm/config	Sat Aug  4 06:59:26 2007
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.23
-# Thu Jul 26 12:48:37 2007
+# Fri Aug  3 10:39:13 2007
 #
 CONFIG_X86_32=y
 CONFIG_GENERIC_TIME=y
@@ -47,10 +47,10 @@
 CONFIG_LOG_BUF_SHIFT=15
 CONFIG_CONTAINERS=y
 # CONFIG_CONTAINER_DEBUG is not set
-# CONFIG_CPUSETS is not set
-# CONFIG_SYSFS_DEPRECATED is not set
 CONFIG_CONTAINER_NS=y
 CONFIG_CONTAINER_CPUACCT=y
+# CONFIG_CPUSETS is not set
+# CONFIG_SYSFS_DEPRECATED is not set
 CONFIG_RELAY=y
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE=""
@@ -138,8 +138,8 @@
 # CONFIG_MPENTIUMII is not set
 # CONFIG_MPENTIUMIII is not set
 # CONFIG_MPENTIUMM is not set
-# CONFIG_MCORE2 is not set
 # CONFIG_MPENTIUM4 is not set
+# CONFIG_MCORE2 is not set
 # CONFIG_MK6 is not set
 # CONFIG_MK7 is not set
 # CONFIG_MK8 is not set
@@ -180,6 +180,7 @@
 # CONFIG_PREEMPT_VOLUNTARY is not set
 CONFIG_PREEMPT=y
 CONFIG_PREEMPT_BKL=y
+CONFIG_PREEMPT_NOTIFIERS=y
 CONFIG_X86_LOCAL_APIC=y
 CONFIG_X86_IO_APIC=y
 CONFIG_X86_MCE=y
@@ -251,13 +252,13 @@
 CONFIG_PM=y
 CONFIG_PM_LEGACY=y
 # CONFIG_PM_DEBUG is not set
-CONFIG_SOFTWARE_SUSPEND=y
-CONFIG_PM_STD_PARTITION=""
+CONFIG_SUSPEND_SMP_POSSIBLE=y
 CONFIG_SUSPEND_SMP=y
+CONFIG_PM_SLEEP=y
+CONFIG_SUSPEND=y
+# CONFIG_HIBERNATION is not set
 CONFIG_ACPI=y
 CONFIG_ACPI_SLEEP=y
-CONFIG_ACPI_SLEEP_PROC_FS=y
-# CONFIG_ACPI_SLEEP_PROC_SLEEP is not set
 # CONFIG_ACPI_PROCFS is not set
 CONFIG_ACPI_AC=m
 CONFIG_ACPI_BATTERY=m
@@ -298,6 +299,8 @@
 CONFIG_CPU_FREQ_STAT_DETAILS=y
 CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=m
 CONFIG_CPU_FREQ_GOV_USERSPACE=m
@@ -845,9 +848,11 @@
 # Wireless
 #
 CONFIG_CFG80211=m
+CONFIG_NL80211=y
 CONFIG_WIRELESS_EXT=y
 CONFIG_MAC80211=m
 # CONFIG_MAC80211_LEDS is not set
+CONFIG_MAC80211_HT=y
 # CONFIG_MAC80211_DEBUGFS is not set
 # CONFIG_MAC80211_DEBUG is not set
 CONFIG_IEEE80211=m
@@ -958,6 +963,7 @@
 # IDE chipset support/bugfixes
 #
 CONFIG_IDE_GENERIC=m
+CONFIG_BLK_DEV_PLATFORM=m
 # CONFIG_BLK_DEV_IDEPNP is not set
 
 #
@@ -1235,13 +1241,13 @@
 CONFIG_DM_MULTIPATH_EMC=m
 CONFIG_DM_MULTIPATH_RDAC=m
 CONFIG_DM_DELAY=m
-# CONFIG_DM_NETLINK is not set
 CONFIG_FUSION=y
 CONFIG_FUSION_SPI=m
 CONFIG_FUSION_FC=m
 CONFIG_FUSION_SAS=m
 CONFIG_FUSION_MAX_SGE=128
 CONFIG_FUSION_CTL=m
+# CONFIG_FUSION_LOGGING is not set
 
 #
 # IEEE 1394 (FireWire) support
@@ -1352,6 +1358,7 @@
 CONFIG_AC3200=m
 CONFIG_APRICOT=m
 CONFIG_B44=m
+CONFIG_B44_PCI=y
 CONFIG_FORCEDETH=m
 # CONFIG_FORCEDETH_NAPI is not set
 CONFIG_CS89x0=m
@@ -1384,7 +1391,6 @@
 CONFIG_ACENIC=m
 # CONFIG_ACENIC_OMIT_TIGON_I is not set
 CONFIG_DL2K=m
-CONFIG_E1000NEW=m
 CONFIG_E1000=m
 # CONFIG_E1000_NAPI is not set
 # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
@@ -1457,6 +1463,30 @@
 CONFIG_PRISM54=m
 CONFIG_USB_ZD1201=m
 CONFIG_RTL8187=m
+CONFIG_ADM8211=m
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+CONFIG_RT2X00=m
+CONFIG_RT2X00_LIB=m
+CONFIG_RT2X00_LIB_PCI=m
+CONFIG_RT2X00_LIB_USB=m
+CONFIG_RT2X00_LIB_FIRMWARE=y
+CONFIG_RT2X00_LIB_RFKILL=y
+CONFIG_RT2400PCI=m
+CONFIG_RT2400PCI_RFKILL=y
+CONFIG_RT2500PCI=m
+CONFIG_RT2500PCI_RFKILL=y
+CONFIG_RT61PCI=m
+CONFIG_RT61PCI_RFKILL=y
+CONFIG_RT2500USB=m
+CONFIG_RT73USB=m
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_IWLWIFI=y
+CONFIG_IWLWIFI_DEBUG=y
+CONFIG_IWLWIFI_HT=y
+CONFIG_IWL4965=m
+CONFIG_IWL3945=m
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y
 CONFIG_HOSTAP_FIRMWARE_NVRAM=y
@@ -1470,8 +1500,19 @@
 CONFIG_BCM43XX_DMA_AND_PIO_MODE=y
 # CONFIG_BCM43XX_DMA_MODE is not set
 # CONFIG_BCM43XX_PIO_MODE is not set
+CONFIG_BCM43XX_MAC80211=m
+CONFIG_BCM43XX_MAC80211_PCI=y
+CONFIG_BCM43XX_MAC80211_PCMCIA=y
+CONFIG_BCM43XX_MAC80211_DEBUG=y
+CONFIG_BCM43XX_MAC80211_DMA=y
+CONFIG_BCM43XX_MAC80211_PIO=y
+CONFIG_BCM43XX_MAC80211_DMA_AND_PIO_MODE=y
+# CONFIG_BCM43XX_MAC80211_DMA_MODE is not set
+# CONFIG_BCM43XX_MAC80211_PIO_MODE is not set
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_ZD1211RW_MAC80211=m
+# CONFIG_ZD1211RW_MAC80211_DEBUG is not set
 
 #
 # USB Network Adapters
@@ -1557,6 +1598,7 @@
 # CONFIG_NET_FC is not set
 CONFIG_SHAPER=m
 CONFIG_NETCONSOLE=m
+CONFIG_NETCONSOLE_DYNAMIC=y
 CONFIG_NETPOLL=y
 # CONFIG_NETPOLL_TRAP is not set
 CONFIG_NET_POLL_CONTROLLER=y
@@ -2105,7 +2147,7 @@
 CONFIG_SSB_PCIHOST=y
 CONFIG_SSB_PCMCIAHOST=y
 # CONFIG_SSB_SILENT is not set
-# CONFIG_SSB_DEBUG is not set
+CONFIG_SSB_DEBUG=y
 CONFIG_SSB_DRIVER_PCICORE=y
 
 #
@@ -2142,6 +2184,7 @@
 CONFIG_VIDEO_TLV320AIC23B=m
 CONFIG_VIDEO_WM8775=m
 CONFIG_VIDEO_WM8739=m
+CONFIG_VIDEO_VP27SMPX=m
 
 #
 # Video decoders
@@ -2386,6 +2429,7 @@
 CONFIG_DVB_OR51132=m
 CONFIG_DVB_BCM3510=m
 CONFIG_DVB_LGDT330X=m
+CONFIG_DVB_S5H1409=m
 
 #
 # Tuners/PLL support
@@ -2395,6 +2439,8 @@
 CONFIG_DVB_TDA827X=m
 CONFIG_DVB_TUNER_QT1010=m
 CONFIG_DVB_TUNER_MT2060=m
+CONFIG_DVB_TUNER_MT2266=m
+CONFIG_DVB_TUNER_MT2131=m
 
 #
 # Miscellaneous devices
@@ -2461,6 +2507,7 @@
 CONFIG_FB_ASILIANT=y
 CONFIG_FB_IMSTT=y
 CONFIG_FB_VGA16=m
+CONFIG_FB_UVESA=m
 CONFIG_FB_VESA=y
 CONFIG_FB_IMAC=y
 CONFIG_FB_HECUBA=m
@@ -2520,6 +2567,7 @@
 CONFIG_FB_ARK=m
 CONFIG_FB_PM3=m
 CONFIG_FB_GEODE=y
+CONFIG_FB_GEODE_LX=m
 CONFIG_FB_GEODE_GX=m
 # CONFIG_FB_GEODE_GX_SET_FBSIZE is not set
 CONFIG_FB_GEODE_GX1=m
@@ -2683,6 +2731,16 @@
 CONFIG_SND_FM801_TEA575X_BOOL=y
 CONFIG_SND_FM801_TEA575X=m
 CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDA_HWDEP=y
+CONFIG_SND_HDA_CODEC_REALTEK=y
+CONFIG_SND_HDA_CODEC_ANALOG=y
+CONFIG_SND_HDA_CODEC_SIGMATEL=y
+CONFIG_SND_HDA_CODEC_VIA=y
+CONFIG_SND_HDA_CODEC_ATIHDMI=y
+CONFIG_SND_HDA_CODEC_CONEXANT=y
+CONFIG_SND_HDA_CODEC_CMEDIA=y
+CONFIG_SND_HDA_CODEC_SI3054=y
+CONFIG_SND_HDA_GENERIC=y
 CONFIG_SND_HDSP=m
 CONFIG_SND_HDSPM=m
 CONFIG_SND_ICE1712=m
@@ -3348,6 +3406,7 @@
 CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_CHECK is not set
 CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SHIRQ is not set
 CONFIG_DETECT_SOFTLOCKUP=y
 CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
@@ -3382,10 +3441,7 @@
 CONFIG_EARLY_PRINTK=y
 # CONFIG_DEBUG_STACKOVERFLOW is not set
 # CONFIG_DEBUG_STACK_USAGE is not set
-
-#
-# Page alloc debug is incompatible with Software Suspend on i386
-#
+# CONFIG_DEBUG_PAGEALLOC is not set
 # CONFIG_DEBUG_RODATA is not set
 # CONFIG_4KSTACKS is not set
 CONFIG_X86_FIND_SMP_CONFIG=y
@@ -3465,6 +3521,8 @@
 CONFIG_LIBCRC32C=m
 CONFIG_ZLIB_INFLATE=m
 CONFIG_ZLIB_DEFLATE=m
+CONFIG_LZO_COMPRESS=m
+CONFIG_LZO_DECOMPRESS=m
 CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_KMP=m
 CONFIG_TEXTSEARCH_BM=m




More information about the arch-commits mailing list