powerpc/85xx: Update defconfigs (0ae0e7ed) · Commits · e / devices / android_kernel_fairphone_FP5

arch/powerpc/configs/85xx/ksi8560_defconfig

+64 −22

Original line number	Diff line number	Diff line
		#
		# Automatically generated make config: don't edit
		# Linux kernel version: 2.6.29-rc2
		# Mon Jan 26 15:36:03 2009
		# Linux kernel version: 2.6.30-rc3
		# Wed May 13 17:22:16 2009
		#
		# CONFIG_PPC64 is not set

		@@ -22,6 +22,7 @@ CONFIG_FSL_EMB_PERFMON=y
		# CONFIG_PHYS_64BIT is not set
		CONFIG_SPE=y
		CONFIG_PPC_MMU_NOHASH=y
		CONFIG_PPC_BOOK3E_MMU=y
		# CONFIG_PPC_MM_SLICES is not set
		# CONFIG_SMP is not set
		CONFIG_PPC32=y
		@@ -59,6 +60,7 @@ CONFIG_GENERIC_BUG=y
		CONFIG_DEFAULT_UIMAGE=y
		# CONFIG_PPC_DCR_NATIVE is not set
		# CONFIG_PPC_DCR_MMIO is not set
		CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
		CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"

		#
		@@ -76,6 +78,15 @@ CONFIG_SYSVIPC_SYSCTL=y
		# CONFIG_BSD_PROCESS_ACCT is not set
		# CONFIG_TASKSTATS is not set
		# CONFIG_AUDIT is not set

		#
		# RCU Subsystem
		#
		CONFIG_CLASSIC_RCU=y
		# CONFIG_TREE_RCU is not set
		# CONFIG_PREEMPT_RCU is not set
		# CONFIG_TREE_RCU_TRACE is not set
		# CONFIG_PREEMPT_RCU_TRACE is not set
		# CONFIG_IKCONFIG is not set
		CONFIG_LOG_BUF_SHIFT=14
		# CONFIG_GROUP_SCHED is not set
		@@ -86,21 +97,24 @@ CONFIG_SYSFS_DEPRECATED_V2=y
		# CONFIG_NAMESPACES is not set
		CONFIG_BLK_DEV_INITRD=y
		CONFIG_INITRAMFS_SOURCE=""
		CONFIG_RD_GZIP=y
		# CONFIG_RD_BZIP2 is not set
		# CONFIG_RD_LZMA is not set
		# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
		CONFIG_SYSCTL=y
		CONFIG_ANON_INODES=y
		CONFIG_EMBEDDED=y
		CONFIG_SYSCTL_SYSCALL=y
		CONFIG_KALLSYMS=y
		# CONFIG_KALLSYMS_ALL is not set
		# CONFIG_KALLSYMS_EXTRA_PASS is not set
		# CONFIG_STRIP_ASM_SYMS is not set
		CONFIG_HOTPLUG=y
		CONFIG_PRINTK=y
		CONFIG_BUG=y
		CONFIG_ELF_CORE=y
		CONFIG_COMPAT_BRK=y
		CONFIG_BASE_FULL=y
		CONFIG_FUTEX=y
		CONFIG_ANON_INODES=y
		CONFIG_EPOLL=y
		CONFIG_SIGNALFD=y
		CONFIG_TIMERFD=y
		@@ -109,10 +123,12 @@ CONFIG_SHMEM=y
		CONFIG_AIO=y
		CONFIG_VM_EVENT_COUNTERS=y
		CONFIG_SLUB_DEBUG=y
		CONFIG_COMPAT_BRK=y
		# CONFIG_SLAB is not set
		CONFIG_SLUB=y
		# CONFIG_SLOB is not set
		# CONFIG_PROFILING is not set
		# CONFIG_MARKERS is not set
		CONFIG_HAVE_OPROFILE=y
		CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
		CONFIG_HAVE_IOREMAP_PROT=y
		@@ -120,6 +136,7 @@ CONFIG_HAVE_KPROBES=y
		CONFIG_HAVE_KRETPROBES=y
		CONFIG_HAVE_ARCH_TRACEHOOK=y
		CONFIG_HAVE_CLK=y
		# CONFIG_SLOW_WORK is not set
		# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
		CONFIG_SLABINFO=y
		CONFIG_RT_MUTEXES=y
		@@ -127,7 +144,6 @@ CONFIG_BASE_SMALL=0
		# CONFIG_MODULES is not set
		CONFIG_BLOCK=y
		# CONFIG_LBD is not set
		# CONFIG_BLK_DEV_IO_TRACE is not set
		# CONFIG_BLK_DEV_BSG is not set
		# CONFIG_BLK_DEV_INTEGRITY is not set

		@@ -143,11 +159,6 @@ CONFIG_DEFAULT_AS=y
		# CONFIG_DEFAULT_CFQ is not set
		# CONFIG_DEFAULT_NOOP is not set
		CONFIG_DEFAULT_IOSCHED="anticipatory"
		CONFIG_CLASSIC_RCU=y
		# CONFIG_TREE_RCU is not set
		# CONFIG_PREEMPT_RCU is not set
		# CONFIG_TREE_RCU_TRACE is not set
		# CONFIG_PREEMPT_RCU_TRACE is not set
		# CONFIG_FREEZER is not set

		#
		@@ -163,6 +174,7 @@ CONFIG_MPC85xx=y
		# CONFIG_MPC85xx_MDS is not set
		# CONFIG_MPC8536_DS is not set
		# CONFIG_MPC85xx_DS is not set
		# CONFIG_SOCRATES is not set
		CONFIG_KSI8560=y
		# CONFIG_STX_GP3 is not set
		# CONFIG_TQM8540 is not set
		@@ -231,9 +243,12 @@ CONFIG_ZONE_DMA_FLAG=1
		CONFIG_BOUNCE=y
		CONFIG_VIRT_TO_BUS=y
		CONFIG_UNEVICTABLE_LRU=y
		CONFIG_HAVE_MLOCK=y
		CONFIG_HAVE_MLOCKED_PAGE_BIT=y
		CONFIG_PPC_4K_PAGES=y
		# CONFIG_PPC_16K_PAGES is not set
		# CONFIG_PPC_64K_PAGES is not set
		# CONFIG_PPC_256K_PAGES is not set
		CONFIG_FORCE_MAX_ZONEORDER=11
		# CONFIG_PROC_DEVICETREE is not set
		# CONFIG_CMDLINE_BOOL is not set
		@@ -264,17 +279,17 @@ CONFIG_PPC_PCI_CHOICE=y
		# Default settings for advanced configuration options are used
		#
		CONFIG_LOWMEM_SIZE=0x30000000
		CONFIG_LOWMEM_CAM_NUM=3
		CONFIG_PAGE_OFFSET=0xc0000000
		CONFIG_KERNEL_START=0xc0000000
		CONFIG_PHYSICAL_START=0x00000000
		CONFIG_PHYSICAL_ALIGN=0x10000000
		CONFIG_PHYSICAL_ALIGN=0x04000000
		CONFIG_TASK_SIZE=0xc0000000
		CONFIG_NET=y

		#
		# Networking options
		#
		CONFIG_COMPAT_NET_DEV_OPS=y
		CONFIG_PACKET=y
		# CONFIG_PACKET_MMAP is not set
		CONFIG_UNIX=y
		@@ -330,6 +345,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
		# CONFIG_LAPB is not set
		# CONFIG_ECONET is not set
		# CONFIG_WAN_ROUTER is not set
		# CONFIG_PHONET is not set
		# CONFIG_NET_SCHED is not set
		# CONFIG_DCB is not set

		@@ -342,7 +358,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
		# CONFIG_IRDA is not set
		# CONFIG_BT is not set
		# CONFIG_AF_RXRPC is not set
		# CONFIG_PHONET is not set
		CONFIG_WIRELESS=y
		# CONFIG_CFG80211 is not set
		CONFIG_WIRELESS_OLD_REGULATORY=y
		@@ -444,7 +459,6 @@ CONFIG_MTD_PHYSMAP_OF=y
		# LPDDR flash memory drivers
		#
		# CONFIG_MTD_LPDDR is not set
		# CONFIG_MTD_QINFO_PROBE is not set

		#
		# UBI - Unsorted block images
		@@ -467,9 +481,13 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
		# CONFIG_ATA_OVER_ETH is not set
		# CONFIG_BLK_DEV_HD is not set
		CONFIG_MISC_DEVICES=y
		# CONFIG_EEPROM_93CX6 is not set
		# CONFIG_ENCLOSURE_SERVICES is not set
		# CONFIG_C2PORT is not set

		#
		# EEPROM support
		#
		# CONFIG_EEPROM_93CX6 is not set
		CONFIG_HAVE_IDE=y
		CONFIG_IDE=y

		@@ -502,6 +520,7 @@ CONFIG_IDE_PROC_FS=y
		# CONFIG_MD is not set
		# CONFIG_MACINTOSH_DRIVERS is not set
		CONFIG_NETDEVICES=y
		CONFIG_COMPAT_NET_DEV_OPS=y
		# CONFIG_DUMMY is not set
		# CONFIG_BONDING is not set
		# CONFIG_MACVLAN is not set
		@@ -531,6 +550,8 @@ CONFIG_MDIO_BITBANG=y
		# CONFIG_MDIO_GPIO is not set
		CONFIG_NET_ETHERNET=y
		CONFIG_MII=y
		# CONFIG_ETHOC is not set
		# CONFIG_DNET 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
		@@ -544,6 +565,7 @@ CONFIG_FS_ENET=y
		CONFIG_FS_ENET_HAS_FCC=y
		CONFIG_FS_ENET_MDIO_FCC=y
		CONFIG_NETDEV_1000=y
		CONFIG_FSL_PQ_MDIO=y
		CONFIG_GIANFAR=y
		CONFIG_NETDEV_10000=y

		@@ -552,7 +574,6 @@ CONFIG_NETDEV_10000=y
		#
		# CONFIG_WLAN_PRE80211 is not set
		# CONFIG_WLAN_80211 is not set
		# CONFIG_IWLWIFI_LEDS is not set

		#
		# Enable WiMAX (Networking options) to see the WiMAX drivers
		@@ -624,6 +645,7 @@ CONFIG_LEGACY_PTY_COUNT=256
		# CONFIG_HVC_UDBG is not set
		# CONFIG_IPMI_HANDLER is not set
		CONFIG_HW_RANDOM=y
		# CONFIG_HW_RANDOM_TIMERIOMEM is not set
		# CONFIG_NVRAM is not set
		CONFIG_GEN_RTC=y
		# CONFIG_GEN_RTC_X is not set
		@@ -663,6 +685,7 @@ CONFIG_HWMON=y
		# CONFIG_SENSORS_IT87 is not set
		# CONFIG_SENSORS_PC87360 is not set
		# CONFIG_SENSORS_PC87427 is not set
		# CONFIG_SENSORS_SHT15 is not set
		# CONFIG_SENSORS_SMSC47M1 is not set
		# CONFIG_SENSORS_SMSC47B397 is not set
		# CONFIG_SENSORS_VT1211 is not set
		@@ -726,7 +749,6 @@ CONFIG_HID=y
		#
		# Special HID drivers
		#
		CONFIG_HID_COMPAT=y
		CONFIG_USB_SUPPORT=y
		# CONFIG_USB_ARCH_HAS_HCD is not set
		# CONFIG_USB_ARCH_HAS_OHCI is not set
		@@ -739,7 +761,7 @@ CONFIG_USB_SUPPORT=y
		#

		#
		# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
		# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
		#
		# CONFIG_USB_GADGET is not set

		@@ -753,6 +775,7 @@ CONFIG_USB_SUPPORT=y
		# CONFIG_EDAC is not set
		# CONFIG_RTC_CLASS is not set
		# CONFIG_DMADEVICES is not set
		# CONFIG_AUXDISPLAY is not set
		# CONFIG_UIO is not set
		# CONFIG_STAGING is not set

		@@ -763,6 +786,7 @@ CONFIG_EXT2_FS=y
		# CONFIG_EXT2_FS_XATTR is not set
		# CONFIG_EXT2_FS_XIP is not set
		CONFIG_EXT3_FS=y
		# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
		CONFIG_EXT3_FS_XATTR=y
		# CONFIG_EXT3_FS_POSIX_ACL is not set
		# CONFIG_EXT3_FS_SECURITY is not set
		@@ -785,6 +809,11 @@ CONFIG_INOTIFY_USER=y
		# CONFIG_AUTOFS4_FS is not set
		# CONFIG_FUSE_FS is not set

		#
		# Caches
		#
		# CONFIG_FSCACHE is not set

		#
		# CD-ROM/DVD Filesystems
		#
		@@ -829,6 +858,7 @@ CONFIG_MISC_FILESYSTEMS=y
		# CONFIG_ROMFS_FS is not set
		# CONFIG_SYSV_FS is not set
		# CONFIG_UFS_FS is not set
		# CONFIG_NILFS2_FS is not set
		CONFIG_NETWORK_FILESYSTEMS=y
		CONFIG_NFS_FS=y
		# CONFIG_NFS_V3 is not set
		@@ -838,7 +868,6 @@ CONFIG_ROOT_NFS=y
		CONFIG_LOCKD=y
		CONFIG_NFS_COMMON=y
		CONFIG_SUNRPC=y
		# CONFIG_SUNRPC_REGISTER_V4 is not set
		# CONFIG_RPCSEC_GSS_KRB5 is not set
		# CONFIG_RPCSEC_GSS_SPKM3 is not set
		# CONFIG_SMB_FS is not set
		@@ -866,6 +895,7 @@ CONFIG_PARTITION_ADVANCED=y
		# CONFIG_SYSV68_PARTITION is not set
		# CONFIG_NLS is not set
		# CONFIG_DLM is not set
		# CONFIG_BINARY_PRINTF is not set

		#
		# Library routines
		@@ -879,11 +909,13 @@ CONFIG_GENERIC_FIND_LAST_BIT=y
		CONFIG_CRC32=y
		# CONFIG_CRC7 is not set
		# CONFIG_LIBCRC32C is not set
		CONFIG_PLIST=y
		CONFIG_ZLIB_INFLATE=y
		CONFIG_DECOMPRESS_GZIP=y
		CONFIG_HAS_IOMEM=y
		CONFIG_HAS_IOPORT=y
		CONFIG_HAS_DMA=y
		CONFIG_HAVE_LMB=y
		CONFIG_NLATTR=y

		#
		# Kernel hacking
		@@ -901,6 +933,9 @@ CONFIG_DEBUG_KERNEL=y
		CONFIG_DETECT_SOFTLOCKUP=y
		# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
		CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
		CONFIG_DETECT_HUNG_TASK=y
		# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
		CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
		CONFIG_SCHED_DEBUG=y
		# CONFIG_SCHEDSTATS is not set
		# CONFIG_TIMER_STATS is not set
		@@ -931,9 +966,12 @@ CONFIG_DEBUG_MUTEXES=y
		# CONFIG_FAULT_INJECTION is not set
		# CONFIG_LATENCYTOP is not set
		CONFIG_SYSCTL_SYSCALL_CHECK=y
		# CONFIG_DEBUG_PAGEALLOC is not set
		CONFIG_HAVE_FUNCTION_TRACER=y
		CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
		CONFIG_HAVE_DYNAMIC_FTRACE=y
		CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
		CONFIG_TRACING_SUPPORT=y

		#
		# Tracers
		@@ -941,17 +979,20 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
		# CONFIG_FUNCTION_TRACER is not set
		# CONFIG_SCHED_TRACER is not set
		# CONFIG_CONTEXT_SWITCH_TRACER is not set
		# CONFIG_EVENT_TRACER is not set
		# CONFIG_BOOT_TRACER is not set
		# CONFIG_TRACE_BRANCH_PROFILING is not set
		# CONFIG_STACK_TRACER is not set
		# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
		# CONFIG_KMEMTRACE is not set
		# CONFIG_WORKQUEUE_TRACER is not set
		# CONFIG_BLK_DEV_IO_TRACE is not set
		# CONFIG_DYNAMIC_DEBUG is not set
		# CONFIG_SAMPLES is not set
		CONFIG_HAVE_ARCH_KGDB=y
		# CONFIG_KGDB is not set
		CONFIG_PRINT_STACK_DEPTH=64
		# CONFIG_DEBUG_STACKOVERFLOW is not set
		# CONFIG_DEBUG_STACK_USAGE is not set
		# CONFIG_DEBUG_PAGEALLOC is not set
		# CONFIG_CODE_PATCHING_SELFTEST is not set
		# CONFIG_FTR_FIXUP_SELFTEST is not set
		# CONFIG_MSI_BITMAP_SELFTEST is not set
		@@ -1045,6 +1086,7 @@ CONFIG_CRYPTO=y
		# Compression
		#
		# CONFIG_CRYPTO_DEFLATE is not set
		# CONFIG_CRYPTO_ZLIB is not set
		# CONFIG_CRYPTO_LZO is not set

		#

arch/powerpc/configs/85xx/mpc8540_ads_defconfig

+61 −21

Original line number	Diff line number	Diff line
		#
		# Automatically generated make config: don't edit
		# Linux kernel version: 2.6.29-rc2
		# Mon Jan 26 15:36:05 2009
		# Linux kernel version: 2.6.30-rc3
		# Wed May 13 17:22:17 2009
		#
		# CONFIG_PPC64 is not set

		@@ -22,6 +22,7 @@ CONFIG_FSL_EMB_PERFMON=y
		# CONFIG_PHYS_64BIT is not set
		CONFIG_SPE=y
		CONFIG_PPC_MMU_NOHASH=y
		CONFIG_PPC_BOOK3E_MMU=y
		# CONFIG_PPC_MM_SLICES is not set
		# CONFIG_SMP is not set
		CONFIG_PPC32=y
		@@ -58,6 +59,7 @@ CONFIG_GENERIC_BUG=y
		CONFIG_DEFAULT_UIMAGE=y
		# CONFIG_PPC_DCR_NATIVE is not set
		# CONFIG_PPC_DCR_MMIO is not set
		CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
		CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"

		#
		@@ -75,6 +77,15 @@ CONFIG_SYSVIPC_SYSCTL=y
		# CONFIG_BSD_PROCESS_ACCT is not set
		# CONFIG_TASKSTATS is not set
		# CONFIG_AUDIT is not set

		#
		# RCU Subsystem
		#
		CONFIG_CLASSIC_RCU=y
		# CONFIG_TREE_RCU is not set
		# CONFIG_PREEMPT_RCU is not set
		# CONFIG_TREE_RCU_TRACE is not set
		# CONFIG_PREEMPT_RCU_TRACE is not set
		# CONFIG_IKCONFIG is not set
		CONFIG_LOG_BUF_SHIFT=14
		CONFIG_GROUP_SCHED=y
		@@ -89,21 +100,24 @@ CONFIG_SYSFS_DEPRECATED_V2=y
		# CONFIG_NAMESPACES is not set
		CONFIG_BLK_DEV_INITRD=y
		CONFIG_INITRAMFS_SOURCE=""
		CONFIG_RD_GZIP=y
		# CONFIG_RD_BZIP2 is not set
		# CONFIG_RD_LZMA is not set
		# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
		CONFIG_SYSCTL=y
		CONFIG_ANON_INODES=y
		CONFIG_EMBEDDED=y
		CONFIG_SYSCTL_SYSCALL=y
		CONFIG_KALLSYMS=y
		# CONFIG_KALLSYMS_ALL is not set
		# CONFIG_KALLSYMS_EXTRA_PASS is not set
		# CONFIG_STRIP_ASM_SYMS is not set
		CONFIG_HOTPLUG=y
		CONFIG_PRINTK=y
		CONFIG_BUG=y
		CONFIG_ELF_CORE=y
		CONFIG_COMPAT_BRK=y
		CONFIG_BASE_FULL=y
		CONFIG_FUTEX=y
		CONFIG_ANON_INODES=y
		CONFIG_EPOLL=y
		CONFIG_SIGNALFD=y
		CONFIG_TIMERFD=y
		@@ -112,16 +126,19 @@ CONFIG_SHMEM=y
		CONFIG_AIO=y
		CONFIG_VM_EVENT_COUNTERS=y
		CONFIG_SLUB_DEBUG=y
		CONFIG_COMPAT_BRK=y
		# CONFIG_SLAB is not set
		CONFIG_SLUB=y
		# CONFIG_SLOB is not set
		# CONFIG_PROFILING is not set
		# CONFIG_MARKERS is not set
		CONFIG_HAVE_OPROFILE=y
		CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
		CONFIG_HAVE_IOREMAP_PROT=y
		CONFIG_HAVE_KPROBES=y
		CONFIG_HAVE_KRETPROBES=y
		CONFIG_HAVE_ARCH_TRACEHOOK=y
		# CONFIG_SLOW_WORK is not set
		# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
		CONFIG_SLABINFO=y
		CONFIG_RT_MUTEXES=y
		@@ -129,7 +146,6 @@ CONFIG_BASE_SMALL=0
		# CONFIG_MODULES is not set
		CONFIG_BLOCK=y
		# CONFIG_LBD is not set
		# CONFIG_BLK_DEV_IO_TRACE is not set
		# CONFIG_BLK_DEV_BSG is not set
		# CONFIG_BLK_DEV_INTEGRITY is not set

		@@ -145,11 +161,6 @@ CONFIG_DEFAULT_AS=y
		# CONFIG_DEFAULT_CFQ is not set
		# CONFIG_DEFAULT_NOOP is not set
		CONFIG_DEFAULT_IOSCHED="anticipatory"
		CONFIG_CLASSIC_RCU=y
		# CONFIG_TREE_RCU is not set
		# CONFIG_PREEMPT_RCU is not set
		# CONFIG_TREE_RCU_TRACE is not set
		# CONFIG_PREEMPT_RCU_TRACE is not set
		# CONFIG_FREEZER is not set

		#
		@@ -165,6 +176,7 @@ CONFIG_MPC8540_ADS=y
		# CONFIG_MPC85xx_MDS is not set
		# CONFIG_MPC8536_DS is not set
		# CONFIG_MPC85xx_DS is not set
		# CONFIG_SOCRATES is not set
		# CONFIG_KSI8560 is not set
		# CONFIG_STX_GP3 is not set
		# CONFIG_TQM8540 is not set
		@@ -233,9 +245,12 @@ CONFIG_ZONE_DMA_FLAG=1
		CONFIG_BOUNCE=y
		CONFIG_VIRT_TO_BUS=y
		CONFIG_UNEVICTABLE_LRU=y
		CONFIG_HAVE_MLOCK=y
		CONFIG_HAVE_MLOCKED_PAGE_BIT=y
		CONFIG_PPC_4K_PAGES=y
		# CONFIG_PPC_16K_PAGES is not set
		# CONFIG_PPC_64K_PAGES is not set
		# CONFIG_PPC_256K_PAGES is not set
		CONFIG_FORCE_MAX_ZONEORDER=11
		CONFIG_PROC_DEVICETREE=y
		# CONFIG_CMDLINE_BOOL is not set
		@@ -266,17 +281,17 @@ CONFIG_PPC_PCI_CHOICE=y
		# Default settings for advanced configuration options are used
		#
		CONFIG_LOWMEM_SIZE=0x30000000
		CONFIG_LOWMEM_CAM_NUM=3
		CONFIG_PAGE_OFFSET=0xc0000000
		CONFIG_KERNEL_START=0xc0000000
		CONFIG_PHYSICAL_START=0x00000000
		CONFIG_PHYSICAL_ALIGN=0x10000000
		CONFIG_PHYSICAL_ALIGN=0x04000000
		CONFIG_TASK_SIZE=0xc0000000
		CONFIG_NET=y

		#
		# Networking options
		#
		CONFIG_COMPAT_NET_DEV_OPS=y
		CONFIG_PACKET=y
		# CONFIG_PACKET_MMAP is not set
		CONFIG_UNIX=y
		@@ -332,6 +347,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
		# CONFIG_LAPB is not set
		# CONFIG_ECONET is not set
		# CONFIG_WAN_ROUTER is not set
		# CONFIG_PHONET is not set
		# CONFIG_NET_SCHED is not set
		# CONFIG_DCB is not set

		@@ -344,7 +360,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
		# CONFIG_IRDA is not set
		# CONFIG_BT is not set
		# CONFIG_AF_RXRPC is not set
		# CONFIG_PHONET is not set
		CONFIG_WIRELESS=y
		# CONFIG_CFG80211 is not set
		CONFIG_WIRELESS_OLD_REGULATORY=y
		@@ -387,9 +402,13 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
		# CONFIG_ATA_OVER_ETH is not set
		# CONFIG_BLK_DEV_HD is not set
		CONFIG_MISC_DEVICES=y
		# CONFIG_EEPROM_93CX6 is not set
		# CONFIG_ENCLOSURE_SERVICES is not set
		# CONFIG_C2PORT is not set

		#
		# EEPROM support
		#
		# CONFIG_EEPROM_93CX6 is not set
		CONFIG_HAVE_IDE=y
		# CONFIG_IDE is not set

		@@ -404,6 +423,7 @@ CONFIG_HAVE_IDE=y
		# CONFIG_MD is not set
		# CONFIG_MACINTOSH_DRIVERS is not set
		CONFIG_NETDEVICES=y
		CONFIG_COMPAT_NET_DEV_OPS=y
		# CONFIG_DUMMY is not set
		# CONFIG_BONDING is not set
		# CONFIG_MACVLAN is not set
		@@ -432,6 +452,8 @@ CONFIG_PHYLIB=y
		# CONFIG_MDIO_BITBANG is not set
		CONFIG_NET_ETHERNET=y
		CONFIG_MII=y
		# CONFIG_ETHOC is not set
		# CONFIG_DNET 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
		@@ -441,6 +463,7 @@ CONFIG_MII=y
		# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
		# CONFIG_B44 is not set
		CONFIG_NETDEV_1000=y
		CONFIG_FSL_PQ_MDIO=y
		CONFIG_GIANFAR=y
		CONFIG_NETDEV_10000=y

		@@ -449,7 +472,6 @@ CONFIG_NETDEV_10000=y
		#
		# CONFIG_WLAN_PRE80211 is not set
		# CONFIG_WLAN_80211 is not set
		# CONFIG_IWLWIFI_LEDS is not set

		#
		# Enable WiMAX (Networking options) to see the WiMAX drivers
		@@ -607,7 +629,6 @@ CONFIG_HID=y
		#
		# Special HID drivers
		#
		CONFIG_HID_COMPAT=y
		CONFIG_USB_SUPPORT=y
		# CONFIG_USB_ARCH_HAS_HCD is not set
		# CONFIG_USB_ARCH_HAS_OHCI is not set
		@@ -620,7 +641,7 @@ CONFIG_USB_SUPPORT=y
		#

		#
		# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
		# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
		#
		# CONFIG_USB_GADGET is not set

		@@ -634,6 +655,7 @@ CONFIG_USB_SUPPORT=y
		# CONFIG_EDAC is not set
		# CONFIG_RTC_CLASS is not set
		# CONFIG_DMADEVICES is not set
		# CONFIG_AUXDISPLAY is not set
		# CONFIG_UIO is not set
		# CONFIG_STAGING is not set

		@@ -644,6 +666,7 @@ CONFIG_EXT2_FS=y
		# CONFIG_EXT2_FS_XATTR is not set
		# CONFIG_EXT2_FS_XIP is not set
		CONFIG_EXT3_FS=y
		# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
		CONFIG_EXT3_FS_XATTR=y
		# CONFIG_EXT3_FS_POSIX_ACL is not set
		# CONFIG_EXT3_FS_SECURITY is not set
		@@ -665,6 +688,11 @@ CONFIG_INOTIFY_USER=y
		# CONFIG_AUTOFS4_FS is not set
		# CONFIG_FUSE_FS is not set

		#
		# Caches
		#
		# CONFIG_FSCACHE is not set

		#
		# CD-ROM/DVD Filesystems
		#
		@@ -708,6 +736,7 @@ CONFIG_MISC_FILESYSTEMS=y
		# CONFIG_ROMFS_FS is not set
		# CONFIG_SYSV_FS is not set
		# CONFIG_UFS_FS is not set
		# CONFIG_NILFS2_FS is not set
		CONFIG_NETWORK_FILESYSTEMS=y
		CONFIG_NFS_FS=y
		# CONFIG_NFS_V3 is not set
		@@ -717,7 +746,6 @@ CONFIG_ROOT_NFS=y
		CONFIG_LOCKD=y
		CONFIG_NFS_COMMON=y
		CONFIG_SUNRPC=y
		# CONFIG_SUNRPC_REGISTER_V4 is not set
		# CONFIG_RPCSEC_GSS_KRB5 is not set
		# CONFIG_RPCSEC_GSS_SPKM3 is not set
		# CONFIG_SMB_FS is not set
		@@ -745,6 +773,7 @@ CONFIG_PARTITION_ADVANCED=y
		# CONFIG_SYSV68_PARTITION is not set
		# CONFIG_NLS is not set
		# CONFIG_DLM is not set
		# CONFIG_BINARY_PRINTF is not set

		#
		# Library routines
		@@ -758,11 +787,13 @@ CONFIG_GENERIC_FIND_LAST_BIT=y
		CONFIG_CRC32=y
		# CONFIG_CRC7 is not set
		# CONFIG_LIBCRC32C is not set
		CONFIG_PLIST=y
		CONFIG_ZLIB_INFLATE=y
		CONFIG_DECOMPRESS_GZIP=y
		CONFIG_HAS_IOMEM=y
		CONFIG_HAS_IOPORT=y
		CONFIG_HAS_DMA=y
		CONFIG_HAVE_LMB=y
		CONFIG_NLATTR=y

		#
		# Kernel hacking
		@@ -780,6 +811,9 @@ CONFIG_DEBUG_KERNEL=y
		CONFIG_DETECT_SOFTLOCKUP=y
		# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
		CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
		CONFIG_DETECT_HUNG_TASK=y
		# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
		CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
		CONFIG_SCHED_DEBUG=y
		# CONFIG_SCHEDSTATS is not set
		# CONFIG_TIMER_STATS is not set
		@@ -809,9 +843,12 @@ CONFIG_DEBUG_MUTEXES=y
		# CONFIG_FAULT_INJECTION is not set
		# CONFIG_LATENCYTOP is not set
		CONFIG_SYSCTL_SYSCALL_CHECK=y
		# CONFIG_DEBUG_PAGEALLOC is not set
		CONFIG_HAVE_FUNCTION_TRACER=y
		CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
		CONFIG_HAVE_DYNAMIC_FTRACE=y
		CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
		CONFIG_TRACING_SUPPORT=y

		#
		# Tracers
		@@ -819,17 +856,19 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
		# CONFIG_FUNCTION_TRACER is not set
		# CONFIG_SCHED_TRACER is not set
		# CONFIG_CONTEXT_SWITCH_TRACER is not set
		# CONFIG_EVENT_TRACER is not set
		# CONFIG_BOOT_TRACER is not set
		# CONFIG_TRACE_BRANCH_PROFILING is not set
		# CONFIG_STACK_TRACER is not set
		# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
		# CONFIG_KMEMTRACE is not set
		# CONFIG_WORKQUEUE_TRACER is not set
		# CONFIG_BLK_DEV_IO_TRACE is not set
		# CONFIG_SAMPLES is not set
		CONFIG_HAVE_ARCH_KGDB=y
		# CONFIG_KGDB is not set
		CONFIG_PRINT_STACK_DEPTH=64
		# CONFIG_DEBUG_STACKOVERFLOW is not set
		# CONFIG_DEBUG_STACK_USAGE is not set
		# CONFIG_DEBUG_PAGEALLOC is not set
		# CONFIG_CODE_PATCHING_SELFTEST is not set
		# CONFIG_FTR_FIXUP_SELFTEST is not set
		# CONFIG_MSI_BITMAP_SELFTEST is not set
		@@ -922,6 +961,7 @@ CONFIG_CRYPTO=y
		# Compression
		#
		# CONFIG_CRYPTO_DEFLATE is not set
		# CONFIG_CRYPTO_ZLIB is not set
		# CONFIG_CRYPTO_LZO is not set

		#