SOURCES (LINUX_2_6): kernel-ppc.config, kernel-ppc-smp.config - bi...
sparky
sparky at pld-linux.org
Sun Oct 23 02:06:56 CEST 2005
Author: sparky Date: Sun Oct 23 00:06:56 2005 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- big update for 2.6.14
---- Files affected:
SOURCES:
kernel-ppc.config (1.3.2.3.2.2.2.170 -> 1.3.2.3.2.2.2.171) , kernel-ppc-smp.config (1.6.4.1.2.171 -> 1.6.4.1.2.172)
---- Diffs:
================================================================
Index: SOURCES/kernel-ppc.config
diff -u SOURCES/kernel-ppc.config:1.3.2.3.2.2.2.170 SOURCES/kernel-ppc.config:1.3.2.3.2.2.2.171
--- SOURCES/kernel-ppc.config:1.3.2.3.2.2.2.170 Fri Oct 7 14:54:35 2005
+++ SOURCES/kernel-ppc.config Sun Oct 23 02:06:51 2005
@@ -1,22 +1,17 @@
-#
-# Linux kernel version: 2.6.13
-#
CONFIG_MMU=y
CONFIG_GENERIC_HARDIRQS=y
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_HAVE_DEC_LOCK=y
CONFIG_PPC=y
CONFIG_PPC32=y
CONFIG_GENERIC_NVRAM=y
CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
#
# Code maturity level options
#
CONFIG_EXPERIMENTAL=y
CONFIG_CLEAN_COMPILE=y
-# BROKEN depends on !CLEAN_COMPILE
CONFIG_BROKEN=y
CONFIG_BROKEN_ON_SMP=y
CONFIG_LOCK_KERNEL=y
@@ -26,6 +21,7 @@
# General setup
#
CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_SWAP=y
CONFIG_SYSVIPC=y
CONFIG_POSIX_MQUEUE=y
@@ -37,6 +33,7 @@
CONFIG_HOTPLUG=y
CONFIG_KOBJECT_UEVENT=y
# CONFIG_IKCONFIG is not set
+CONFIG_INITRAMFS_SOURCE=""
# CONFIG_EMBEDDED is not set
CONFIG_KALLSYMS=y
CONFIG_KALLSYMS_ALL=y
@@ -68,6 +65,10 @@
#
# Processor
#
+
+#
+# Processor Type
+#
CONFIG_6xx=y
# CONFIG_40x is not set
# CONFIG_44x is not set
@@ -87,6 +88,10 @@
# CONFIG_CPU_FREQ_DEBUG is not set
CONFIG_CPU_FREQ_STAT=m
# CONFIG_CPU_FREQ_STAT_DETAILS is not set
+
+#
+# Default CPUFreq governor
+#
# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
CONFIG_CPU_FREQ_GOV_PERFORMANCE=m
@@ -102,27 +107,27 @@
#
# Platform options
#
+
+#
+# Machine Type
+#
CONFIG_PPC_MULTIPLATFORM=y
# CONFIG_APUS is not set
# CONFIG_KATANA is not set
# CONFIG_WILLOW is not set
# CONFIG_CPCI690 is not set
-# CONFIG_PCORE is not set
# CONFIG_POWERPMC250 is not set
# CONFIG_CHESTNUT is not set
# CONFIG_SPRUCE is not set
# CONFIG_HDPU is not set
# CONFIG_EV64260 is not set
# CONFIG_LOPEC is not set
-# CONFIG_MCPN765 is not set
# CONFIG_MVME5100 is not set
# CONFIG_PPLUS is not set
# CONFIG_PRPMC750 is not set
# CONFIG_PRPMC800 is not set
# CONFIG_SANDPOINT is not set
# CONFIG_RADSTONE_PPC7D is not set
-# CONFIG_ADIR is not set
-# CONFIG_K2 is not set
# CONFIG_PAL4 is not set
# CONFIG_GEMINI is not set
# CONFIG_EST8260 is not set
@@ -134,6 +139,10 @@
# CONFIG_PQ2FADS is not set
# CONFIG_LITE5200 is not set
# CONFIG_MPC834x_SYS is not set
+# CONFIG_EV64360 is not set
+# CONFIG_8272 is not set
+CONFIG_83xx=y
+CONFIG_MPC834x=y
CONFIG_PPC_CHRP=y
CONFIG_PPC_PMAC=y
CONFIG_PPC_PREP=y
@@ -141,20 +150,37 @@
CONFIG_PPCBUG_NVRAM=y
# CONFIG_SMP is not set
CONFIG_HIGHMEM=y
+
+#
+# Timer frequency
+#
# CONFIG_HZ_100 is not set
CONFIG_HZ_250=y
# CONFIG_HZ_1000 is not set
CONFIG_HZ=250
+
+#
+# Preemption Mode
+#
CONFIG_PREEMPT_NONE=y
# CONFIG_PREEMPT_VOLUNTARY is not set
# CONFIG_PREEMPT is not set
+# CONFIG_PREEMPT_SOFTIRQS is not set
+# CONFIG_PREEMPT_HARDIRQS is not set
# CONFIG_PREEMPT_BKL is not set
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
CONFIG_SELECT_MEMORY_MODEL=y
+
+#
+# Memory model
+#
CONFIG_FLATMEM_MANUAL=y
# CONFIG_DISCONTIGMEM_MANUAL is not set
# CONFIG_SPARSEMEM_MANUAL is not set
CONFIG_FLATMEM=y
CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
CONFIG_BINFMT_ELF=y
CONFIG_BINFMT_MISC=m
CONFIG_PROC_DEVICETREE=y
@@ -167,55 +193,14 @@
CONFIG_ISA_DMA_API=y
#
-# Software Suspend 2
-#
-CONFIG_SOFTWARE_SUSPEND2_CORE=m
-CONFIG_SOFTWARE_SUSPEND2=y
-CONFIG_SOFTWARE_SUSPEND2_WRITER=y
-
-#
-# Image Storage (you need at least one writer)
-#
-CONFIG_SOFTWARE_SUSPEND_SWAPWRITER=m
-CONFIG_SOFTWARE_SUSPEND_NULLWRITER=m
-
-#
-# Page Transformers
-#
-CONFIG_SOFTWARE_SUSPEND_LZF_COMPRESSION=m
-CONFIG_SOFTWARE_SUSPEND_GZIP_COMPRESSION=m
-CONFIG_SOFTWARE_SUSPEND_NULLTRANSFORMER=m
-
-#
-# User Interface Options
-#
-CONFIG_SOFTWARE_SUSPEND_BOOTSPLASH=m
-CONFIG_SOFTWARE_SUSPEND_TEXT_MODE=m
-
-#
-# General Options
-#
-CONFIG_SOFTWARE_SUSPEND_ACPI=y
-# CONFIG_SOFTWARE_SUSPEND_RELAXED_PROC is not set
-CONFIG_SOFTWARE_SUSPEND_DEFAULT_RESUME2=""
-CONFIG_SOFTWARE_SUSPEND_KEEP_IMAGE=y
-
-#
-# Debugging
-#
-# CONFIG_SOFTWARE_SUSPEND_DEBUG is not set
-# CONFIG_SOFTWARE_SUSPEND_VARIATION_ANALYSIS is not set
-CONFIG_SOFTWARE_SUSPEND2_DUMP=y
-
-#
# Bus options
#
CONFIG_ISA=y
CONFIG_GENERIC_ISA_DMA=y
CONFIG_PCI=y
CONFIG_PCI_DOMAINS=y
+CONFIG_MPC83xx_PCI2=y
CONFIG_PCI_LEGACY_PROC=y
-CONFIG_PCI_NAMES=y
# CONFIG_PCI_DEBUG is not set
#
@@ -298,8 +283,8 @@
CONFIG_INET_ESP=m
CONFIG_INET_IPCOMP=m
CONFIG_INET_TUNNEL=m
-CONFIG_IP_TCPDIAG=m
-CONFIG_IP_TCPDIAG_IPV6=y
+CONFIG_INET_DIAG=m
+CONFIG_INET_TCP_DIAG=m
# CONFIG_TCP_CONG_ADVANCED is not set
CONFIG_TCP_CONG_BIC=y
@@ -348,11 +333,49 @@
CONFIG_BRIDGE_NETFILTER=y
#
+# IP: Netfilter Configuration
+#
+
+#
+# IPv6: Netfilter Configuration (EXPERIMENTAL)
+#
+
+#
+# DECnet: Netfilter Configuration
+#
+
+#
+# Bridge: Netfilter Configuration
+#
+
+#
+# DCCP Configuration (EXPERIMENTAL)
+#
+CONFIG_IP_DCCP=m
+CONFIG_INET_DCCP_DIAG=m
+
+#
+# DCCP CCIDs Configuration (EXPERIMENTAL)
+#
+CONFIG_IP_DCCP_CCID3=m
+CONFIG_IP_DCCP_TFRC_LIB=m
+
+#
+# DCCP Kernel Hacking
+#
+# CONFIG_IP_DCCP_DEBUG is not set
+# CONFIG_IP_DCCP_UNLOAD_HACK is not set
+
+#
# SCTP Configuration (EXPERIMENTAL)
#
CONFIG_IP_SCTP=m
# CONFIG_SCTP_DBG_MSG is not set
# CONFIG_SCTP_DBG_OBJCNT is not set
+
+#
+# SCTP: Cookie HMAC Algorithm
+#
# CONFIG_SCTP_HMAC_NONE is not set
# CONFIG_SCTP_HMAC_SHA1 is not set
CONFIG_SCTP_HMAC_MD5=y
@@ -389,15 +412,19 @@
# CONFIG_ECONET_NATIVE is not set
CONFIG_WAN_ROUTER=m
CONFIG_NET_SCHED=y
+
+#
+# Packet scheduler clock source
+#
CONFIG_NET_SCH_CLK_JIFFIES=y
# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
# CONFIG_NET_SCH_CLK_CPU is not set
CONFIG_NET_SCH_CBQ=m
CONFIG_NET_SCH_HTB=m
-CONFIG_NET_SCH_WRR=m
CONFIG_NET_SCH_HFSC=m
CONFIG_NET_SCH_ATM=m
CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_WRR=m
CONFIG_NET_SCH_RED=m
CONFIG_NET_SCH_SFQ=m
CONFIG_NET_SCH_ESFQ=m
@@ -559,6 +586,11 @@
CONFIG_BT_HCIBLUECARD=m
CONFIG_BT_HCIBTUART=m
CONFIG_BT_HCIVHCI=m
+CONFIG_IEEE80211=m
+# CONFIG_IEEE80211_DEBUG is not set
+CONFIG_IEEE80211_CRYPT_WEP=m
+CONFIG_IEEE80211_CRYPT_CCMP=m
+CONFIG_IEEE80211_CRYPT_TKIP=m
#
# Device Drivers
@@ -573,6 +605,11 @@
# CONFIG_DEBUG_DRIVER is not set
#
+# Connector - unified userspace <-> kernelspace linker
+#
+CONFIG_CONNECTOR=m
+
+#
# Memory Technology Devices (MTD)
#
CONFIG_MTD=m
@@ -603,6 +640,10 @@
CONFIG_MTD_JEDECPROBE=m
CONFIG_MTD_GEN_PROBE=m
CONFIG_MTD_CFI_ADV_OPTIONS=y
+
+#
+# Flash cmd/query data swapping
+#
CONFIG_MTD_CFI_NOSWAP=y
# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
@@ -754,7 +795,6 @@
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_BLK_DEV_RAM_SIZE=4096
CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE=""
CONFIG_LBD=y
CONFIG_CDROM_PKTCDVD=m
CONFIG_CDROM_PKTCDVD_BUFFERS=8
@@ -852,6 +892,7 @@
#
# SCSI device support
#
+CONFIG_RAID_ATTRS=m
CONFIG_SCSI=m
CONFIG_SCSI_PROC_FS=y
@@ -879,6 +920,7 @@
CONFIG_SCSI_SPI_ATTRS=m
CONFIG_SCSI_FC_ATTRS=m
CONFIG_SCSI_ISCSI_ATTRS=m
+CONFIG_SCSI_SAS_ATTRS=m
#
# SCSI low-level drivers
@@ -910,10 +952,12 @@
CONFIG_MEGARAID_MM=m
CONFIG_MEGARAID_MAILBOX=m
CONFIG_MEGARAID_LEGACY=m
+CONFIG_MEGARAID_SAS=m
CONFIG_SCSI_SATA=m
CONFIG_SCSI_SATA_AHCI=m
CONFIG_SCSI_SATA_SVW=m
CONFIG_SCSI_ATA_PIIX=m
+CONFIG_SCSI_SATA_MV=m
CONFIG_SCSI_SATA_NV=m
CONFIG_SCSI_SATA_PROMISE=m
CONFIG_SCSI_SATA_QSTOR=m
@@ -923,6 +967,7 @@
CONFIG_SCSI_SATA_ULI=m
CONFIG_SCSI_SATA_VIA=m
CONFIG_SCSI_SATA_VITESSE=m
+# CONFIG_SCSI_SATA_INTEL_COMBINED is not set
CONFIG_SCSI_BUSLOGIC=m
# CONFIG_SCSI_OMIT_FLASHPOINT is not set
CONFIG_SCSI_CPQFCTS=m
@@ -1036,6 +1081,7 @@
CONFIG_FUSION=y
CONFIG_FUSION_SPI=m
CONFIG_FUSION_FC=m
+CONFIG_FUSION_SAS=m
CONFIG_FUSION_MAX_SGE=40
CONFIG_FUSION_CTL=m
CONFIG_FUSION_LAN=m
@@ -1108,6 +1154,10 @@
CONFIG_BONDING=m
CONFIG_EQUALIZER=m
CONFIG_IMQ=m
+
+#
+# IMQ behavior (PRE/POSTROUTING)
+#
# CONFIG_IMQ_BEHAVIOR_AA is not set
CONFIG_IMQ_BEHAVIOR_AB=y
# CONFIG_IMQ_BEHAVIOR_BA is not set
@@ -1132,6 +1182,21 @@
CONFIG_ARCNET_COM20020_PCI=m
#
+# PHY device support
+#
+CONFIG_PHYLIB=m
+CONFIG_PHYCONTROL=y
+
+#
+# MII PHY device drivers
+#
+CONFIG_MARVELL_PHY=m
+CONFIG_DAVICOM_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_CICADA_PHY=m
+
+#
# Ethernet (10 or 100Mbit)
#
CONFIG_NET_ETHERNET=y
@@ -1142,6 +1207,7 @@
# CONFIG_OAKNET is not set
CONFIG_HAPPYMEAL=m
CONFIG_SUNGEM=m
+# CONFIG_CASSINI is not set
CONFIG_NET_VENDOR_3COM=y
CONFIG_EL1=m
CONFIG_EL2=m
@@ -1174,6 +1240,7 @@
CONFIG_DE4X5=m
CONFIG_WINBOND_840=m
CONFIG_DM9102=m
+CONFIG_ULI526X=m
CONFIG_PCMCIA_XIRCOM=m
CONFIG_PCMCIA_XIRTULIP=m
CONFIG_AT1700=m
@@ -1239,12 +1306,15 @@
CONFIG_R8169=m
CONFIG_R8169_NAPI=y
CONFIG_R8169_VLAN=y
+CONFIG_SIS190=m
CONFIG_SKGE=m
CONFIG_SK98LIN=m
CONFIG_SK98LIN_NAPI=y
CONFIG_VIA_VELOCITY=m
CONFIG_TIGON3=m
CONFIG_BNX2=m
+CONFIG_GIANFAR=m
+CONFIG_GFAR_NAPI=y
CONFIG_MV643XX_ETH=m
CONFIG_MV643XX_ETH_0=y
CONFIG_MV643XX_ETH_1=y
@@ -1253,6 +1323,7 @@
#
# Ethernet (10000 Mbit)
#
+CONFIG_CHELSIO_T1=m
CONFIG_IXGB=m
# CONFIG_IXGB_NAPI is not set
CONFIG_S2IO=m
@@ -1296,11 +1367,16 @@
#
# Wireless 802.11b ISA/PCI cards support
#
+CONFIG_IPW2100=m
+CONFIG_IPW2100_MONITOR=y
+# CONFIG_IPW_DEBUG is not set
+CONFIG_IPW2200=m
CONFIG_AIRO=m
CONFIG_HERMES=m
CONFIG_APPLE_AIRPORT=m
CONFIG_PLX_HERMES=m
CONFIG_TMD_HERMES=m
+CONFIG_NORTEL_HERMES=m
CONFIG_PCI_HERMES=m
CONFIG_ATMEL=m
CONFIG_PCI_ATMEL=m
@@ -1309,6 +1385,7 @@
# Wireless 802.11b Pcmcia/Cardbus cards support
#
CONFIG_PCMCIA_HERMES=m
+CONFIG_PCMCIA_SPECTRUM=m
CONFIG_AIRO_CS=m
CONFIG_PCMCIA_ATMEL=m
CONFIG_PCMCIA_WL3501=m
@@ -1317,6 +1394,11 @@
# Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support
#
CONFIG_PRISM54=m
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+CONFIG_HOSTAP_PLX=m
+CONFIG_HOSTAP_PCI=m
+CONFIG_HOSTAP_CS=m
CONFIG_NET_WIRELESS=y
#
@@ -1473,6 +1555,22 @@
# CONFIG_ISDN_DRV_HISAX is not set
#
+# D-channel protocol features
+#
+
+#
+# HiSax supported cards
+#
+
+#
+# HiSax PCMCIA card service modules
+#
+
+#
+# HiSax sub driver modules
+#
+
+#
# Active cards
#
CONFIG_ISDN_DRV_ICN=m
@@ -1696,6 +1794,10 @@
# Watchdog Device Drivers
#
CONFIG_SOFT_WATCHDOG=m
+CONFIG_IBMASR=m
+CONFIG_I6300ESB_WDT=m
+CONFIG_SBC8360_WDT=m
+CONFIG_W83977F_WDT=m
#
# ISA-based Watchdog Cards
@@ -1730,12 +1832,12 @@
CONFIG_AGP_UNINORTH=m
CONFIG_DRM=m
CONFIG_DRM_TDFX=m
-CONFIG_DRM_GAMMA=m
CONFIG_DRM_R128=m
CONFIG_DRM_RADEON=m
CONFIG_DRM_MGA=m
CONFIG_DRM_SIS=m
CONFIG_DRM_VIA=m
+CONFIG_DRM_SAVAGE=m
#
# PCMCIA character devices
@@ -1795,7 +1897,6 @@
CONFIG_I2C_VIAPRO=m
CONFIG_I2C_VOODOO3=m
CONFIG_I2C_PCA_ISA=m
-CONFIG_I2C_SENSOR=m
#
# Miscellaneous I2C Chip support
@@ -1823,11 +1924,14 @@
CONFIG_W1_DS9490_BRIDGE=m
CONFIG_W1_THERM=m
CONFIG_W1_SMEM=m
+CONFIG_W1_DS2433=m
+CONFIG_W1_DS2433_CRC=y
#
# Hardware Monitoring support
#
CONFIG_HWMON=m
+# CONFIG_HWMON_VID is not set
CONFIG_SENSORS_ADM1021=m
CONFIG_SENSORS_ADM1025=m
CONFIG_SENSORS_ADM1026=m
@@ -1858,9 +1962,11 @@
CONFIG_SENSORS_SMSC47B397=m
CONFIG_SENSORS_VIA686A=m
CONFIG_SENSORS_W83781D=m
+CONFIG_SENSORS_W83792D=m
CONFIG_SENSORS_W83L785TS=m
CONFIG_SENSORS_W83627HF=m
CONFIG_SENSORS_W83627EHF=m
+CONFIG_SENSORS_HDAPS=m
# CONFIG_HWMON_DEBUG_CHIP is not set
#
@@ -1868,6 +1974,10 @@
#
#
+# Multimedia Capabilities Port drivers
+#
+
+#
# Multimedia devices
#
CONFIG_VIDEO_DEV=m
@@ -1880,6 +1990,7 @@
# Video Adapters
#
CONFIG_VIDEO_BT848=m
+CONFIG_VIDEO_SAA6588=m
CONFIG_VIDEO_PMS=m
CONFIG_VIDEO_PLANB=m
CONFIG_VIDEO_BWQCAM=m
@@ -1959,6 +2070,7 @@
CONFIG_DVB_USB_CXUSB=m
CONFIG_DVB_USB_DIGITV=m
CONFIG_DVB_USB_VP7045=m
+CONFIG_DVB_USB_VP702X=m
CONFIG_DVB_USB_NOVA_T_USB2=m
CONFIG_DVB_USB_DTT200U=m
CONFIG_DVB_TTUSB_BUDGET=m
@@ -2076,6 +2188,7 @@
CONFIG_FB_RIVA=m
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/kernel-ppc.config?r1=1.3.2.3.2.2.2.170&r2=1.3.2.3.2.2.2.171&f=u
http://cvs.pld-linux.org/SOURCES/kernel-ppc-smp.config?r1=1.6.4.1.2.171&r2=1.6.4.1.2.172&f=u
More information about the pld-cvs-commit
mailing list