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

Tom Killian tom at archlinux.org
Thu Apr 26 16:49:59 EDT 2007


    Date: Thursday, April 26, 2007 @ 16:49:59
  Author: tom
    Path: /home/cvs-unstable/unstable/kernels/kernel26mm

Modified: PKGBUILD (1.8 -> 1.9) config (1.3 -> 1.4)

upgpkg: kernel26mm 2.6.21.rc7.mm2-1


----------+
 PKGBUILD |   11 +--
 config   |  196 +++++++++----------------------------------------------------
 2 files changed, 35 insertions(+), 172 deletions(-)


Index: unstable/kernels/kernel26mm/PKGBUILD
diff -u unstable/kernels/kernel26mm/PKGBUILD:1.8 unstable/kernels/kernel26mm/PKGBUILD:1.9
--- unstable/kernels/kernel26mm/PKGBUILD:1.8	Wed Apr 11 06:04:24 2007
+++ unstable/kernels/kernel26mm/PKGBUILD	Thu Apr 26 16:49:59 2007
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD,v 1.8 2007/04/11 10:04:24 tom Exp $ 
+# $Id: PKGBUILD,v 1.9 2007/04/26 20:49:59 tom Exp $ 
 # Maintainer: Tom Killian <tom at archlinux.org>
 pkgname=kernel26mm
 _basekernel=2.6.20
-_basepatch=2.6.21-rc6
-_mmver=${_basepatch}-mm1
+_basepatch=2.6.21-rc7
+_mmver=${_basepatch}-mm2
 pkgver=${_mmver//-/.}
 pkgrel=1
 pkgdesc="The Linux Kernel and modules, Andrew Morton's -mm tree"
@@ -24,8 +24,8 @@
         logo_linux_vga16.ppm \
         kernel26mm-fallback.conf \
         kernel26mm.preset)
-md5sums=('34b0f354819217e6a345f48ebbd8f13e' '291cbc4c09c5111e4a2030a04ee69b65'\
-         '33287db3a533b9596f4700c546bf1488' 'a9708b06f77544800914fa2e4e55f18a'\
+md5sums=('34b0f354819217e6a345f48ebbd8f13e' '3a54bf5a7cf6b124e680e1d08fe1b20b'\
+         'bee062933c2f4999072a88d6929f14c3' '52cafd8c3d200e1e04b4ad5a66de19f5'\
          '3f3666305b45b5fde82bb67b320f0840' '5a62bcc7e96601052c7405459b483826'\
          'ed6b42fea2f5d27f7eb920746ccc1ebb' 'a995ec849ea43d3c89d607bbdd1e7d09'\
          '8c579c72a4f7187de6b496aec88250ed' '55f6c2c0131cdbafc388ad1d9a3a37c3')
@@ -65,6 +65,7 @@
   # STOP HERE
   #msg "Stopping build ..."
   #return 1
+  
   # build!
   make bzImage modules || return 1
   mkdir -p $startdir/pkg/{lib/modules,boot}
Index: unstable/kernels/kernel26mm/config
diff -u unstable/kernels/kernel26mm/config:1.3 unstable/kernels/kernel26mm/config:1.4
--- unstable/kernels/kernel26mm/config:1.3	Wed Apr 11 05:03:02 2007
+++ unstable/kernels/kernel26mm/config	Thu Apr 26 16:49:59 2007
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.21
-# Tue Apr 10 00:21:10 2007
+# Thu Apr 26 09:04:05 2007
 #
 CONFIG_X86_32=y
 CONFIG_GENERIC_TIME=y
@@ -83,7 +83,6 @@
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-CONFIG_PAGE_GROUP_BY_MOBILITY=y
 
 #
 # Loadable module support
@@ -97,12 +96,6 @@
 CONFIG_STOP_MACHINE=y
 
 #
-# Process debugging support
-#
-CONFIG_UTRACE=y
-CONFIG_PTRACE=y
-
-#
 # Block layer
 #
 CONFIG_BLOCK=y
@@ -261,10 +254,6 @@
 CONFIG_SOFTWARE_SUSPEND=y
 CONFIG_PM_STD_PARTITION=""
 CONFIG_SUSPEND_SMP=y
-
-#
-# ACPI (Advanced Configuration and Power Interface) Support
-#
 CONFIG_ACPI=y
 CONFIG_ACPI_SLEEP=y
 CONFIG_ACPI_SLEEP_PROC_FS=y
@@ -290,10 +279,6 @@
 CONFIG_X86_PM_TIMER=y
 CONFIG_ACPI_CONTAINER=y
 CONFIG_ACPI_SBS=m
-
-#
-# APM (Advanced Power Management) BIOS Support
-#
 CONFIG_APM=y
 # CONFIG_APM_IGNORE_USER_SUSPEND is not set
 CONFIG_APM_DO_ENABLE=y
@@ -371,6 +356,7 @@
 CONFIG_HOTPLUG_PCI_PCIE=m
 # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set
 CONFIG_PCIEAER=y
+CONFIG_ARCH_SUPPORTS_MSI=y
 # CONFIG_PCI_MSI is not set
 # CONFIG_PCI_DEBUG is not set
 CONFIG_HT_IRQ=y
@@ -380,10 +366,6 @@
 # CONFIG_MCA is not set
 # CONFIG_SCx200 is not set
 CONFIG_K8_NB=y
-
-#
-# PCCARD (PCMCIA/CardBus) support
-#
 CONFIG_PCCARD=m
 # CONFIG_PCMCIA_DEBUG is not set
 CONFIG_PCMCIA=m
@@ -405,10 +387,6 @@
 CONFIG_TCIC=m
 CONFIG_PCMCIA_PROBE=y
 CONFIG_PCCARD_NONSTATIC=m
-
-#
-# PCI Hotplug Support
-#
 CONFIG_HOTPLUG_PCI=m
 CONFIG_HOTPLUG_PCI_FAKE=m
 CONFIG_HOTPLUG_PCI_COMPAQ=m
@@ -480,10 +458,6 @@
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_TCP_MD5SIG is not set
-
-#
-# IP: Virtual Server Configuration
-#
 CONFIG_IP_VS=m
 # CONFIG_IP_VS_DEBUG is not set
 CONFIG_IP_VS_TAB_BITS=12
@@ -688,25 +662,13 @@
 CONFIG_BRIDGE_EBT_SNAT=m
 CONFIG_BRIDGE_EBT_LOG=m
 CONFIG_BRIDGE_EBT_ULOG=m
-
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 CONFIG_IP_SCTP=m
 # CONFIG_SCTP_DBG_MSG is not set
 # CONFIG_SCTP_DBG_OBJCNT is not set
 # CONFIG_SCTP_HMAC_NONE is not set
 CONFIG_SCTP_HMAC_SHA1=y
 # CONFIG_SCTP_HMAC_MD5 is not set
-
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 CONFIG_ATM=m
 CONFIG_ATM_CLIP=m
@@ -872,13 +834,7 @@
 # Wireless
 #
 CONFIG_CFG80211=m
-CONFIG_CFG80211_WEXT_COMPAT=y
-CONFIG_NL80211=y
 CONFIG_WIRELESS_EXT=y
-CONFIG_MAC80211=m
-CONFIG_MAC80211_LEDS=y
-# CONFIG_MAC80211_DEBUGFS is not set
-# CONFIG_MAC80211_DEBUG is not set
 CONFIG_IEEE80211=m
 # CONFIG_IEEE80211_DEBUG is not set
 CONFIG_IEEE80211_CRYPT_WEP=m
@@ -886,6 +842,8 @@
 CONFIG_IEEE80211_CRYPT_TKIP=m
 CONFIG_IEEE80211_SOFTMAC=m
 # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
+CONFIG_RFKILL=m
+CONFIG_RFKILL_INPUT=m
 
 #
 # Device Drivers
@@ -900,20 +858,8 @@
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
 CONFIG_CONNECTOR=m
-
-#
-# Memory Technology Devices (MTD)
-#
 # CONFIG_MTD is not set
-
-#
-# Parallel port support
-#
 CONFIG_PARPORT=m
 CONFIG_PARPORT_PC=m
 CONFIG_PARPORT_SERIAL=m
@@ -924,10 +870,6 @@
 CONFIG_PARPORT_AX88796=m
 CONFIG_PARPORT_1284=y
 CONFIG_PARPORT_NOT_PC=y
-
-#
-# Plug and Play support
-#
 CONFIG_PNP=y
 # CONFIG_PNP_DEBUG is not set
 
@@ -976,11 +918,9 @@
 CONFIG_SONY_LAPTOP=m
 CONFIG_SONY_LAPTOP_OLD=y
 CONFIG_THINKPAD_ACPI=m
+# CONFIG_THINKPAD_ACPI_DEBUG is not set
 CONFIG_THINKPAD_ACPI_BAY=y
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
+CONFIG_BLINK=m
 CONFIG_IDE=m
 CONFIG_BLK_DEV_IDE=m
 
@@ -1188,10 +1128,6 @@
 CONFIG_PCMCIA_NINJA_SCSI=m
 CONFIG_PCMCIA_QLOGIC=m
 CONFIG_PCMCIA_SYM53C500=m
-
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 CONFIG_ATA=m
 # CONFIG_ATA_NONSTANDARD is not set
 CONFIG_SATA_AHCI=m
@@ -1254,10 +1190,6 @@
 CONFIG_PATA_VIA=m
 CONFIG_PATA_WINBOND=m
 CONFIG_PATA_WINBOND_VLB=m
-
-#
-# Old CD-ROM drivers (not SCSI, not IDE)
-#
 # CONFIG_CD_NO_IDESCSI is not set
 
 #
@@ -1322,10 +1254,6 @@
 CONFIG_IEEE1394_ETH1394=m
 CONFIG_IEEE1394_DV1394=m
 CONFIG_IEEE1394_RAWIO=m
-
-#
-# I2O device support
-#
 CONFIG_I2O=m
 CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y
 CONFIG_I2O_EXT_ADAPTEC=y
@@ -1350,15 +1278,7 @@
 CONFIG_EQUALIZER=m
 CONFIG_TUN=m
 CONFIG_NET_SB1000=m
-
-#
-# ARCnet devices
-#
 # CONFIG_ARCNET is not set
-
-#
-# PHY device support
-#
 # CONFIG_PHYLIB is not set
 
 #
@@ -1426,7 +1346,6 @@
 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
@@ -1455,10 +1374,7 @@
 CONFIG_ATP=m
 CONFIG_DE600=m
 CONFIG_DE620=m
-
-#
-# Ethernet (1000 Mbit)
-#
+CONFIG_NETDEV_1000=y
 CONFIG_ACENIC=m
 # CONFIG_ACENIC_OMIT_TIGON_I is not set
 CONFIG_DL2K=m
@@ -1480,10 +1396,7 @@
 CONFIG_BNX2=m
 CONFIG_QLA3XXX=m
 CONFIG_ATL1=m
-
-#
-# Ethernet (10000 Mbit)
-#
+CONFIG_NETDEV_10000=y
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T1_1G=y
 CONFIG_CHELSIO_T1_NAPI=y
@@ -1494,11 +1407,10 @@
 # CONFIG_S2IO_NAPI is not set
 CONFIG_MYRI10GE=m
 CONFIG_NETXEN_NIC=m
+CONFIG_MLX4_ETHERNET=m
+CONFIG_MLX4_CORE=m
+CONFIG_MLX4_DEBUG=y
 CONFIG_VIOC=m
-
-#
-# Token Ring devices
-#
 # CONFIG_TR is not set
 
 #
@@ -1551,33 +1463,6 @@
 # CONFIG_BCM43XX_PIO_MODE is not set
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
-CONFIG_BCM43XX_MAC80211=m
-CONFIG_BCM43XX_MAC80211_PCI=y
-CONFIG_BCM43XX_MAC80211_PCMCIA=y
-# CONFIG_BCM43XX_MAC80211_DEBUG is not set
-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_RT2X00=m
-CONFIG_RT2X00_LIB=m
-CONFIG_RT2X00_LIB_FIRMWARE=y
-CONFIG_RT2400PCI=m
-CONFIG_RT2500PCI=m
-CONFIG_RT61PCI=m
-CONFIG_RT2500USB=m
-CONFIG_RT73USB=m
-# CONFIG_RT2X00_DEBUGFS is not set
-# CONFIG_RT2X00_DEBUG is not set
-CONFIG_ADM8211=m
-CONFIG_P54_COMMON=m
-CONFIG_P54_USB=m
-CONFIG_P54_PCI=m
-CONFIG_ZD1211RW_MAC80211=m
-# CONFIG_ZD1211RW_MAC80211_DEBUG is not set
-CONFIG_RTL818X=y
-CONFIG_RTL8187=m
 
 #
 # PCMCIA network device support
@@ -1891,6 +1776,7 @@
 # CONFIG_INPUT_WISTRON_BTNS is not set
 CONFIG_INPUT_ATLAS_BTNS=m
 CONFIG_INPUT_UINPUT=m
+CONFIG_PHANTOM=m
 
 #
 # Hardware I/O ports
@@ -2037,10 +1923,6 @@
 CONFIG_TCG_INFINEON=m
 # CONFIG_TELCLOCK is not set
 CONFIG_DEVPORT=y
-
-#
-# I2C support
-#
 CONFIG_I2C=m
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_CHARDEV=m
@@ -2069,14 +1951,15 @@
 CONFIG_I2C_OCORES=m
 CONFIG_I2C_PARPORT=m
 CONFIG_I2C_PARPORT_LIGHT=m
-CONFIG_I2C_PASEMI=m
 CONFIG_I2C_PROSAVAGE=m
 CONFIG_I2C_SAVAGE4=m
+CONFIG_I2C_SIMTEC=m
 CONFIG_SCx200_ACB=m
 CONFIG_I2C_SIS5595=m
 CONFIG_I2C_SIS630=m
 CONFIG_I2C_SIS96X=m
 # CONFIG_I2C_STUB is not set
+CONFIG_I2C_TINY_USB=m
 CONFIG_I2C_VIA=m
 CONFIG_I2C_VIAPRO=m
 CONFIG_I2C_VOODOO3=m
@@ -2116,10 +1999,6 @@
 #
 CONFIG_SPI_AT25=m
 CONFIG_SPI_SPIDEV=m
-
-#
-# Dallas's 1-wire bus
-#
 CONFIG_W1=m
 CONFIG_W1_CON=y
 
@@ -2196,16 +2075,6 @@
 # CONFIG_HWMON_DEBUG_CHIP is not set
 
 #
-# Sonics Silicon Backplane
-#
-CONFIG_SSB=m
-CONFIG_SSB_PCIHOST=y
-CONFIG_SSB_PCMCIAHOST=y
-# CONFIG_SSB_SILENT is not set
-# CONFIG_SSB_DEBUG is not set
-CONFIG_SSB_DRIVER_PCICORE=y
-
-#
 # Multifunction device drivers
 #
 CONFIG_MFD_SM501=m
@@ -2495,6 +2364,7 @@
 CONFIG_BACKLIGHT_CLASS_DEVICE=m
 CONFIG_LCD_CLASS_DEVICE=m
 CONFIG_BACKLIGHT_PROGEAR=m
+CONFIG_BACKLIGHT_CARILLO_RANCH=m
 
 #
 # Display device support
@@ -2504,12 +2374,17 @@
 #
 # Display hardware drivers
 #
+CONFIG_VGASTATE=m
 CONFIG_FB=y
 CONFIG_FIRMWARE_EDID=y
 # CONFIG_FB_DDC is not set
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
+CONFIG_FB_SYS_FILLRECT=m
+CONFIG_FB_SYS_COPYAREA=m
+CONFIG_FB_SYS_IMAGEBLIT=m
+CONFIG_FB_SYS_FOPS=m
 CONFIG_FB_DEFERRED_IO=y
 CONFIG_FB_SVGALIB=m
 # CONFIG_FB_MACMODES is not set
@@ -2518,7 +2393,7 @@
 CONFIG_FB_TILEBLITTING=y
 
 #
-# Frambuffer hardware drivers
+# Frame buffer hardware drivers
 #
 # CONFIG_FB_CIRRUS is not set
 # CONFIG_FB_PM2 is not set
@@ -2535,6 +2410,8 @@
 # CONFIG_FB_NVIDIA is not set
 # CONFIG_FB_RIVA is not set
 # CONFIG_FB_I810 is not set
+CONFIG_FB_LE80578=m
+CONFIG_FB_CARILLO_RANCH=m
 # CONFIG_FB_INTEL is not set
 # CONFIG_FB_MATROX is not set
 # CONFIG_FB_RADEON is not set
@@ -2750,7 +2627,7 @@
 CONFIG_SND_PDAUDIOCF=m
 
 #
-# SoC audio support
+# System on Chip audio support
 #
 CONFIG_SND_SOC=m
 
@@ -2814,7 +2691,6 @@
 # CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
 CONFIG_USB_ISP116X_HCD=m
 CONFIG_USB_OHCI_HCD=m
-CONFIG_USB_OHCI_HCD_SSB=y
 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
@@ -3270,17 +3146,11 @@
 CONFIG_CONFIGFS_FS=m
 
 #
-# Layered filesystems
-#
-CONFIG_ECRYPT_FS=m
-CONFIG_UNION_FS=m
-CONFIG_UNION_FS_XATTR=y
-
-#
 # Miscellaneous filesystems
 #
 # CONFIG_ADFS_FS is not set
 CONFIG_AFFS_FS=m
+CONFIG_ECRYPT_FS=m
 CONFIG_HFS_FS=m
 CONFIG_HFSPLUS_FS=m
 # CONFIG_BEFS_FS is not set
@@ -3393,8 +3263,6 @@
 # Distributed Lock Manager
 #
 CONFIG_DLM=m
-CONFIG_DLM_TCP=y
-# CONFIG_DLM_SCTP is not set
 # CONFIG_DLM_DEBUG is not set
 
 #
@@ -3454,6 +3322,7 @@
 # Page alloc debug is incompatible with Software Suspend on i386
 #
 # CONFIG_DEBUG_RODATA is not set
+# CONFIG_4KSTACKS is not set
 CONFIG_X86_FIND_SMP_CONFIG=y
 CONFIG_X86_MPPARSE=y
 CONFIG_DOUBLEFAULT=y
@@ -3473,12 +3342,9 @@
 CONFIG_SECURITY_FILE_CAPABILITIES=y
 CONFIG_SECURITY_FILE_CAPABILITIES_STRICTXATTR=y
 CONFIG_SECURITY_ROOTPLUG=m
-
-#
-# Cryptographic options
-#
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ABLKCIPHER=m
 CONFIG_CRYPTO_BLKCIPHER=y
 CONFIG_CRYPTO_HASH=y
 CONFIG_CRYPTO_MANAGER=y
@@ -3497,6 +3363,7 @@
 CONFIG_CRYPTO_CBC=y
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_CRYPTD=m
 CONFIG_CRYPTO_DES=y
 CONFIG_CRYPTO_FCRYPT=m
 CONFIG_CRYPTO_BLOWFISH=m
@@ -3517,10 +3384,7 @@
 CONFIG_CRYPTO_CRC32C=m
 CONFIG_CRYPTO_CAMELLIA=m
 CONFIG_CRYPTO_TEST=m
-
-#
-# Hardware crypto devices
-#
+CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_PADLOCK=m
 CONFIG_CRYPTO_DEV_PADLOCK_AES=m
 CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
@@ -3533,9 +3397,7 @@
 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=m
 CONFIG_CRC32=y
-CONFIG_CRC_ITU_T=m
 CONFIG_LIBCRC32C=m
-CONFIG_EEPROM_93CX6=m
 CONFIG_ZLIB_INFLATE=m
 CONFIG_ZLIB_DEFLATE=m
 CONFIG_TEXTSEARCH=y




More information about the arch-commits mailing list