Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 (8a322726) · Commits · e / devices / android_kernel_oneplus_sm7250

Documentation/feature-removal-schedule.txt

+0 −11

Original line number	Original line	Diff line number	Diff line
	@@ -261,17 +261,6 @@ Who: Michael Buesch <mb@bu3sch.de>

	---------------------------		---------------------------

	What: Solaris/SunOS syscall and binary support on Sparc
	When: 2.6.26
	Why: Largely unmaintained and almost entirely unused. File system
	layering used to divert library and dynamic linker searches to
	/usr/gnemul is extremely buggy and unfixable. Making it work
	is largely pointless as without a lot of work only the most
	trivial of Solaris binaries can work with the emulation code.
	Who: David S. Miller <davem@davemloft.net>

	---------------------------

	What: init_mm export		What: init_mm export
	When: 2.6.26		When: 2.6.26
	Why: Not used in-tree. The current out-of-tree users used it to		Why: Not used in-tree. The current out-of-tree users used it to

Documentation/highuid.txt

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -28,8 +28,6 @@ What's left to be done for 32-bit UIDs on all Linux architectures:
	uses the 32-bit UID system calls properly otherwise.		uses the 32-bit UID system calls properly otherwise.

	This affects at least:		This affects at least:
	SunOS emulation
	Solaris emulation
	iBCS on Intel		iBCS on Intel

	sparc32 emulation on sparc64		sparc32 emulation on sparc64

Documentation/magic-number.txt

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -95,7 +95,6 @@ RFCOMM_TTY_MAGIC 0x6d02 net/bluetooth/rfcomm/tty.c
	USB_SERIAL_PORT_MAGIC 0x7301 usb_serial_port drivers/usb/serial/usb-serial.h		USB_SERIAL_PORT_MAGIC 0x7301 usb_serial_port drivers/usb/serial/usb-serial.h
	CG_MAGIC 0x00090255 ufs_cylinder_group include/linux/ufs_fs.h		CG_MAGIC 0x00090255 ufs_cylinder_group include/linux/ufs_fs.h
	A2232_MAGIC 0x000a2232 gs_port drivers/char/ser_a2232.h		A2232_MAGIC 0x000a2232 gs_port drivers/char/ser_a2232.h
	SOLARIS_SOCKET_MAGIC 0x000ADDED sol_socket_struct arch/sparc64/solaris/socksys.h
	RPORT_MAGIC 0x00525001 r_port drivers/char/rocket_int.h		RPORT_MAGIC 0x00525001 r_port drivers/char/rocket_int.h
	LSEMAGIC 0x05091998 lse drivers/fc4/fc.c		LSEMAGIC 0x05091998 lse drivers/fc4/fc.c
	GDTIOCTL_MAGIC 0x06030f07 gdth_iowr_str drivers/scsi/gdth_ioctl.h		GDTIOCTL_MAGIC 0x06030f07 gdth_iowr_str drivers/scsi/gdth_ioctl.h

arch/sparc/Kconfig

+0 −12

Original line number	Original line	Diff line number	Diff line
	@@ -27,9 +27,6 @@ config ARCH_NO_VIRT_TO_BUS
	config OF		config OF
	def_bool y		def_bool y

	config ARCH_SUPPORTS_AOUT
	def_bool y

	config HZ		config HZ
	int		int
	default 100		default 100
	@@ -257,15 +254,6 @@ config SPARC_LED

	source "fs/Kconfig.binfmt"		source "fs/Kconfig.binfmt"

	config SUNOS_EMUL
	bool "SunOS binary emulation"
	help
	This allows you to run most SunOS binaries. If you want to do this,
	say Y here and place appropriate files in /usr/gnemul/sunos. See
	<http://www.ultralinux.org/faq.html> for more information. If you
	want to run SunOS binaries on an Ultra you must also say Y to
	"Kernel support for 32-bit a.out binaries" above.

	source "mm/Kconfig"		source "mm/Kconfig"

	endmenu		endmenu

arch/sparc/defconfig

+90 −75

Original line number	Original line	Diff line number	Diff line
	#		#
	# Automatically generated make config: don't edit		# Automatically generated make config: don't edit
	# Linux kernel version: 2.6.23-rc1		# Linux kernel version: 2.6.25
	# Wed Jul 25 15:30:21 2007		# Sun Apr 20 01:49:51 2008
	#		#
	CONFIG_MMU=y		CONFIG_MMU=y
	CONFIG_HIGHMEM=y		CONFIG_HIGHMEM=y
	@@ -9,18 +9,15 @@ CONFIG_ZONE_DMA=y
	CONFIG_GENERIC_ISA_DMA=y		CONFIG_GENERIC_ISA_DMA=y
	CONFIG_ARCH_NO_VIRT_TO_BUS=y		CONFIG_ARCH_NO_VIRT_TO_BUS=y
	CONFIG_OF=y		CONFIG_OF=y
			CONFIG_HZ=100
	CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"		CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"

	#		#
	# Code maturity level options		# General setup
	#		#
	CONFIG_EXPERIMENTAL=y		CONFIG_EXPERIMENTAL=y
	CONFIG_BROKEN_ON_SMP=y		CONFIG_BROKEN_ON_SMP=y
	CONFIG_INIT_ENV_ARG_LIMIT=32		CONFIG_INIT_ENV_ARG_LIMIT=32

	#
	# General setup
	#
	CONFIG_LOCALVERSION=""		CONFIG_LOCALVERSION=""
	CONFIG_LOCALVERSION_AUTO=y		CONFIG_LOCALVERSION_AUTO=y
	CONFIG_SWAP=y		CONFIG_SWAP=y
	@@ -29,12 +26,23 @@ CONFIG_SYSVIPC_SYSCTL=y
	CONFIG_POSIX_MQUEUE=y		CONFIG_POSIX_MQUEUE=y
	# CONFIG_BSD_PROCESS_ACCT is not set		# CONFIG_BSD_PROCESS_ACCT is not set
	# CONFIG_TASKSTATS is not set		# CONFIG_TASKSTATS is not set
	# CONFIG_USER_NS is not set
	# CONFIG_AUDIT is not set		# CONFIG_AUDIT is not set
	# CONFIG_IKCONFIG is not set		# CONFIG_IKCONFIG is not set
	CONFIG_LOG_BUF_SHIFT=14		CONFIG_LOG_BUF_SHIFT=14
			# CONFIG_CGROUPS is not set
			CONFIG_GROUP_SCHED=y
			CONFIG_FAIR_GROUP_SCHED=y
			CONFIG_RT_GROUP_SCHED=y
			CONFIG_USER_SCHED=y
			# CONFIG_CGROUP_SCHED is not set
	CONFIG_SYSFS_DEPRECATED=y		CONFIG_SYSFS_DEPRECATED=y
			CONFIG_SYSFS_DEPRECATED_V2=y
	# CONFIG_RELAY is not set		# CONFIG_RELAY is not set
			CONFIG_NAMESPACES=y
			# CONFIG_UTS_NS is not set
			# CONFIG_IPC_NS is not set
			# CONFIG_USER_NS is not set
			# CONFIG_PID_NS is not set
	CONFIG_BLK_DEV_INITRD=y		CONFIG_BLK_DEV_INITRD=y
	CONFIG_INITRAMFS_SOURCE=""		CONFIG_INITRAMFS_SOURCE=""
	# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set		# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
	@@ -49,6 +57,7 @@ CONFIG_HOTPLUG=y
	CONFIG_PRINTK=y		CONFIG_PRINTK=y
	CONFIG_BUG=y		CONFIG_BUG=y
	CONFIG_ELF_CORE=y		CONFIG_ELF_CORE=y
			CONFIG_COMPAT_BRK=y
	CONFIG_BASE_FULL=y		CONFIG_BASE_FULL=y
	CONFIG_FUTEX=y		CONFIG_FUTEX=y
	CONFIG_ANON_INODES=y		CONFIG_ANON_INODES=y
	@@ -61,6 +70,13 @@ CONFIG_VM_EVENT_COUNTERS=y
	CONFIG_SLAB=y		CONFIG_SLAB=y
	# CONFIG_SLUB is not set		# CONFIG_SLUB is not set
	# CONFIG_SLOB is not set		# CONFIG_SLOB is not set
			# CONFIG_PROFILING is not set
			# CONFIG_MARKERS is not set
			CONFIG_HAVE_OPROFILE=y
			# CONFIG_HAVE_KPROBES is not set
			# CONFIG_HAVE_KRETPROBES is not set
			CONFIG_PROC_PAGE_MONITOR=y
			CONFIG_SLABINFO=y
	CONFIG_RT_MUTEXES=y		CONFIG_RT_MUTEXES=y
	# CONFIG_TINY_SHMEM is not set		# CONFIG_TINY_SHMEM is not set
	CONFIG_BASE_SMALL=0		CONFIG_BASE_SMALL=0
	@@ -88,6 +104,7 @@ CONFIG_IOSCHED_CFQ=y
	CONFIG_DEFAULT_CFQ=y		CONFIG_DEFAULT_CFQ=y
	# CONFIG_DEFAULT_NOOP is not set		# CONFIG_DEFAULT_NOOP is not set
	CONFIG_DEFAULT_IOSCHED="cfq"		CONFIG_DEFAULT_IOSCHED="cfq"
			CONFIG_CLASSIC_RCU=y

	#		#
	# General machine setup		# General machine setup
	@@ -113,14 +130,13 @@ CONFIG_SUN_PM=y
	CONFIG_PCI=y		CONFIG_PCI=y
	CONFIG_PCI_SYSCALL=y		CONFIG_PCI_SYSCALL=y
	# CONFIG_ARCH_SUPPORTS_MSI is not set		# CONFIG_ARCH_SUPPORTS_MSI is not set
			CONFIG_PCI_LEGACY=y
	# CONFIG_PCI_DEBUG is not set		# CONFIG_PCI_DEBUG is not set
	# CONFIG_NO_DMA is not set		# CONFIG_NO_DMA is not set
	CONFIG_SUN_OPENPROMFS=m		CONFIG_SUN_OPENPROMFS=m
	# CONFIG_SPARC_LED is not set		# CONFIG_SPARC_LED is not set
	CONFIG_BINFMT_ELF=y		CONFIG_BINFMT_ELF=y
	CONFIG_BINFMT_AOUT=y
	CONFIG_BINFMT_MISC=m		CONFIG_BINFMT_MISC=m
	CONFIG_SUNOS_EMUL=y
	CONFIG_SELECT_MEMORY_MODEL=y		CONFIG_SELECT_MEMORY_MODEL=y
	CONFIG_FLATMEM_MANUAL=y		CONFIG_FLATMEM_MANUAL=y
	# CONFIG_DISCONTIGMEM_MANUAL is not set		# CONFIG_DISCONTIGMEM_MANUAL is not set
	@@ -128,6 +144,7 @@ CONFIG_FLATMEM_MANUAL=y
	CONFIG_FLATMEM=y		CONFIG_FLATMEM=y
	CONFIG_FLAT_NODE_MEM_MAP=y		CONFIG_FLAT_NODE_MEM_MAP=y
	# CONFIG_SPARSEMEM_STATIC is not set		# CONFIG_SPARSEMEM_STATIC is not set
			# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
	CONFIG_SPLIT_PTLOCK_CPUS=4		CONFIG_SPLIT_PTLOCK_CPUS=4
	# CONFIG_RESOURCES_64BIT is not set		# CONFIG_RESOURCES_64BIT is not set
	CONFIG_ZONE_DMA_FLAG=1		CONFIG_ZONE_DMA_FLAG=1
	@@ -148,6 +165,7 @@ CONFIG_XFRM=y
	CONFIG_XFRM_USER=m		CONFIG_XFRM_USER=m
	# CONFIG_XFRM_SUB_POLICY is not set		# CONFIG_XFRM_SUB_POLICY is not set
	# CONFIG_XFRM_MIGRATE is not set		# CONFIG_XFRM_MIGRATE is not set
			# CONFIG_XFRM_STATISTICS is not set
	CONFIG_NET_KEY=m		CONFIG_NET_KEY=m
	# CONFIG_NET_KEY_MIGRATE is not set		# CONFIG_NET_KEY_MIGRATE is not set
	CONFIG_INET=y		CONFIG_INET=y
	@@ -170,6 +188,7 @@ CONFIG_INET_TUNNEL=y
	CONFIG_INET_XFRM_MODE_TRANSPORT=y		CONFIG_INET_XFRM_MODE_TRANSPORT=y
	CONFIG_INET_XFRM_MODE_TUNNEL=y		CONFIG_INET_XFRM_MODE_TUNNEL=y
	CONFIG_INET_XFRM_MODE_BEET=y		CONFIG_INET_XFRM_MODE_BEET=y
			# CONFIG_INET_LRO is not set
	CONFIG_INET_DIAG=y		CONFIG_INET_DIAG=y
	CONFIG_INET_TCP_DIAG=y		CONFIG_INET_TCP_DIAG=y
	# CONFIG_TCP_CONG_ADVANCED is not set		# CONFIG_TCP_CONG_ADVANCED is not set
	@@ -191,8 +210,10 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m
	CONFIG_INET6_XFRM_MODE_BEET=m		CONFIG_INET6_XFRM_MODE_BEET=m
	# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set		# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
	CONFIG_IPV6_SIT=m		CONFIG_IPV6_SIT=m
			CONFIG_IPV6_NDISC_NODETYPE=y
	CONFIG_IPV6_TUNNEL=m		CONFIG_IPV6_TUNNEL=m
	# CONFIG_IPV6_MULTIPLE_TABLES is not set		# CONFIG_IPV6_MULTIPLE_TABLES is not set
			# CONFIG_IPV6_MROUTE is not set
	# CONFIG_NETWORK_SECMARK is not set		# CONFIG_NETWORK_SECMARK is not set
	# CONFIG_NETFILTER is not set		# CONFIG_NETFILTER is not set
	# CONFIG_IP_DCCP is not set		# CONFIG_IP_DCCP is not set
	@@ -214,10 +235,6 @@ CONFIG_SCTP_HMAC_MD5=y
	# CONFIG_LAPB is not set		# CONFIG_LAPB is not set
	# CONFIG_ECONET is not set		# CONFIG_ECONET is not set
	# CONFIG_WAN_ROUTER is not set		# CONFIG_WAN_ROUTER is not set

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

	#		#
	@@ -225,6 +242,7 @@ CONFIG_SCTP_HMAC_MD5=y
	#		#
	CONFIG_NET_PKTGEN=m		CONFIG_NET_PKTGEN=m
	# CONFIG_HAMRADIO is not set		# CONFIG_HAMRADIO is not set
			# CONFIG_CAN is not set
	# CONFIG_IRDA is not set		# CONFIG_IRDA is not set
	# CONFIG_BT is not set		# CONFIG_BT is not set
	CONFIG_AF_RXRPC=m		CONFIG_AF_RXRPC=m
	@@ -248,6 +266,7 @@ CONFIG_AF_RXRPC=m
	#		#
	# Generic Driver Options		# Generic Driver Options
	#		#
			CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
	CONFIG_STANDALONE=y		CONFIG_STANDALONE=y
	CONFIG_PREVENT_FIRMWARE_BUILD=y		CONFIG_PREVENT_FIRMWARE_BUILD=y
	# CONFIG_FW_LOADER is not set		# CONFIG_FW_LOADER is not set
	@@ -271,7 +290,7 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
	CONFIG_BLK_DEV_RAM=y		CONFIG_BLK_DEV_RAM=y
	CONFIG_BLK_DEV_RAM_COUNT=16		CONFIG_BLK_DEV_RAM_COUNT=16
	CONFIG_BLK_DEV_RAM_SIZE=4096		CONFIG_BLK_DEV_RAM_SIZE=4096
	CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024		# CONFIG_BLK_DEV_XIP is not set
	# CONFIG_CDROM_PKTCDVD is not set		# CONFIG_CDROM_PKTCDVD is not set
	# CONFIG_ATA_OVER_ETH is not set		# CONFIG_ATA_OVER_ETH is not set
	CONFIG_MISC_DEVICES=y		CONFIG_MISC_DEVICES=y
	@@ -279,6 +298,8 @@ CONFIG_MISC_DEVICES=y
	# CONFIG_EEPROM_93CX6 is not set		# CONFIG_EEPROM_93CX6 is not set
	# CONFIG_SGI_IOC4 is not set		# CONFIG_SGI_IOC4 is not set
	# CONFIG_TIFM_CORE is not set		# CONFIG_TIFM_CORE is not set
			# CONFIG_ENCLOSURE_SERVICES is not set
			CONFIG_HAVE_IDE=y
	# CONFIG_IDE is not set		# CONFIG_IDE is not set

	#		#
	@@ -318,6 +339,7 @@ CONFIG_SCSI_SPI_ATTRS=y
	# CONFIG_SCSI_FC_ATTRS is not set		# CONFIG_SCSI_FC_ATTRS is not set
	# CONFIG_SCSI_ISCSI_ATTRS is not set		# CONFIG_SCSI_ISCSI_ATTRS is not set
	# CONFIG_SCSI_SAS_LIBSAS is not set		# CONFIG_SCSI_SAS_LIBSAS is not set
			# CONFIG_SCSI_SRP_ATTRS is not set
	CONFIG_SCSI_LOWLEVEL=y		CONFIG_SCSI_LOWLEVEL=y
	# CONFIG_ISCSI_TCP is not set		# CONFIG_ISCSI_TCP is not set
	# CONFIG_BLK_DEV_3W_XXXX_RAID is not set		# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
	@@ -338,6 +360,7 @@ CONFIG_SCSI_LOWLEVEL=y
	# CONFIG_SCSI_IPS is not set		# CONFIG_SCSI_IPS is not set
	# CONFIG_SCSI_INITIO is not set		# CONFIG_SCSI_INITIO is not set
	# CONFIG_SCSI_INIA100 is not set		# CONFIG_SCSI_INIA100 is not set
			# CONFIG_SCSI_MVSAS is not set
	# CONFIG_SCSI_STEX is not set		# CONFIG_SCSI_STEX is not set
	# CONFIG_SCSI_SYM53C8XX_2 is not set		# CONFIG_SCSI_SYM53C8XX_2 is not set
	# CONFIG_SCSI_QLOGIC_1280 is not set		# CONFIG_SCSI_QLOGIC_1280 is not set
	@@ -353,14 +376,7 @@ CONFIG_SCSI_SUNESP=y
	# CONFIG_SCSI_SRP is not set		# CONFIG_SCSI_SRP is not set
	# CONFIG_ATA is not set		# CONFIG_ATA is not set
	# CONFIG_MD is not set		# CONFIG_MD is not set

	#
	# Fusion MPT device support
	#
	# CONFIG_FUSION is not set		# 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		# IEEE 1394 (FireWire) support
	@@ -375,6 +391,7 @@ CONFIG_DUMMY=m
	# CONFIG_MACVLAN is not set		# CONFIG_MACVLAN is not set
	# CONFIG_EQUALIZER is not set		# CONFIG_EQUALIZER is not set
	CONFIG_TUN=m		CONFIG_TUN=m
			# CONFIG_VETH is not set
	# CONFIG_ARCNET is not set		# CONFIG_ARCNET is not set
	# CONFIG_PHYLIB is not set		# CONFIG_PHYLIB is not set
	CONFIG_NET_ETHERNET=y		CONFIG_NET_ETHERNET=y
	@@ -388,11 +405,20 @@ CONFIG_SUNQE=m
	# CONFIG_NET_VENDOR_3COM is not set		# CONFIG_NET_VENDOR_3COM is not set
	# CONFIG_NET_TULIP is not set		# CONFIG_NET_TULIP is not set
	# CONFIG_HP100 is not set		# CONFIG_HP100 is not set
			# CONFIG_IBM_NEW_EMAC_ZMII is not set
			# CONFIG_IBM_NEW_EMAC_RGMII is not set
			# CONFIG_IBM_NEW_EMAC_TAH is not set
			# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
	# CONFIG_NET_PCI is not set		# CONFIG_NET_PCI is not set
			# CONFIG_B44 is not set
	CONFIG_NETDEV_1000=y		CONFIG_NETDEV_1000=y
	# CONFIG_ACENIC is not set		# CONFIG_ACENIC is not set
	# CONFIG_DL2K is not set		# CONFIG_DL2K is not set
	# CONFIG_E1000 is not set		# CONFIG_E1000 is not set
			# CONFIG_E1000E is not set
			# CONFIG_E1000E_ENABLED is not set
			# CONFIG_IP1000 is not set
			# CONFIG_IGB is not set
	# CONFIG_MYRI_SBUS is not set		# CONFIG_MYRI_SBUS is not set
	# CONFIG_NS83820 is not set		# CONFIG_NS83820 is not set
	# CONFIG_HAMACHI is not set		# CONFIG_HAMACHI is not set
	@@ -409,11 +435,15 @@ CONFIG_NETDEV_1000=y
	CONFIG_NETDEV_10000=y		CONFIG_NETDEV_10000=y
	# CONFIG_CHELSIO_T1 is not set		# CONFIG_CHELSIO_T1 is not set
	# CONFIG_CHELSIO_T3 is not set		# CONFIG_CHELSIO_T3 is not set
			# CONFIG_IXGBE is not set
	# CONFIG_IXGB is not set		# CONFIG_IXGB is not set
	# CONFIG_S2IO is not set		# CONFIG_S2IO is not set
	# CONFIG_MYRI10GE is not set		# CONFIG_MYRI10GE is not set
	# CONFIG_NETXEN_NIC is not set		# CONFIG_NETXEN_NIC is not set
			# CONFIG_NIU is not set
	# CONFIG_MLX4_CORE is not set		# CONFIG_MLX4_CORE is not set
			# CONFIG_TEHUTI is not set
			# CONFIG_BNX2X is not set
	# CONFIG_TR is not set		# CONFIG_TR is not set

	#		#
	@@ -421,13 +451,13 @@ CONFIG_NETDEV_10000=y
	#		#
	# CONFIG_WLAN_PRE80211 is not set		# CONFIG_WLAN_PRE80211 is not set
	# CONFIG_WLAN_80211 is not set		# CONFIG_WLAN_80211 is not set
			# CONFIG_IWLWIFI_LEDS is not set
	# CONFIG_WAN is not set		# CONFIG_WAN is not set
	# CONFIG_FDDI is not set		# CONFIG_FDDI is not set
	# CONFIG_HIPPI is not set		# CONFIG_HIPPI is not set
	# CONFIG_PPP is not set		# CONFIG_PPP is not set
	# CONFIG_SLIP is not set		# CONFIG_SLIP is not set
	# CONFIG_NET_FC is not set		# CONFIG_NET_FC is not set
	# CONFIG_SHAPER is not set
	# CONFIG_NETCONSOLE is not set		# CONFIG_NETCONSOLE is not set
	# CONFIG_NETPOLL is not set		# CONFIG_NETPOLL is not set
	# CONFIG_NET_POLL_CONTROLLER is not set		# CONFIG_NET_POLL_CONTROLLER is not set
	@@ -449,7 +479,6 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y
	CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024		CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
	CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768		CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
	CONFIG_INPUT_JOYDEV=m		CONFIG_INPUT_JOYDEV=m
	# CONFIG_INPUT_TSDEV is not set
	CONFIG_INPUT_EVDEV=m		CONFIG_INPUT_EVDEV=m
	CONFIG_INPUT_EVBUG=m		CONFIG_INPUT_EVBUG=m

	@@ -498,6 +527,7 @@ CONFIG_VT_CONSOLE=y
	CONFIG_HW_CONSOLE=y		CONFIG_HW_CONSOLE=y
	# CONFIG_VT_HW_CONSOLE_BINDING is not set		# CONFIG_VT_HW_CONSOLE_BINDING is not set
	# CONFIG_SERIAL_NONSTANDARD is not set		# CONFIG_SERIAL_NONSTANDARD is not set
			# CONFIG_NOZOMI is not set

	#		#
	# Serial drivers		# Serial drivers
	@@ -519,7 +549,6 @@ CONFIG_UNIX98_PTYS=y
	CONFIG_LEGACY_PTYS=y		CONFIG_LEGACY_PTYS=y
	CONFIG_LEGACY_PTY_COUNT=256		CONFIG_LEGACY_PTY_COUNT=256
	# CONFIG_IPMI_HANDLER is not set		# CONFIG_IPMI_HANDLER is not set
	# CONFIG_WATCHDOG is not set
	CONFIG_HW_RANDOM=m		CONFIG_HW_RANDOM=m
	CONFIG_JS_RTC=m		CONFIG_JS_RTC=m
	# CONFIG_R3964 is not set		# CONFIG_R3964 is not set
	@@ -538,9 +567,9 @@ CONFIG_DEVPORT=y
	# CONFIG_POWER_SUPPLY is not set		# CONFIG_POWER_SUPPLY is not set
	CONFIG_HWMON=y		CONFIG_HWMON=y
	# CONFIG_HWMON_VID is not set		# CONFIG_HWMON_VID is not set
	# CONFIG_SENSORS_ABITUGURU is not set		# CONFIG_SENSORS_I5K_AMB is not set
	# CONFIG_SENSORS_ABITUGURU3 is not set
	# CONFIG_SENSORS_F71805F is not set		# CONFIG_SENSORS_F71805F is not set
			# CONFIG_SENSORS_F71882FG is not set
	# CONFIG_SENSORS_IT87 is not set		# CONFIG_SENSORS_IT87 is not set
	# CONFIG_SENSORS_PC87360 is not set		# CONFIG_SENSORS_PC87360 is not set
	# CONFIG_SENSORS_PC87427 is not set		# CONFIG_SENSORS_PC87427 is not set
	@@ -553,6 +582,14 @@ CONFIG_HWMON=y
	# CONFIG_SENSORS_W83627HF is not set		# CONFIG_SENSORS_W83627HF is not set
	# CONFIG_SENSORS_W83627EHF is not set		# CONFIG_SENSORS_W83627EHF is not set
	# CONFIG_HWMON_DEBUG_CHIP is not set		# CONFIG_HWMON_DEBUG_CHIP is not set
			# CONFIG_THERMAL is not set
			# CONFIG_WATCHDOG is not set

			#
			# Sonics Silicon Backplane
			#
			CONFIG_SSB_POSSIBLE=y
			# CONFIG_SSB is not set

	#		#
	# Multifunction device drivers		# Multifunction device drivers
	@@ -569,15 +606,15 @@ CONFIG_HWMON=y
	#		#
	# Graphics support		# Graphics support
	#		#
			# CONFIG_VGASTATE is not set
			# CONFIG_VIDEO_OUTPUT_CONTROL is not set
			# CONFIG_FB is not set
	# CONFIG_BACKLIGHT_LCD_SUPPORT is not set		# CONFIG_BACKLIGHT_LCD_SUPPORT is not set

	#		#
	# Display device support		# Display device support
	#		#
	# CONFIG_DISPLAY_SUPPORT is not set		# CONFIG_DISPLAY_SUPPORT is not set
	# CONFIG_VGASTATE is not set
	# CONFIG_VIDEO_OUTPUT_CONTROL is not set
	# CONFIG_FB is not set

	#		#
	# Console display driver support		# Console display driver support
	@@ -592,6 +629,7 @@ CONFIG_DUMMY_CONSOLE=y
	CONFIG_HID_SUPPORT=y		CONFIG_HID_SUPPORT=y
	CONFIG_HID=y		CONFIG_HID=y
	# CONFIG_HID_DEBUG is not set		# CONFIG_HID_DEBUG is not set
			# CONFIG_HIDRAW is not set
	CONFIG_USB_SUPPORT=y		CONFIG_USB_SUPPORT=y
	CONFIG_USB_ARCH_HAS_HCD=y		CONFIG_USB_ARCH_HAS_HCD=y
	CONFIG_USB_ARCH_HAS_OHCI=y		CONFIG_USB_ARCH_HAS_OHCI=y
	@@ -601,33 +639,13 @@ CONFIG_USB_ARCH_HAS_EHCI=y
	#		#
	# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'		# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
	#		#

	#
	# USB Gadget Support
	#
	# CONFIG_USB_GADGET is not set		# CONFIG_USB_GADGET is not set
	# CONFIG_MMC is not set		# CONFIG_MMC is not set
			# CONFIG_MEMSTICK is not set
	# CONFIG_NEW_LEDS is not set		# CONFIG_NEW_LEDS is not set
	# CONFIG_INFINIBAND is not set		# CONFIG_INFINIBAND is not set

	#
	# Real Time Clock
	#
	# CONFIG_RTC_CLASS is not set		# CONFIG_RTC_CLASS is not set

	#
	# DMA Engine support
	#
	# CONFIG_DMA_ENGINE is not set

	#
	# DMA Clients
	#

	#
	# DMA Devices
	#

	#		#
	# Userspace I/O		# Userspace I/O
	#		#
	@@ -664,18 +682,14 @@ CONFIG_FS_MBCACHE=y
	CONFIG_FS_POSIX_ACL=y		CONFIG_FS_POSIX_ACL=y
	CONFIG_XFS_FS=m		CONFIG_XFS_FS=m
	CONFIG_XFS_QUOTA=y		CONFIG_XFS_QUOTA=y
	CONFIG_XFS_SECURITY=y
	CONFIG_XFS_POSIX_ACL=y		CONFIG_XFS_POSIX_ACL=y
	CONFIG_XFS_RT=y		CONFIG_XFS_RT=y
	# CONFIG_GFS2_FS is not set
	# CONFIG_OCFS2_FS is not set		# CONFIG_OCFS2_FS is not set
	# CONFIG_MINIX_FS is not set		CONFIG_DNOTIFY=y
	CONFIG_ROMFS_FS=m
	CONFIG_INOTIFY=y		CONFIG_INOTIFY=y
	CONFIG_INOTIFY_USER=y		CONFIG_INOTIFY_USER=y
	# CONFIG_QUOTA is not set		# CONFIG_QUOTA is not set
	CONFIG_QUOTACTL=y		CONFIG_QUOTACTL=y
	CONFIG_DNOTIFY=y
	CONFIG_AUTOFS_FS=m		CONFIG_AUTOFS_FS=m
	CONFIG_AUTOFS4_FS=m		CONFIG_AUTOFS4_FS=m
	# CONFIG_FUSE_FS is not set		# CONFIG_FUSE_FS is not set
	@@ -704,7 +718,6 @@ CONFIG_PROC_SYSCTL=y
	CONFIG_SYSFS=y		CONFIG_SYSFS=y
	# CONFIG_TMPFS is not set		# CONFIG_TMPFS is not set
	# CONFIG_HUGETLB_PAGE is not set		# CONFIG_HUGETLB_PAGE is not set
	CONFIG_RAMFS=y
	# CONFIG_CONFIGFS_FS is not set		# CONFIG_CONFIGFS_FS is not set

	#		#
	@@ -721,14 +734,13 @@ CONFIG_BEFS_FS=m
	# CONFIG_EFS_FS is not set		# CONFIG_EFS_FS is not set
	# CONFIG_CRAMFS is not set		# CONFIG_CRAMFS is not set
	# CONFIG_VXFS_FS is not set		# CONFIG_VXFS_FS is not set
			# CONFIG_MINIX_FS is not set
	# CONFIG_HPFS_FS is not set		# CONFIG_HPFS_FS is not set
	# CONFIG_QNX4FS_FS is not set		# CONFIG_QNX4FS_FS is not set
			CONFIG_ROMFS_FS=m
	# CONFIG_SYSV_FS is not set		# CONFIG_SYSV_FS is not set
	# CONFIG_UFS_FS is not set		# CONFIG_UFS_FS is not set
			CONFIG_NETWORK_FILESYSTEMS=y
	#
	# Network File Systems
	#
	CONFIG_NFS_FS=y		CONFIG_NFS_FS=y
	# CONFIG_NFS_V3 is not set		# CONFIG_NFS_V3 is not set
	# CONFIG_NFS_V4 is not set		# CONFIG_NFS_V4 is not set
	@@ -760,10 +772,6 @@ CONFIG_AFS_FS=m
	# CONFIG_PARTITION_ADVANCED is not set		# CONFIG_PARTITION_ADVANCED is not set
	CONFIG_MSDOS_PARTITION=y		CONFIG_MSDOS_PARTITION=y
	CONFIG_SUN_PARTITION=y		CONFIG_SUN_PARTITION=y

	#
	# Native Language Support
	#
	CONFIG_NLS=y		CONFIG_NLS=y
	CONFIG_NLS_DEFAULT="iso8859-1"		CONFIG_NLS_DEFAULT="iso8859-1"
	# CONFIG_NLS_CODEPAGE_437 is not set		# CONFIG_NLS_CODEPAGE_437 is not set
	@@ -804,21 +812,14 @@ CONFIG_NLS_DEFAULT="iso8859-1"
	# CONFIG_NLS_KOI8_R is not set		# CONFIG_NLS_KOI8_R is not set
	# CONFIG_NLS_KOI8_U is not set		# CONFIG_NLS_KOI8_U is not set
	# CONFIG_NLS_UTF8 is not set		# CONFIG_NLS_UTF8 is not set

	#
	# Distributed Lock Manager
	#
	# CONFIG_DLM is not set		# CONFIG_DLM is not set

	#
	# Instrumentation Support
	#
	# CONFIG_PROFILING is not set

	#		#
	# Kernel hacking		# Kernel hacking
	#		#
			CONFIG_TRACE_IRQFLAGS_SUPPORT=y
	# CONFIG_PRINTK_TIME is not set		# CONFIG_PRINTK_TIME is not set
			# CONFIG_ENABLE_WARN_DEPRECATED is not set
	CONFIG_ENABLE_MUST_CHECK=y		CONFIG_ENABLE_MUST_CHECK=y
	CONFIG_MAGIC_SYSRQ=y		CONFIG_MAGIC_SYSRQ=y
	# CONFIG_UNUSED_SYMBOLS is not set		# CONFIG_UNUSED_SYMBOLS is not set
	@@ -842,9 +843,12 @@ CONFIG_DEBUG_BUGVERBOSE=y
	# CONFIG_DEBUG_INFO is not set		# CONFIG_DEBUG_INFO is not set
	# CONFIG_DEBUG_VM is not set		# CONFIG_DEBUG_VM is not set
	# CONFIG_DEBUG_LIST is not set		# CONFIG_DEBUG_LIST is not set
	CONFIG_FORCED_INLINING=y		# CONFIG_DEBUG_SG is not set
			# CONFIG_BOOT_PRINTK_DELAY is not set
	# CONFIG_RCU_TORTURE_TEST is not set		# CONFIG_RCU_TORTURE_TEST is not set
			# CONFIG_BACKTRACE_SELF_TEST is not set
	# CONFIG_FAULT_INJECTION is not set		# CONFIG_FAULT_INJECTION is not set
			# CONFIG_SAMPLES is not set
	# CONFIG_DEBUG_STACK_USAGE is not set		# CONFIG_DEBUG_STACK_USAGE is not set

	#		#
	@@ -853,9 +857,12 @@ CONFIG_FORCED_INLINING=y
	CONFIG_KEYS=y		CONFIG_KEYS=y
	# CONFIG_KEYS_DEBUG_PROC_KEYS is not set		# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
	# CONFIG_SECURITY is not set		# CONFIG_SECURITY is not set
			# CONFIG_SECURITY_FILE_CAPABILITIES is not set
	CONFIG_CRYPTO=y		CONFIG_CRYPTO=y
	CONFIG_CRYPTO_ALGAPI=y		CONFIG_CRYPTO_ALGAPI=y
			CONFIG_CRYPTO_AEAD=y
	CONFIG_CRYPTO_BLKCIPHER=y		CONFIG_CRYPTO_BLKCIPHER=y
			# CONFIG_CRYPTO_SEQIV is not set
	CONFIG_CRYPTO_HASH=y		CONFIG_CRYPTO_HASH=y
	CONFIG_CRYPTO_MANAGER=y		CONFIG_CRYPTO_MANAGER=y
	CONFIG_CRYPTO_HMAC=y		CONFIG_CRYPTO_HMAC=y
	@@ -873,6 +880,10 @@ CONFIG_CRYPTO_ECB=m
	CONFIG_CRYPTO_CBC=y		CONFIG_CRYPTO_CBC=y
	CONFIG_CRYPTO_PCBC=m		CONFIG_CRYPTO_PCBC=m
	# CONFIG_CRYPTO_LRW is not set		# CONFIG_CRYPTO_LRW is not set
			# CONFIG_CRYPTO_XTS is not set
			# CONFIG_CRYPTO_CTR is not set
			# CONFIG_CRYPTO_GCM is not set
			# CONFIG_CRYPTO_CCM is not set
	# CONFIG_CRYPTO_CRYPTD is not set		# CONFIG_CRYPTO_CRYPTD is not set
	CONFIG_CRYPTO_DES=y		CONFIG_CRYPTO_DES=y
	# CONFIG_CRYPTO_FCRYPT is not set		# CONFIG_CRYPTO_FCRYPT is not set
	@@ -887,11 +898,15 @@ CONFIG_CRYPTO_CAST6=m
	CONFIG_CRYPTO_ARC4=m		CONFIG_CRYPTO_ARC4=m
	# CONFIG_CRYPTO_KHAZAD is not set		# CONFIG_CRYPTO_KHAZAD is not set
	# CONFIG_CRYPTO_ANUBIS is not set		# CONFIG_CRYPTO_ANUBIS is not set
			# CONFIG_CRYPTO_SEED is not set
			# CONFIG_CRYPTO_SALSA20 is not set
	CONFIG_CRYPTO_DEFLATE=y		CONFIG_CRYPTO_DEFLATE=y
	CONFIG_CRYPTO_MICHAEL_MIC=m		CONFIG_CRYPTO_MICHAEL_MIC=m
	CONFIG_CRYPTO_CRC32C=m		CONFIG_CRYPTO_CRC32C=m
	# CONFIG_CRYPTO_CAMELLIA is not set		# CONFIG_CRYPTO_CAMELLIA is not set
	# CONFIG_CRYPTO_TEST is not set		# CONFIG_CRYPTO_TEST is not set
			CONFIG_CRYPTO_AUTHENC=y
			# CONFIG_CRYPTO_LZO is not set
	# CONFIG_CRYPTO_HW is not set		# CONFIG_CRYPTO_HW is not set

	#		#