Merge commit 'kumar/merge' into merge (291f8de2) · Commits · e / devices / android_kernel_fairphone_FP4

arch/powerpc/configs/83xx/asp8347_defconfig

+66 −22

Original line number	Diff line number	Diff line
		#
		# Automatically generated make config: don't edit
		# Linux kernel version: 2.6.32-rc5
		# Thu Nov 5 08:20:20 2009
		# Linux kernel version: 2.6.33-rc3
		# Wed Jan 6 09:24:14 2010
		#
		# CONFIG_PPC64 is not set

		@@ -37,6 +37,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
		# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
		# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
		CONFIG_IRQ_PER_CPU=y
		CONFIG_NR_IRQS=512
		CONFIG_STACKTRACE_SUPPORT=y
		CONFIG_HAVE_LATENCYTOP_SUPPORT=y
		CONFIG_TRACE_IRQFLAGS_SUPPORT=y
		@@ -60,6 +61,7 @@ CONFIG_GENERIC_BUG=y
		CONFIG_DTC=y
		# CONFIG_DEFAULT_UIMAGE is not set
		CONFIG_REDBOOT=y
		CONFIG_ARCH_HIBERNATION_POSSIBLE=y
		CONFIG_ARCH_SUSPEND_POSSIBLE=y
		# CONFIG_PPC_DCR_NATIVE is not set
		# CONFIG_PPC_DCR_MMIO is not set
		@@ -88,6 +90,7 @@ CONFIG_SYSVIPC_SYSCTL=y
		#
		CONFIG_TREE_RCU=y
		# CONFIG_TREE_PREEMPT_RCU is not set
		# CONFIG_TINY_RCU is not set
		# CONFIG_RCU_TRACE is not set
		CONFIG_RCU_FANOUT=32
		# CONFIG_RCU_FANOUT_EXACT is not set
		@@ -174,14 +177,41 @@ CONFIG_LBDAF=y
		# 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_CFQ=y
		# CONFIG_DEFAULT_NOOP is not set
		CONFIG_DEFAULT_IOSCHED="anticipatory"
		CONFIG_DEFAULT_IOSCHED="cfq"
		# CONFIG_INLINE_SPIN_TRYLOCK is not set
		# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
		# CONFIG_INLINE_SPIN_LOCK is not set
		# CONFIG_INLINE_SPIN_LOCK_BH is not set
		# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
		# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
		CONFIG_INLINE_SPIN_UNLOCK=y
		# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
		CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
		# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
		# CONFIG_INLINE_READ_TRYLOCK is not set
		# CONFIG_INLINE_READ_LOCK is not set
		# CONFIG_INLINE_READ_LOCK_BH is not set
		# CONFIG_INLINE_READ_LOCK_IRQ is not set
		# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
		CONFIG_INLINE_READ_UNLOCK=y
		# CONFIG_INLINE_READ_UNLOCK_BH is not set
		CONFIG_INLINE_READ_UNLOCK_IRQ=y
		# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
		# CONFIG_INLINE_WRITE_TRYLOCK is not set
		# CONFIG_INLINE_WRITE_LOCK is not set
		# CONFIG_INLINE_WRITE_LOCK_BH is not set
		# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
		# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
		CONFIG_INLINE_WRITE_UNLOCK=y
		# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
		CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
		# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
		# CONFIG_MUTEX_SPIN_ON_OWNER is not set
		# CONFIG_FREEZER is not set

		#
		@@ -260,6 +290,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
		CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
		# CONFIG_KEXEC is not set
		# CONFIG_CRASH_DUMP is not set
		CONFIG_SPARSE_IRQ=y
		CONFIG_MAX_ACTIVE_REGIONS=32
		CONFIG_ARCH_FLATMEM_ENABLE=y
		CONFIG_ARCH_POPULATES_NODE_MAP=y
		@@ -276,8 +307,6 @@ CONFIG_MIGRATION=y
		CONFIG_ZONE_DMA_FLAG=1
		CONFIG_BOUNCE=y
		CONFIG_VIRT_TO_BUS=y
		CONFIG_HAVE_MLOCK=y
		CONFIG_HAVE_MLOCKED_PAGE_BIT=y
		# CONFIG_KSM is not set
		CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
		CONFIG_PPC_4K_PAGES=y
		@@ -404,9 +433,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
		# CONFIG_AF_RXRPC is not set
		CONFIG_WIRELESS=y
		# CONFIG_CFG80211 is not set
		CONFIG_CFG80211_DEFAULT_PS_VALUE=0
		CONFIG_WIRELESS_OLD_REGULATORY=y
		# CONFIG_WIRELESS_EXT is not set
		# CONFIG_LIB80211 is not set

		#
		@@ -530,6 +556,10 @@ CONFIG_BLK_DEV=y
		# CONFIG_BLK_DEV_COW_COMMON is not set
		CONFIG_BLK_DEV_LOOP=y
		# CONFIG_BLK_DEV_CRYPTOLOOP is not set

		#
		# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
		#
		# CONFIG_BLK_DEV_NBD is not set
		# CONFIG_BLK_DEV_SX8 is not set
		# CONFIG_BLK_DEV_UB is not set
		@@ -541,6 +571,7 @@ 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_AD525X_DPOT is not set
		# CONFIG_PHANTOM is not set
		# CONFIG_SGI_IOC4 is not set
		# CONFIG_TIFM_CORE is not set
		@@ -548,6 +579,7 @@ CONFIG_MISC_DEVICES=y
		# CONFIG_ENCLOSURE_SERVICES is not set
		# CONFIG_HP_ILO is not set
		# CONFIG_ISL29003 is not set
		# CONFIG_DS1682 is not set
		# CONFIG_C2PORT is not set

		#
		@@ -581,7 +613,7 @@ CONFIG_HAVE_IDE=y
		#

		#
		# See the help texts for more information.
		# The newer stack is recommended.
		#
		# CONFIG_FIREWIRE is not set
		# CONFIG_IEEE1394 is not set
		@@ -668,8 +700,11 @@ CONFIG_GIANFAR=y
		# CONFIG_NETDEV_10000 is not set
		# CONFIG_TR is not set
		CONFIG_WLAN=y
		# CONFIG_WLAN_PRE80211 is not set
		# CONFIG_WLAN_80211 is not set
		# CONFIG_AIRO is not set
		# CONFIG_ATMEL is not set
		# CONFIG_PRISM54 is not set
		# CONFIG_USB_ZD1201 is not set
		# CONFIG_HOSTAP is not set

		#
		# Enable WiMAX (Networking options) to see the WiMAX drivers
		@@ -691,6 +726,7 @@ CONFIG_WLAN=y
		# CONFIG_NETCONSOLE is not set
		# CONFIG_NETPOLL is not set
		# CONFIG_NET_POLL_CONTROLLER is not set
		# CONFIG_VMXNET3 is not set
		# CONFIG_ISDN is not set
		# CONFIG_PHONE is not set

		@@ -700,6 +736,7 @@ CONFIG_WLAN=y
		CONFIG_INPUT=y
		# CONFIG_INPUT_FF_MEMLESS is not set
		# CONFIG_INPUT_POLLDEV is not set
		# CONFIG_INPUT_SPARSEKMAP is not set

		#
		# Userland interfaces
		@@ -751,6 +788,7 @@ CONFIG_SERIAL_CORE=y
		CONFIG_SERIAL_CORE_CONSOLE=y
		# CONFIG_SERIAL_JSM is not set
		# CONFIG_SERIAL_OF_PLATFORM is not set
		# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
		CONFIG_UNIX98_PTYS=y
		# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
		CONFIG_LEGACY_PTYS=y
		@@ -806,11 +844,6 @@ CONFIG_I2C_MPC=y
		# CONFIG_I2C_TAOS_EVM is not set
		# CONFIG_I2C_TINY_USB is not set

		#
		# Graphics adapter I2C/DDC channel drivers
		#
		# CONFIG_I2C_VOODOO3 is not set

		#
		# Other I2C/SMBus bus drivers
		#
		@@ -820,7 +853,6 @@ CONFIG_I2C_MPC=y
		#
		# Miscellaneous I2C Chip support
		#
		# CONFIG_DS1682 is not set
		# CONFIG_SENSORS_TSL2550 is not set
		# CONFIG_I2C_DEBUG_CORE is not set
		# CONFIG_I2C_DEBUG_ALGO is not set
		@@ -866,6 +898,7 @@ CONFIG_HWMON=y
		# CONFIG_SENSORS_GL520SM is not set
		# CONFIG_SENSORS_IT87 is not set
		# CONFIG_SENSORS_LM63 is not set
		# CONFIG_SENSORS_LM73 is not set
		# CONFIG_SENSORS_LM75 is not set
		# CONFIG_SENSORS_LM77 is not set
		# CONFIG_SENSORS_LM78 is not set
		@@ -904,6 +937,7 @@ CONFIG_HWMON=y
		# CONFIG_SENSORS_W83L786NG is not set
		# CONFIG_SENSORS_W83627HF is not set
		# CONFIG_SENSORS_W83627EHF is not set
		# CONFIG_SENSORS_LIS3_I2C is not set
		CONFIG_THERMAL=y
		# CONFIG_THERMAL_HWMON is not set
		CONFIG_WATCHDOG=y
		@@ -942,11 +976,13 @@ CONFIG_SSB_POSSIBLE=y
		# CONFIG_TWL4030_CORE is not set
		# CONFIG_MFD_TMIO is not set
		# CONFIG_PMIC_DA903X is not set
		# CONFIG_PMIC_ADP5520 is not set
		# CONFIG_MFD_WM8400 is not set
		# CONFIG_MFD_WM831X is not set
		# CONFIG_MFD_WM8350_I2C is not set
		# CONFIG_MFD_PCF50633 is not set
		# CONFIG_AB3100_CORE is not set
		# CONFIG_MFD_88PM8607 is not set
		# CONFIG_REGULATOR is not set
		# CONFIG_MEDIA_SUPPORT is not set

		@@ -996,6 +1032,7 @@ CONFIG_USB_MON=y
		CONFIG_USB_EHCI_HCD=y
		CONFIG_USB_EHCI_ROOT_HUB_TT=y
		# CONFIG_USB_EHCI_TT_NEWSCHED is not set
		# CONFIG_XPS_USB_HCD_XILINX is not set
		CONFIG_USB_EHCI_FSL=y
		CONFIG_USB_EHCI_HCD_PPC_OF=y
		# CONFIG_USB_OXU210HP_HCD is not set
		@@ -1101,6 +1138,7 @@ CONFIG_RTC_DRV_DS1374=y
		# CONFIG_RTC_DRV_PCF8563 is not set
		# CONFIG_RTC_DRV_PCF8583 is not set
		# CONFIG_RTC_DRV_M41T80 is not set
		# CONFIG_RTC_DRV_BQ32K is not set
		# CONFIG_RTC_DRV_S35390A is not set
		# CONFIG_RTC_DRV_FM3130 is not set
		# CONFIG_RTC_DRV_RX8581 is not set
		@@ -1122,7 +1160,9 @@ CONFIG_RTC_DRV_DS1374=y
		# CONFIG_RTC_DRV_M48T86 is not set
		# CONFIG_RTC_DRV_M48T35 is not set
		# CONFIG_RTC_DRV_M48T59 is not set
		# CONFIG_RTC_DRV_MSM6242 is not set
		# CONFIG_RTC_DRV_BQ4802 is not set
		# CONFIG_RTC_DRV_RP5C01 is not set
		# CONFIG_RTC_DRV_V3020 is not set

		#
		@@ -1347,7 +1387,7 @@ CONFIG_FRAME_WARN=1024
		# CONFIG_DEBUG_KERNEL is not set
		# CONFIG_SLUB_DEBUG_ON is not set
		# CONFIG_SLUB_STATS is not set
		# CONFIG_DEBUG_BUGVERBOSE is not set
		CONFIG_DEBUG_BUGVERBOSE=y
		# CONFIG_DEBUG_MEMORY_INIT is not set
		# CONFIG_RCU_CPU_STALL_DETECTOR is not set
		# CONFIG_LATENCYTOP is not set
		@@ -1374,7 +1414,11 @@ CONFIG_PRINT_STACK_DEPTH=64
		# CONFIG_KEYS is not set
		# CONFIG_SECURITY is not set
		# CONFIG_SECURITYFS is not set
		# CONFIG_SECURITY_FILE_CAPABILITIES is not set
		# CONFIG_DEFAULT_SECURITY_SELINUX is not set
		# CONFIG_DEFAULT_SECURITY_SMACK is not set
		# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
		CONFIG_DEFAULT_SECURITY_DAC=y
		CONFIG_DEFAULT_SECURITY=""
		CONFIG_CRYPTO=y

		#

arch/powerpc/configs/83xx/kmeter1_defconfig

+56 −12

Original line number	Diff line number	Diff line
		#
		# Automatically generated make config: don't edit
		# Linux kernel version: 2.6.32-rc5
		# Thu Nov 5 08:20:21 2009
		# Linux kernel version: 2.6.33-rc3
		# Wed Jan 6 09:24:14 2010
		#
		# CONFIG_PPC64 is not set

		@@ -37,6 +37,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
		# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
		# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
		CONFIG_IRQ_PER_CPU=y
		CONFIG_NR_IRQS=512
		CONFIG_STACKTRACE_SUPPORT=y
		CONFIG_HAVE_LATENCYTOP_SUPPORT=y
		CONFIG_TRACE_IRQFLAGS_SUPPORT=y
		@@ -59,6 +60,7 @@ CONFIG_AUDIT_ARCH=y
		CONFIG_GENERIC_BUG=y
		CONFIG_DTC=y
		CONFIG_DEFAULT_UIMAGE=y
		CONFIG_ARCH_HIBERNATION_POSSIBLE=y
		CONFIG_ARCH_SUSPEND_POSSIBLE=y
		# CONFIG_PPC_DCR_NATIVE is not set
		# CONFIG_PPC_DCR_MMIO is not set
		@@ -89,6 +91,7 @@ CONFIG_POSIX_MQUEUE_SYSCTL=y
		#
		CONFIG_TREE_RCU=y
		# CONFIG_TREE_PREEMPT_RCU is not set
		# CONFIG_TINY_RCU is not set
		# CONFIG_RCU_TRACE is not set
		CONFIG_RCU_FANOUT=32
		# CONFIG_RCU_FANOUT_EXACT is not set
		@@ -168,14 +171,41 @@ CONFIG_LBDAF=y
		# IO Schedulers
		#
		CONFIG_IOSCHED_NOOP=y
		# CONFIG_IOSCHED_AS is not set
		# CONFIG_IOSCHED_DEADLINE is not set
		# CONFIG_IOSCHED_CFQ is not set
		# CONFIG_DEFAULT_AS is not set
		# CONFIG_DEFAULT_DEADLINE is not set
		# CONFIG_DEFAULT_CFQ is not set
		CONFIG_DEFAULT_NOOP=y
		CONFIG_DEFAULT_IOSCHED="noop"
		# CONFIG_INLINE_SPIN_TRYLOCK is not set
		# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
		# CONFIG_INLINE_SPIN_LOCK is not set
		# CONFIG_INLINE_SPIN_LOCK_BH is not set
		# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
		# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
		# CONFIG_INLINE_SPIN_UNLOCK is not set
		# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
		# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set
		# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
		# CONFIG_INLINE_READ_TRYLOCK is not set
		# CONFIG_INLINE_READ_LOCK is not set
		# CONFIG_INLINE_READ_LOCK_BH is not set
		# CONFIG_INLINE_READ_LOCK_IRQ is not set
		# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
		# CONFIG_INLINE_READ_UNLOCK is not set
		# CONFIG_INLINE_READ_UNLOCK_BH is not set
		# CONFIG_INLINE_READ_UNLOCK_IRQ is not set
		# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
		# CONFIG_INLINE_WRITE_TRYLOCK is not set
		# CONFIG_INLINE_WRITE_LOCK is not set
		# CONFIG_INLINE_WRITE_LOCK_BH is not set
		# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
		# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
		# CONFIG_INLINE_WRITE_UNLOCK is not set
		# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
		# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
		# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
		# CONFIG_MUTEX_SPIN_ON_OWNER is not set
		# CONFIG_FREEZER is not set

		#
		@@ -253,6 +283,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
		CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
		# CONFIG_KEXEC is not set
		# CONFIG_CRASH_DUMP is not set
		CONFIG_SPARSE_IRQ=y
		CONFIG_MAX_ACTIVE_REGIONS=32
		CONFIG_ARCH_FLATMEM_ENABLE=y
		CONFIG_ARCH_POPULATES_NODE_MAP=y
		@@ -269,8 +300,6 @@ CONFIG_MIGRATION=y
		CONFIG_ZONE_DMA_FLAG=1
		CONFIG_BOUNCE=y
		CONFIG_VIRT_TO_BUS=y
		CONFIG_HAVE_MLOCK=y
		CONFIG_HAVE_MLOCKED_PAGE_BIT=y
		# CONFIG_KSM is not set
		CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
		CONFIG_PPC_4K_PAGES=y
		@@ -384,7 +413,13 @@ CONFIG_LLC=m
		# CONFIG_IRDA is not set
		# CONFIG_BT is not set
		# CONFIG_AF_RXRPC is not set
		# CONFIG_WIRELESS is not set
		CONFIG_WIRELESS=y
		# CONFIG_CFG80211 is not set
		# CONFIG_LIB80211 is not set

		#
		# CFG80211 needs to be enabled for MAC80211
		#
		# CONFIG_WIMAX is not set
		# CONFIG_RFKILL is not set
		# CONFIG_NET_9P is not set
		@@ -512,6 +547,10 @@ CONFIG_BLK_DEV=y
		# CONFIG_BLK_DEV_FD is not set
		# CONFIG_BLK_DEV_COW_COMMON is not set
		# CONFIG_BLK_DEV_LOOP is not set

		#
		# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
		#
		# CONFIG_BLK_DEV_NBD is not set
		# CONFIG_BLK_DEV_RAM is not set
		# CONFIG_CDROM_PKTCDVD is not set
		@@ -581,8 +620,7 @@ CONFIG_UCC_GETH=y
		# CONFIG_MV643XX_ETH is not set
		# CONFIG_NETDEV_10000 is not set
		CONFIG_WLAN=y
		# CONFIG_WLAN_PRE80211 is not set
		# CONFIG_WLAN_80211 is not set
		# CONFIG_HOSTAP is not set

		#
		# Enable WiMAX (Networking options) to see the WiMAX drivers
		@@ -652,6 +690,7 @@ CONFIG_SERIAL_CORE=y
		CONFIG_SERIAL_CORE_CONSOLE=y
		# CONFIG_SERIAL_OF_PLATFORM is not set
		# CONFIG_SERIAL_QE is not set
		# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
		CONFIG_UNIX98_PTYS=y
		# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
		CONFIG_LEGACY_PTYS=y
		@@ -697,7 +736,6 @@ CONFIG_I2C_MPC=y
		#
		# Miscellaneous I2C Chip support
		#
		# CONFIG_DS1682 is not set
		# CONFIG_SENSORS_TSL2550 is not set
		# CONFIG_I2C_DEBUG_CORE is not set
		# CONFIG_I2C_DEBUG_ALGO is not set
		@@ -732,11 +770,13 @@ CONFIG_SSB_POSSIBLE=y
		# CONFIG_TWL4030_CORE is not set
		# CONFIG_MFD_TMIO is not set
		# CONFIG_PMIC_DA903X is not set
		# CONFIG_PMIC_ADP5520 is not set
		# CONFIG_MFD_WM8400 is not set
		# CONFIG_MFD_WM831X is not set
		# CONFIG_MFD_WM8350_I2C is not set
		# CONFIG_MFD_PCF50633 is not set
		# CONFIG_AB3100_CORE is not set
		# CONFIG_MFD_88PM8607 is not set
		# CONFIG_REGULATOR is not set
		# CONFIG_MEDIA_SUPPORT is not set

		@@ -933,7 +973,7 @@ CONFIG_FRAME_WARN=1024
		CONFIG_DEBUG_FS=y
		# CONFIG_HEADERS_CHECK is not set
		# CONFIG_DEBUG_KERNEL is not set
		# CONFIG_DEBUG_BUGVERBOSE is not set
		CONFIG_DEBUG_BUGVERBOSE=y
		# CONFIG_DEBUG_MEMORY_INIT is not set
		# CONFIG_RCU_CPU_STALL_DETECTOR is not set
		# CONFIG_LATENCYTOP is not set
		@@ -963,7 +1003,11 @@ CONFIG_PRINT_STACK_DEPTH=64
		# CONFIG_KEYS is not set
		# CONFIG_SECURITY is not set
		# CONFIG_SECURITYFS is not set
		# CONFIG_SECURITY_FILE_CAPABILITIES is not set
		# CONFIG_DEFAULT_SECURITY_SELINUX is not set
		# CONFIG_DEFAULT_SECURITY_SMACK is not set
		# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
		CONFIG_DEFAULT_SECURITY_DAC=y
		CONFIG_DEFAULT_SECURITY=""
		# CONFIG_CRYPTO is not set
		# CONFIG_PPC_CLOCK is not set
		CONFIG_PPC_LIB_RHEAP=y

arch/powerpc/configs/83xx/mpc8313_rdb_defconfig

+75 −22

Original line number	Diff line number	Diff line
		#
		# Automatically generated make config: don't edit
		# Linux kernel version: 2.6.32-rc5
		# Thu Nov 5 08:20:22 2009
		# Linux kernel version: 2.6.33-rc3
		# Wed Jan 6 09:24:15 2010
		#
		# CONFIG_PPC64 is not set

		@@ -37,6 +37,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
		# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
		# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
		CONFIG_IRQ_PER_CPU=y
		CONFIG_NR_IRQS=512
		CONFIG_STACKTRACE_SUPPORT=y
		CONFIG_HAVE_LATENCYTOP_SUPPORT=y
		CONFIG_TRACE_IRQFLAGS_SUPPORT=y
		@@ -59,6 +60,7 @@ CONFIG_AUDIT_ARCH=y
		CONFIG_GENERIC_BUG=y
		CONFIG_DTC=y
		CONFIG_DEFAULT_UIMAGE=y
		CONFIG_ARCH_HIBERNATION_POSSIBLE=y
		CONFIG_ARCH_SUSPEND_POSSIBLE=y
		# CONFIG_PPC_DCR_NATIVE is not set
		# CONFIG_PPC_DCR_MMIO is not set
		@@ -87,6 +89,7 @@ CONFIG_SYSVIPC_SYSCTL=y
		#
		CONFIG_TREE_RCU=y
		# CONFIG_TREE_PREEMPT_RCU is not set
		# CONFIG_TINY_RCU is not set
		# CONFIG_RCU_TRACE is not set
		CONFIG_RCU_FANOUT=32
		# CONFIG_RCU_FANOUT_EXACT is not set
		@@ -173,14 +176,41 @@ CONFIG_LBDAF=y
		# 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_CFQ=y
		# CONFIG_DEFAULT_NOOP is not set
		CONFIG_DEFAULT_IOSCHED="anticipatory"
		CONFIG_DEFAULT_IOSCHED="cfq"
		# CONFIG_INLINE_SPIN_TRYLOCK is not set
		# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
		# CONFIG_INLINE_SPIN_LOCK is not set
		# CONFIG_INLINE_SPIN_LOCK_BH is not set
		# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
		# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
		CONFIG_INLINE_SPIN_UNLOCK=y
		# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
		CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
		# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
		# CONFIG_INLINE_READ_TRYLOCK is not set
		# CONFIG_INLINE_READ_LOCK is not set
		# CONFIG_INLINE_READ_LOCK_BH is not set
		# CONFIG_INLINE_READ_LOCK_IRQ is not set
		# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
		CONFIG_INLINE_READ_UNLOCK=y
		# CONFIG_INLINE_READ_UNLOCK_BH is not set
		CONFIG_INLINE_READ_UNLOCK_IRQ=y
		# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
		# CONFIG_INLINE_WRITE_TRYLOCK is not set
		# CONFIG_INLINE_WRITE_LOCK is not set
		# CONFIG_INLINE_WRITE_LOCK_BH is not set
		# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
		# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
		CONFIG_INLINE_WRITE_UNLOCK=y
		# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
		CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
		# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
		# CONFIG_MUTEX_SPIN_ON_OWNER is not set
		# CONFIG_FREEZER is not set

		#
		@@ -259,6 +289,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
		CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
		# CONFIG_KEXEC is not set
		# CONFIG_CRASH_DUMP is not set
		CONFIG_SPARSE_IRQ=y
		CONFIG_MAX_ACTIVE_REGIONS=32
		CONFIG_ARCH_FLATMEM_ENABLE=y
		CONFIG_ARCH_POPULATES_NODE_MAP=y
		@@ -275,8 +306,6 @@ CONFIG_MIGRATION=y
		CONFIG_ZONE_DMA_FLAG=1
		CONFIG_BOUNCE=y
		CONFIG_VIRT_TO_BUS=y
		CONFIG_HAVE_MLOCK=y
		CONFIG_HAVE_MLOCKED_PAGE_BIT=y
		# CONFIG_KSM is not set
		CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
		CONFIG_PPC_4K_PAGES=y
		@@ -404,9 +433,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
		# CONFIG_AF_RXRPC is not set
		CONFIG_WIRELESS=y
		# CONFIG_CFG80211 is not set
		CONFIG_CFG80211_DEFAULT_PS_VALUE=0
		CONFIG_WIRELESS_OLD_REGULATORY=y
		# CONFIG_WIRELESS_EXT is not set
		# CONFIG_LIB80211 is not set

		#
		@@ -544,6 +570,10 @@ CONFIG_BLK_DEV=y
		# CONFIG_BLK_DEV_COW_COMMON is not set
		CONFIG_BLK_DEV_LOOP=y
		# CONFIG_BLK_DEV_CRYPTOLOOP is not set

		#
		# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
		#
		# CONFIG_BLK_DEV_NBD is not set
		# CONFIG_BLK_DEV_SX8 is not set
		# CONFIG_BLK_DEV_UB is not set
		@@ -555,6 +585,7 @@ 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_AD525X_DPOT is not set
		# CONFIG_PHANTOM is not set
		# CONFIG_SGI_IOC4 is not set
		# CONFIG_TIFM_CORE is not set
		@@ -562,6 +593,8 @@ CONFIG_MISC_DEVICES=y
		# CONFIG_ENCLOSURE_SERVICES is not set
		# CONFIG_HP_ILO is not set
		# CONFIG_ISL29003 is not set
		# CONFIG_DS1682 is not set
		# CONFIG_TI_DAC7512 is not set
		# CONFIG_C2PORT is not set

		#
		@@ -615,7 +648,9 @@ CONFIG_SCSI_LOWLEVEL=y
		# CONFIG_SCSI_BNX2_ISCSI is not set
		# CONFIG_BE2ISCSI is not set
		# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
		# CONFIG_SCSI_HPSA is not set
		# CONFIG_SCSI_3W_9XXX is not set
		# CONFIG_SCSI_3W_SAS is not set
		# CONFIG_SCSI_ACARD is not set
		# CONFIG_SCSI_AACRAID is not set
		# CONFIG_SCSI_AIC7XXX is not set
		@@ -653,6 +688,7 @@ CONFIG_SCSI_LOWLEVEL=y
		# CONFIG_SCSI_NSP32 is not set
		# CONFIG_SCSI_DEBUG is not set
		# CONFIG_SCSI_PMCRAID is not set
		# CONFIG_SCSI_PM8001 is not set
		# CONFIG_SCSI_SRP is not set
		# CONFIG_SCSI_BFA_FC is not set
		# CONFIG_SCSI_DH is not set
		@@ -680,7 +716,7 @@ CONFIG_MD_RAID1=y
		#

		#
		# See the help texts for more information.
		# The newer stack is recommended.
		#
		# CONFIG_FIREWIRE is not set
		# CONFIG_IEEE1394 is not set
		@@ -805,8 +841,11 @@ CONFIG_CHELSIO_T3_DEPENDS=y
		# CONFIG_BE2NET is not set
		# CONFIG_TR is not set
		CONFIG_WLAN=y
		# CONFIG_WLAN_PRE80211 is not set
		# CONFIG_WLAN_80211 is not set
		# CONFIG_AIRO is not set
		# CONFIG_ATMEL is not set
		# CONFIG_PRISM54 is not set
		# CONFIG_USB_ZD1201 is not set
		# CONFIG_HOSTAP is not set

		#
		# Enable WiMAX (Networking options) to see the WiMAX drivers
		@@ -829,6 +868,7 @@ CONFIG_WLAN=y
		# CONFIG_NETCONSOLE is not set
		# CONFIG_NETPOLL is not set
		# CONFIG_NET_POLL_CONTROLLER is not set
		# CONFIG_VMXNET3 is not set
		# CONFIG_ISDN is not set
		# CONFIG_PHONE is not set

		@@ -838,6 +878,7 @@ CONFIG_WLAN=y
		CONFIG_INPUT=y
		# CONFIG_INPUT_FF_MEMLESS is not set
		# CONFIG_INPUT_POLLDEV is not set
		# CONFIG_INPUT_SPARSEKMAP is not set

		#
		# Userland interfaces
		@@ -890,6 +931,7 @@ CONFIG_SERIAL_CORE=y
		CONFIG_SERIAL_CORE_CONSOLE=y
		# CONFIG_SERIAL_JSM is not set
		# CONFIG_SERIAL_OF_PLATFORM is not set
		# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
		CONFIG_UNIX98_PTYS=y
		# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
		CONFIG_LEGACY_PTYS=y
		@@ -946,11 +988,6 @@ CONFIG_I2C_MPC=y
		# CONFIG_I2C_TAOS_EVM is not set
		# CONFIG_I2C_TINY_USB is not set

		#
		# Graphics adapter I2C/DDC channel drivers
		#
		# CONFIG_I2C_VOODOO3 is not set

		#
		# Other I2C/SMBus bus drivers
		#
		@@ -960,7 +997,6 @@ CONFIG_I2C_MPC=y
		#
		# Miscellaneous I2C Chip support
		#
		# CONFIG_DS1682 is not set
		# CONFIG_SENSORS_TSL2550 is not set
		# CONFIG_I2C_DEBUG_CORE is not set
		# CONFIG_I2C_DEBUG_ALGO is not set
		@@ -975,6 +1011,8 @@ CONFIG_SPI_MASTER=y
		#
		CONFIG_SPI_BITBANG=y
		# CONFIG_SPI_MPC8xxx is not set
		# CONFIG_SPI_XILINX is not set
		# CONFIG_SPI_DESIGNWARE is not set

		#
		# SPI Protocol Masters
		@@ -1022,6 +1060,7 @@ CONFIG_HWMON=y
		# CONFIG_SENSORS_IT87 is not set
		# CONFIG_SENSORS_LM63 is not set
		# CONFIG_SENSORS_LM70 is not set
		# CONFIG_SENSORS_LM73 is not set
		# CONFIG_SENSORS_LM75 is not set
		# CONFIG_SENSORS_LM77 is not set
		# CONFIG_SENSORS_LM78 is not set
		@@ -1062,6 +1101,7 @@ CONFIG_HWMON=y
		# CONFIG_SENSORS_W83627HF is not set
		# CONFIG_SENSORS_W83627EHF is not set
		# CONFIG_SENSORS_LIS3_SPI is not set
		# CONFIG_SENSORS_LIS3_I2C is not set
		# CONFIG_THERMAL is not set
		CONFIG_WATCHDOG=y
		# CONFIG_WATCHDOG_NOWAYOUT is not set
		@@ -1099,6 +1139,7 @@ CONFIG_SSB_POSSIBLE=y
		# CONFIG_TWL4030_CORE is not set
		# CONFIG_MFD_TMIO is not set
		# CONFIG_PMIC_DA903X is not set
		# CONFIG_PMIC_ADP5520 is not set
		# CONFIG_MFD_WM8400 is not set
		# CONFIG_MFD_WM831X is not set
		# CONFIG_MFD_WM8350_I2C is not set
		@@ -1106,6 +1147,8 @@ CONFIG_SSB_POSSIBLE=y
		# CONFIG_MFD_MC13783 is not set
		# CONFIG_AB3100_CORE is not set
		# CONFIG_EZX_PCAP is not set
		# CONFIG_MFD_88PM8607 is not set
		# CONFIG_AB4500_CORE is not set
		# CONFIG_REGULATOR is not set
		# CONFIG_MEDIA_SUPPORT is not set

		@@ -1173,6 +1216,7 @@ CONFIG_USB_MON=y
		CONFIG_USB_EHCI_HCD=y
		CONFIG_USB_EHCI_ROOT_HUB_TT=y
		# CONFIG_USB_EHCI_TT_NEWSCHED is not set
		# CONFIG_XPS_USB_HCD_XILINX is not set
		CONFIG_USB_EHCI_FSL=y
		CONFIG_USB_EHCI_HCD_PPC_OF=y
		# CONFIG_USB_OXU210HP_HCD is not set
		@@ -1287,15 +1331,17 @@ CONFIG_USB_NET2280=y
		CONFIG_USB_GADGET_DUALSPEED=y
		# CONFIG_USB_ZERO is not set
		# CONFIG_USB_AUDIO is not set
		CONFIG_USB_ETH=y
		CONFIG_USB_ETH=m
		CONFIG_USB_ETH_RNDIS=y
		# CONFIG_USB_ETH_EEM is not set
		# CONFIG_USB_GADGETFS is not set
		# CONFIG_USB_FILE_STORAGE is not set
		# CONFIG_USB_MASS_STORAGE is not set
		# CONFIG_USB_G_SERIAL is not set
		# CONFIG_USB_MIDI_GADGET is not set
		# CONFIG_USB_G_PRINTER is not set
		# CONFIG_USB_CDC_COMPOSITE is not set
		# CONFIG_USB_G_MULTI is not set

		#
		# OTG and related infrastructure
		@@ -1336,6 +1382,7 @@ CONFIG_RTC_DRV_DS1307=y
		# CONFIG_RTC_DRV_PCF8563 is not set
		# CONFIG_RTC_DRV_PCF8583 is not set
		# CONFIG_RTC_DRV_M41T80 is not set
		# CONFIG_RTC_DRV_BQ32K is not set
		# CONFIG_RTC_DRV_S35390A is not set
		# CONFIG_RTC_DRV_FM3130 is not set
		# CONFIG_RTC_DRV_RX8581 is not set
		@@ -1365,7 +1412,9 @@ CONFIG_RTC_DRV_DS1307=y
		# CONFIG_RTC_DRV_M48T86 is not set
		# CONFIG_RTC_DRV_M48T35 is not set
		# CONFIG_RTC_DRV_M48T59 is not set
		# CONFIG_RTC_DRV_MSM6242 is not set
		# CONFIG_RTC_DRV_BQ4802 is not set
		# CONFIG_RTC_DRV_RP5C01 is not set
		# CONFIG_RTC_DRV_V3020 is not set

		#
		@@ -1676,7 +1725,11 @@ CONFIG_PRINT_STACK_DEPTH=64
		# CONFIG_KEYS is not set
		# CONFIG_SECURITY is not set
		# CONFIG_SECURITYFS is not set
		# CONFIG_SECURITY_FILE_CAPABILITIES is not set
		# CONFIG_DEFAULT_SECURITY_SELINUX is not set
		# CONFIG_DEFAULT_SECURITY_SMACK is not set
		# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
		CONFIG_DEFAULT_SECURITY_DAC=y
		CONFIG_DEFAULT_SECURITY=""
		CONFIG_CRYPTO=y

		#

arch/powerpc/configs/83xx/mpc8315_rdb_defconfig

+77 −23

File changed.

Preview size limit exceeded, changes collapsed.

arch/powerpc/configs/83xx/mpc832x_mds_defconfig

+67 −22

File changed.

Preview size limit exceeded, changes collapsed.