Merge master.kernel.org:/home/rmk/linux-2.6-arm (03e6b495) · Commits · e / devices / android_kernel_sony_msm8994

arch/arm/configs/enp2611_defconfig

+92 −90

Original line number	Diff line number	Diff line
		#
		# Automatically generated make config: don't edit
		# Linux kernel version: 2.6.13-rc2
		# Thu Jul 7 16:41:21 2005
		# Linux kernel version: 2.6.13
		# Wed Sep 14 10:51:52 2005
		#
		CONFIG_ARM=y
		CONFIG_MMU=y
		@@ -135,7 +135,6 @@ CONFIG_PCI_NAMES=y
		#
		# Kernel Features
		#
		# CONFIG_SMP is not set
		# CONFIG_PREEMPT is not set
		# CONFIG_NO_IDLE_HZ is not set
		# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
		@@ -178,6 +177,68 @@ CONFIG_BINFMT_ELF=y
		#
		# CONFIG_PM is not set

		#
		# Networking
		#
		CONFIG_NET=y

		#
		# Networking options
		#
		CONFIG_PACKET=y
		CONFIG_PACKET_MMAP=y
		CONFIG_UNIX=y
		# CONFIG_NET_KEY is not set
		CONFIG_INET=y
		# CONFIG_IP_MULTICAST is not set
		# CONFIG_IP_ADVANCED_ROUTER is not set
		CONFIG_IP_FIB_HASH=y
		CONFIG_IP_PNP=y
		CONFIG_IP_PNP_DHCP=y
		CONFIG_IP_PNP_BOOTP=y
		# CONFIG_IP_PNP_RARP is not set
		# CONFIG_NET_IPIP is not set
		# CONFIG_NET_IPGRE is not set
		# CONFIG_ARPD is not set
		CONFIG_SYN_COOKIES=y
		# CONFIG_INET_AH is not set
		# CONFIG_INET_ESP is not set
		# CONFIG_INET_IPCOMP is not set
		# CONFIG_INET_TUNNEL is not set
		# CONFIG_IP_TCPDIAG is not set
		# CONFIG_IP_TCPDIAG_IPV6 is not set
		# CONFIG_TCP_CONG_ADVANCED is not set
		CONFIG_TCP_CONG_BIC=y
		# CONFIG_IPV6 is not set
		# CONFIG_NETFILTER is not set

		#
		# SCTP Configuration (EXPERIMENTAL)
		#
		# CONFIG_IP_SCTP is not set
		# CONFIG_ATM is not set
		# CONFIG_BRIDGE is not set
		# CONFIG_VLAN_8021Q is not set
		# CONFIG_DECNET is not set
		# CONFIG_LLC2 is not set
		# CONFIG_IPX is not set
		# CONFIG_ATALK is not set
		# CONFIG_X25 is not set
		# CONFIG_LAPB is not set
		# CONFIG_NET_DIVERT is not set
		# CONFIG_ECONET is not set
		# CONFIG_WAN_ROUTER is not set
		# CONFIG_NET_SCHED is not set
		# CONFIG_NET_CLS_ROUTE is not set

		#
		# Network testing
		#
		# CONFIG_NET_PKTGEN is not set
		# CONFIG_HAMRADIO is not set
		# CONFIG_IRDA is not set
		# CONFIG_BT is not set

		#
		# Device Drivers
		#
		@@ -248,6 +309,7 @@ CONFIG_MTD_COMPLEX_MAPPINGS=y
		CONFIG_MTD_IXP2000=y
		# CONFIG_MTD_EDB7312 is not set
		# CONFIG_MTD_PCI is not set
		# CONFIG_MTD_PLATRAM is not set

		#
		# Self-contained MTD device drivers
		@@ -334,72 +396,8 @@ CONFIG_IOSCHED_CFQ=y
		# CONFIG_I2O is not set

		#
		# Networking support
		#
		CONFIG_NET=y

		#
		# Networking options
		#
		CONFIG_PACKET=y
		CONFIG_PACKET_MMAP=y
		CONFIG_UNIX=y
		# CONFIG_NET_KEY is not set
		CONFIG_INET=y
		# CONFIG_IP_MULTICAST is not set
		# CONFIG_IP_ADVANCED_ROUTER is not set
		CONFIG_IP_FIB_HASH=y
		CONFIG_IP_PNP=y
		CONFIG_IP_PNP_DHCP=y
		CONFIG_IP_PNP_BOOTP=y
		# CONFIG_IP_PNP_RARP is not set
		# CONFIG_NET_IPIP is not set
		# CONFIG_NET_IPGRE is not set
		# CONFIG_ARPD is not set
		CONFIG_SYN_COOKIES=y
		# CONFIG_INET_AH is not set
		# CONFIG_INET_ESP is not set
		# CONFIG_INET_IPCOMP is not set
		# CONFIG_INET_TUNNEL is not set
		# CONFIG_IP_TCPDIAG is not set
		# CONFIG_IP_TCPDIAG_IPV6 is not set
		# CONFIG_TCP_CONG_ADVANCED is not set
		CONFIG_TCP_CONG_BIC=y
		# CONFIG_IPV6 is not set
		# CONFIG_NETFILTER is not set

		#
		# SCTP Configuration (EXPERIMENTAL)
		#
		# CONFIG_IP_SCTP is not set
		# CONFIG_ATM is not set
		# CONFIG_BRIDGE is not set
		# CONFIG_VLAN_8021Q is not set
		# CONFIG_DECNET is not set
		# CONFIG_LLC2 is not set
		# CONFIG_IPX is not set
		# CONFIG_ATALK is not set
		# CONFIG_X25 is not set
		# CONFIG_LAPB is not set
		# 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

		#
		# Network testing
		# Network device support
		#
		# CONFIG_NET_PKTGEN is not set
		# CONFIG_NETPOLL is not set
		# CONFIG_NET_POLL_CONTROLLER is not set
		# CONFIG_HAMRADIO is not set
		# CONFIG_IRDA is not set
		# CONFIG_BT is not set
		CONFIG_NETDEVICES=y
		CONFIG_DUMMY=y
		# CONFIG_BONDING is not set
		@@ -509,6 +507,8 @@ CONFIG_DLCI_MAX=8
		# CONFIG_SLIP is not set
		# CONFIG_SHAPER is not set
		# CONFIG_NETCONSOLE is not set
		# CONFIG_NETPOLL is not set
		# CONFIG_NET_POLL_CONTROLLER is not set

		#
		# ISDN subsystem
		@@ -635,7 +635,7 @@ CONFIG_I2C_ALGOBIT=y
		# CONFIG_I2C_I810 is not set
		# CONFIG_I2C_PIIX4 is not set
		# CONFIG_I2C_ISA is not set
		# CONFIG_I2C_IXP2000 is not set
		CONFIG_I2C_IXP2000=y
		# CONFIG_I2C_NFORCE2 is not set
		# CONFIG_I2C_PARPORT_LIGHT is not set
		# CONFIG_I2C_PROSAVAGE is not set
		@@ -649,11 +649,28 @@ CONFIG_I2C_ALGOBIT=y
		# CONFIG_I2C_VIAPRO is not set
		# CONFIG_I2C_VOODOO3 is not set
		# CONFIG_I2C_PCA_ISA is not set
		CONFIG_I2C_SENSOR=y

		#
		# Hardware Sensors Chip support
		# Miscellaneous I2C Chip support
		#
		CONFIG_I2C_SENSOR=y
		# CONFIG_SENSORS_DS1337 is not set
		# CONFIG_SENSORS_DS1374 is not set
		CONFIG_SENSORS_EEPROM=y
		# CONFIG_SENSORS_PCF8574 is not set
		# CONFIG_SENSORS_PCA9539 is not set
		# CONFIG_SENSORS_PCF8591 is not set
		# CONFIG_SENSORS_RTC8564 is not set
		# CONFIG_SENSORS_MAX6875 is not set
		# CONFIG_I2C_DEBUG_CORE is not set
		# CONFIG_I2C_DEBUG_ALGO is not set
		# CONFIG_I2C_DEBUG_BUS is not set
		# CONFIG_I2C_DEBUG_CHIP is not set

		#
		# Hardware Monitoring support
		#
		CONFIG_HWMON=y
		# CONFIG_SENSORS_ADM1021 is not set
		# CONFIG_SENSORS_ADM1025 is not set
		# CONFIG_SENSORS_ADM1026 is not set
		@@ -679,30 +696,15 @@ CONFIG_I2C_SENSOR=y
		# CONFIG_SENSORS_LM92 is not set
		# CONFIG_SENSORS_MAX1619 is not set
		# CONFIG_SENSORS_PC87360 is not set
		# CONFIG_SENSORS_SMSC47B397 is not set
		# CONFIG_SENSORS_SIS5595 is not set
		# CONFIG_SENSORS_SMSC47M1 is not set
		# CONFIG_SENSORS_SMSC47B397 is not set
		# CONFIG_SENSORS_VIA686A is not set
		# CONFIG_SENSORS_W83781D is not set
		# CONFIG_SENSORS_W83L785TS is not set
		# CONFIG_SENSORS_W83627HF is not set
		# CONFIG_SENSORS_W83627EHF is not set

		#
		# Other I2C Chip support
		#
		# CONFIG_SENSORS_DS1337 is not set
		# CONFIG_SENSORS_DS1374 is not set
		CONFIG_SENSORS_EEPROM=y
		# CONFIG_SENSORS_PCF8574 is not set
		# CONFIG_SENSORS_PCA9539 is not set
		# CONFIG_SENSORS_PCF8591 is not set
		# CONFIG_SENSORS_RTC8564 is not set
		# CONFIG_SENSORS_MAX6875 is not set
		# CONFIG_I2C_DEBUG_CORE is not set
		# CONFIG_I2C_DEBUG_ALGO is not set
		# CONFIG_I2C_DEBUG_BUS is not set
		# CONFIG_I2C_DEBUG_CHIP is not set
		# CONFIG_HWMON_DEBUG_CHIP is not set

		#
		# Misc devices
		@@ -770,6 +772,7 @@ CONFIG_FS_POSIX_ACL=y
		# CONFIG_XFS_FS is not set
		# CONFIG_MINIX_FS is not set
		# CONFIG_ROMFS_FS is not set
		CONFIG_INOTIFY=y
		# CONFIG_QUOTA is not set
		CONFIG_DNOTIFY=y
		# CONFIG_AUTOFS_FS is not set
		@@ -812,8 +815,7 @@ CONFIG_RAMFS=y
		# CONFIG_JFFS_FS is not set
		CONFIG_JFFS2_FS=y
		CONFIG_JFFS2_FS_DEBUG=0
		# CONFIG_JFFS2_FS_NAND is not set
		# CONFIG_JFFS2_FS_NOR_ECC is not set
		CONFIG_JFFS2_FS_WRITEBUFFER=y
		# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
		CONFIG_JFFS2_ZLIB=y
		CONFIG_JFFS2_RTIME=y

arch/arm/configs/ixdp2400_defconfig

+92 −90

Original line number	Diff line number	Diff line
		#
		# Automatically generated make config: don't edit
		# Linux kernel version: 2.6.13-rc2
		# Thu Jul 7 16:49:01 2005
		# Linux kernel version: 2.6.13
		# Wed Sep 14 10:52:01 2005
		#
		CONFIG_ARM=y
		CONFIG_MMU=y
		@@ -136,7 +136,6 @@ CONFIG_PCI_NAMES=y
		#
		# Kernel Features
		#
		# CONFIG_SMP is not set
		# CONFIG_PREEMPT is not set
		# CONFIG_NO_IDLE_HZ is not set
		# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
		@@ -179,6 +178,68 @@ CONFIG_BINFMT_ELF=y
		#
		# CONFIG_PM is not set

		#
		# Networking
		#
		CONFIG_NET=y

		#
		# Networking options
		#
		CONFIG_PACKET=y
		CONFIG_PACKET_MMAP=y
		CONFIG_UNIX=y
		# CONFIG_NET_KEY is not set
		CONFIG_INET=y
		# CONFIG_IP_MULTICAST is not set
		# CONFIG_IP_ADVANCED_ROUTER is not set
		CONFIG_IP_FIB_HASH=y
		CONFIG_IP_PNP=y
		CONFIG_IP_PNP_DHCP=y
		CONFIG_IP_PNP_BOOTP=y
		# CONFIG_IP_PNP_RARP is not set
		# CONFIG_NET_IPIP is not set
		# CONFIG_NET_IPGRE is not set
		# CONFIG_ARPD is not set
		CONFIG_SYN_COOKIES=y
		# CONFIG_INET_AH is not set
		# CONFIG_INET_ESP is not set
		# CONFIG_INET_IPCOMP is not set
		# CONFIG_INET_TUNNEL is not set
		# CONFIG_IP_TCPDIAG is not set
		# CONFIG_IP_TCPDIAG_IPV6 is not set
		# CONFIG_TCP_CONG_ADVANCED is not set
		CONFIG_TCP_CONG_BIC=y
		# CONFIG_IPV6 is not set
		# CONFIG_NETFILTER is not set

		#
		# SCTP Configuration (EXPERIMENTAL)
		#
		# CONFIG_IP_SCTP is not set
		# CONFIG_ATM is not set
		# CONFIG_BRIDGE is not set
		# CONFIG_VLAN_8021Q is not set
		# CONFIG_DECNET is not set
		# CONFIG_LLC2 is not set
		# CONFIG_IPX is not set
		# CONFIG_ATALK is not set
		# CONFIG_X25 is not set
		# CONFIG_LAPB is not set
		# CONFIG_NET_DIVERT is not set
		# CONFIG_ECONET is not set
		# CONFIG_WAN_ROUTER is not set
		# CONFIG_NET_SCHED is not set
		# CONFIG_NET_CLS_ROUTE is not set

		#
		# Network testing
		#
		# CONFIG_NET_PKTGEN is not set
		# CONFIG_HAMRADIO is not set
		# CONFIG_IRDA is not set
		# CONFIG_BT is not set

		#
		# Device Drivers
		#
		@@ -249,6 +310,7 @@ CONFIG_MTD_COMPLEX_MAPPINGS=y
		CONFIG_MTD_IXP2000=y
		# CONFIG_MTD_EDB7312 is not set
		# CONFIG_MTD_PCI is not set
		# CONFIG_MTD_PLATRAM is not set

		#
		# Self-contained MTD device drivers
		@@ -335,72 +397,8 @@ CONFIG_IOSCHED_CFQ=y
		# CONFIG_I2O is not set

		#
		# Networking support
		#
		CONFIG_NET=y

		#
		# Networking options
		#
		CONFIG_PACKET=y
		CONFIG_PACKET_MMAP=y
		CONFIG_UNIX=y
		# CONFIG_NET_KEY is not set
		CONFIG_INET=y
		# CONFIG_IP_MULTICAST is not set
		# CONFIG_IP_ADVANCED_ROUTER is not set
		CONFIG_IP_FIB_HASH=y
		CONFIG_IP_PNP=y
		CONFIG_IP_PNP_DHCP=y
		CONFIG_IP_PNP_BOOTP=y
		# CONFIG_IP_PNP_RARP is not set
		# CONFIG_NET_IPIP is not set
		# CONFIG_NET_IPGRE is not set
		# CONFIG_ARPD is not set
		CONFIG_SYN_COOKIES=y
		# CONFIG_INET_AH is not set
		# CONFIG_INET_ESP is not set
		# CONFIG_INET_IPCOMP is not set
		# CONFIG_INET_TUNNEL is not set
		# CONFIG_IP_TCPDIAG is not set
		# CONFIG_IP_TCPDIAG_IPV6 is not set
		# CONFIG_TCP_CONG_ADVANCED is not set
		CONFIG_TCP_CONG_BIC=y
		# CONFIG_IPV6 is not set
		# CONFIG_NETFILTER is not set

		#
		# SCTP Configuration (EXPERIMENTAL)
		#
		# CONFIG_IP_SCTP is not set
		# CONFIG_ATM is not set
		# CONFIG_BRIDGE is not set
		# CONFIG_VLAN_8021Q is not set
		# CONFIG_DECNET is not set
		# CONFIG_LLC2 is not set
		# CONFIG_IPX is not set
		# CONFIG_ATALK is not set
		# CONFIG_X25 is not set
		# CONFIG_LAPB is not set
		# 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

		#
		# Network testing
		# Network device support
		#
		# CONFIG_NET_PKTGEN is not set
		# CONFIG_NETPOLL is not set
		# CONFIG_NET_POLL_CONTROLLER is not set
		# CONFIG_HAMRADIO is not set
		# CONFIG_IRDA is not set
		# CONFIG_BT is not set
		CONFIG_NETDEVICES=y
		CONFIG_DUMMY=y
		# CONFIG_BONDING is not set
		@@ -510,6 +508,8 @@ CONFIG_DLCI_MAX=8
		# CONFIG_SLIP is not set
		# CONFIG_SHAPER is not set
		# CONFIG_NETCONSOLE is not set
		# CONFIG_NETPOLL is not set
		# CONFIG_NET_POLL_CONTROLLER is not set

		#
		# ISDN subsystem
		@@ -636,7 +636,7 @@ CONFIG_I2C_ALGOBIT=y
		# CONFIG_I2C_I810 is not set
		# CONFIG_I2C_PIIX4 is not set
		# CONFIG_I2C_ISA is not set
		# CONFIG_I2C_IXP2000 is not set
		CONFIG_I2C_IXP2000=y
		# CONFIG_I2C_NFORCE2 is not set
		# CONFIG_I2C_PARPORT_LIGHT is not set
		# CONFIG_I2C_PROSAVAGE is not set
		@@ -650,11 +650,28 @@ CONFIG_I2C_ALGOBIT=y
		# CONFIG_I2C_VIAPRO is not set
		# CONFIG_I2C_VOODOO3 is not set
		# CONFIG_I2C_PCA_ISA is not set
		CONFIG_I2C_SENSOR=y

		#
		# Hardware Sensors Chip support
		# Miscellaneous I2C Chip support
		#
		CONFIG_I2C_SENSOR=y
		# CONFIG_SENSORS_DS1337 is not set
		# CONFIG_SENSORS_DS1374 is not set
		CONFIG_SENSORS_EEPROM=y
		# CONFIG_SENSORS_PCF8574 is not set
		# CONFIG_SENSORS_PCA9539 is not set
		# CONFIG_SENSORS_PCF8591 is not set
		# CONFIG_SENSORS_RTC8564 is not set
		# CONFIG_SENSORS_MAX6875 is not set
		# CONFIG_I2C_DEBUG_CORE is not set
		# CONFIG_I2C_DEBUG_ALGO is not set
		# CONFIG_I2C_DEBUG_BUS is not set
		# CONFIG_I2C_DEBUG_CHIP is not set

		#
		# Hardware Monitoring support
		#
		CONFIG_HWMON=y
		# CONFIG_SENSORS_ADM1021 is not set
		# CONFIG_SENSORS_ADM1025 is not set
		# CONFIG_SENSORS_ADM1026 is not set
		@@ -680,30 +697,15 @@ CONFIG_I2C_SENSOR=y
		# CONFIG_SENSORS_LM92 is not set
		# CONFIG_SENSORS_MAX1619 is not set
		# CONFIG_SENSORS_PC87360 is not set
		# CONFIG_SENSORS_SMSC47B397 is not set
		# CONFIG_SENSORS_SIS5595 is not set
		# CONFIG_SENSORS_SMSC47M1 is not set
		# CONFIG_SENSORS_SMSC47B397 is not set
		# CONFIG_SENSORS_VIA686A is not set
		# CONFIG_SENSORS_W83781D is not set
		# CONFIG_SENSORS_W83L785TS is not set
		# CONFIG_SENSORS_W83627HF is not set
		# CONFIG_SENSORS_W83627EHF is not set

		#
		# Other I2C Chip support
		#
		# CONFIG_SENSORS_DS1337 is not set
		# CONFIG_SENSORS_DS1374 is not set
		CONFIG_SENSORS_EEPROM=y
		# CONFIG_SENSORS_PCF8574 is not set
		# CONFIG_SENSORS_PCA9539 is not set
		# CONFIG_SENSORS_PCF8591 is not set
		# CONFIG_SENSORS_RTC8564 is not set
		# CONFIG_SENSORS_MAX6875 is not set
		# CONFIG_I2C_DEBUG_CORE is not set
		# CONFIG_I2C_DEBUG_ALGO is not set
		# CONFIG_I2C_DEBUG_BUS is not set
		# CONFIG_I2C_DEBUG_CHIP is not set
		# CONFIG_HWMON_DEBUG_CHIP is not set

		#
		# Misc devices
		@@ -771,6 +773,7 @@ CONFIG_FS_POSIX_ACL=y
		# CONFIG_XFS_FS is not set
		# CONFIG_MINIX_FS is not set
		# CONFIG_ROMFS_FS is not set
		CONFIG_INOTIFY=y
		# CONFIG_QUOTA is not set
		CONFIG_DNOTIFY=y
		# CONFIG_AUTOFS_FS is not set
		@@ -813,8 +816,7 @@ CONFIG_RAMFS=y
		# CONFIG_JFFS_FS is not set
		CONFIG_JFFS2_FS=y
		CONFIG_JFFS2_FS_DEBUG=0
		# CONFIG_JFFS2_FS_NAND is not set
		# CONFIG_JFFS2_FS_NOR_ECC is not set
		CONFIG_JFFS2_FS_WRITEBUFFER=y
		# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
		CONFIG_JFFS2_ZLIB=y
		CONFIG_JFFS2_RTIME=y

arch/arm/configs/ixdp2401_defconfig

+92 −90

Original line number	Diff line number	Diff line
		#
		# Automatically generated make config: don't edit
		# Linux kernel version: 2.6.13-rc2
		# Thu Jul 7 16:49:08 2005
		# Linux kernel version: 2.6.13
		# Wed Sep 14 10:52:10 2005
		#
		CONFIG_ARM=y
		CONFIG_MMU=y
		@@ -136,7 +136,6 @@ CONFIG_PCI_NAMES=y
		#
		# Kernel Features
		#
		# CONFIG_SMP is not set
		# CONFIG_PREEMPT is not set
		# CONFIG_NO_IDLE_HZ is not set
		# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
		@@ -179,6 +178,68 @@ CONFIG_BINFMT_ELF=y
		#
		# CONFIG_PM is not set

		#
		# Networking
		#
		CONFIG_NET=y

		#
		# Networking options
		#
		CONFIG_PACKET=y
		CONFIG_PACKET_MMAP=y
		CONFIG_UNIX=y
		# CONFIG_NET_KEY is not set
		CONFIG_INET=y
		# CONFIG_IP_MULTICAST is not set
		# CONFIG_IP_ADVANCED_ROUTER is not set
		CONFIG_IP_FIB_HASH=y
		CONFIG_IP_PNP=y
		CONFIG_IP_PNP_DHCP=y
		CONFIG_IP_PNP_BOOTP=y
		# CONFIG_IP_PNP_RARP is not set
		# CONFIG_NET_IPIP is not set
		# CONFIG_NET_IPGRE is not set
		# CONFIG_ARPD is not set
		CONFIG_SYN_COOKIES=y
		# CONFIG_INET_AH is not set
		# CONFIG_INET_ESP is not set
		# CONFIG_INET_IPCOMP is not set
		# CONFIG_INET_TUNNEL is not set
		CONFIG_IP_TCPDIAG=y
		# CONFIG_IP_TCPDIAG_IPV6 is not set
		# CONFIG_TCP_CONG_ADVANCED is not set
		CONFIG_TCP_CONG_BIC=y
		# CONFIG_IPV6 is not set
		# CONFIG_NETFILTER is not set

		#
		# SCTP Configuration (EXPERIMENTAL)
		#
		# CONFIG_IP_SCTP is not set
		# CONFIG_ATM is not set
		# CONFIG_BRIDGE is not set
		# CONFIG_VLAN_8021Q is not set
		# CONFIG_DECNET is not set
		# CONFIG_LLC2 is not set
		# CONFIG_IPX is not set
		# CONFIG_ATALK is not set
		# CONFIG_X25 is not set
		# CONFIG_LAPB is not set
		# CONFIG_NET_DIVERT is not set
		# CONFIG_ECONET is not set
		# CONFIG_WAN_ROUTER is not set
		# CONFIG_NET_SCHED is not set
		# CONFIG_NET_CLS_ROUTE is not set

		#
		# Network testing
		#
		# CONFIG_NET_PKTGEN is not set
		# CONFIG_HAMRADIO is not set
		# CONFIG_IRDA is not set
		# CONFIG_BT is not set

		#
		# Device Drivers
		#
		@@ -249,6 +310,7 @@ CONFIG_MTD_COMPLEX_MAPPINGS=y
		CONFIG_MTD_IXP2000=y
		# CONFIG_MTD_EDB7312 is not set
		# CONFIG_MTD_PCI is not set
		# CONFIG_MTD_PLATRAM is not set

		#
		# Self-contained MTD device drivers
		@@ -335,72 +397,8 @@ CONFIG_IOSCHED_CFQ=y
		# CONFIG_I2O is not set

		#
		# Networking support
		#
		CONFIG_NET=y

		#
		# Networking options
		#
		CONFIG_PACKET=y
		CONFIG_PACKET_MMAP=y
		CONFIG_UNIX=y
		# CONFIG_NET_KEY is not set
		CONFIG_INET=y
		# CONFIG_IP_MULTICAST is not set
		# CONFIG_IP_ADVANCED_ROUTER is not set
		CONFIG_IP_FIB_HASH=y
		CONFIG_IP_PNP=y
		CONFIG_IP_PNP_DHCP=y
		CONFIG_IP_PNP_BOOTP=y
		# CONFIG_IP_PNP_RARP is not set
		# CONFIG_NET_IPIP is not set
		# CONFIG_NET_IPGRE is not set
		# CONFIG_ARPD is not set
		CONFIG_SYN_COOKIES=y
		# CONFIG_INET_AH is not set
		# CONFIG_INET_ESP is not set
		# CONFIG_INET_IPCOMP is not set
		# CONFIG_INET_TUNNEL is not set
		CONFIG_IP_TCPDIAG=y
		# CONFIG_IP_TCPDIAG_IPV6 is not set
		# CONFIG_TCP_CONG_ADVANCED is not set
		CONFIG_TCP_CONG_BIC=y
		# CONFIG_IPV6 is not set
		# CONFIG_NETFILTER is not set

		#
		# SCTP Configuration (EXPERIMENTAL)
		#
		# CONFIG_IP_SCTP is not set
		# CONFIG_ATM is not set
		# CONFIG_BRIDGE is not set
		# CONFIG_VLAN_8021Q is not set
		# CONFIG_DECNET is not set
		# CONFIG_LLC2 is not set
		# CONFIG_IPX is not set
		# CONFIG_ATALK is not set
		# CONFIG_X25 is not set
		# CONFIG_LAPB is not set
		# 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

		#
		# Network testing
		# Network device support
		#
		# CONFIG_NET_PKTGEN is not set
		# CONFIG_NETPOLL is not set
		# CONFIG_NET_POLL_CONTROLLER is not set
		# CONFIG_HAMRADIO is not set
		# CONFIG_IRDA is not set
		# CONFIG_BT is not set
		CONFIG_NETDEVICES=y
		CONFIG_DUMMY=y
		# CONFIG_BONDING is not set
		@@ -511,6 +509,8 @@ CONFIG_DLCI_MAX=8
		# CONFIG_SLIP is not set
		# CONFIG_SHAPER is not set
		# CONFIG_NETCONSOLE is not set
		# CONFIG_NETPOLL is not set
		# CONFIG_NET_POLL_CONTROLLER is not set

		#
		# ISDN subsystem
		@@ -637,7 +637,7 @@ CONFIG_I2C_ALGOBIT=y
		# CONFIG_I2C_I810 is not set
		# CONFIG_I2C_PIIX4 is not set
		# CONFIG_I2C_ISA is not set
		# CONFIG_I2C_IXP2000 is not set
		CONFIG_I2C_IXP2000=y
		# CONFIG_I2C_NFORCE2 is not set
		# CONFIG_I2C_PARPORT_LIGHT is not set
		# CONFIG_I2C_PROSAVAGE is not set
		@@ -651,11 +651,28 @@ CONFIG_I2C_ALGOBIT=y
		# CONFIG_I2C_VIAPRO is not set
		# CONFIG_I2C_VOODOO3 is not set
		# CONFIG_I2C_PCA_ISA is not set
		CONFIG_I2C_SENSOR=y

		#
		# Hardware Sensors Chip support
		# Miscellaneous I2C Chip support
		#
		CONFIG_I2C_SENSOR=y
		# CONFIG_SENSORS_DS1337 is not set
		# CONFIG_SENSORS_DS1374 is not set
		CONFIG_SENSORS_EEPROM=y
		# CONFIG_SENSORS_PCF8574 is not set
		# CONFIG_SENSORS_PCA9539 is not set
		# CONFIG_SENSORS_PCF8591 is not set
		# CONFIG_SENSORS_RTC8564 is not set
		# CONFIG_SENSORS_MAX6875 is not set
		# CONFIG_I2C_DEBUG_CORE is not set
		# CONFIG_I2C_DEBUG_ALGO is not set
		# CONFIG_I2C_DEBUG_BUS is not set
		# CONFIG_I2C_DEBUG_CHIP is not set

		#
		# Hardware Monitoring support
		#
		CONFIG_HWMON=y
		# CONFIG_SENSORS_ADM1021 is not set
		# CONFIG_SENSORS_ADM1025 is not set
		# CONFIG_SENSORS_ADM1026 is not set
		@@ -681,30 +698,15 @@ CONFIG_I2C_SENSOR=y
		# CONFIG_SENSORS_LM92 is not set
		# CONFIG_SENSORS_MAX1619 is not set
		# CONFIG_SENSORS_PC87360 is not set
		# CONFIG_SENSORS_SMSC47B397 is not set
		# CONFIG_SENSORS_SIS5595 is not set
		# CONFIG_SENSORS_SMSC47M1 is not set
		# CONFIG_SENSORS_SMSC47B397 is not set
		# CONFIG_SENSORS_VIA686A is not set
		# CONFIG_SENSORS_W83781D is not set
		# CONFIG_SENSORS_W83L785TS is not set
		# CONFIG_SENSORS_W83627HF is not set
		# CONFIG_SENSORS_W83627EHF is not set

		#
		# Other I2C Chip support
		#
		# CONFIG_SENSORS_DS1337 is not set
		# CONFIG_SENSORS_DS1374 is not set
		CONFIG_SENSORS_EEPROM=y
		# CONFIG_SENSORS_PCF8574 is not set
		# CONFIG_SENSORS_PCA9539 is not set
		# CONFIG_SENSORS_PCF8591 is not set
		# CONFIG_SENSORS_RTC8564 is not set
		# CONFIG_SENSORS_MAX6875 is not set
		# CONFIG_I2C_DEBUG_CORE is not set
		# CONFIG_I2C_DEBUG_ALGO is not set
		# CONFIG_I2C_DEBUG_BUS is not set
		# CONFIG_I2C_DEBUG_CHIP is not set
		# CONFIG_HWMON_DEBUG_CHIP is not set

		#
		# Misc devices
		@@ -772,6 +774,7 @@ CONFIG_FS_POSIX_ACL=y
		# CONFIG_XFS_FS is not set
		# CONFIG_MINIX_FS is not set
		# CONFIG_ROMFS_FS is not set
		CONFIG_INOTIFY=y
		# CONFIG_QUOTA is not set
		CONFIG_DNOTIFY=y
		# CONFIG_AUTOFS_FS is not set
		@@ -814,8 +817,7 @@ CONFIG_RAMFS=y
		# CONFIG_JFFS_FS is not set
		CONFIG_JFFS2_FS=y
		CONFIG_JFFS2_FS_DEBUG=0
		# CONFIG_JFFS2_FS_NAND is not set
		# CONFIG_JFFS2_FS_NOR_ECC is not set
		CONFIG_JFFS2_FS_WRITEBUFFER=y
		# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
		CONFIG_JFFS2_ZLIB=y
		CONFIG_JFFS2_RTIME=y

arch/arm/configs/ixdp2800_defconfig

+92 −90

Original line number	Diff line number	Diff line
		#
		# Automatically generated make config: don't edit
		# Linux kernel version: 2.6.13-rc2
		# Thu Jul 7 16:49:20 2005
		# Linux kernel version: 2.6.13
		# Wed Sep 14 10:52:23 2005
		#
		CONFIG_ARM=y
		CONFIG_MMU=y
		@@ -136,7 +136,6 @@ CONFIG_PCI_NAMES=y
		#
		# Kernel Features
		#
		# CONFIG_SMP is not set
		# CONFIG_PREEMPT is not set
		# CONFIG_NO_IDLE_HZ is not set
		# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
		@@ -179,6 +178,68 @@ CONFIG_BINFMT_ELF=y
		#
		# CONFIG_PM is not set

		#
		# Networking
		#
		CONFIG_NET=y

		#
		# Networking options
		#
		CONFIG_PACKET=y
		CONFIG_PACKET_MMAP=y
		CONFIG_UNIX=y
		# CONFIG_NET_KEY is not set
		CONFIG_INET=y
		# CONFIG_IP_MULTICAST is not set
		# CONFIG_IP_ADVANCED_ROUTER is not set
		CONFIG_IP_FIB_HASH=y
		CONFIG_IP_PNP=y
		CONFIG_IP_PNP_DHCP=y
		CONFIG_IP_PNP_BOOTP=y
		# CONFIG_IP_PNP_RARP is not set
		# CONFIG_NET_IPIP is not set
		# CONFIG_NET_IPGRE is not set
		# CONFIG_ARPD is not set
		CONFIG_SYN_COOKIES=y
		# CONFIG_INET_AH is not set
		# CONFIG_INET_ESP is not set
		# CONFIG_INET_IPCOMP is not set
		# CONFIG_INET_TUNNEL is not set
		# CONFIG_IP_TCPDIAG is not set
		# CONFIG_IP_TCPDIAG_IPV6 is not set
		# CONFIG_TCP_CONG_ADVANCED is not set
		CONFIG_TCP_CONG_BIC=y
		# CONFIG_IPV6 is not set
		# CONFIG_NETFILTER is not set

		#
		# SCTP Configuration (EXPERIMENTAL)
		#
		# CONFIG_IP_SCTP is not set
		# CONFIG_ATM is not set
		# CONFIG_BRIDGE is not set
		# CONFIG_VLAN_8021Q is not set
		# CONFIG_DECNET is not set
		# CONFIG_LLC2 is not set
		# CONFIG_IPX is not set
		# CONFIG_ATALK is not set
		# CONFIG_X25 is not set
		# CONFIG_LAPB is not set
		# CONFIG_NET_DIVERT is not set
		# CONFIG_ECONET is not set
		# CONFIG_WAN_ROUTER is not set
		# CONFIG_NET_SCHED is not set
		# CONFIG_NET_CLS_ROUTE is not set

		#
		# Network testing
		#
		# CONFIG_NET_PKTGEN is not set
		# CONFIG_HAMRADIO is not set
		# CONFIG_IRDA is not set
		# CONFIG_BT is not set

		#
		# Device Drivers
		#
		@@ -249,6 +310,7 @@ CONFIG_MTD_COMPLEX_MAPPINGS=y
		CONFIG_MTD_IXP2000=y
		# CONFIG_MTD_EDB7312 is not set
		# CONFIG_MTD_PCI is not set
		# CONFIG_MTD_PLATRAM is not set

		#
		# Self-contained MTD device drivers
		@@ -335,72 +397,8 @@ CONFIG_IOSCHED_CFQ=y
		# CONFIG_I2O is not set

		#
		# Networking support
		#
		CONFIG_NET=y

		#
		# Networking options
		#
		CONFIG_PACKET=y
		CONFIG_PACKET_MMAP=y
		CONFIG_UNIX=y
		# CONFIG_NET_KEY is not set
		CONFIG_INET=y
		# CONFIG_IP_MULTICAST is not set
		# CONFIG_IP_ADVANCED_ROUTER is not set
		CONFIG_IP_FIB_HASH=y
		CONFIG_IP_PNP=y
		CONFIG_IP_PNP_DHCP=y
		CONFIG_IP_PNP_BOOTP=y
		# CONFIG_IP_PNP_RARP is not set
		# CONFIG_NET_IPIP is not set
		# CONFIG_NET_IPGRE is not set
		# CONFIG_ARPD is not set
		CONFIG_SYN_COOKIES=y
		# CONFIG_INET_AH is not set
		# CONFIG_INET_ESP is not set
		# CONFIG_INET_IPCOMP is not set
		# CONFIG_INET_TUNNEL is not set
		# CONFIG_IP_TCPDIAG is not set
		# CONFIG_IP_TCPDIAG_IPV6 is not set
		# CONFIG_TCP_CONG_ADVANCED is not set
		CONFIG_TCP_CONG_BIC=y
		# CONFIG_IPV6 is not set
		# CONFIG_NETFILTER is not set

		#
		# SCTP Configuration (EXPERIMENTAL)
		#
		# CONFIG_IP_SCTP is not set
		# CONFIG_ATM is not set
		# CONFIG_BRIDGE is not set
		# CONFIG_VLAN_8021Q is not set
		# CONFIG_DECNET is not set
		# CONFIG_LLC2 is not set
		# CONFIG_IPX is not set
		# CONFIG_ATALK is not set
		# CONFIG_X25 is not set
		# CONFIG_LAPB is not set
		# 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

		#
		# Network testing
		# Network device support
		#
		# CONFIG_NET_PKTGEN is not set
		# CONFIG_NETPOLL is not set
		# CONFIG_NET_POLL_CONTROLLER is not set
		# CONFIG_HAMRADIO is not set
		# CONFIG_IRDA is not set
		# CONFIG_BT is not set
		CONFIG_NETDEVICES=y
		CONFIG_DUMMY=y
		# CONFIG_BONDING is not set
		@@ -510,6 +508,8 @@ CONFIG_DLCI_MAX=8
		# CONFIG_SLIP is not set
		# CONFIG_SHAPER is not set
		# CONFIG_NETCONSOLE is not set
		# CONFIG_NETPOLL is not set
		# CONFIG_NET_POLL_CONTROLLER is not set

		#
		# ISDN subsystem
		@@ -636,7 +636,7 @@ CONFIG_I2C_ALGOBIT=y
		# CONFIG_I2C_I810 is not set
		# CONFIG_I2C_PIIX4 is not set
		# CONFIG_I2C_ISA is not set
		# CONFIG_I2C_IXP2000 is not set
		CONFIG_I2C_IXP2000=y
		# CONFIG_I2C_NFORCE2 is not set
		# CONFIG_I2C_PARPORT_LIGHT is not set
		# CONFIG_I2C_PROSAVAGE is not set
		@@ -650,11 +650,28 @@ CONFIG_I2C_ALGOBIT=y
		# CONFIG_I2C_VIAPRO is not set
		# CONFIG_I2C_VOODOO3 is not set
		# CONFIG_I2C_PCA_ISA is not set
		CONFIG_I2C_SENSOR=y

		#
		# Hardware Sensors Chip support
		# Miscellaneous I2C Chip support
		#
		CONFIG_I2C_SENSOR=y
		# CONFIG_SENSORS_DS1337 is not set
		# CONFIG_SENSORS_DS1374 is not set
		CONFIG_SENSORS_EEPROM=y
		# CONFIG_SENSORS_PCF8574 is not set
		# CONFIG_SENSORS_PCA9539 is not set
		# CONFIG_SENSORS_PCF8591 is not set
		# CONFIG_SENSORS_RTC8564 is not set
		# CONFIG_SENSORS_MAX6875 is not set
		# CONFIG_I2C_DEBUG_CORE is not set
		# CONFIG_I2C_DEBUG_ALGO is not set
		# CONFIG_I2C_DEBUG_BUS is not set
		# CONFIG_I2C_DEBUG_CHIP is not set

		#
		# Hardware Monitoring support
		#
		CONFIG_HWMON=y
		# CONFIG_SENSORS_ADM1021 is not set
		# CONFIG_SENSORS_ADM1025 is not set
		# CONFIG_SENSORS_ADM1026 is not set
		@@ -680,30 +697,15 @@ CONFIG_I2C_SENSOR=y
		# CONFIG_SENSORS_LM92 is not set
		# CONFIG_SENSORS_MAX1619 is not set
		# CONFIG_SENSORS_PC87360 is not set
		# CONFIG_SENSORS_SMSC47B397 is not set
		# CONFIG_SENSORS_SIS5595 is not set
		# CONFIG_SENSORS_SMSC47M1 is not set
		# CONFIG_SENSORS_SMSC47B397 is not set
		# CONFIG_SENSORS_VIA686A is not set
		# CONFIG_SENSORS_W83781D is not set
		# CONFIG_SENSORS_W83L785TS is not set
		# CONFIG_SENSORS_W83627HF is not set
		# CONFIG_SENSORS_W83627EHF is not set

		#
		# Other I2C Chip support
		#
		# CONFIG_SENSORS_DS1337 is not set
		# CONFIG_SENSORS_DS1374 is not set
		CONFIG_SENSORS_EEPROM=y
		# CONFIG_SENSORS_PCF8574 is not set
		# CONFIG_SENSORS_PCA9539 is not set
		# CONFIG_SENSORS_PCF8591 is not set
		# CONFIG_SENSORS_RTC8564 is not set
		# CONFIG_SENSORS_MAX6875 is not set
		# CONFIG_I2C_DEBUG_CORE is not set
		# CONFIG_I2C_DEBUG_ALGO is not set
		# CONFIG_I2C_DEBUG_BUS is not set
		# CONFIG_I2C_DEBUG_CHIP is not set
		# CONFIG_HWMON_DEBUG_CHIP is not set

		#
		# Misc devices
		@@ -771,6 +773,7 @@ CONFIG_FS_POSIX_ACL=y
		# CONFIG_XFS_FS is not set
		# CONFIG_MINIX_FS is not set
		# CONFIG_ROMFS_FS is not set
		CONFIG_INOTIFY=y
		# CONFIG_QUOTA is not set
		CONFIG_DNOTIFY=y
		# CONFIG_AUTOFS_FS is not set
		@@ -813,8 +816,7 @@ CONFIG_RAMFS=y
		# CONFIG_JFFS_FS is not set
		CONFIG_JFFS2_FS=y
		CONFIG_JFFS2_FS_DEBUG=0
		# CONFIG_JFFS2_FS_NAND is not set
		# CONFIG_JFFS2_FS_NOR_ECC is not set
		CONFIG_JFFS2_FS_WRITEBUFFER=y
		# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
		CONFIG_JFFS2_ZLIB=y
		CONFIG_JFFS2_RTIME=y

arch/arm/configs/ixdp2801_defconfig

+92 −90

File changed.

Preview size limit exceeded, changes collapsed.