Author: baggins Date: Fri Apr 28 15:06:25 2006 GMT Module: SOURCES Tag: LINUX_2_6 ---- Log message: - cleanup and update
---- Files affected: SOURCES: kernel-ppc.config (1.3.2.3.2.2.2.184 -> 1.3.2.3.2.2.2.185) , kernel-ppc-smp.config (1.6.4.1.2.184 -> 1.6.4.1.2.185) ---- Diffs: ================================================================ Index: SOURCES/kernel-ppc.config diff -u SOURCES/kernel-ppc.config:1.3.2.3.2.2.2.184 SOURCES/kernel-ppc.config:1.3.2.3.2.2.2.185 --- SOURCES/kernel-ppc.config:1.3.2.3.2.2.2.184 Fri Apr 21 15:29:34 2006 +++ SOURCES/kernel-ppc.config Fri Apr 28 17:06:20 2006 @@ -1,6 +1,10 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.16.11 +# Fri Apr 28 17:03:33 2006 +# CONFIG_MMU=y CONFIG_GENERIC_HARDIRQS=y -CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_RWSEM_XCHGADD_ALGORITHM=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_PPC=y @@ -13,10 +17,7 @@ # Code maturity level options # CONFIG_EXPERIMENTAL=y -CONFIG_CLEAN_COMPILE=y -CONFIG_BROKEN=y CONFIG_BROKEN_ON_SMP=y -CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 # @@ -32,17 +33,18 @@ CONFIG_SYSCTL=y CONFIG_AUDIT=y CONFIG_AUDITSYSCALL=y -CONFIG_HOTPLUG=y -CONFIG_KOBJECT_UEVENT=y -# CONFIG_IKCONFIG is not set +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y CONFIG_INITRAMFS_SOURCE="" # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set # CONFIG_EMBEDDED is not set CONFIG_KALLSYMS=y CONFIG_KALLSYMS_ALL=y CONFIG_KALLSYMS_EXTRA_PASS=y +CONFIG_HOTPLUG=y CONFIG_PRINTK=y CONFIG_BUG=y +CONFIG_ELF_CORE=y CONFIG_BASE_FULL=y CONFIG_FUTEX=y CONFIG_EPOLL=y @@ -51,8 +53,11 @@ CONFIG_CC_ALIGN_LABELS=0 CONFIG_CC_ALIGN_LOOPS=0 CONFIG_CC_ALIGN_JUMPS=0 +CONFIG_SLAB=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 +# CONFIG_SLOB is not set +CONFIG_OBSOLETE_INTERMODULE=m # # Loadable module support @@ -77,28 +82,19 @@ CONFIG_IOSCHED_AS=y CONFIG_IOSCHED_DEADLINE=y CONFIG_IOSCHED_CFQ=y - -# -# Default I/O scheduler -# -CONFIG_DEFAULT_AS=y +# CONFIG_DEFAULT_AS is not set # CONFIG_DEFAULT_DEADLINE is not set -# CONFIG_DEFAULT_CFQ is not set +CONFIG_DEFAULT_CFQ=y # CONFIG_DEFAULT_NOOP is not set -CONFIG_DEFAULT_IOSCHED="anticipatory" +CONFIG_DEFAULT_IOSCHED="cfq" # # Processor # - -# -# Processor Type -# CONFIG_6xx=y # CONFIG_40x is not set # CONFIG_44x is not set # CONFIG_POWER3 is not set -# CONFIG_POWER4 is not set # CONFIG_8xx is not set # CONFIG_E200 is not set # CONFIG_E500 is not set @@ -109,22 +105,17 @@ # CONFIG_TAU_AVERAGE is not set CONFIG_KEXEC=y CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_TABLE=y +CONFIG_CPU_FREQ_TABLE=m # 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 +CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y CONFIG_CPU_FREQ_GOV_POWERSAVE=m CONFIG_CPU_FREQ_GOV_USERSPACE=y CONFIG_CPU_FREQ_GOV_ONDEMAND=m CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m -CONFIG_CPU_FREQ_PMAC=y # CONFIG_PPC601_SYNC_FIX is not set # CONFIG_WANT_EARLY_SERIAL is not set CONFIG_PPC_STD_MMU=y @@ -132,10 +123,6 @@ # # Platform options # - -# -# Machine Type -# CONFIG_PPC_MULTIPLATFORM=y # CONFIG_APUS is not set # CONFIG_KATANA is not set @@ -165,37 +152,20 @@ # 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 CONFIG_PPC_OF=y 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 Model -# CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set -# CONFIG_PREEMPT_BKL is not set CONFIG_SELECT_MEMORY_MODEL=y - -# -# Memory model -# CONFIG_FLATMEM_MANUAL=y # CONFIG_DISCONTIGMEM_MANUAL is not set # CONFIG_SPARSEMEM_MANUAL is not set @@ -224,7 +194,6 @@ CONFIG_PPC_INDIRECT_PCI=y CONFIG_PCI=y CONFIG_PCI_DOMAINS=y -CONFIG_MPC83xx_PCI2=y CONFIG_PCI_LEGACY_PROC=y # CONFIG_PCI_DEBUG is not set @@ -242,6 +211,11 @@ # PC-card bridges # CONFIG_YENTA=m +CONFIG_YENTA_O2=y +CONFIG_YENTA_RICOH=y +CONFIG_YENTA_TI=y +CONFIG_YENTA_ENE_TUNE=y +CONFIG_YENTA_TOSHIBA=y CONFIG_PD6729=m CONFIG_I82092=m CONFIG_I82365=m @@ -271,6 +245,7 @@ # # Networking options # +# CONFIG_NETDEBUG is not set CONFIG_PACKET=y CONFIG_PACKET_MMAP=y CONFIG_UNIX=y @@ -310,8 +285,19 @@ CONFIG_INET_TUNNEL=m CONFIG_INET_DIAG=m CONFIG_INET_TCP_DIAG=m -# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_ADVANCED=y + +# +# TCP congestion control +# CONFIG_TCP_CONG_BIC=y +CONFIG_TCP_CONG_CUBIC=m +CONFIG_TCP_CONG_WESTWOOD=m +CONFIG_TCP_CONG_HTCP=m +CONFIG_TCP_CONG_HSTCP=m +CONFIG_TCP_CONG_HYBLA=m +CONFIG_TCP_CONG_VEGAS=m +CONFIG_TCP_CONG_SCALABLE=m # # IP: Virtual Server Configuration @@ -358,26 +344,6 @@ CONFIG_BRIDGE_NETFILTER=y # -# Core Netfilter Configuration -# - -# -# IP: Netfilter Configuration -# - -# -# IPv6: Netfilter Configuration (EXPERIMENTAL) -# - -# -# DECnet: Netfilter Configuration -# - -# -# Bridge: Netfilter Configuration -# - -# # DCCP Configuration (EXPERIMENTAL) # CONFIG_IP_DCCP=m @@ -401,13 +367,16 @@ 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 + +# +# TIPC Configuration (EXPERIMENTAL) +# +CONFIG_TIPC=m +# CONFIG_TIPC_ADVANCED is not set +# CONFIG_TIPC_DEBUG is not set CONFIG_ATM=m CONFIG_ATM_CLIP=m CONFIG_ATM_CLIP_NO_ICMP=y @@ -431,24 +400,20 @@ CONFIG_COPS_DAYNA=y CONFIG_COPS_TANGENT=y CONFIG_IPDDP=m -# CONFIG_IPDDP_ENCAP is not set -# CONFIG_IPDDP_DECAP is not set +CONFIG_IPDDP_ENCAP=y +CONFIG_IPDDP_DECAP=y CONFIG_X25=m CONFIG_LAPB=m -# CONFIG_NET_DIVERT is not set +CONFIG_NET_DIVERT=y CONFIG_ECONET=m CONFIG_ECONET_AUNUDP=y -# CONFIG_ECONET_NATIVE is not set +CONFIG_ECONET_NATIVE=y CONFIG_WAN_ROUTER=m # # QoS and/or fair queueing # 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 @@ -461,7 +426,6 @@ 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 @@ -500,7 +464,7 @@ CONFIG_NET_ACT_MIRRED=m CONFIG_NET_ACT_IPT=m CONFIG_NET_ACT_PEDIT=m -# CONFIG_NET_ACT_SIMP is not set +CONFIG_NET_ACT_SIMP=m CONFIG_NET_CLS_IND=y CONFIG_NET_ESTIMATOR=y @@ -652,7 +616,7 @@ # # Connector - unified userspace <-> kernelspace linker # -CONFIG_CONNECTOR=m +CONFIG_CONNECTOR=y CONFIG_PROC_EVENTS=y # @@ -687,10 +651,6 @@ 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 @@ -725,8 +685,6 @@ CONFIG_MTD_PHYSMAP_LEN=0x4000000 CONFIG_MTD_PHYSMAP_BANKWIDTH=2 CONFIG_MTD_PCI=m -CONFIG_MTD_PCMCIA=m -CONFIG_MTD_PCMCIA_ANONYMOUS=y CONFIG_MTD_PLATRAM=m # @@ -735,6 +693,8 @@ CONFIG_MTD_PMC551=m 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_SLRAM=m CONFIG_MTD_PHRAM=m CONFIG_MTD_MTDRAM=m @@ -800,7 +760,6 @@ # Block devices # CONFIG_BLK_DEV_FD=m -CONFIG_MAC_FLOPPY=m CONFIG_BLK_DEV_XD=m CONFIG_PARIDE=m CONFIG_PARIDE_PARPORT=m @@ -840,7 +799,7 @@ CONFIG_BLK_DEV_UMEM=m # CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=m -CONFIG_BLK_DEV_CRYPTOLOOP=m +# CONFIG_BLK_DEV_CRYPTOLOOP is not set CONFIG_BLK_DEV_NBD=m CONFIG_BLK_DEV_SX8=m # CONFIG_BLK_DEV_UB is not set @@ -906,16 +865,11 @@ CONFIG_BLK_DEV_PDC202XX_OLD=m CONFIG_PDC202XX_BURST=y CONFIG_BLK_DEV_PDC202XX_NEW=m -CONFIG_PDC202XX_FORCE=y CONFIG_BLK_DEV_SVWKS=m CONFIG_BLK_DEV_SIIMAGE=m CONFIG_BLK_DEV_SLC90E66=m CONFIG_BLK_DEV_TRM290=m CONFIG_BLK_DEV_VIA82CXXX=m -CONFIG_BLK_DEV_IDE_PMAC=y -CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y -CONFIG_BLK_DEV_IDEDMA_PMAC=y -CONFIG_BLK_DEV_IDE_PMAC_BLINK=y # CONFIG_IDE_ARM is not set CONFIG_IDE_CHIPSETS=y @@ -972,10 +926,10 @@ CONFIG_ISCSI_TCP=m CONFIG_BLK_DEV_3W_XXXX_RAID=m CONFIG_SCSI_3W_9XXX=m -# CONFIG_SCSI_7000FASST is not set +CONFIG_SCSI_7000FASST=m CONFIG_SCSI_ACARD=m CONFIG_SCSI_AHA152X=m -# CONFIG_SCSI_AHA1542 is not set +CONFIG_SCSI_AHA1542=m CONFIG_SCSI_AACRAID=m CONFIG_SCSI_AIC7XXX=m CONFIG_AIC7XXX_CMDS_PER_DEVICE=32 @@ -992,7 +946,7 @@ CONFIG_AIC79XX_DEBUG_MASK=0 CONFIG_AIC79XX_REG_PRETTY_PRINT=y CONFIG_SCSI_DPT_I2O=m -# CONFIG_SCSI_IN2000 is not set +CONFIG_SCSI_IN2000=m CONFIG_MEGARAID_NEWGEN=y CONFIG_MEGARAID_MM=m CONFIG_MEGARAID_MAILBOX=m @@ -1014,7 +968,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_SATA_INTEL_COMBINED=y CONFIG_SCSI_BUSLOGIC=m # CONFIG_SCSI_OMIT_FLASHPOINT is not set CONFIG_SCSI_DMX3191D=m @@ -1023,7 +977,6 @@ CONFIG_SCSI_EATA_TAGGED_QUEUE=y CONFIG_SCSI_EATA_LINKED_COMMANDS=y CONFIG_SCSI_EATA_MAX_TAGS=16 -CONFIG_SCSI_EATA_PIO=m CONFIG_SCSI_FUTURE_DOMAIN=m CONFIG_SCSI_GDTH=m CONFIG_SCSI_GENERIC_NCR5380=m @@ -1051,13 +1004,8 @@ CONFIG_SCSI_QLOGIC_FC=m CONFIG_SCSI_QLOGIC_FC_FIRMWARE=y CONFIG_SCSI_QLOGIC_1280=m -CONFIG_SCSI_QLA2XXX=m -CONFIG_SCSI_QLA21XX=m -CONFIG_SCSI_QLA22XX=m -CONFIG_SCSI_QLA2300=m -CONFIG_SCSI_QLA2322=m -CONFIG_SCSI_QLA6312=m -CONFIG_SCSI_QLA24XX=m +CONFIG_SCSI_QLA_FC=m +# CONFIG_SCSI_QLA2XXX_EMBEDDED_FIRMWARE is not set CONFIG_SCSI_LPFC=m CONFIG_SCSI_SYM53C416=m CONFIG_SCSI_DC395x=m @@ -1069,10 +1017,6 @@ CONFIG_SCSI_U14_34F_MAX_TAGS=8 CONFIG_SCSI_NSP32=m CONFIG_SCSI_DEBUG=m -CONFIG_SCSI_MESH=m -CONFIG_SCSI_MESH_SYNC_RATE=5 -CONFIG_SCSI_MESH_RESET_DELAY_MS=4000 -CONFIG_SCSI_MAC53C94=m # # PCMCIA SCSI adapter support @@ -1159,13 +1103,12 @@ CONFIG_IEEE1394_ETH1394=m CONFIG_IEEE1394_DV1394=m CONFIG_IEEE1394_RAWIO=m -CONFIG_IEEE1394_CMP=m -CONFIG_IEEE1394_AMDTP=m # # I2O device support # CONFIG_I2O=m +CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y CONFIG_I2O_EXT_ADAPTEC=y CONFIG_I2O_CONFIG=m CONFIG_I2O_CONFIG_OLD_IOCTL=y @@ -1177,32 +1120,17 @@ # # Macintosh device drivers # -CONFIG_ADB=y -CONFIG_ADB_CUDA=y -CONFIG_ADB_PMU=y -CONFIG_PMAC_APM_EMU=m -CONFIG_PMAC_MEDIABAY=y -CONFIG_PMAC_BACKLIGHT=y -CONFIG_ADB_MACIO=y -CONFIG_INPUT_ADBHID=y -CONFIG_MAC_EMUMOUSEBTN=y -CONFIG_THERM_WINDTUNNEL=m -CONFIG_THERM_ADT746X=m CONFIG_WINDFARM=m -CONFIG_ANSLCD=m # # Network device support # CONFIG_NETDEVICES=y +CONFIG_IFB=m CONFIG_DUMMY=m 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 @@ -1219,9 +1147,9 @@ CONFIG_ARCNET_1051=m CONFIG_ARCNET_RAW=m CONFIG_ARCNET_CAP=m -# CONFIG_ARCNET_COM90xx is not set +CONFIG_ARCNET_COM90xx=m CONFIG_ARCNET_COM90xxIO=m -# CONFIG_ARCNET_RIM_I is not set +CONFIG_ARCNET_RIM_I=m CONFIG_ARCNET_COM20020=m CONFIG_ARCNET_COM20020_ISA=m CONFIG_ARCNET_COM20020_PCI=m @@ -1245,31 +1173,27 @@ # CONFIG_NET_ETHERNET=y CONFIG_MII=m -CONFIG_MACE=m -CONFIG_MACE_AAUI_PORT=y -CONFIG_BMAC=m -# CONFIG_OAKNET is not set CONFIG_HAPPYMEAL=m CONFIG_SUNGEM=m -# CONFIG_CASSINI is not set +CONFIG_CASSINI=m CONFIG_NET_VENDOR_3COM=y CONFIG_EL1=m CONFIG_EL2=m -# CONFIG_ELPLUS is not set +CONFIG_ELPLUS=m CONFIG_EL16=m CONFIG_EL3=m -# CONFIG_3C515 is not set +CONFIG_3C515=m CONFIG_VORTEX=m CONFIG_TYPHOON=m -# CONFIG_LANCE is not set +CONFIG_LANCE=m CONFIG_NET_VENDOR_SMC=y CONFIG_WD80x3=m CONFIG_ULTRA=m CONFIG_SMC9194=m CONFIG_NET_VENDOR_RACAL=y CONFIG_NI5010=m -# CONFIG_NI52 is not set -# CONFIG_NI65 is not set +CONFIG_NI52=m +CONFIG_NI65=m # # Tulip family network device support @@ -1289,13 +1213,13 @@ CONFIG_PCMCIA_XIRTULIP=m CONFIG_AT1700=m CONFIG_DEPCA=m -# CONFIG_HP100 is not set +CONFIG_HP100=m CONFIG_NET_ISA=y CONFIG_E2100=m CONFIG_EWRK3=m CONFIG_EEXPRESS=m CONFIG_EEXPRESS_PRO=m -# CONFIG_HPLAN_PLUS is not set +CONFIG_HPLAN_PLUS=m CONFIG_HPLAN=m CONFIG_LP486E=m CONFIG_ETH16I=m @@ -1307,7 +1231,7 @@ CONFIG_AMD8111_ETH=m CONFIG_AMD8111E_NAPI=y CONFIG_ADAPTEC_STARFIRE=m -# CONFIG_ADAPTEC_STARFIRE_NAPI is not set +CONFIG_ADAPTEC_STARFIRE_NAPI=y CONFIG_AC3200=m CONFIG_APRICOT=m CONFIG_B44=m @@ -1344,6 +1268,7 @@ CONFIG_DL2K=m CONFIG_E1000=m CONFIG_E1000_NAPI=y +CONFIG_E1000_DISABLE_PACKET_SPLIT=y CONFIG_NS83820=m CONFIG_HAMACHI=m CONFIG_YELLOWFIN=m @@ -1352,12 +1277,12 @@ CONFIG_R8169_VLAN=y CONFIG_SIS190=m CONFIG_SKGE=m +CONFIG_SKY2=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 <<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.184&r2=1.3.2.3.2.2.2.185&f=u http://cvs.pld-linux.org/SOURCES/kernel-ppc-smp.config?r1=1.6.4.1.2.184&r2=1.6.4.1.2.185&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit