SOURCES (LINUX_2_6): kernel-alpha.config, kernel-i386.config, kernel-ia64.c...

zbyniu zbyniu at pld-linux.org
Mon May 12 13:43:55 CEST 2008


Author: zbyniu                       Date: Mon May 12 11:43:55 2008 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- cleanup

---- Files affected:
SOURCES:
   kernel-alpha.config (1.30.6.3.2.194 -> 1.30.6.3.2.195) , kernel-i386.config (1.82.10.209 -> 1.82.10.210) , kernel-ia64.config (1.1.2.59 -> 1.1.2.60) , kernel-ppc.config (1.3.2.3.2.2.2.236 -> 1.3.2.3.2.2.2.237) , kernel-ppc64.config (1.1.2.33 -> 1.1.2.34) , kernel-sparc.config (1.37.2.161 -> 1.37.2.162) , kernel-sparc64.config (1.48.2.149 -> 1.48.2.150) , kernel-x86_64.config (1.1.2.176 -> 1.1.2.177) 

---- Diffs:

================================================================
Index: SOURCES/kernel-alpha.config
diff -u SOURCES/kernel-alpha.config:1.30.6.3.2.194 SOURCES/kernel-alpha.config:1.30.6.3.2.195
--- SOURCES/kernel-alpha.config:1.30.6.3.2.194	Sun May 11 03:45:26 2008
+++ SOURCES/kernel-alpha.config	Mon May 12 13:43:49 2008
@@ -17,10 +17,6 @@
 CONFIG_AUTO_IRQ_AFFINITY=y
 
 #
-# Code maturity level options
-#
-
-#
 # General setup
 #
 
@@ -87,7 +83,7 @@
 # CONFIG_SPARSEMEM_MANUAL is not set
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
-# CONFIG_SPARSEMEM_STATIC is not set
+CONFIG_SPARSEMEM_STATIC=y
 CONFIG_RESOURCES_64BIT=y
 CONFIG_ZONE_DMA_FLAG=1
 # CONFIG_VERBOSE_MCHECK is not set
@@ -157,14 +153,6 @@
 #
 
 #
-# Old SIR device drivers
-#
-
-#
-# Old Serial dongle support
-#
-
-#
 # FIR device drivers
 #
 CONFIG_USB_IRDA=m
@@ -225,23 +213,15 @@
 #
 CONFIG_MTD_PMC551_BUGFIX=y
 # CONFIG_MTD_PMC551_DEBUG is not set
-# CONFIG_MTD_DATAFLASH is not set
-# CONFIG_MTD_M25P80 is not set
+CONFIG_MTD_DATAFLASH=m
+CONFIG_MTD_M25P80=m
 
 #
 # Disk-On-Chip Device Drivers
 #
-
-#
-# NAND Flash Device Drivers
-#
 CONFIG_MTD_NAND_CAFE=m
 CONFIG_MTD_NAND_NANDSIM=m
 CONFIG_MTD_NAND_PLATFORM=m
-
-#
-# OneNAND Flash Device Drivers
-#
 # CONFIG_MTD_ONENAND_VERIFY_WRITE is not set
 CONFIG_MTD_ONENAND_OTP=y
 
@@ -257,20 +237,12 @@
 # UBI debugging options
 #
 # CONFIG_MTD_UBI_DEBUG is not set
-
-#
-# Parallel port support
-#
 CONFIG_PARPORT_PC=m
 CONFIG_PARPORT_SERIAL=m
 CONFIG_PARPORT_PC_FIFO=y
 CONFIG_PARPORT_PC_SUPERIO=y
 CONFIG_PARPORT_PC_PCMCIA=m
 CONFIG_PARPORT_1284=y
-
-#
-# Plug and Play support
-#
 CONFIG_PNP=y
 # CONFIG_PNP_DEBUG is not set
 
@@ -279,10 +251,6 @@
 #
 CONFIG_ISAPNP=y
 # CONFIG_PNPACPI is not set
-
-#
-# Block devices
-#
 CONFIG_BLK_DEV_FD=m
 CONFIG_BLK_DEV_XD=m
 CONFIG_PARIDE=m
@@ -315,18 +283,10 @@
 CONFIG_PARIDE_ON20=m
 CONFIG_PARIDE_ON26=m
 CONFIG_BLK_CPQ_DA=m
-
-#
-# Misc devices
-#
 CONFIG_MISC_DEVICES=y
 CONFIG_PHANTOM=m
 CONFIG_EEPROM_93CX6=m
 CONFIG_SGI_IOC4=m
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
 CONFIG_IDE=y
 CONFIG_IDE_MAX_HWIFS=4
 CONFIG_BLK_DEV_IDE=y
@@ -352,7 +312,6 @@
 CONFIG_IDE_GENERIC=m
 CONFIG_BLK_DEV_IDEPNP=y
 CONFIG_BLK_DEV_IDEPCI=y
-CONFIG_IDEPCI_SHARE_IRQ=y
 # CONFIG_BLK_DEV_OFFBOARD is not set
 CONFIG_BLK_DEV_GENERIC=m
 CONFIG_BLK_DEV_OPTI621=m
@@ -411,10 +370,6 @@
 #
 # SCSI Transports
 #
-
-#
-# SCSI low-level drivers
-#
 CONFIG_SCSI_7000FASST=m
 CONFIG_SCSI_AHA1542=m
 CONFIG_SCSI_AHA1740=m
@@ -452,18 +407,10 @@
 CONFIG_SCSI_U14_34F_TAGGED_QUEUE=y
 CONFIG_SCSI_U14_34F_LINKED_COMMANDS=y
 CONFIG_SCSI_U14_34F_MAX_TAGS=8
-
-#
-# PCMCIA SCSI adapter support
-#
 CONFIG_SCSI_LOWLEVEL_PCMCIA=y
 CONFIG_PCMCIA_FDOMAIN=m
 CONFIG_PCMCIA_QLOGIC=m
 CONFIG_PCMCIA_SYM53C500=m
-
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 # CONFIG_ATA_NONSTANDARD is not set
 CONFIG_PATA_ISAPNP=m
 CONFIG_PATA_LEGACY=m
@@ -493,10 +440,6 @@
 CONFIG_IEEE1394_ETH1394=m
 CONFIG_IEEE1394_DV1394=m
 CONFIG_IEEE1394_RAWIO=m
-
-#
-# I2O device support
-#
 CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y
 CONFIG_I2O_EXT_ADAPTEC=y
 CONFIG_I2O_EXT_ADAPTEC_DMA64=y
@@ -506,15 +449,7 @@
 CONFIG_I2O_BLOCK=m
 CONFIG_I2O_SCSI=m
 CONFIG_I2O_PROC=m
-
-#
-# Network device support
-#
 CONFIG_NET_SB1000=m
-
-#
-# ARCnet devices
-#
 CONFIG_ARCNET_1201=m
 CONFIG_ARCNET_1051=m
 CONFIG_ARCNET_RAW=m
@@ -527,16 +462,8 @@
 CONFIG_ARCNET_COM20020_PCI=m
 
 #
-# PHY device support
-#
-
-#
 # MII PHY device drivers
 #
-
-#
-# Ethernet (10 or 100Mbit)
-#
 CONFIG_EL1=m
 CONFIG_EL2=m
 CONFIG_ELPLUS=m
@@ -552,10 +479,6 @@
 CONFIG_NET_VENDOR_RACAL=y
 CONFIG_NI52=m
 CONFIG_NI65=m
-
-#
-# Tulip family network device support
-#
 CONFIG_PCMCIA_XIRCOM=m
 CONFIG_AT1700=m
 CONFIG_DEPCA=m
@@ -584,28 +507,16 @@
 # CONFIG_SUNDANCE_MMIO is not set
 # CONFIG_VIA_RHINE_MMIO is not set
 # CONFIG_VIA_RHINE_NAPI is not set
-
-#
-# Ethernet (1000 Mbit)
-#
 # CONFIG_ACENIC_OMIT_TIGON_I is not set
 CONFIG_E1000_NAPI=y
 CONFIG_E1000_DISABLE_PACKET_SPLIT=y
 # CONFIG_R8169_NAPI is not set
 CONFIG_R8169_VLAN=y
 CONFIG_SK98LIN_NAPI=y
-
-#
-# Ethernet (10000 Mbit)
-#
 CONFIG_CHELSIO_T1_1G=y
 CONFIG_CHELSIO_T1_NAPI=y
 CONFIG_IXGB_NAPI=y
 CONFIG_S2IO_NAPI=y
-
-#
-# Token Ring devices
-#
 CONFIG_IBMTR=m
 CONFIG_SKISA=m
 CONFIG_PROTEON=m
@@ -624,24 +535,12 @@
 #
 CONFIG_WLAN_80211=y
 CONFIG_PCMCIA_RAYCS=m
-
-#
-# Wireless 802.11b ISA/PCI cards support
-#
 CONFIG_AIRO=m
-
-#
-# Wireless 802.11b Pcmcia/Cardbus cards support
-#
 CONFIG_PCMCIA_HERMES=m
 CONFIG_PCMCIA_SPECTRUM=m
-CONFIG_AIRO_CS=m
 CONFIG_PCMCIA_ATMEL=m
+CONFIG_AIRO_CS=m
 CONFIG_PCMCIA_WL3501=m
-
-#
-# Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support
-#
 CONFIG_USB_ZD1201=m
 CONFIG_RTL8187=m
 CONFIG_HOSTAP_FIRMWARE=y
@@ -691,10 +590,6 @@
 CONFIG_PCMCIA_XIRC2PS=m
 CONFIG_PCMCIA_AXNET=m
 CONFIG_ARCNET_COM20020_CS=m
-
-#
-# Wan interfaces
-#
 CONFIG_HOSTESS_SV11=m
 CONFIG_COSA=m
 CONFIG_LANMEDIA=m
@@ -714,10 +609,6 @@
 CONFIG_DSCC4_PCISYNC=y
 CONFIG_DSCC4_PCI_RST=y
 CONFIG_SDLA=m
-
-#
-# ATM drivers
-#
 # CONFIG_ATM_ENI_DEBUG is not set
 # CONFIG_ATM_ENI_TUNE_BURST is not set
 CONFIG_ATM_FIRESTREAM=m
@@ -730,20 +621,8 @@
 # CONFIG_ATM_HORIZON_DEBUG is not set
 CONFIG_ATM_FORE200E_PCA_DEFAULT_FW=y
 CONFIG_ATM_HE_USE_SUNI=y
-
-#
-# ISDN subsystem
-#
 CONFIG_ISDN=m
-
-#
-# Old ISDN4Linux
-#
 # CONFIG_ISDN_I4L is not set
-
-#
-# CAPI subsystem
-#
 CONFIG_ISDN_CAPI=m
 CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
 CONFIG_CAPI_TRACE=y
@@ -755,10 +634,6 @@
 #
 # CAPI hardware drivers
 #
-
-#
-# Active AVM cards
-#
 CONFIG_CAPI_AVM=y
 CONFIG_ISDN_DRV_AVMB1_B1ISA=m
 CONFIG_ISDN_DRV_AVMB1_B1PCI=m
@@ -768,10 +643,6 @@
 CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
 CONFIG_ISDN_DRV_AVMB1_T1PCI=m
 CONFIG_ISDN_DRV_AVMB1_C4=m
-
-#
-# Active Eicon DIVA Server cards
-#
 CONFIG_CAPI_EICON=y
 CONFIG_ISDN_DIVAS=m
 CONFIG_ISDN_DIVAS_BRIPCI=y
@@ -779,10 +650,6 @@
 CONFIG_ISDN_DIVAS_DIVACAPI=m
 CONFIG_ISDN_DIVAS_USERIDI=m
 CONFIG_ISDN_DIVAS_MAINT=m
-
-#
-# Telephony Support
-#
 CONFIG_PHONE_IXJ_PCMCIA=m
 
 #
@@ -817,7 +684,6 @@
 CONFIG_TOUCHSCREEN_ADS7846=m
 CONFIG_TOUCHSCREEN_FUJITSU=m
 CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
-
 CONFIG_INPUT_PCSPKR=m
 CONFIG_INPUT_ATI_REMOTE=m
 CONFIG_INPUT_ATI_REMOTE2=m
@@ -867,35 +733,10 @@
 #
 # Non-8250 serial port support
 #
-
-#
-# IPMI
-#
-
-#
-# Watchdog Cards
-#
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-
-#
-# Watchdog Device Drivers
-#
-
-#
-# ISA-based Watchdog Cards
-#
 CONFIG_PCWATCHDOG=m
 CONFIG_MIXCOMWD=m
 CONFIG_WDT=m
 CONFIG_WDT_501=y
-
-#
-# PCI-based Watchdog Cards
-#
-
-#
-# USB-based Watchdog Cards
-#
 CONFIG_USBPCWATCHDOG=m
 CONFIG_HW_RANDOM=y
 CONFIG_RTC=m
@@ -920,14 +761,6 @@
 CONFIG_SYNCLINK_CS=m
 CONFIG_CARDMAN_4000=m
 CONFIG_CARDMAN_4040=m
-
-#
-# TPM devices
-#
-
-#
-# I2C support
-#
 CONFIG_I2C=m
 
 #
@@ -958,10 +791,6 @@
 #
 
 #
-# Dallas's 1-wire bus
-#
-
-#
 # 1-wire Bus Masters
 #
 CONFIG_W1_MASTER_DS2490=m
@@ -1001,7 +830,6 @@
 CONFIG_VIDEO_CPIA_PP=m
 CONFIG_VIDEO_CPIA_USB=m
 CONFIG_VIDEO_CPIA2=m
-# CONFIG_TUNER_TEA5761 is not set
 CONFIG_VIDEO_STRADIS=m
 CONFIG_VIDEO_ZORAN_ZR36060=m
 CONFIG_VIDEO_ZORAN=m
@@ -1018,10 +846,6 @@
 CONFIG_VIDEO_CX88_DVB=m
 CONFIG_VIDEO_CX88_VP3054=m
 CONFIG_VIDEO_IVTV=m
-
-#
-# V4L USB devices
-#
 CONFIG_V4L_USB_DRIVERS=y
 CONFIG_VIDEO_PVRUSB2=m
 CONFIG_VIDEO_PVRUSB2_SYSFS=y
@@ -1044,10 +868,6 @@
 CONFIG_USB_PWC=m
 # CONFIG_USB_PWC_DEBUG is not set
 CONFIG_USB_ZR364XX=m
-
-#
-# Radio Adapters
-#
 CONFIG_RADIO_CADET=m
 CONFIG_RADIO_RTRACK=m
 CONFIG_RADIO_RTRACK2=m
@@ -1063,10 +883,6 @@
 CONFIG_USB_DSBR=m
 
 #
-# Digital Video Broadcasting Devices
-#
-
-#
 # Supported SAA7146 based PCI Adapters
 #
 # CONFIG_DVB_AV7110_FIRMWARE is not set
@@ -1109,12 +925,6 @@
 CONFIG_DVB_CINERGYT2_RC_QUERY_INTERVAL=100
 
 #
-# Graphics support
-#
-
-#
-# Display device support
-#
 
 CONFIG_FB_CFB_FILLRECT=m
 CONFIG_FB_CFB_COPYAREA=m
@@ -1168,10 +978,6 @@
 # CONFIG_VGACON_SOFT_SCROLLBACK is not set
 CONFIG_MDA_CONSOLE=m
 # CONFIG_FONTS is not set
-
-#
-# Logo configuration
-#
 CONFIG_LOGO=y
 # CONFIG_LOGO_LINUX_MONO is not set
 # CONFIG_LOGO_LINUX_VGA16 is not set
@@ -1212,21 +1018,6 @@
 CONFIG_SND_VXPOCKET=m
 CONFIG_SND_PDAUDIOCF=m
 
-#
-# SoC audio support
-#
-
-#
-# SoC Platforms
-#
-
-#
-# SoC Audio for the Atmel AT91
-#
-
-#
-# SoC Audio for the Intel PXA2xx
-#
 
 #
 # Open Sound System
@@ -1256,10 +1047,6 @@
 CONFIG_SOUND_KAHLUA=m
 
 #
-# HID Devices
-#
-
-#
 # USB Input Devices
 #
 CONFIG_USB_HID=m
@@ -1273,16 +1060,11 @@
 CONFIG_USB_HIDDEV=y
 
 #
-# USB support
-#
-# CONFIG_USB_DEBUG is not set
-
-#
 # USB HID Boot Protocol drivers
 #
 CONFIG_USB_KBD=m
 CONFIG_USB_MOUSE=m
-
+# CONFIG_USB_DEBUG is not set
 
 #
 # Miscellaneous USB options
@@ -1349,10 +1131,6 @@
 # USB port drivers
 #
 CONFIG_USB_USS720=m
-
-#
-# USB Serial Converter support
-#
 CONFIG_USB_SERIAL=m
 CONFIG_USB_SERIAL_GENERIC=y
 CONFIG_USB_SERIAL_AIRCABLE=m
@@ -1434,19 +1212,11 @@
 CONFIG_USB_TRANCEVIBRATOR=m
 CONFIG_USB_IOWARRIOR=m
 CONFIG_USB_TEST=m
-
-#
-# USB DSL modem support
-#
 CONFIG_USB_ATM=m
 CONFIG_USB_SPEEDTOUCH=m
 CONFIG_USB_CXACRU=m
 CONFIG_USB_UEAGLEATM=m
 CONFIG_USB_XUSBATM=m
-
-#
-# USB Gadget Support
-#
 CONFIG_USB_GADGET=m
 # CONFIG_USB_GADGET_DEBUG is not set
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
@@ -1482,9 +1252,6 @@
 #
 CONFIG_MMC_WBSD=m
 
-#
-# LED devices
-#
 
 #
 # LED drivers
@@ -1541,29 +1308,10 @@
 CONFIG_RTC_DRV_MAX6902=m
 CONFIG_RTC_DRV_V3020=m
 
-#
-# DMA Engine support
-#
-
-#
-# DMA Clients
-#
-
-#
-# DMA Devices
-#
-
-#
-# Auxiliary Display support
-#
 CONFIG_KS0108=m
 CONFIG_KS0108_PORT=0x378
 CONFIG_KS0108_DELAY=2
 
-#
-# Virtualization
-#
-
 
 #
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-alpha.config?r1=1.30.6.3.2.194&r2=1.30.6.3.2.195&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-i386.config?r1=1.82.10.209&r2=1.82.10.210&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-ia64.config?r1=1.1.2.59&r2=1.1.2.60&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-ppc.config?r1=1.3.2.3.2.2.2.236&r2=1.3.2.3.2.2.2.237&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-ppc64.config?r1=1.1.2.33&r2=1.1.2.34&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-sparc.config?r1=1.37.2.161&r2=1.37.2.162&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-sparc64.config?r1=1.48.2.149&r2=1.48.2.150&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-x86_64.config?r1=1.1.2.176&r2=1.1.2.177&f=u



More information about the pld-cvs-commit mailing list