[MIPS] Update defconfigs (aec8b755) · Commits · e / devices / android_kernel_teracube_2e

arch/mips/configs/atlas_defconfig

+51 −16

Original line number	Diff line number	Diff line
		#
		# Automatically generated make config: don't edit
		# Linux kernel version: 2.6.14-rc2
		# Thu Oct 20 22:25:13 2005
		# Linux kernel version: 2.6.14
		# Thu Nov 10 12:14:02 2005
		#
		CONFIG_MIPS=y

		@@ -56,6 +56,24 @@ CONFIG_MODVERSIONS=y
		CONFIG_MODULE_SRCVERSION_ALL=y
		CONFIG_KMOD=y

		#
		# Block layer
		#
		# CONFIG_LBD is not set

		#
		# IO Schedulers
		#
		CONFIG_IOSCHED_NOOP=y
		CONFIG_IOSCHED_AS=y
		CONFIG_IOSCHED_DEADLINE=y
		CONFIG_IOSCHED_CFQ=y
		CONFIG_DEFAULT_AS=y
		# CONFIG_DEFAULT_DEADLINE is not set
		# CONFIG_DEFAULT_CFQ is not set
		# CONFIG_DEFAULT_NOOP is not set
		CONFIG_DEFAULT_IOSCHED="anticipatory"

		#
		# Machine selection
		#
		@@ -191,6 +209,7 @@ CONFIG_FLATMEM_MANUAL=y
		CONFIG_FLATMEM=y
		CONFIG_FLAT_NODE_MEM_MAP=y
		# CONFIG_SPARSEMEM_STATIC is not set
		CONFIG_SPLIT_PTLOCK_CPUS=4
		CONFIG_PREEMPT_NONE=y
		# CONFIG_PREEMPT_VOLUNTARY is not set
		# CONFIG_PREEMPT is not set
		@@ -309,6 +328,10 @@ CONFIG_IPV6_TUNNEL=m
		CONFIG_NETFILTER=y
		# CONFIG_NETFILTER_DEBUG is not set
		CONFIG_BRIDGE_NETFILTER=y

		#
		# Core Netfilter Configuration
		#
		CONFIG_NETFILTER_NETLINK=m
		CONFIG_NETFILTER_NETLINK_QUEUE=m
		CONFIG_NETFILTER_NETLINK_LOG=m
		@@ -363,6 +386,7 @@ CONFIG_IP_NF_TARGET_REJECT=m
		CONFIG_IP_NF_TARGET_LOG=m
		CONFIG_IP_NF_TARGET_ULOG=m
		CONFIG_IP_NF_TARGET_TCPMSS=m
		CONFIG_IP_NF_TARGET_NFQUEUE=m
		CONFIG_IP_NF_NAT=m
		CONFIG_IP_NF_NAT_NEEDED=y
		CONFIG_IP_NF_TARGET_MASQUERADE=m
		@@ -412,6 +436,7 @@ CONFIG_IP6_NF_MATCH_PHYSDEV=m
		CONFIG_IP6_NF_FILTER=m
		CONFIG_IP6_NF_TARGET_LOG=m
		CONFIG_IP6_NF_TARGET_REJECT=m
		CONFIG_IP6_NF_TARGET_NFQUEUE=m
		CONFIG_IP6_NF_MANGLE=m
		CONFIG_IP6_NF_TARGET_MARK=m
		CONFIG_IP6_NF_TARGET_HL=m
		@@ -472,10 +497,18 @@ CONFIG_IPDDP_DECAP=y
		CONFIG_NET_DIVERT=y
		# CONFIG_ECONET is not set
		# CONFIG_WAN_ROUTER is not set

		#
		# QoS and/or fair queueing
		#
		CONFIG_NET_SCHED=y
		CONFIG_NET_SCH_CLK_JIFFIES=y
		# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
		# CONFIG_NET_SCH_CLK_CPU is not set

		#
		# Queueing/Scheduling
		#
		CONFIG_NET_SCH_CBQ=m
		CONFIG_NET_SCH_HTB=m
		CONFIG_NET_SCH_HFSC=m
		@@ -488,8 +521,10 @@ CONFIG_NET_SCH_GRED=m
		CONFIG_NET_SCH_DSMARK=m
		CONFIG_NET_SCH_NETEM=m
		CONFIG_NET_SCH_INGRESS=m
		CONFIG_NET_QOS=y
		CONFIG_NET_ESTIMATOR=y

		#
		# Classification
		#
		CONFIG_NET_CLS=y
		CONFIG_NET_CLS_BASIC=m
		CONFIG_NET_CLS_TCINDEX=m
		@@ -498,13 +533,14 @@ CONFIG_NET_CLS_ROUTE=y
		CONFIG_NET_CLS_FW=m
		CONFIG_NET_CLS_U32=m
		# CONFIG_CLS_U32_PERF is not set
		CONFIG_NET_CLS_IND=y
		# CONFIG_CLS_U32_MARK is not set
		CONFIG_NET_CLS_RSVP=m
		CONFIG_NET_CLS_RSVP6=m
		# CONFIG_NET_EMATCH is not set
		# CONFIG_NET_CLS_ACT is not set
		CONFIG_NET_CLS_POLICE=y
		CONFIG_NET_CLS_IND=y
		CONFIG_NET_ESTIMATOR=y

		#
		# Network testing
		@@ -565,18 +601,9 @@ CONFIG_BLK_DEV_RAM=y
		CONFIG_BLK_DEV_RAM_COUNT=16
		CONFIG_BLK_DEV_RAM_SIZE=4096
		# CONFIG_BLK_DEV_INITRD is not set
		# CONFIG_LBD is not set
		CONFIG_CDROM_PKTCDVD=m
		CONFIG_CDROM_PKTCDVD_BUFFERS=8
		# CONFIG_CDROM_PKTCDVD_WCACHE is not set

		#
		# IO Schedulers
		#
		CONFIG_IOSCHED_NOOP=y
		CONFIG_IOSCHED_AS=y
		CONFIG_IOSCHED_DEADLINE=y
		CONFIG_IOSCHED_CFQ=y
		CONFIG_ATA_OVER_ETH=m

		#
		@@ -643,6 +670,7 @@ CONFIG_SCSI_SAS_ATTRS=m
		#
		# SCSI low-level drivers
		#
		CONFIG_ISCSI_TCP=m
		# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
		# CONFIG_SCSI_3W_9XXX is not set
		# CONFIG_SCSI_ACARD is not set
		@@ -653,6 +681,7 @@ CONFIG_SCSI_SAS_ATTRS=m
		# CONFIG_SCSI_DPT_I2O is not set
		# CONFIG_MEGARAID_NEWGEN is not set
		# CONFIG_MEGARAID_LEGACY is not set
		# CONFIG_MEGARAID_SAS is not set
		# CONFIG_SCSI_SATA is not set
		# CONFIG_SCSI_DMX3191D is not set
		# CONFIG_SCSI_FUTURE_DOMAIN is not set
		@@ -707,6 +736,7 @@ CONFIG_DM_MULTIPATH_EMC=m
		# CONFIG_FUSION is not set
		# CONFIG_FUSION_SPI is not set
		# CONFIG_FUSION_FC is not set
		# CONFIG_FUSION_SAS is not set

		#
		# IEEE 1394 (FireWire) support
		@@ -736,7 +766,6 @@ CONFIG_TUN=m
		# PHY device support
		#
		CONFIG_PHYLIB=m
		CONFIG_PHYCONTROL=y

		#
		# MII PHY device drivers
		@@ -754,6 +783,7 @@ CONFIG_NET_ETHERNET=y
		CONFIG_MII=y
		# CONFIG_HAPPYMEAL is not set
		# CONFIG_SUNGEM is not set
		# CONFIG_CASSINI is not set
		# CONFIG_NET_VENDOR_3COM is not set

		#
		@@ -933,6 +963,7 @@ CONFIG_LEGACY_PTY_COUNT=256
		# TPM devices
		#
		# CONFIG_TCG_TPM is not set
		# CONFIG_TELCLOCK is not set

		#
		# I2C support
		@@ -991,6 +1022,10 @@ CONFIG_USB_ARCH_HAS_HCD=y
		CONFIG_USB_ARCH_HAS_OHCI=y
		# CONFIG_USB is not set

		#
		# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
		#

		#
		# USB Gadget Support
		#
		@@ -1037,7 +1072,7 @@ CONFIG_JFS_SECURITY=y
		CONFIG_FS_POSIX_ACL=y
		CONFIG_XFS_FS=m
		CONFIG_XFS_EXPORT=y
		CONFIG_XFS_QUOTA=m
		CONFIG_XFS_QUOTA=y
		CONFIG_XFS_SECURITY=y
		CONFIG_XFS_POSIX_ACL=y
		# CONFIG_XFS_RT is not set

arch/mips/configs/bigsur_defconfig

+35 −12

Original line number	Diff line number	Diff line
		#
		# Automatically generated make config: don't edit
		# Linux kernel version: 2.6.14-rc2
		# Thu Oct 20 22:25:17 2005
		# Linux kernel version: 2.6.14
		# Mon Nov 7 23:04:36 2005
		#
		CONFIG_MIPS=y

		@@ -60,6 +60,23 @@ CONFIG_MODULE_SRCVERSION_ALL=y
		CONFIG_KMOD=y
		CONFIG_STOP_MACHINE=y

		#
		# Block layer
		#

		#
		# IO Schedulers
		#
		CONFIG_IOSCHED_NOOP=y
		CONFIG_IOSCHED_AS=y
		CONFIG_IOSCHED_DEADLINE=y
		CONFIG_IOSCHED_CFQ=y
		CONFIG_DEFAULT_AS=y
		# CONFIG_DEFAULT_DEADLINE is not set
		# CONFIG_DEFAULT_CFQ is not set
		# CONFIG_DEFAULT_NOOP is not set
		CONFIG_DEFAULT_IOSCHED="anticipatory"

		#
		# Machine selection
		#
		@@ -127,8 +144,8 @@ CONFIG_SIBYTE_SB1xxx_SOC=y
		# CONFIG_CPU_SB1_PASS_2_112x is not set
		# CONFIG_CPU_SB1_PASS_3 is not set
		# CONFIG_SIMULATION is not set
		# CONFIG_CONFIG_SB1_CEX_ALWAYS_FATAL is not set
		# CONFIG_CONFIG_SB1_CERR_STALL is not set
		# CONFIG_SB1_CEX_ALWAYS_FATAL is not set
		# CONFIG_SB1_CERR_STALL is not set
		CONFIG_SIBYTE_CFE=y
		# CONFIG_SIBYTE_CFE_CONSOLE is not set
		# CONFIG_SIBYTE_BUS_WATCHER is not set
		@@ -198,6 +215,7 @@ CONFIG_FLATMEM_MANUAL=y
		CONFIG_FLATMEM=y
		CONFIG_FLAT_NODE_MEM_MAP=y
		# CONFIG_SPARSEMEM_STATIC is not set
		CONFIG_SPLIT_PTLOCK_CPUS=4
		CONFIG_SMP=y
		CONFIG_NR_CPUS=4
		CONFIG_PREEMPT_NONE=y
		@@ -295,6 +313,10 @@ CONFIG_TCP_CONG_BIC=y
		# CONFIG_NET_DIVERT is not set
		# CONFIG_ECONET is not set
		# CONFIG_WAN_ROUTER is not set

		#
		# QoS and/or fair queueing
		#
		# CONFIG_NET_SCHED is not set
		# CONFIG_NET_CLS_ROUTE is not set

		@@ -353,14 +375,6 @@ CONFIG_BLK_DEV_NBD=m
		# CONFIG_BLK_DEV_RAM is not set
		CONFIG_BLK_DEV_RAM_COUNT=16
		# CONFIG_CDROM_PKTCDVD is not set

		#
		# IO Schedulers
		#
		CONFIG_IOSCHED_NOOP=y
		CONFIG_IOSCHED_AS=y
		CONFIG_IOSCHED_DEADLINE=y
		CONFIG_IOSCHED_CFQ=y
		# CONFIG_ATA_OVER_ETH is not set

		#
		@@ -443,6 +457,7 @@ CONFIG_NET_ETHERNET=y
		CONFIG_MII=y
		# CONFIG_HAPPYMEAL is not set
		# CONFIG_SUNGEM is not set
		# CONFIG_CASSINI is not set
		# CONFIG_NET_VENDOR_3COM is not set

		#
		@@ -582,6 +597,7 @@ CONFIG_GEN_RTC=y
		# TPM devices
		#
		# CONFIG_TCG_TPM is not set
		# CONFIG_TELCLOCK is not set

		#
		# I2C support
		@@ -634,6 +650,7 @@ CONFIG_SENSORS_PCA9539=y
		CONFIG_SENSORS_PCF8591=y
		CONFIG_SENSORS_RTC8564=y
		CONFIG_SENSORS_MAX6875=y
		# CONFIG_RTC_X1205_I2C is not set
		CONFIG_I2C_DEBUG_CORE=y
		CONFIG_I2C_DEBUG_ALGO=y
		CONFIG_I2C_DEBUG_BUS=y
		@@ -685,6 +702,10 @@ CONFIG_USB_ARCH_HAS_HCD=y
		CONFIG_USB_ARCH_HAS_OHCI=y
		# CONFIG_USB is not set

		#
		# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
		#

		#
		# USB Gadget Support
		#
		@@ -823,6 +844,8 @@ CONFIG_DETECT_SOFTLOCKUP=y
		# CONFIG_DEBUG_KOBJECT is not set
		# CONFIG_DEBUG_INFO is not set
		# CONFIG_DEBUG_FS is not set
		# CONFIG_DEBUG_VM is not set
		# CONFIG_RCU_TORTURE_TEST is not set
		CONFIG_CROSSCOMPILE=y
		CONFIG_CMDLINE=""
		# CONFIG_DEBUG_STACK_USAGE is not set

arch/mips/configs/capcella_defconfig

+32 −12

Original line number	Diff line number	Diff line
		#
		# Automatically generated make config: don't edit
		# Linux kernel version: 2.6.14-rc2
		# Thu Oct 20 22:25:20 2005
		# Linux kernel version: 2.6.14
		# Mon Nov 7 23:04:39 2005
		#
		CONFIG_MIPS=y

		@@ -56,6 +56,24 @@ CONFIG_MODVERSIONS=y
		CONFIG_MODULE_SRCVERSION_ALL=y
		CONFIG_KMOD=y

		#
		# Block layer
		#
		# CONFIG_LBD is not set

		#
		# IO Schedulers
		#
		CONFIG_IOSCHED_NOOP=y
		CONFIG_IOSCHED_AS=y
		CONFIG_IOSCHED_DEADLINE=y
		CONFIG_IOSCHED_CFQ=y
		CONFIG_DEFAULT_AS=y
		# CONFIG_DEFAULT_DEADLINE is not set
		# CONFIG_DEFAULT_CFQ is not set
		# CONFIG_DEFAULT_NOOP is not set
		CONFIG_DEFAULT_IOSCHED="anticipatory"

		#
		# Machine selection
		#
		@@ -182,6 +200,7 @@ CONFIG_FLATMEM_MANUAL=y
		CONFIG_FLATMEM=y
		CONFIG_FLAT_NODE_MEM_MAP=y
		# CONFIG_SPARSEMEM_STATIC is not set
		CONFIG_SPLIT_PTLOCK_CPUS=4
		CONFIG_PREEMPT_NONE=y
		# CONFIG_PREEMPT_VOLUNTARY is not set
		# CONFIG_PREEMPT is not set
		@@ -270,6 +289,10 @@ CONFIG_TCP_CONG_BIC=y
		# CONFIG_NET_DIVERT is not set
		# CONFIG_ECONET is not set
		# CONFIG_WAN_ROUTER is not set

		#
		# QoS and/or fair queueing
		#
		# CONFIG_NET_SCHED is not set
		# CONFIG_NET_CLS_ROUTE is not set

		@@ -329,16 +352,7 @@ CONFIG_CONNECTOR=m
		# CONFIG_BLK_DEV_SX8 is not set
		# CONFIG_BLK_DEV_RAM is not set
		CONFIG_BLK_DEV_RAM_COUNT=16
		# CONFIG_LBD is not set
		# CONFIG_CDROM_PKTCDVD is not set

		#
		# IO Schedulers
		#
		CONFIG_IOSCHED_NOOP=y
		CONFIG_IOSCHED_AS=y
		CONFIG_IOSCHED_DEADLINE=y
		CONFIG_IOSCHED_CFQ=y
		CONFIG_ATA_OVER_ETH=m

		#
		@@ -412,7 +426,6 @@ CONFIG_NETDEVICES=y
		# PHY device support
		#
		CONFIG_PHYLIB=m
		CONFIG_PHYCONTROL=y

		#
		# MII PHY device drivers
		@@ -430,6 +443,7 @@ CONFIG_NET_ETHERNET=y
		CONFIG_MII=y
		# CONFIG_HAPPYMEAL is not set
		# CONFIG_SUNGEM is not set
		# CONFIG_CASSINI is not set
		# CONFIG_NET_VENDOR_3COM is not set

		#
		@@ -586,6 +600,7 @@ CONFIG_LEGACY_PTY_COUNT=256
		# CONFIG_WATCHDOG is not set
		# CONFIG_RTC is not set
		# CONFIG_GEN_RTC is not set
		# CONFIG_RTC_VR41XX is not set
		# CONFIG_DTLK is not set
		# CONFIG_R3964 is not set
		# CONFIG_APPLICOM is not set
		@@ -601,6 +616,7 @@ CONFIG_GPIO_VR41XX=y
		# TPM devices
		#
		# CONFIG_TCG_TPM is not set
		# CONFIG_TELCLOCK is not set

		#
		# I2C support
		@@ -659,6 +675,10 @@ CONFIG_USB_ARCH_HAS_HCD=y
		CONFIG_USB_ARCH_HAS_OHCI=y
		# CONFIG_USB is not set

		#
		# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
		#

		#
		# USB Gadget Support
		#

arch/mips/configs/cobalt_defconfig

+32 −12

Original line number	Diff line number	Diff line
		#
		# Automatically generated make config: don't edit
		# Linux kernel version: 2.6.14-rc2
		# Thu Oct 20 22:25:23 2005
		# Linux kernel version: 2.6.14
		# Mon Nov 7 23:04:42 2005
		#
		CONFIG_MIPS=y

		@@ -50,6 +50,24 @@ CONFIG_BASE_SMALL=0
		#
		# CONFIG_MODULES is not set

		#
		# Block layer
		#
		# CONFIG_LBD is not set

		#
		# IO Schedulers
		#
		CONFIG_IOSCHED_NOOP=y
		CONFIG_IOSCHED_AS=y
		CONFIG_IOSCHED_DEADLINE=y
		CONFIG_IOSCHED_CFQ=y
		CONFIG_DEFAULT_AS=y
		# CONFIG_DEFAULT_DEADLINE is not set
		# CONFIG_DEFAULT_CFQ is not set
		# CONFIG_DEFAULT_NOOP is not set
		CONFIG_DEFAULT_IOSCHED="anticipatory"

		#
		# Machine selection
		#
		@@ -172,6 +190,7 @@ CONFIG_FLATMEM_MANUAL=y
		CONFIG_FLATMEM=y
		CONFIG_FLAT_NODE_MEM_MAP=y
		# CONFIG_SPARSEMEM_STATIC is not set
		CONFIG_SPLIT_PTLOCK_CPUS=4
		CONFIG_PREEMPT_NONE=y
		# CONFIG_PREEMPT_VOLUNTARY is not set
		# CONFIG_PREEMPT is not set
		@@ -256,6 +275,10 @@ CONFIG_TCP_CONG_BIC=y
		# CONFIG_NET_DIVERT is not set
		# CONFIG_ECONET is not set
		# CONFIG_WAN_ROUTER is not set

		#
		# QoS and/or fair queueing
		#
		# CONFIG_NET_SCHED is not set
		# CONFIG_NET_CLS_ROUTE is not set

		@@ -287,6 +310,7 @@ CONFIG_FW_LOADER=y
		# Connector - unified userspace <-> kernelspace linker
		#
		CONFIG_CONNECTOR=y
		CONFIG_PROC_EVENTS=y

		#
		# Memory Technology Devices (MTD)
		@@ -316,18 +340,9 @@ CONFIG_BLK_DEV_LOOP=y
		# CONFIG_BLK_DEV_SX8 is not set
		# CONFIG_BLK_DEV_RAM is not set
		CONFIG_BLK_DEV_RAM_COUNT=16
		# CONFIG_LBD is not set
		CONFIG_CDROM_PKTCDVD=y
		CONFIG_CDROM_PKTCDVD_BUFFERS=8
		# CONFIG_CDROM_PKTCDVD_WCACHE is not set

		#
		# IO Schedulers
		#
		CONFIG_IOSCHED_NOOP=y
		CONFIG_IOSCHED_AS=y
		CONFIG_IOSCHED_DEADLINE=y
		CONFIG_IOSCHED_CFQ=y
		CONFIG_ATA_OVER_ETH=y

		#
		@@ -401,7 +416,6 @@ CONFIG_NETDEVICES=y
		# PHY device support
		#
		CONFIG_PHYLIB=y
		CONFIG_PHYCONTROL=y

		#
		# MII PHY device drivers
		@@ -419,6 +433,7 @@ CONFIG_NET_ETHERNET=y
		# CONFIG_MII is not set
		# CONFIG_HAPPYMEAL is not set
		# CONFIG_SUNGEM is not set
		# CONFIG_CASSINI is not set
		# CONFIG_NET_VENDOR_3COM is not set

		#
		@@ -574,6 +589,7 @@ CONFIG_COBALT_LCD=y
		# TPM devices
		#
		# CONFIG_TCG_TPM is not set
		# CONFIG_TELCLOCK is not set

		#
		# I2C support
		@@ -632,6 +648,10 @@ CONFIG_USB_ARCH_HAS_HCD=y
		CONFIG_USB_ARCH_HAS_OHCI=y
		# CONFIG_USB is not set

		#
		# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
		#

		#
		# USB Gadget Support
		#

arch/mips/configs/db1000_defconfig

+52 −17

Original line number	Diff line number	Diff line
		#
		# Automatically generated make config: don't edit
		# Linux kernel version: 2.6.14-rc2
		# Thu Oct 20 22:25:26 2005
		# Linux kernel version: 2.6.15-rc1
		# Tue Nov 15 11:11:04 2005
		#
		CONFIG_MIPS=y

		@@ -56,6 +56,24 @@ CONFIG_MODVERSIONS=y
		CONFIG_MODULE_SRCVERSION_ALL=y
		CONFIG_KMOD=y

		#
		# Block layer
		#
		# CONFIG_LBD is not set

		#
		# IO Schedulers
		#
		CONFIG_IOSCHED_NOOP=y
		CONFIG_IOSCHED_AS=y
		CONFIG_IOSCHED_DEADLINE=y
		CONFIG_IOSCHED_CFQ=y
		CONFIG_DEFAULT_AS=y
		# CONFIG_DEFAULT_DEADLINE is not set
		# CONFIG_DEFAULT_CFQ is not set
		# CONFIG_DEFAULT_NOOP is not set
		CONFIG_DEFAULT_IOSCHED="anticipatory"

		#
		# Machine selection
		#
		@@ -178,6 +196,7 @@ CONFIG_FLATMEM_MANUAL=y
		CONFIG_FLATMEM=y
		CONFIG_FLAT_NODE_MEM_MAP=y
		# CONFIG_SPARSEMEM_STATIC is not set
		CONFIG_SPLIT_PTLOCK_CPUS=4
		CONFIG_PREEMPT_NONE=y
		# CONFIG_PREEMPT_VOLUNTARY is not set
		# CONFIG_PREEMPT is not set
		@@ -201,7 +220,6 @@ CONFIG_PCMCIA_IOCTL=y
		#
		# PC-card bridges
		#
		# CONFIG_TCIC is not set
		# CONFIG_PCMCIA_AU1X00 is not set

		#
		@@ -259,15 +277,19 @@ CONFIG_TCP_CONG_BIC=y
		# CONFIG_IPV6 is not set
		CONFIG_NETFILTER=y
		# CONFIG_NETFILTER_DEBUG is not set

		#
		# Core Netfilter Configuration
		#
		CONFIG_NETFILTER_NETLINK=m
		CONFIG_NETFILTER_NETLINK_QUEUE=m
		CONFIG_NETFILTER_NETLINK_LOG=m
		# CONFIG_NF_CONNTRACK is not set

		#
		# IP: Netfilter Configuration
		#
		# CONFIG_IP_NF_CONNTRACK is not set
		CONFIG_IP_NF_PPTP=m
		# CONFIG_IP_NF_QUEUE is not set
		# CONFIG_IP_NF_IPTABLES is not set
		# CONFIG_IP_NF_ARPTABLES is not set
		@@ -293,6 +315,10 @@ CONFIG_IP_NF_PPTP=m
		# CONFIG_NET_DIVERT is not set
		# CONFIG_ECONET is not set
		# CONFIG_WAN_ROUTER is not set

		#
		# QoS and/or fair queueing
		#
		# CONFIG_NET_SCHED is not set
		# CONFIG_NET_CLS_ROUTE is not set

		@@ -343,6 +369,7 @@ CONFIG_MTD_BLOCK=y
		# CONFIG_FTL is not set
		# CONFIG_NFTL is not set
		# CONFIG_INFTL is not set
		# CONFIG_RFD_FTL is not set

		#
		# RAM/ROM/Flash chip drivers
		@@ -399,6 +426,11 @@ CONFIG_MTD_ALCHEMY=y
		#
		# CONFIG_MTD_NAND is not set

		#
		# OneNAND Flash Device Drivers
		#
		# CONFIG_MTD_ONENAND is not set

		#
		# Parallel port support
		#
		@@ -417,18 +449,9 @@ CONFIG_BLK_DEV_LOOP=y
		# CONFIG_BLK_DEV_NBD is not set
		# CONFIG_BLK_DEV_RAM is not set
		CONFIG_BLK_DEV_RAM_COUNT=16
		# CONFIG_LBD is not set
		CONFIG_CDROM_PKTCDVD=m
		CONFIG_CDROM_PKTCDVD_BUFFERS=8
		# CONFIG_CDROM_PKTCDVD_WCACHE is not set

		#
		# IO Schedulers
		#
		CONFIG_IOSCHED_NOOP=y
		CONFIG_IOSCHED_AS=y
		CONFIG_IOSCHED_DEADLINE=y
		CONFIG_IOSCHED_CFQ=y
		CONFIG_ATA_OVER_ETH=m

		#
		@@ -473,7 +496,6 @@ CONFIG_NETDEVICES=y
		# PHY device support
		#
		CONFIG_PHYLIB=m
		CONFIG_PHYCONTROL=y

		#
		# MII PHY device drivers
		@@ -490,6 +512,7 @@ CONFIG_CICADA_PHY=m
		CONFIG_NET_ETHERNET=y
		CONFIG_MII=m
		CONFIG_MIPS_AU1X00_ENET=y
		# CONFIG_SMC91X is not set

		#
		# Ethernet (1000 Mbit)
		@@ -532,6 +555,7 @@ CONFIG_PPP_ASYNC=m
		# CONFIG_PPP_SYNC_TTY is not set
		CONFIG_PPP_DEFLATE=m
		# CONFIG_PPP_BSDCOMP is not set
		CONFIG_PPP_MPPE=m
		CONFIG_PPPOE=m
		# CONFIG_SLIP is not set
		# CONFIG_SHAPER is not set
		@@ -598,13 +622,17 @@ CONFIG_HW_CONSOLE=y
		#
		# Serial drivers
		#
		# CONFIG_SERIAL_8250 is not set
		CONFIG_SERIAL_8250=y
		CONFIG_SERIAL_8250_CONSOLE=y
		CONFIG_SERIAL_8250_CS=m
		CONFIG_SERIAL_8250_NR_UARTS=4
		# CONFIG_SERIAL_8250_EXTENDED is not set
		CONFIG_SERIAL_8250_AU1X00=y

		#
		# Non-8250 serial port support
		#
		CONFIG_SERIAL_AU1X00=y
		CONFIG_SERIAL_AU1X00_CONSOLE=y
		# CONFIG_SERIAL_AU1X00 is not set
		CONFIG_SERIAL_CORE=y
		CONFIG_SERIAL_CORE_CONSOLE=y
		CONFIG_UNIX98_PTYS=y
		@@ -633,11 +661,14 @@ CONFIG_LEGACY_PTY_COUNT=256
		# PCMCIA character devices
		#
		CONFIG_SYNCLINK_CS=m
		# CONFIG_CARDMAN_4000 is not set
		# CONFIG_CARDMAN_4040 is not set
		# CONFIG_RAW_DRIVER is not set

		#
		# TPM devices
		#
		# CONFIG_TELCLOCK is not set

		#
		# I2C support
		@@ -696,6 +727,10 @@ CONFIG_USB_ARCH_HAS_HCD=y
		CONFIG_USB_ARCH_HAS_OHCI=y
		# CONFIG_USB is not set

		#
		# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
		#

		#
		# USB Gadget Support
		#