aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arch/powerpc/configs/83xx/asp8347_defconfig91
-rw-r--r--arch/powerpc/configs/83xx/mpc8313_rdb_defconfig103
-rw-r--r--arch/powerpc/configs/83xx/mpc8315_rdb_defconfig103
-rw-r--r--arch/powerpc/configs/83xx/mpc832x_mds_defconfig86
-rw-r--r--arch/powerpc/configs/83xx/mpc832x_rdb_defconfig89
-rw-r--r--arch/powerpc/configs/83xx/mpc834x_itx_defconfig100
-rw-r--r--arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig98
-rw-r--r--arch/powerpc/configs/83xx/mpc834x_mds_defconfig84
-rw-r--r--arch/powerpc/configs/83xx/mpc836x_mds_defconfig93
-rw-r--r--arch/powerpc/configs/83xx/mpc836x_rdk_defconfig88
-rw-r--r--arch/powerpc/configs/83xx/mpc837x_mds_defconfig84
-rw-r--r--arch/powerpc/configs/83xx/mpc837x_rdb_defconfig90
-rw-r--r--arch/powerpc/configs/83xx/sbc834x_defconfig74
-rw-r--r--arch/powerpc/configs/mpc83xx_defconfig107
14 files changed, 895 insertions, 395 deletions
diff --git a/arch/powerpc/configs/83xx/asp8347_defconfig b/arch/powerpc/configs/83xx/asp8347_defconfig
index cbecaf3d790..9041bd2f12b 100644
--- a/arch/powerpc/configs/83xx/asp8347_defconfig
+++ b/arch/powerpc/configs/83xx/asp8347_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc3 3# Linux kernel version: 2.6.29-rc2
4# Sat Nov 8 12:39:49 2008 4# Mon Jan 26 15:35:47 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -44,7 +44,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
44CONFIG_PPC=y 44CONFIG_PPC=y
45CONFIG_EARLY_PRINTK=y 45CONFIG_EARLY_PRINTK=y
46CONFIG_GENERIC_NVRAM=y 46CONFIG_GENERIC_NVRAM=y
47CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 47CONFIG_SCHED_OMIT_FRAME_POINTER=y
48CONFIG_ARCH_MAY_HAVE_PC_FDC=y 48CONFIG_ARCH_MAY_HAVE_PC_FDC=y
49CONFIG_PPC_OF=y 49CONFIG_PPC_OF=y
50CONFIG_OF=y 50CONFIG_OF=y
@@ -76,12 +76,12 @@ CONFIG_SYSVIPC_SYSCTL=y
76# CONFIG_AUDIT is not set 76# CONFIG_AUDIT is not set
77# CONFIG_IKCONFIG is not set 77# CONFIG_IKCONFIG is not set
78CONFIG_LOG_BUF_SHIFT=14 78CONFIG_LOG_BUF_SHIFT=14
79# CONFIG_CGROUPS is not set
80CONFIG_GROUP_SCHED=y 79CONFIG_GROUP_SCHED=y
81# CONFIG_FAIR_GROUP_SCHED is not set 80# CONFIG_FAIR_GROUP_SCHED is not set
82# CONFIG_RT_GROUP_SCHED is not set 81# CONFIG_RT_GROUP_SCHED is not set
83CONFIG_USER_SCHED=y 82CONFIG_USER_SCHED=y
84# CONFIG_CGROUP_SCHED is not set 83# CONFIG_CGROUP_SCHED is not set
84# CONFIG_CGROUPS is not set
85CONFIG_SYSFS_DEPRECATED=y 85CONFIG_SYSFS_DEPRECATED=y
86CONFIG_SYSFS_DEPRECATED_V2=y 86CONFIG_SYSFS_DEPRECATED_V2=y
87# CONFIG_RELAY is not set 87# CONFIG_RELAY is not set
@@ -114,7 +114,6 @@ CONFIG_SLUB_DEBUG=y
114CONFIG_SLUB=y 114CONFIG_SLUB=y
115# CONFIG_SLOB is not set 115# CONFIG_SLOB is not set
116# CONFIG_PROFILING is not set 116# CONFIG_PROFILING is not set
117# CONFIG_MARKERS is not set
118CONFIG_HAVE_OPROFILE=y 117CONFIG_HAVE_OPROFILE=y
119CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 118CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
120CONFIG_HAVE_IOREMAP_PROT=y 119CONFIG_HAVE_IOREMAP_PROT=y
@@ -124,7 +123,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
124# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 123# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
125CONFIG_SLABINFO=y 124CONFIG_SLABINFO=y
126CONFIG_RT_MUTEXES=y 125CONFIG_RT_MUTEXES=y
127# CONFIG_TINY_SHMEM is not set
128CONFIG_BASE_SMALL=0 126CONFIG_BASE_SMALL=0
129CONFIG_MODULES=y 127CONFIG_MODULES=y
130# CONFIG_MODULE_FORCE_LOAD is not set 128# CONFIG_MODULE_FORCE_LOAD is not set
@@ -132,11 +130,9 @@ CONFIG_MODULE_UNLOAD=y
132# CONFIG_MODULE_FORCE_UNLOAD is not set 130# CONFIG_MODULE_FORCE_UNLOAD is not set
133# CONFIG_MODVERSIONS is not set 131# CONFIG_MODVERSIONS is not set
134# CONFIG_MODULE_SRCVERSION_ALL is not set 132# CONFIG_MODULE_SRCVERSION_ALL is not set
135CONFIG_KMOD=y
136CONFIG_BLOCK=y 133CONFIG_BLOCK=y
137# CONFIG_LBD is not set 134# CONFIG_LBD is not set
138# CONFIG_BLK_DEV_IO_TRACE is not set 135# CONFIG_BLK_DEV_IO_TRACE is not set
139# CONFIG_LSF is not set
140# CONFIG_BLK_DEV_BSG is not set 136# CONFIG_BLK_DEV_BSG is not set
141# CONFIG_BLK_DEV_INTEGRITY is not set 137# CONFIG_BLK_DEV_INTEGRITY is not set
142 138
@@ -153,6 +149,10 @@ CONFIG_DEFAULT_AS=y
153# CONFIG_DEFAULT_NOOP is not set 149# CONFIG_DEFAULT_NOOP is not set
154CONFIG_DEFAULT_IOSCHED="anticipatory" 150CONFIG_DEFAULT_IOSCHED="anticipatory"
155CONFIG_CLASSIC_RCU=y 151CONFIG_CLASSIC_RCU=y
152# CONFIG_TREE_RCU is not set
153# CONFIG_PREEMPT_RCU is not set
154# CONFIG_TREE_RCU_TRACE is not set
155# CONFIG_PREEMPT_RCU_TRACE is not set
156# CONFIG_FREEZER is not set 156# CONFIG_FREEZER is not set
157 157
158# 158#
@@ -199,6 +199,8 @@ CONFIG_IPIC=y
199# CONFIG_QUICC_ENGINE is not set 199# CONFIG_QUICC_ENGINE is not set
200# CONFIG_FSL_ULI1575 is not set 200# CONFIG_FSL_ULI1575 is not set
201# CONFIG_MPC8xxx_GPIO is not set 201# CONFIG_MPC8xxx_GPIO is not set
202# CONFIG_SIMPLE_GPIO is not set
203# CONFIG_MCU_MPC8349EMITX is not set
202 204
203# 205#
204# Kernel options 206# Kernel options
@@ -226,6 +228,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
226CONFIG_ARCH_HAS_WALK_MEMORY=y 228CONFIG_ARCH_HAS_WALK_MEMORY=y
227CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 229CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
228# CONFIG_KEXEC is not set 230# CONFIG_KEXEC is not set
231# CONFIG_CRASH_DUMP is not set
229CONFIG_ARCH_FLATMEM_ENABLE=y 232CONFIG_ARCH_FLATMEM_ENABLE=y
230CONFIG_ARCH_POPULATES_NODE_MAP=y 233CONFIG_ARCH_POPULATES_NODE_MAP=y
231CONFIG_SELECT_MEMORY_MODEL=y 234CONFIG_SELECT_MEMORY_MODEL=y
@@ -237,12 +240,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
237CONFIG_PAGEFLAGS_EXTENDED=y 240CONFIG_PAGEFLAGS_EXTENDED=y
238CONFIG_SPLIT_PTLOCK_CPUS=4 241CONFIG_SPLIT_PTLOCK_CPUS=4
239CONFIG_MIGRATION=y 242CONFIG_MIGRATION=y
240# CONFIG_RESOURCES_64BIT is not set
241# CONFIG_PHYS_ADDR_T_64BIT is not set 243# CONFIG_PHYS_ADDR_T_64BIT is not set
242CONFIG_ZONE_DMA_FLAG=1 244CONFIG_ZONE_DMA_FLAG=1
243CONFIG_BOUNCE=y 245CONFIG_BOUNCE=y
244CONFIG_VIRT_TO_BUS=y 246CONFIG_VIRT_TO_BUS=y
245CONFIG_UNEVICTABLE_LRU=y 247CONFIG_UNEVICTABLE_LRU=y
248CONFIG_PPC_4K_PAGES=y
249# CONFIG_PPC_16K_PAGES is not set
250# CONFIG_PPC_64K_PAGES is not set
246CONFIG_FORCE_MAX_ZONEORDER=11 251CONFIG_FORCE_MAX_ZONEORDER=11
247CONFIG_PROC_DEVICETREE=y 252CONFIG_PROC_DEVICETREE=y
248# CONFIG_CMDLINE_BOOL is not set 253# CONFIG_CMDLINE_BOOL is not set
@@ -267,6 +272,7 @@ CONFIG_PCI_SYSCALL=y
267CONFIG_ARCH_SUPPORTS_MSI=y 272CONFIG_ARCH_SUPPORTS_MSI=y
268# CONFIG_PCI_MSI is not set 273# CONFIG_PCI_MSI is not set
269# CONFIG_PCI_LEGACY is not set 274# CONFIG_PCI_LEGACY is not set
275# CONFIG_PCI_STUB is not set
270# CONFIG_PCCARD is not set 276# CONFIG_PCCARD is not set
271# CONFIG_HOTPLUG_PCI is not set 277# CONFIG_HOTPLUG_PCI is not set
272# CONFIG_HAS_RAPIDIO is not set 278# CONFIG_HAS_RAPIDIO is not set
@@ -289,6 +295,7 @@ CONFIG_NET=y
289# 295#
290# Networking options 296# Networking options
291# 297#
298CONFIG_COMPAT_NET_DEV_OPS=y
292CONFIG_PACKET=y 299CONFIG_PACKET=y
293# CONFIG_PACKET_MMAP is not set 300# CONFIG_PACKET_MMAP is not set
294CONFIG_UNIX=y 301CONFIG_UNIX=y
@@ -345,6 +352,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
345# CONFIG_ECONET is not set 352# CONFIG_ECONET is not set
346# CONFIG_WAN_ROUTER is not set 353# CONFIG_WAN_ROUTER is not set
347# CONFIG_NET_SCHED is not set 354# CONFIG_NET_SCHED is not set
355# CONFIG_DCB is not set
348 356
349# 357#
350# Network testing 358# Network testing
@@ -360,8 +368,9 @@ CONFIG_WIRELESS=y
360# CONFIG_CFG80211 is not set 368# CONFIG_CFG80211 is not set
361CONFIG_WIRELESS_OLD_REGULATORY=y 369CONFIG_WIRELESS_OLD_REGULATORY=y
362# CONFIG_WIRELESS_EXT is not set 370# CONFIG_WIRELESS_EXT is not set
371# CONFIG_LIB80211 is not set
363# CONFIG_MAC80211 is not set 372# CONFIG_MAC80211 is not set
364# CONFIG_IEEE80211 is not set 373# CONFIG_WIMAX is not set
365# CONFIG_RFKILL is not set 374# CONFIG_RFKILL is not set
366# CONFIG_NET_9P is not set 375# CONFIG_NET_9P is not set
367 376
@@ -382,6 +391,7 @@ CONFIG_MTD=y
382# CONFIG_MTD_DEBUG is not set 391# CONFIG_MTD_DEBUG is not set
383# CONFIG_MTD_CONCAT is not set 392# CONFIG_MTD_CONCAT is not set
384CONFIG_MTD_PARTITIONS=y 393CONFIG_MTD_PARTITIONS=y
394# CONFIG_MTD_TESTS is not set
385CONFIG_MTD_REDBOOT_PARTS=y 395CONFIG_MTD_REDBOOT_PARTS=y
386CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 396CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
387CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y 397CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y
@@ -456,6 +466,12 @@ CONFIG_MTD_PHYSMAP_OF=y
456# CONFIG_MTD_ONENAND is not set 466# CONFIG_MTD_ONENAND is not set
457 467
458# 468#
469# LPDDR flash memory drivers
470#
471# CONFIG_MTD_LPDDR is not set
472# CONFIG_MTD_QINFO_PROBE is not set
473
474#
459# UBI - Unsorted block images 475# UBI - Unsorted block images
460# 476#
461# CONFIG_MTD_UBI is not set 477# CONFIG_MTD_UBI is not set
@@ -486,8 +502,10 @@ CONFIG_MISC_DEVICES=y
486# CONFIG_EEPROM_93CX6 is not set 502# CONFIG_EEPROM_93CX6 is not set
487# CONFIG_SGI_IOC4 is not set 503# CONFIG_SGI_IOC4 is not set
488# CONFIG_TIFM_CORE is not set 504# CONFIG_TIFM_CORE is not set
505# CONFIG_ICS932S401 is not set
489# CONFIG_ENCLOSURE_SERVICES is not set 506# CONFIG_ENCLOSURE_SERVICES is not set
490# CONFIG_HP_ILO is not set 507# CONFIG_HP_ILO is not set
508# CONFIG_C2PORT is not set
491CONFIG_HAVE_IDE=y 509CONFIG_HAVE_IDE=y
492# CONFIG_IDE is not set 510# CONFIG_IDE is not set
493 511
@@ -536,6 +554,9 @@ CONFIG_PHYLIB=y
536# CONFIG_BROADCOM_PHY is not set 554# CONFIG_BROADCOM_PHY is not set
537# CONFIG_ICPLUS_PHY is not set 555# CONFIG_ICPLUS_PHY is not set
538# CONFIG_REALTEK_PHY is not set 556# CONFIG_REALTEK_PHY is not set
557# CONFIG_NATIONAL_PHY is not set
558# CONFIG_STE10XP is not set
559# CONFIG_LSI_ET1011C_PHY is not set
539# CONFIG_FIXED_PHY is not set 560# CONFIG_FIXED_PHY is not set
540# CONFIG_MDIO_BITBANG is not set 561# CONFIG_MDIO_BITBANG is not set
541CONFIG_NET_ETHERNET=y 562CONFIG_NET_ETHERNET=y
@@ -590,6 +611,10 @@ CONFIG_GIANFAR=y
590# CONFIG_IWLWIFI_LEDS is not set 611# CONFIG_IWLWIFI_LEDS is not set
591 612
592# 613#
614# Enable WiMAX (Networking options) to see the WiMAX drivers
615#
616
617#
593# USB Network Adapters 618# USB Network Adapters
594# 619#
595# CONFIG_USB_CATC is not set 620# CONFIG_USB_CATC is not set
@@ -666,8 +691,10 @@ CONFIG_SERIAL_CORE_CONSOLE=y
666# CONFIG_SERIAL_JSM is not set 691# CONFIG_SERIAL_JSM is not set
667# CONFIG_SERIAL_OF_PLATFORM is not set 692# CONFIG_SERIAL_OF_PLATFORM is not set
668CONFIG_UNIX98_PTYS=y 693CONFIG_UNIX98_PTYS=y
694# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
669CONFIG_LEGACY_PTYS=y 695CONFIG_LEGACY_PTYS=y
670CONFIG_LEGACY_PTY_COUNT=256 696CONFIG_LEGACY_PTY_COUNT=256
697# CONFIG_HVC_UDBG is not set
671# CONFIG_IPMI_HANDLER is not set 698# CONFIG_IPMI_HANDLER is not set
672# CONFIG_HW_RANDOM is not set 699# CONFIG_HW_RANDOM is not set
673# CONFIG_NVRAM is not set 700# CONFIG_NVRAM is not set
@@ -740,7 +767,6 @@ CONFIG_I2C_MPC=y
740# CONFIG_SENSORS_PCF8591 is not set 767# CONFIG_SENSORS_PCF8591 is not set
741# CONFIG_SENSORS_MAX6875 is not set 768# CONFIG_SENSORS_MAX6875 is not set
742# CONFIG_SENSORS_TSL2550 is not set 769# CONFIG_SENSORS_TSL2550 is not set
743# CONFIG_MCU_MPC8349EMITX is not set
744# CONFIG_I2C_DEBUG_CORE is not set 770# CONFIG_I2C_DEBUG_CORE is not set
745# CONFIG_I2C_DEBUG_ALGO is not set 771# CONFIG_I2C_DEBUG_ALGO is not set
746# CONFIG_I2C_DEBUG_BUS is not set 772# CONFIG_I2C_DEBUG_BUS is not set
@@ -760,8 +786,10 @@ CONFIG_HWMON=y
760# CONFIG_SENSORS_ADM1029 is not set 786# CONFIG_SENSORS_ADM1029 is not set
761# CONFIG_SENSORS_ADM1031 is not set 787# CONFIG_SENSORS_ADM1031 is not set
762# CONFIG_SENSORS_ADM9240 is not set 788# CONFIG_SENSORS_ADM9240 is not set
789# CONFIG_SENSORS_ADT7462 is not set
763# CONFIG_SENSORS_ADT7470 is not set 790# CONFIG_SENSORS_ADT7470 is not set
764# CONFIG_SENSORS_ADT7473 is not set 791# CONFIG_SENSORS_ADT7473 is not set
792# CONFIG_SENSORS_ADT7475 is not set
765# CONFIG_SENSORS_ATXP1 is not set 793# CONFIG_SENSORS_ATXP1 is not set
766# CONFIG_SENSORS_DS1621 is not set 794# CONFIG_SENSORS_DS1621 is not set
767# CONFIG_SENSORS_I5K_AMB is not set 795# CONFIG_SENSORS_I5K_AMB is not set
@@ -782,6 +810,7 @@ CONFIG_HWMON=y
782# CONFIG_SENSORS_LM90 is not set 810# CONFIG_SENSORS_LM90 is not set
783# CONFIG_SENSORS_LM92 is not set 811# CONFIG_SENSORS_LM92 is not set
784# CONFIG_SENSORS_LM93 is not set 812# CONFIG_SENSORS_LM93 is not set
813# CONFIG_SENSORS_LTC4245 is not set
785# CONFIG_SENSORS_MAX1619 is not set 814# CONFIG_SENSORS_MAX1619 is not set
786# CONFIG_SENSORS_MAX6650 is not set 815# CONFIG_SENSORS_MAX6650 is not set
787# CONFIG_SENSORS_PC87360 is not set 816# CONFIG_SENSORS_PC87360 is not set
@@ -827,11 +856,11 @@ CONFIG_WATCHDOG=y
827# USB-based Watchdog Cards 856# USB-based Watchdog Cards
828# 857#
829# CONFIG_USBPCWATCHDOG is not set 858# CONFIG_USBPCWATCHDOG is not set
859CONFIG_SSB_POSSIBLE=y
830 860
831# 861#
832# Sonics Silicon Backplane 862# Sonics Silicon Backplane
833# 863#
834CONFIG_SSB_POSSIBLE=y
835# CONFIG_SSB is not set 864# CONFIG_SSB is not set
836 865
837# 866#
@@ -840,18 +869,13 @@ CONFIG_SSB_POSSIBLE=y
840# CONFIG_MFD_CORE is not set 869# CONFIG_MFD_CORE is not set
841# CONFIG_MFD_SM501 is not set 870# CONFIG_MFD_SM501 is not set
842# CONFIG_HTC_PASIC3 is not set 871# CONFIG_HTC_PASIC3 is not set
872# CONFIG_TWL4030_CORE is not set
843# CONFIG_MFD_TMIO is not set 873# CONFIG_MFD_TMIO is not set
844# CONFIG_PMIC_DA903X is not set 874# CONFIG_PMIC_DA903X is not set
845# CONFIG_MFD_WM8400 is not set 875# CONFIG_MFD_WM8400 is not set
846# CONFIG_MFD_WM8350_I2C is not set 876# CONFIG_MFD_WM8350_I2C is not set
847 877# CONFIG_MFD_PCF50633 is not set
848#
849# Voltage and Current regulators
850#
851# CONFIG_REGULATOR is not set 878# CONFIG_REGULATOR is not set
852# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
853# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
854# CONFIG_REGULATOR_BQ24022 is not set
855 879
856# 880#
857# Multimedia devices 881# Multimedia devices
@@ -916,6 +940,7 @@ CONFIG_USB_EHCI_ROOT_HUB_TT=y
916# CONFIG_USB_EHCI_TT_NEWSCHED is not set 940# CONFIG_USB_EHCI_TT_NEWSCHED is not set
917CONFIG_USB_EHCI_FSL=y 941CONFIG_USB_EHCI_FSL=y
918CONFIG_USB_EHCI_HCD_PPC_OF=y 942CONFIG_USB_EHCI_HCD_PPC_OF=y
943# CONFIG_USB_OXU210HP_HCD is not set
919# CONFIG_USB_ISP116X_HCD is not set 944# CONFIG_USB_ISP116X_HCD is not set
920# CONFIG_USB_ISP1760_HCD is not set 945# CONFIG_USB_ISP1760_HCD is not set
921# CONFIG_USB_OHCI_HCD is not set 946# CONFIG_USB_OHCI_HCD is not set
@@ -934,11 +959,11 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y
934# CONFIG_USB_TMC is not set 959# CONFIG_USB_TMC is not set
935 960
936# 961#
937# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 962# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
938# 963#
939 964
940# 965#
941# may also be needed; see USB_STORAGE Help for more information 966# see USB_STORAGE Help for more information
942# 967#
943# CONFIG_USB_LIBUSUAL is not set 968# CONFIG_USB_LIBUSUAL is not set
944 969
@@ -977,6 +1002,10 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y
977# CONFIG_USB_ISIGHTFW is not set 1002# CONFIG_USB_ISIGHTFW is not set
978# CONFIG_USB_VST is not set 1003# CONFIG_USB_VST is not set
979# CONFIG_USB_GADGET is not set 1004# CONFIG_USB_GADGET is not set
1005
1006#
1007# OTG and related infrastructure
1008#
980# CONFIG_UWB is not set 1009# CONFIG_UWB is not set
981# CONFIG_MMC is not set 1010# CONFIG_MMC is not set
982# CONFIG_MEMSTICK is not set 1011# CONFIG_MEMSTICK is not set
@@ -1014,6 +1043,7 @@ CONFIG_RTC_DRV_DS1374=y
1014# CONFIG_RTC_DRV_M41T80 is not set 1043# CONFIG_RTC_DRV_M41T80 is not set
1015# CONFIG_RTC_DRV_S35390A is not set 1044# CONFIG_RTC_DRV_S35390A is not set
1016# CONFIG_RTC_DRV_FM3130 is not set 1045# CONFIG_RTC_DRV_FM3130 is not set
1046# CONFIG_RTC_DRV_RX8581 is not set
1017 1047
1018# 1048#
1019# SPI RTC drivers 1049# SPI RTC drivers
@@ -1061,6 +1091,7 @@ CONFIG_FS_MBCACHE=y
1061CONFIG_FILE_LOCKING=y 1091CONFIG_FILE_LOCKING=y
1062# CONFIG_XFS_FS is not set 1092# CONFIG_XFS_FS is not set
1063# CONFIG_OCFS2_FS is not set 1093# CONFIG_OCFS2_FS is not set
1094# CONFIG_BTRFS_FS is not set
1064CONFIG_DNOTIFY=y 1095CONFIG_DNOTIFY=y
1065CONFIG_INOTIFY=y 1096CONFIG_INOTIFY=y
1066CONFIG_INOTIFY_USER=y 1097CONFIG_INOTIFY_USER=y
@@ -1094,10 +1125,7 @@ CONFIG_TMPFS=y
1094# CONFIG_TMPFS_POSIX_ACL is not set 1125# CONFIG_TMPFS_POSIX_ACL is not set
1095# CONFIG_HUGETLB_PAGE is not set 1126# CONFIG_HUGETLB_PAGE is not set
1096# CONFIG_CONFIGFS_FS is not set 1127# CONFIG_CONFIGFS_FS is not set
1097 1128CONFIG_MISC_FILESYSTEMS=y
1098#
1099# Miscellaneous filesystems
1100#
1101# CONFIG_ADFS_FS is not set 1129# CONFIG_ADFS_FS is not set
1102# CONFIG_AFFS_FS is not set 1130# CONFIG_AFFS_FS is not set
1103# CONFIG_HFS_FS is not set 1131# CONFIG_HFS_FS is not set
@@ -1117,6 +1145,7 @@ CONFIG_JFFS2_ZLIB=y
1117CONFIG_JFFS2_RTIME=y 1145CONFIG_JFFS2_RTIME=y
1118# CONFIG_JFFS2_RUBIN is not set 1146# CONFIG_JFFS2_RUBIN is not set
1119# CONFIG_CRAMFS is not set 1147# CONFIG_CRAMFS is not set
1148# CONFIG_SQUASHFS is not set
1120# CONFIG_VXFS_FS is not set 1149# CONFIG_VXFS_FS is not set
1121# CONFIG_MINIX_FS is not set 1150# CONFIG_MINIX_FS is not set
1122# CONFIG_OMFS_FS is not set 1151# CONFIG_OMFS_FS is not set
@@ -1209,6 +1238,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1209# Library routines 1238# Library routines
1210# 1239#
1211CONFIG_BITREVERSE=y 1240CONFIG_BITREVERSE=y
1241CONFIG_GENERIC_FIND_LAST_BIT=y
1212# CONFIG_CRC_CCITT is not set 1242# CONFIG_CRC_CCITT is not set
1213# CONFIG_CRC16 is not set 1243# CONFIG_CRC16 is not set
1214# CONFIG_CRC_T10DIF is not set 1244# CONFIG_CRC_T10DIF is not set
@@ -1244,6 +1274,8 @@ CONFIG_FRAME_WARN=1024
1244# CONFIG_LATENCYTOP is not set 1274# CONFIG_LATENCYTOP is not set
1245# CONFIG_SYSCTL_SYSCALL_CHECK is not set 1275# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1246CONFIG_HAVE_FUNCTION_TRACER=y 1276CONFIG_HAVE_FUNCTION_TRACER=y
1277CONFIG_HAVE_DYNAMIC_FTRACE=y
1278CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1247 1279
1248# 1280#
1249# Tracers 1281# Tracers
@@ -1251,6 +1283,7 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1251# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1283# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1252# CONFIG_SAMPLES is not set 1284# CONFIG_SAMPLES is not set
1253CONFIG_HAVE_ARCH_KGDB=y 1285CONFIG_HAVE_ARCH_KGDB=y
1286CONFIG_PRINT_STACK_DEPTH=64
1254# CONFIG_IRQSTACKS is not set 1287# CONFIG_IRQSTACKS is not set
1255# CONFIG_BOOTX_TEXT is not set 1288# CONFIG_BOOTX_TEXT is not set
1256# CONFIG_PPC_EARLY_DEBUG is not set 1289# CONFIG_PPC_EARLY_DEBUG is not set
@@ -1269,11 +1302,15 @@ CONFIG_CRYPTO=y
1269# 1302#
1270# CONFIG_CRYPTO_FIPS is not set 1303# CONFIG_CRYPTO_FIPS is not set
1271CONFIG_CRYPTO_ALGAPI=y 1304CONFIG_CRYPTO_ALGAPI=y
1272CONFIG_CRYPTO_AEAD=y 1305CONFIG_CRYPTO_ALGAPI2=y
1306CONFIG_CRYPTO_AEAD2=y
1273CONFIG_CRYPTO_BLKCIPHER=y 1307CONFIG_CRYPTO_BLKCIPHER=y
1308CONFIG_CRYPTO_BLKCIPHER2=y
1274CONFIG_CRYPTO_HASH=y 1309CONFIG_CRYPTO_HASH=y
1275CONFIG_CRYPTO_RNG=y 1310CONFIG_CRYPTO_HASH2=y
1311CONFIG_CRYPTO_RNG2=y
1276CONFIG_CRYPTO_MANAGER=y 1312CONFIG_CRYPTO_MANAGER=y
1313CONFIG_CRYPTO_MANAGER2=y
1277# CONFIG_CRYPTO_GF128MUL is not set 1314# CONFIG_CRYPTO_GF128MUL is not set
1278# CONFIG_CRYPTO_NULL is not set 1315# CONFIG_CRYPTO_NULL is not set
1279# CONFIG_CRYPTO_CRYPTD is not set 1316# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig b/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig
index bfc32ea265a..da2433f1c6a 100644
--- a/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig
+++ b/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc3 3# Linux kernel version: 2.6.29-rc2
4# Sat Nov 8 12:39:50 2008 4# Mon Jan 26 15:35:48 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -44,7 +44,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
44CONFIG_PPC=y 44CONFIG_PPC=y
45CONFIG_EARLY_PRINTK=y 45CONFIG_EARLY_PRINTK=y
46CONFIG_GENERIC_NVRAM=y 46CONFIG_GENERIC_NVRAM=y
47CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 47CONFIG_SCHED_OMIT_FRAME_POINTER=y
48CONFIG_ARCH_MAY_HAVE_PC_FDC=y 48CONFIG_ARCH_MAY_HAVE_PC_FDC=y
49CONFIG_PPC_OF=y 49CONFIG_PPC_OF=y
50CONFIG_OF=y 50CONFIG_OF=y
@@ -75,12 +75,12 @@ CONFIG_SYSVIPC_SYSCTL=y
75# CONFIG_AUDIT is not set 75# CONFIG_AUDIT is not set
76# CONFIG_IKCONFIG is not set 76# CONFIG_IKCONFIG is not set
77CONFIG_LOG_BUF_SHIFT=14 77CONFIG_LOG_BUF_SHIFT=14
78# CONFIG_CGROUPS is not set
79CONFIG_GROUP_SCHED=y 78CONFIG_GROUP_SCHED=y
80# CONFIG_FAIR_GROUP_SCHED is not set 79# CONFIG_FAIR_GROUP_SCHED is not set
81# CONFIG_RT_GROUP_SCHED is not set 80# CONFIG_RT_GROUP_SCHED is not set
82CONFIG_USER_SCHED=y 81CONFIG_USER_SCHED=y
83# CONFIG_CGROUP_SCHED is not set 82# CONFIG_CGROUP_SCHED is not set
83# CONFIG_CGROUPS is not set
84CONFIG_SYSFS_DEPRECATED=y 84CONFIG_SYSFS_DEPRECATED=y
85CONFIG_SYSFS_DEPRECATED_V2=y 85CONFIG_SYSFS_DEPRECATED_V2=y
86# CONFIG_RELAY is not set 86# CONFIG_RELAY is not set
@@ -113,7 +113,6 @@ CONFIG_SLUB_DEBUG=y
113CONFIG_SLUB=y 113CONFIG_SLUB=y
114# CONFIG_SLOB is not set 114# CONFIG_SLOB is not set
115# CONFIG_PROFILING is not set 115# CONFIG_PROFILING is not set
116# CONFIG_MARKERS is not set
117CONFIG_HAVE_OPROFILE=y 116CONFIG_HAVE_OPROFILE=y
118CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 117CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
119CONFIG_HAVE_IOREMAP_PROT=y 118CONFIG_HAVE_IOREMAP_PROT=y
@@ -123,7 +122,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
123# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 122# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
124CONFIG_SLABINFO=y 123CONFIG_SLABINFO=y
125CONFIG_RT_MUTEXES=y 124CONFIG_RT_MUTEXES=y
126# CONFIG_TINY_SHMEM is not set
127CONFIG_BASE_SMALL=0 125CONFIG_BASE_SMALL=0
128CONFIG_MODULES=y 126CONFIG_MODULES=y
129# CONFIG_MODULE_FORCE_LOAD is not set 127# CONFIG_MODULE_FORCE_LOAD is not set
@@ -131,11 +129,9 @@ CONFIG_MODULE_UNLOAD=y
131# CONFIG_MODULE_FORCE_UNLOAD is not set 129# CONFIG_MODULE_FORCE_UNLOAD is not set
132# CONFIG_MODVERSIONS is not set 130# CONFIG_MODVERSIONS is not set
133# CONFIG_MODULE_SRCVERSION_ALL is not set 131# CONFIG_MODULE_SRCVERSION_ALL is not set
134CONFIG_KMOD=y
135CONFIG_BLOCK=y 132CONFIG_BLOCK=y
136# CONFIG_LBD is not set 133# CONFIG_LBD is not set
137# CONFIG_BLK_DEV_IO_TRACE is not set 134# CONFIG_BLK_DEV_IO_TRACE is not set
138# CONFIG_LSF is not set
139# CONFIG_BLK_DEV_BSG is not set 135# CONFIG_BLK_DEV_BSG is not set
140# CONFIG_BLK_DEV_INTEGRITY is not set 136# CONFIG_BLK_DEV_INTEGRITY is not set
141 137
@@ -152,6 +148,10 @@ CONFIG_DEFAULT_AS=y
152# CONFIG_DEFAULT_NOOP is not set 148# CONFIG_DEFAULT_NOOP is not set
153CONFIG_DEFAULT_IOSCHED="anticipatory" 149CONFIG_DEFAULT_IOSCHED="anticipatory"
154CONFIG_CLASSIC_RCU=y 150CONFIG_CLASSIC_RCU=y
151# CONFIG_TREE_RCU is not set
152# CONFIG_PREEMPT_RCU is not set
153# CONFIG_TREE_RCU_TRACE is not set
154# CONFIG_PREEMPT_RCU_TRACE is not set
155# CONFIG_FREEZER is not set 155# CONFIG_FREEZER is not set
156 156
157# 157#
@@ -198,6 +198,8 @@ CONFIG_IPIC=y
198# CONFIG_QUICC_ENGINE is not set 198# CONFIG_QUICC_ENGINE is not set
199# CONFIG_FSL_ULI1575 is not set 199# CONFIG_FSL_ULI1575 is not set
200# CONFIG_MPC8xxx_GPIO is not set 200# CONFIG_MPC8xxx_GPIO is not set
201# CONFIG_SIMPLE_GPIO is not set
202# CONFIG_MCU_MPC8349EMITX is not set
201 203
202# 204#
203# Kernel options 205# Kernel options
@@ -225,6 +227,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
225CONFIG_ARCH_HAS_WALK_MEMORY=y 227CONFIG_ARCH_HAS_WALK_MEMORY=y
226CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 228CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
227# CONFIG_KEXEC is not set 229# CONFIG_KEXEC is not set
230# CONFIG_CRASH_DUMP is not set
228CONFIG_ARCH_FLATMEM_ENABLE=y 231CONFIG_ARCH_FLATMEM_ENABLE=y
229CONFIG_ARCH_POPULATES_NODE_MAP=y 232CONFIG_ARCH_POPULATES_NODE_MAP=y
230CONFIG_SELECT_MEMORY_MODEL=y 233CONFIG_SELECT_MEMORY_MODEL=y
@@ -236,12 +239,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
236CONFIG_PAGEFLAGS_EXTENDED=y 239CONFIG_PAGEFLAGS_EXTENDED=y
237CONFIG_SPLIT_PTLOCK_CPUS=4 240CONFIG_SPLIT_PTLOCK_CPUS=4
238CONFIG_MIGRATION=y 241CONFIG_MIGRATION=y
239# CONFIG_RESOURCES_64BIT is not set
240# CONFIG_PHYS_ADDR_T_64BIT is not set 242# CONFIG_PHYS_ADDR_T_64BIT is not set
241CONFIG_ZONE_DMA_FLAG=1 243CONFIG_ZONE_DMA_FLAG=1
242CONFIG_BOUNCE=y 244CONFIG_BOUNCE=y
243CONFIG_VIRT_TO_BUS=y 245CONFIG_VIRT_TO_BUS=y
244CONFIG_UNEVICTABLE_LRU=y 246CONFIG_UNEVICTABLE_LRU=y
247CONFIG_PPC_4K_PAGES=y
248# CONFIG_PPC_16K_PAGES is not set
249# CONFIG_PPC_64K_PAGES is not set
245CONFIG_FORCE_MAX_ZONEORDER=11 250CONFIG_FORCE_MAX_ZONEORDER=11
246CONFIG_PROC_DEVICETREE=y 251CONFIG_PROC_DEVICETREE=y
247# CONFIG_CMDLINE_BOOL is not set 252# CONFIG_CMDLINE_BOOL is not set
@@ -267,6 +272,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
267# CONFIG_PCI_MSI is not set 272# CONFIG_PCI_MSI is not set
268# CONFIG_PCI_LEGACY is not set 273# CONFIG_PCI_LEGACY is not set
269# CONFIG_PCI_DEBUG is not set 274# CONFIG_PCI_DEBUG is not set
275# CONFIG_PCI_STUB is not set
270# CONFIG_PCCARD is not set 276# CONFIG_PCCARD is not set
271# CONFIG_HOTPLUG_PCI is not set 277# CONFIG_HOTPLUG_PCI is not set
272# CONFIG_HAS_RAPIDIO is not set 278# CONFIG_HAS_RAPIDIO is not set
@@ -289,6 +295,7 @@ CONFIG_NET=y
289# 295#
290# Networking options 296# Networking options
291# 297#
298CONFIG_COMPAT_NET_DEV_OPS=y
292CONFIG_PACKET=y 299CONFIG_PACKET=y
293# CONFIG_PACKET_MMAP is not set 300# CONFIG_PACKET_MMAP is not set
294CONFIG_UNIX=y 301CONFIG_UNIX=y
@@ -345,6 +352,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
345# CONFIG_ECONET is not set 352# CONFIG_ECONET is not set
346# CONFIG_WAN_ROUTER is not set 353# CONFIG_WAN_ROUTER is not set
347# CONFIG_NET_SCHED is not set 354# CONFIG_NET_SCHED is not set
355# CONFIG_DCB is not set
348 356
349# 357#
350# Network testing 358# Network testing
@@ -360,8 +368,9 @@ CONFIG_WIRELESS=y
360# CONFIG_CFG80211 is not set 368# CONFIG_CFG80211 is not set
361CONFIG_WIRELESS_OLD_REGULATORY=y 369CONFIG_WIRELESS_OLD_REGULATORY=y
362# CONFIG_WIRELESS_EXT is not set 370# CONFIG_WIRELESS_EXT is not set
371# CONFIG_LIB80211 is not set
363# CONFIG_MAC80211 is not set 372# CONFIG_MAC80211 is not set
364# CONFIG_IEEE80211 is not set 373# CONFIG_WIMAX is not set
365# CONFIG_RFKILL is not set 374# CONFIG_RFKILL is not set
366# CONFIG_NET_9P is not set 375# CONFIG_NET_9P is not set
367 376
@@ -384,6 +393,7 @@ CONFIG_MTD=y
384# CONFIG_MTD_DEBUG is not set 393# CONFIG_MTD_DEBUG is not set
385# CONFIG_MTD_CONCAT is not set 394# CONFIG_MTD_CONCAT is not set
386CONFIG_MTD_PARTITIONS=y 395CONFIG_MTD_PARTITIONS=y
396# CONFIG_MTD_TESTS is not set
387# CONFIG_MTD_REDBOOT_PARTS is not set 397# CONFIG_MTD_REDBOOT_PARTS is not set
388# CONFIG_MTD_CMDLINE_PARTS is not set 398# CONFIG_MTD_CMDLINE_PARTS is not set
389CONFIG_MTD_OF_PARTS=y 399CONFIG_MTD_OF_PARTS=y
@@ -468,6 +478,12 @@ CONFIG_MTD_NAND_FSL_ELBC=y
468# CONFIG_MTD_ONENAND is not set 478# CONFIG_MTD_ONENAND is not set
469 479
470# 480#
481# LPDDR flash memory drivers
482#
483# CONFIG_MTD_LPDDR is not set
484# CONFIG_MTD_QINFO_PROBE is not set
485
486#
471# UBI - Unsorted block images 487# UBI - Unsorted block images
472# 488#
473# CONFIG_MTD_UBI is not set 489# CONFIG_MTD_UBI is not set
@@ -499,8 +515,10 @@ CONFIG_MISC_DEVICES=y
499# CONFIG_EEPROM_93CX6 is not set 515# CONFIG_EEPROM_93CX6 is not set
500# CONFIG_SGI_IOC4 is not set 516# CONFIG_SGI_IOC4 is not set
501# CONFIG_TIFM_CORE is not set 517# CONFIG_TIFM_CORE is not set
518# CONFIG_ICS932S401 is not set
502# CONFIG_ENCLOSURE_SERVICES is not set 519# CONFIG_ENCLOSURE_SERVICES is not set
503# CONFIG_HP_ILO is not set 520# CONFIG_HP_ILO is not set
521# CONFIG_C2PORT is not set
504CONFIG_HAVE_IDE=y 522CONFIG_HAVE_IDE=y
505# CONFIG_IDE is not set 523# CONFIG_IDE is not set
506 524
@@ -543,6 +561,7 @@ CONFIG_SCSI_SPI_ATTRS=y
543# CONFIG_SCSI_SRP_ATTRS is not set 561# CONFIG_SCSI_SRP_ATTRS is not set
544CONFIG_SCSI_LOWLEVEL=y 562CONFIG_SCSI_LOWLEVEL=y
545# CONFIG_ISCSI_TCP is not set 563# CONFIG_ISCSI_TCP is not set
564# CONFIG_SCSI_CXGB3_ISCSI is not set
546# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 565# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
547# CONFIG_SCSI_3W_9XXX is not set 566# CONFIG_SCSI_3W_9XXX is not set
548# CONFIG_SCSI_ACARD is not set 567# CONFIG_SCSI_ACARD is not set
@@ -559,6 +578,8 @@ CONFIG_SCSI_LOWLEVEL=y
559# CONFIG_MEGARAID_SAS is not set 578# CONFIG_MEGARAID_SAS is not set
560# CONFIG_SCSI_HPTIOP is not set 579# CONFIG_SCSI_HPTIOP is not set
561# CONFIG_SCSI_BUSLOGIC is not set 580# CONFIG_SCSI_BUSLOGIC is not set
581# CONFIG_LIBFC is not set
582# CONFIG_FCOE is not set
562# CONFIG_SCSI_DMX3191D is not set 583# CONFIG_SCSI_DMX3191D is not set
563# CONFIG_SCSI_EATA is not set 584# CONFIG_SCSI_EATA is not set
564# CONFIG_SCSI_FUTURE_DOMAIN is not set 585# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -627,6 +648,9 @@ CONFIG_CICADA_PHY=y
627# CONFIG_BROADCOM_PHY is not set 648# CONFIG_BROADCOM_PHY is not set
628# CONFIG_ICPLUS_PHY is not set 649# CONFIG_ICPLUS_PHY is not set
629# CONFIG_REALTEK_PHY is not set 650# CONFIG_REALTEK_PHY is not set
651# CONFIG_NATIONAL_PHY is not set
652# CONFIG_STE10XP is not set
653# CONFIG_LSI_ET1011C_PHY is not set
630# CONFIG_FIXED_PHY is not set 654# CONFIG_FIXED_PHY is not set
631# CONFIG_MDIO_BITBANG is not set 655# CONFIG_MDIO_BITBANG is not set
632CONFIG_NET_ETHERNET=y 656CONFIG_NET_ETHERNET=y
@@ -651,7 +675,6 @@ CONFIG_NET_PCI=y
651# CONFIG_ADAPTEC_STARFIRE is not set 675# CONFIG_ADAPTEC_STARFIRE is not set
652# CONFIG_B44 is not set 676# CONFIG_B44 is not set
653# CONFIG_FORCEDETH is not set 677# CONFIG_FORCEDETH is not set
654# CONFIG_EEPRO100 is not set
655CONFIG_E100=y 678CONFIG_E100=y
656# CONFIG_FEALNX is not set 679# CONFIG_FEALNX is not set
657# CONFIG_NATSEMI is not set 680# CONFIG_NATSEMI is not set
@@ -661,6 +684,7 @@ CONFIG_E100=y
661# CONFIG_R6040 is not set 684# CONFIG_R6040 is not set
662# CONFIG_SIS900 is not set 685# CONFIG_SIS900 is not set
663# CONFIG_EPIC100 is not set 686# CONFIG_EPIC100 is not set
687# CONFIG_SMSC9420 is not set
664# CONFIG_SUNDANCE is not set 688# CONFIG_SUNDANCE is not set
665# CONFIG_TLAN is not set 689# CONFIG_TLAN is not set
666# CONFIG_VIA_RHINE is not set 690# CONFIG_VIA_RHINE is not set
@@ -691,6 +715,7 @@ CONFIG_GIANFAR=y
691# CONFIG_JME is not set 715# CONFIG_JME is not set
692CONFIG_NETDEV_10000=y 716CONFIG_NETDEV_10000=y
693# CONFIG_CHELSIO_T1 is not set 717# CONFIG_CHELSIO_T1 is not set
718CONFIG_CHELSIO_T3_DEPENDS=y
694# CONFIG_CHELSIO_T3 is not set 719# CONFIG_CHELSIO_T3 is not set
695# CONFIG_ENIC is not set 720# CONFIG_ENIC is not set
696# CONFIG_IXGBE is not set 721# CONFIG_IXGBE is not set
@@ -715,6 +740,10 @@ CONFIG_NETDEV_10000=y
715# CONFIG_IWLWIFI_LEDS is not set 740# CONFIG_IWLWIFI_LEDS is not set
716 741
717# 742#
743# Enable WiMAX (Networking options) to see the WiMAX drivers
744#
745
746#
718# USB Network Adapters 747# USB Network Adapters
719# 748#
720# CONFIG_USB_CATC is not set 749# CONFIG_USB_CATC is not set
@@ -792,8 +821,10 @@ CONFIG_SERIAL_CORE_CONSOLE=y
792# CONFIG_SERIAL_JSM is not set 821# CONFIG_SERIAL_JSM is not set
793# CONFIG_SERIAL_OF_PLATFORM is not set 822# CONFIG_SERIAL_OF_PLATFORM is not set
794CONFIG_UNIX98_PTYS=y 823CONFIG_UNIX98_PTYS=y
824# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
795CONFIG_LEGACY_PTYS=y 825CONFIG_LEGACY_PTYS=y
796CONFIG_LEGACY_PTY_COUNT=256 826CONFIG_LEGACY_PTY_COUNT=256
827# CONFIG_HVC_UDBG is not set
797# CONFIG_IPMI_HANDLER is not set 828# CONFIG_IPMI_HANDLER is not set
798CONFIG_HW_RANDOM=y 829CONFIG_HW_RANDOM=y
799# CONFIG_NVRAM is not set 830# CONFIG_NVRAM is not set
@@ -866,7 +897,6 @@ CONFIG_I2C_MPC=y
866# CONFIG_SENSORS_PCF8591 is not set 897# CONFIG_SENSORS_PCF8591 is not set
867# CONFIG_SENSORS_MAX6875 is not set 898# CONFIG_SENSORS_MAX6875 is not set
868# CONFIG_SENSORS_TSL2550 is not set 899# CONFIG_SENSORS_TSL2550 is not set
869# CONFIG_MCU_MPC8349EMITX is not set
870# CONFIG_I2C_DEBUG_CORE is not set 900# CONFIG_I2C_DEBUG_CORE is not set
871# CONFIG_I2C_DEBUG_ALGO is not set 901# CONFIG_I2C_DEBUG_ALGO is not set
872# CONFIG_I2C_DEBUG_BUS is not set 902# CONFIG_I2C_DEBUG_BUS is not set
@@ -902,8 +932,10 @@ CONFIG_HWMON=y
902# CONFIG_SENSORS_ADM1029 is not set 932# CONFIG_SENSORS_ADM1029 is not set
903# CONFIG_SENSORS_ADM1031 is not set 933# CONFIG_SENSORS_ADM1031 is not set
904# CONFIG_SENSORS_ADM9240 is not set 934# CONFIG_SENSORS_ADM9240 is not set
935# CONFIG_SENSORS_ADT7462 is not set
905# CONFIG_SENSORS_ADT7470 is not set 936# CONFIG_SENSORS_ADT7470 is not set
906# CONFIG_SENSORS_ADT7473 is not set 937# CONFIG_SENSORS_ADT7473 is not set
938# CONFIG_SENSORS_ADT7475 is not set
907# CONFIG_SENSORS_ATXP1 is not set 939# CONFIG_SENSORS_ATXP1 is not set
908# CONFIG_SENSORS_DS1621 is not set 940# CONFIG_SENSORS_DS1621 is not set
909# CONFIG_SENSORS_I5K_AMB is not set 941# CONFIG_SENSORS_I5K_AMB is not set
@@ -925,6 +957,7 @@ CONFIG_HWMON=y
925# CONFIG_SENSORS_LM90 is not set 957# CONFIG_SENSORS_LM90 is not set
926# CONFIG_SENSORS_LM92 is not set 958# CONFIG_SENSORS_LM92 is not set
927# CONFIG_SENSORS_LM93 is not set 959# CONFIG_SENSORS_LM93 is not set
960# CONFIG_SENSORS_LTC4245 is not set
928# CONFIG_SENSORS_MAX1111 is not set 961# CONFIG_SENSORS_MAX1111 is not set
929# CONFIG_SENSORS_MAX1619 is not set 962# CONFIG_SENSORS_MAX1619 is not set
930# CONFIG_SENSORS_MAX6650 is not set 963# CONFIG_SENSORS_MAX6650 is not set
@@ -971,11 +1004,11 @@ CONFIG_WATCHDOG=y
971# USB-based Watchdog Cards 1004# USB-based Watchdog Cards
972# 1005#
973# CONFIG_USBPCWATCHDOG is not set 1006# CONFIG_USBPCWATCHDOG is not set
1007CONFIG_SSB_POSSIBLE=y
974 1008
975# 1009#
976# Sonics Silicon Backplane 1010# Sonics Silicon Backplane
977# 1011#
978CONFIG_SSB_POSSIBLE=y
979# CONFIG_SSB is not set 1012# CONFIG_SSB is not set
980 1013
981# 1014#
@@ -984,18 +1017,13 @@ CONFIG_SSB_POSSIBLE=y
984# CONFIG_MFD_CORE is not set 1017# CONFIG_MFD_CORE is not set
985# CONFIG_MFD_SM501 is not set 1018# CONFIG_MFD_SM501 is not set
986# CONFIG_HTC_PASIC3 is not set 1019# CONFIG_HTC_PASIC3 is not set
1020# CONFIG_TWL4030_CORE is not set
987# CONFIG_MFD_TMIO is not set 1021# CONFIG_MFD_TMIO is not set
988# CONFIG_PMIC_DA903X is not set 1022# CONFIG_PMIC_DA903X is not set
989# CONFIG_MFD_WM8400 is not set 1023# CONFIG_MFD_WM8400 is not set
990# CONFIG_MFD_WM8350_I2C is not set 1024# CONFIG_MFD_WM8350_I2C is not set
991 1025# CONFIG_MFD_PCF50633 is not set
992#
993# Voltage and Current regulators
994#
995# CONFIG_REGULATOR is not set 1026# CONFIG_REGULATOR is not set
996# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
997# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
998# CONFIG_REGULATOR_BQ24022 is not set
999 1027
1000# 1028#
1001# Multimedia devices 1029# Multimedia devices
@@ -1080,6 +1108,7 @@ CONFIG_USB_EHCI_ROOT_HUB_TT=y
1080# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1108# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1081CONFIG_USB_EHCI_FSL=y 1109CONFIG_USB_EHCI_FSL=y
1082CONFIG_USB_EHCI_HCD_PPC_OF=y 1110CONFIG_USB_EHCI_HCD_PPC_OF=y
1111# CONFIG_USB_OXU210HP_HCD is not set
1083# CONFIG_USB_ISP116X_HCD is not set 1112# CONFIG_USB_ISP116X_HCD is not set
1084# CONFIG_USB_ISP1760_HCD is not set 1113# CONFIG_USB_ISP1760_HCD is not set
1085CONFIG_USB_OHCI_HCD=y 1114CONFIG_USB_OHCI_HCD=y
@@ -1106,18 +1135,17 @@ CONFIG_USB_UHCI_HCD=y
1106# CONFIG_USB_TMC is not set 1135# CONFIG_USB_TMC is not set
1107 1136
1108# 1137#
1109# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1138# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
1110# 1139#
1111 1140
1112# 1141#
1113# may also be needed; see USB_STORAGE Help for more information 1142# see USB_STORAGE Help for more information
1114# 1143#
1115CONFIG_USB_STORAGE=y 1144CONFIG_USB_STORAGE=y
1116# CONFIG_USB_STORAGE_DEBUG is not set 1145# CONFIG_USB_STORAGE_DEBUG is not set
1117# CONFIG_USB_STORAGE_DATAFAB is not set 1146# CONFIG_USB_STORAGE_DATAFAB is not set
1118# CONFIG_USB_STORAGE_FREECOM is not set 1147# CONFIG_USB_STORAGE_FREECOM is not set
1119# CONFIG_USB_STORAGE_ISD200 is not set 1148# CONFIG_USB_STORAGE_ISD200 is not set
1120# CONFIG_USB_STORAGE_DPCM is not set
1121# CONFIG_USB_STORAGE_USBAT is not set 1149# CONFIG_USB_STORAGE_USBAT is not set
1122# CONFIG_USB_STORAGE_SDDR09 is not set 1150# CONFIG_USB_STORAGE_SDDR09 is not set
1123# CONFIG_USB_STORAGE_SDDR55 is not set 1151# CONFIG_USB_STORAGE_SDDR55 is not set
@@ -1177,9 +1205,11 @@ CONFIG_USB_GADGET_SELECTED=y
1177# CONFIG_USB_GADGET_PXA25X is not set 1205# CONFIG_USB_GADGET_PXA25X is not set
1178# CONFIG_USB_GADGET_PXA27X is not set 1206# CONFIG_USB_GADGET_PXA27X is not set
1179# CONFIG_USB_GADGET_S3C2410 is not set 1207# CONFIG_USB_GADGET_S3C2410 is not set
1208# CONFIG_USB_GADGET_IMX is not set
1180# CONFIG_USB_GADGET_M66592 is not set 1209# CONFIG_USB_GADGET_M66592 is not set
1181# CONFIG_USB_GADGET_AMD5536UDC is not set 1210# CONFIG_USB_GADGET_AMD5536UDC is not set
1182# CONFIG_USB_GADGET_FSL_QE is not set 1211# CONFIG_USB_GADGET_FSL_QE is not set
1212# CONFIG_USB_GADGET_CI13XXX is not set
1183CONFIG_USB_GADGET_NET2280=y 1213CONFIG_USB_GADGET_NET2280=y
1184CONFIG_USB_NET2280=y 1214CONFIG_USB_NET2280=y
1185# CONFIG_USB_GADGET_GOKU is not set 1215# CONFIG_USB_GADGET_GOKU is not set
@@ -1194,6 +1224,10 @@ CONFIG_USB_ETH_RNDIS=y
1194# CONFIG_USB_MIDI_GADGET is not set 1224# CONFIG_USB_MIDI_GADGET is not set
1195# CONFIG_USB_G_PRINTER is not set 1225# CONFIG_USB_G_PRINTER is not set
1196# CONFIG_USB_CDC_COMPOSITE is not set 1226# CONFIG_USB_CDC_COMPOSITE is not set
1227
1228#
1229# OTG and related infrastructure
1230#
1197# CONFIG_UWB is not set 1231# CONFIG_UWB is not set
1198# CONFIG_MMC is not set 1232# CONFIG_MMC is not set
1199# CONFIG_MEMSTICK is not set 1233# CONFIG_MEMSTICK is not set
@@ -1231,12 +1265,14 @@ CONFIG_RTC_DRV_DS1307=y
1231# CONFIG_RTC_DRV_M41T80 is not set 1265# CONFIG_RTC_DRV_M41T80 is not set
1232# CONFIG_RTC_DRV_S35390A is not set 1266# CONFIG_RTC_DRV_S35390A is not set
1233# CONFIG_RTC_DRV_FM3130 is not set 1267# CONFIG_RTC_DRV_FM3130 is not set
1268# CONFIG_RTC_DRV_RX8581 is not set
1234 1269
1235# 1270#
1236# SPI RTC drivers 1271# SPI RTC drivers
1237# 1272#
1238# CONFIG_RTC_DRV_M41T94 is not set 1273# CONFIG_RTC_DRV_M41T94 is not set
1239# CONFIG_RTC_DRV_DS1305 is not set 1274# CONFIG_RTC_DRV_DS1305 is not set
1275# CONFIG_RTC_DRV_DS1390 is not set
1240# CONFIG_RTC_DRV_MAX6902 is not set 1276# CONFIG_RTC_DRV_MAX6902 is not set
1241# CONFIG_RTC_DRV_R9701 is not set 1277# CONFIG_RTC_DRV_R9701 is not set
1242# CONFIG_RTC_DRV_RS5C348 is not set 1278# CONFIG_RTC_DRV_RS5C348 is not set
@@ -1284,6 +1320,7 @@ CONFIG_FS_MBCACHE=y
1284CONFIG_FILE_LOCKING=y 1320CONFIG_FILE_LOCKING=y
1285# CONFIG_XFS_FS is not set 1321# CONFIG_XFS_FS is not set
1286# CONFIG_OCFS2_FS is not set 1322# CONFIG_OCFS2_FS is not set
1323# CONFIG_BTRFS_FS is not set
1287CONFIG_DNOTIFY=y 1324CONFIG_DNOTIFY=y
1288CONFIG_INOTIFY=y 1325CONFIG_INOTIFY=y
1289CONFIG_INOTIFY_USER=y 1326CONFIG_INOTIFY_USER=y
@@ -1317,10 +1354,7 @@ CONFIG_TMPFS=y
1317# CONFIG_TMPFS_POSIX_ACL is not set 1354# CONFIG_TMPFS_POSIX_ACL is not set
1318# CONFIG_HUGETLB_PAGE is not set 1355# CONFIG_HUGETLB_PAGE is not set
1319# CONFIG_CONFIGFS_FS is not set 1356# CONFIG_CONFIGFS_FS is not set
1320 1357CONFIG_MISC_FILESYSTEMS=y
1321#
1322# Miscellaneous filesystems
1323#
1324# CONFIG_ADFS_FS is not set 1358# CONFIG_ADFS_FS is not set
1325# CONFIG_AFFS_FS is not set 1359# CONFIG_AFFS_FS is not set
1326# CONFIG_HFS_FS is not set 1360# CONFIG_HFS_FS is not set
@@ -1340,6 +1374,7 @@ CONFIG_JFFS2_ZLIB=y
1340CONFIG_JFFS2_RTIME=y 1374CONFIG_JFFS2_RTIME=y
1341# CONFIG_JFFS2_RUBIN is not set 1375# CONFIG_JFFS2_RUBIN is not set
1342# CONFIG_CRAMFS is not set 1376# CONFIG_CRAMFS is not set
1377# CONFIG_SQUASHFS is not set
1343# CONFIG_VXFS_FS is not set 1378# CONFIG_VXFS_FS is not set
1344# CONFIG_MINIX_FS is not set 1379# CONFIG_MINIX_FS is not set
1345# CONFIG_OMFS_FS is not set 1380# CONFIG_OMFS_FS is not set
@@ -1397,6 +1432,7 @@ CONFIG_MSDOS_PARTITION=y
1397# Library routines 1432# Library routines
1398# 1433#
1399CONFIG_BITREVERSE=y 1434CONFIG_BITREVERSE=y
1435CONFIG_GENERIC_FIND_LAST_BIT=y
1400# CONFIG_CRC_CCITT is not set 1436# CONFIG_CRC_CCITT is not set
1401# CONFIG_CRC16 is not set 1437# CONFIG_CRC16 is not set
1402# CONFIG_CRC_T10DIF is not set 1438# CONFIG_CRC_T10DIF is not set
@@ -1448,6 +1484,7 @@ CONFIG_SCHED_DEBUG=y
1448# CONFIG_DEBUG_MEMORY_INIT is not set 1484# CONFIG_DEBUG_MEMORY_INIT is not set
1449# CONFIG_DEBUG_LIST is not set 1485# CONFIG_DEBUG_LIST is not set
1450# CONFIG_DEBUG_SG is not set 1486# CONFIG_DEBUG_SG is not set
1487# CONFIG_DEBUG_NOTIFIERS is not set
1451# CONFIG_BOOT_PRINTK_DELAY is not set 1488# CONFIG_BOOT_PRINTK_DELAY is not set
1452# CONFIG_RCU_TORTURE_TEST is not set 1489# CONFIG_RCU_TORTURE_TEST is not set
1453# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1490# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -1457,6 +1494,8 @@ CONFIG_SCHED_DEBUG=y
1457# CONFIG_LATENCYTOP is not set 1494# CONFIG_LATENCYTOP is not set
1458CONFIG_SYSCTL_SYSCALL_CHECK=y 1495CONFIG_SYSCTL_SYSCALL_CHECK=y
1459CONFIG_HAVE_FUNCTION_TRACER=y 1496CONFIG_HAVE_FUNCTION_TRACER=y
1497CONFIG_HAVE_DYNAMIC_FTRACE=y
1498CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1460 1499
1461# 1500#
1462# Tracers 1501# Tracers
@@ -1465,11 +1504,13 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1465# CONFIG_SCHED_TRACER is not set 1504# CONFIG_SCHED_TRACER is not set
1466# CONFIG_CONTEXT_SWITCH_TRACER is not set 1505# CONFIG_CONTEXT_SWITCH_TRACER is not set
1467# CONFIG_BOOT_TRACER is not set 1506# CONFIG_BOOT_TRACER is not set
1507# CONFIG_TRACE_BRANCH_PROFILING is not set
1468# CONFIG_STACK_TRACER is not set 1508# CONFIG_STACK_TRACER is not set
1469# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1509# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1470# CONFIG_SAMPLES is not set 1510# CONFIG_SAMPLES is not set
1471CONFIG_HAVE_ARCH_KGDB=y 1511CONFIG_HAVE_ARCH_KGDB=y
1472# CONFIG_KGDB is not set 1512# CONFIG_KGDB is not set
1513CONFIG_PRINT_STACK_DEPTH=64
1473# CONFIG_DEBUG_STACKOVERFLOW is not set 1514# CONFIG_DEBUG_STACKOVERFLOW is not set
1474# CONFIG_DEBUG_STACK_USAGE is not set 1515# CONFIG_DEBUG_STACK_USAGE is not set
1475# CONFIG_DEBUG_PAGEALLOC is not set 1516# CONFIG_DEBUG_PAGEALLOC is not set
@@ -1496,11 +1537,15 @@ CONFIG_CRYPTO=y
1496# 1537#
1497# CONFIG_CRYPTO_FIPS is not set 1538# CONFIG_CRYPTO_FIPS is not set
1498CONFIG_CRYPTO_ALGAPI=y 1539CONFIG_CRYPTO_ALGAPI=y
1499CONFIG_CRYPTO_AEAD=y 1540CONFIG_CRYPTO_ALGAPI2=y
1541CONFIG_CRYPTO_AEAD2=y
1500CONFIG_CRYPTO_BLKCIPHER=y 1542CONFIG_CRYPTO_BLKCIPHER=y
1543CONFIG_CRYPTO_BLKCIPHER2=y
1501CONFIG_CRYPTO_HASH=y 1544CONFIG_CRYPTO_HASH=y
1502CONFIG_CRYPTO_RNG=y 1545CONFIG_CRYPTO_HASH2=y
1546CONFIG_CRYPTO_RNG2=y
1503CONFIG_CRYPTO_MANAGER=y 1547CONFIG_CRYPTO_MANAGER=y
1548CONFIG_CRYPTO_MANAGER2=y
1504# CONFIG_CRYPTO_GF128MUL is not set 1549# CONFIG_CRYPTO_GF128MUL is not set
1505# CONFIG_CRYPTO_NULL is not set 1550# CONFIG_CRYPTO_NULL is not set
1506# CONFIG_CRYPTO_CRYPTD is not set 1551# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig b/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig
index aad0e1a98c5..c3bef886ba9 100644
--- a/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig
+++ b/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc3 3# Linux kernel version: 2.6.29-rc2
4# Sat Nov 8 12:39:51 2008 4# Mon Jan 26 15:35:49 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -44,7 +44,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
44CONFIG_PPC=y 44CONFIG_PPC=y
45CONFIG_EARLY_PRINTK=y 45CONFIG_EARLY_PRINTK=y
46CONFIG_GENERIC_NVRAM=y 46CONFIG_GENERIC_NVRAM=y
47CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 47CONFIG_SCHED_OMIT_FRAME_POINTER=y
48CONFIG_ARCH_MAY_HAVE_PC_FDC=y 48CONFIG_ARCH_MAY_HAVE_PC_FDC=y
49CONFIG_PPC_OF=y 49CONFIG_PPC_OF=y
50CONFIG_OF=y 50CONFIG_OF=y
@@ -75,12 +75,12 @@ CONFIG_SYSVIPC_SYSCTL=y
75# CONFIG_AUDIT is not set 75# CONFIG_AUDIT is not set
76# CONFIG_IKCONFIG is not set 76# CONFIG_IKCONFIG is not set
77CONFIG_LOG_BUF_SHIFT=14 77CONFIG_LOG_BUF_SHIFT=14
78# CONFIG_CGROUPS is not set
79CONFIG_GROUP_SCHED=y 78CONFIG_GROUP_SCHED=y
80# CONFIG_FAIR_GROUP_SCHED is not set 79# CONFIG_FAIR_GROUP_SCHED is not set
81# CONFIG_RT_GROUP_SCHED is not set 80# CONFIG_RT_GROUP_SCHED is not set
82CONFIG_USER_SCHED=y 81CONFIG_USER_SCHED=y
83# CONFIG_CGROUP_SCHED is not set 82# CONFIG_CGROUP_SCHED is not set
83# CONFIG_CGROUPS is not set
84CONFIG_SYSFS_DEPRECATED=y 84CONFIG_SYSFS_DEPRECATED=y
85CONFIG_SYSFS_DEPRECATED_V2=y 85CONFIG_SYSFS_DEPRECATED_V2=y
86# CONFIG_RELAY is not set 86# CONFIG_RELAY is not set
@@ -113,7 +113,6 @@ CONFIG_SLUB_DEBUG=y
113CONFIG_SLUB=y 113CONFIG_SLUB=y
114# CONFIG_SLOB is not set 114# CONFIG_SLOB is not set
115# CONFIG_PROFILING is not set 115# CONFIG_PROFILING is not set
116# CONFIG_MARKERS is not set
117CONFIG_HAVE_OPROFILE=y 116CONFIG_HAVE_OPROFILE=y
118CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 117CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
119CONFIG_HAVE_IOREMAP_PROT=y 118CONFIG_HAVE_IOREMAP_PROT=y
@@ -123,7 +122,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
123# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 122# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
124CONFIG_SLABINFO=y 123CONFIG_SLABINFO=y
125CONFIG_RT_MUTEXES=y 124CONFIG_RT_MUTEXES=y
126# CONFIG_TINY_SHMEM is not set
127CONFIG_BASE_SMALL=0 125CONFIG_BASE_SMALL=0
128CONFIG_MODULES=y 126CONFIG_MODULES=y
129# CONFIG_MODULE_FORCE_LOAD is not set 127# CONFIG_MODULE_FORCE_LOAD is not set
@@ -131,11 +129,9 @@ CONFIG_MODULE_UNLOAD=y
131# CONFIG_MODULE_FORCE_UNLOAD is not set 129# CONFIG_MODULE_FORCE_UNLOAD is not set
132# CONFIG_MODVERSIONS is not set 130# CONFIG_MODVERSIONS is not set
133# CONFIG_MODULE_SRCVERSION_ALL is not set 131# CONFIG_MODULE_SRCVERSION_ALL is not set
134CONFIG_KMOD=y
135CONFIG_BLOCK=y 132CONFIG_BLOCK=y
136# CONFIG_LBD is not set 133# CONFIG_LBD is not set
137# CONFIG_BLK_DEV_IO_TRACE is not set 134# CONFIG_BLK_DEV_IO_TRACE is not set
138# CONFIG_LSF is not set
139# CONFIG_BLK_DEV_BSG is not set 135# CONFIG_BLK_DEV_BSG is not set
140# CONFIG_BLK_DEV_INTEGRITY is not set 136# CONFIG_BLK_DEV_INTEGRITY is not set
141 137
@@ -152,6 +148,10 @@ CONFIG_DEFAULT_AS=y
152# CONFIG_DEFAULT_NOOP is not set 148# CONFIG_DEFAULT_NOOP is not set
153CONFIG_DEFAULT_IOSCHED="anticipatory" 149CONFIG_DEFAULT_IOSCHED="anticipatory"
154CONFIG_CLASSIC_RCU=y 150CONFIG_CLASSIC_RCU=y
151# CONFIG_TREE_RCU is not set
152# CONFIG_PREEMPT_RCU is not set
153# CONFIG_TREE_RCU_TRACE is not set
154# CONFIG_PREEMPT_RCU_TRACE is not set
155# CONFIG_FREEZER is not set 155# CONFIG_FREEZER is not set
156 156
157# 157#
@@ -198,6 +198,8 @@ CONFIG_IPIC=y
198# CONFIG_QUICC_ENGINE is not set 198# CONFIG_QUICC_ENGINE is not set
199# CONFIG_FSL_ULI1575 is not set 199# CONFIG_FSL_ULI1575 is not set
200# CONFIG_MPC8xxx_GPIO is not set 200# CONFIG_MPC8xxx_GPIO is not set
201# CONFIG_SIMPLE_GPIO is not set
202# CONFIG_MCU_MPC8349EMITX is not set
201 203
202# 204#
203# Kernel options 205# Kernel options
@@ -225,6 +227,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
225CONFIG_ARCH_HAS_WALK_MEMORY=y 227CONFIG_ARCH_HAS_WALK_MEMORY=y
226CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 228CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
227# CONFIG_KEXEC is not set 229# CONFIG_KEXEC is not set
230# CONFIG_CRASH_DUMP is not set
228CONFIG_ARCH_FLATMEM_ENABLE=y 231CONFIG_ARCH_FLATMEM_ENABLE=y
229CONFIG_ARCH_POPULATES_NODE_MAP=y 232CONFIG_ARCH_POPULATES_NODE_MAP=y
230CONFIG_SELECT_MEMORY_MODEL=y 233CONFIG_SELECT_MEMORY_MODEL=y
@@ -236,12 +239,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
236CONFIG_PAGEFLAGS_EXTENDED=y 239CONFIG_PAGEFLAGS_EXTENDED=y
237CONFIG_SPLIT_PTLOCK_CPUS=4 240CONFIG_SPLIT_PTLOCK_CPUS=4
238CONFIG_MIGRATION=y 241CONFIG_MIGRATION=y
239# CONFIG_RESOURCES_64BIT is not set
240# CONFIG_PHYS_ADDR_T_64BIT is not set 242# CONFIG_PHYS_ADDR_T_64BIT is not set
241CONFIG_ZONE_DMA_FLAG=1 243CONFIG_ZONE_DMA_FLAG=1
242CONFIG_BOUNCE=y 244CONFIG_BOUNCE=y
243CONFIG_VIRT_TO_BUS=y 245CONFIG_VIRT_TO_BUS=y
244CONFIG_UNEVICTABLE_LRU=y 246CONFIG_UNEVICTABLE_LRU=y
247CONFIG_PPC_4K_PAGES=y
248# CONFIG_PPC_16K_PAGES is not set
249# CONFIG_PPC_64K_PAGES is not set
245CONFIG_FORCE_MAX_ZONEORDER=11 250CONFIG_FORCE_MAX_ZONEORDER=11
246CONFIG_PROC_DEVICETREE=y 251CONFIG_PROC_DEVICETREE=y
247# CONFIG_CMDLINE_BOOL is not set 252# CONFIG_CMDLINE_BOOL is not set
@@ -267,6 +272,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
267# CONFIG_PCI_MSI is not set 272# CONFIG_PCI_MSI is not set
268# CONFIG_PCI_LEGACY is not set 273# CONFIG_PCI_LEGACY is not set
269# CONFIG_PCI_DEBUG is not set 274# CONFIG_PCI_DEBUG is not set
275# CONFIG_PCI_STUB is not set
270# CONFIG_PCCARD is not set 276# CONFIG_PCCARD is not set
271# CONFIG_HOTPLUG_PCI is not set 277# CONFIG_HOTPLUG_PCI is not set
272# CONFIG_HAS_RAPIDIO is not set 278# CONFIG_HAS_RAPIDIO is not set
@@ -289,6 +295,7 @@ CONFIG_NET=y
289# 295#
290# Networking options 296# Networking options
291# 297#
298CONFIG_COMPAT_NET_DEV_OPS=y
292CONFIG_PACKET=y 299CONFIG_PACKET=y
293# CONFIG_PACKET_MMAP is not set 300# CONFIG_PACKET_MMAP is not set
294CONFIG_UNIX=y 301CONFIG_UNIX=y
@@ -345,6 +352,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
345# CONFIG_ECONET is not set 352# CONFIG_ECONET is not set
346# CONFIG_WAN_ROUTER is not set 353# CONFIG_WAN_ROUTER is not set
347# CONFIG_NET_SCHED is not set 354# CONFIG_NET_SCHED is not set
355# CONFIG_DCB is not set
348 356
349# 357#
350# Network testing 358# Network testing
@@ -360,8 +368,9 @@ CONFIG_WIRELESS=y
360# CONFIG_CFG80211 is not set 368# CONFIG_CFG80211 is not set
361CONFIG_WIRELESS_OLD_REGULATORY=y 369CONFIG_WIRELESS_OLD_REGULATORY=y
362# CONFIG_WIRELESS_EXT is not set 370# CONFIG_WIRELESS_EXT is not set
371# CONFIG_LIB80211 is not set
363# CONFIG_MAC80211 is not set 372# CONFIG_MAC80211 is not set
364# CONFIG_IEEE80211 is not set 373# CONFIG_WIMAX is not set
365# CONFIG_RFKILL is not set 374# CONFIG_RFKILL is not set
366# CONFIG_NET_9P is not set 375# CONFIG_NET_9P is not set
367 376
@@ -384,6 +393,7 @@ CONFIG_MTD=y
384# CONFIG_MTD_DEBUG is not set 393# CONFIG_MTD_DEBUG is not set
385# CONFIG_MTD_CONCAT is not set 394# CONFIG_MTD_CONCAT is not set
386CONFIG_MTD_PARTITIONS=y 395CONFIG_MTD_PARTITIONS=y
396# CONFIG_MTD_TESTS is not set
387# CONFIG_MTD_REDBOOT_PARTS is not set 397# CONFIG_MTD_REDBOOT_PARTS is not set
388# CONFIG_MTD_CMDLINE_PARTS is not set 398# CONFIG_MTD_CMDLINE_PARTS is not set
389# CONFIG_MTD_OF_PARTS is not set 399# CONFIG_MTD_OF_PARTS is not set
@@ -468,6 +478,12 @@ CONFIG_MTD_NAND_IDS=y
468# CONFIG_MTD_ONENAND is not set 478# CONFIG_MTD_ONENAND is not set
469 479
470# 480#
481# LPDDR flash memory drivers
482#
483# CONFIG_MTD_LPDDR is not set
484# CONFIG_MTD_QINFO_PROBE is not set
485
486#
471# UBI - Unsorted block images 487# UBI - Unsorted block images
472# 488#
473# CONFIG_MTD_UBI is not set 489# CONFIG_MTD_UBI is not set
@@ -499,8 +515,10 @@ CONFIG_MISC_DEVICES=y
499# CONFIG_EEPROM_93CX6 is not set 515# CONFIG_EEPROM_93CX6 is not set
500# CONFIG_SGI_IOC4 is not set 516# CONFIG_SGI_IOC4 is not set
501# CONFIG_TIFM_CORE is not set 517# CONFIG_TIFM_CORE is not set
518# CONFIG_ICS932S401 is not set
502# CONFIG_ENCLOSURE_SERVICES is not set 519# CONFIG_ENCLOSURE_SERVICES is not set
503# CONFIG_HP_ILO is not set 520# CONFIG_HP_ILO is not set
521# CONFIG_C2PORT is not set
504CONFIG_HAVE_IDE=y 522CONFIG_HAVE_IDE=y
505# CONFIG_IDE is not set 523# CONFIG_IDE is not set
506 524
@@ -543,6 +561,7 @@ CONFIG_SCSI_SPI_ATTRS=y
543# CONFIG_SCSI_SRP_ATTRS is not set 561# CONFIG_SCSI_SRP_ATTRS is not set
544CONFIG_SCSI_LOWLEVEL=y 562CONFIG_SCSI_LOWLEVEL=y
545# CONFIG_ISCSI_TCP is not set 563# CONFIG_ISCSI_TCP is not set
564# CONFIG_SCSI_CXGB3_ISCSI is not set
546# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 565# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
547# CONFIG_SCSI_3W_9XXX is not set 566# CONFIG_SCSI_3W_9XXX is not set
548# CONFIG_SCSI_ACARD is not set 567# CONFIG_SCSI_ACARD is not set
@@ -559,6 +578,8 @@ CONFIG_SCSI_LOWLEVEL=y
559# CONFIG_MEGARAID_SAS is not set 578# CONFIG_MEGARAID_SAS is not set
560# CONFIG_SCSI_HPTIOP is not set 579# CONFIG_SCSI_HPTIOP is not set
561# CONFIG_SCSI_BUSLOGIC is not set 580# CONFIG_SCSI_BUSLOGIC is not set
581# CONFIG_LIBFC is not set
582# CONFIG_FCOE is not set
562# CONFIG_SCSI_DMX3191D is not set 583# CONFIG_SCSI_DMX3191D is not set
563# CONFIG_SCSI_EATA is not set 584# CONFIG_SCSI_EATA is not set
564# CONFIG_SCSI_FUTURE_DOMAIN is not set 585# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -688,6 +709,9 @@ CONFIG_PHYLIB=y
688# CONFIG_BROADCOM_PHY is not set 709# CONFIG_BROADCOM_PHY is not set
689# CONFIG_ICPLUS_PHY is not set 710# CONFIG_ICPLUS_PHY is not set
690# CONFIG_REALTEK_PHY is not set 711# CONFIG_REALTEK_PHY is not set
712# CONFIG_NATIONAL_PHY is not set
713# CONFIG_STE10XP is not set
714# CONFIG_LSI_ET1011C_PHY is not set
691# CONFIG_FIXED_PHY is not set 715# CONFIG_FIXED_PHY is not set
692# CONFIG_MDIO_BITBANG is not set 716# CONFIG_MDIO_BITBANG is not set
693CONFIG_NET_ETHERNET=y 717CONFIG_NET_ETHERNET=y
@@ -712,7 +736,6 @@ CONFIG_NET_PCI=y
712# CONFIG_ADAPTEC_STARFIRE is not set 736# CONFIG_ADAPTEC_STARFIRE is not set
713# CONFIG_B44 is not set 737# CONFIG_B44 is not set
714# CONFIG_FORCEDETH is not set 738# CONFIG_FORCEDETH is not set
715# CONFIG_EEPRO100 is not set
716CONFIG_E100=y 739CONFIG_E100=y
717# CONFIG_FEALNX is not set 740# CONFIG_FEALNX is not set
718# CONFIG_NATSEMI is not set 741# CONFIG_NATSEMI is not set
@@ -722,6 +745,7 @@ CONFIG_E100=y
722# CONFIG_R6040 is not set 745# CONFIG_R6040 is not set
723# CONFIG_SIS900 is not set 746# CONFIG_SIS900 is not set
724# CONFIG_EPIC100 is not set 747# CONFIG_EPIC100 is not set
748# CONFIG_SMSC9420 is not set
725# CONFIG_SUNDANCE is not set 749# CONFIG_SUNDANCE is not set
726# CONFIG_TLAN is not set 750# CONFIG_TLAN is not set
727# CONFIG_VIA_RHINE is not set 751# CONFIG_VIA_RHINE is not set
@@ -752,6 +776,7 @@ CONFIG_GIANFAR=y
752# CONFIG_JME is not set 776# CONFIG_JME is not set
753CONFIG_NETDEV_10000=y 777CONFIG_NETDEV_10000=y
754# CONFIG_CHELSIO_T1 is not set 778# CONFIG_CHELSIO_T1 is not set
779CONFIG_CHELSIO_T3_DEPENDS=y
755# CONFIG_CHELSIO_T3 is not set 780# CONFIG_CHELSIO_T3 is not set
756# CONFIG_ENIC is not set 781# CONFIG_ENIC is not set
757# CONFIG_IXGBE is not set 782# CONFIG_IXGBE is not set
@@ -776,6 +801,10 @@ CONFIG_NETDEV_10000=y
776# CONFIG_IWLWIFI_LEDS is not set 801# CONFIG_IWLWIFI_LEDS is not set
777 802
778# 803#
804# Enable WiMAX (Networking options) to see the WiMAX drivers
805#
806
807#
779# USB Network Adapters 808# USB Network Adapters
780# 809#
781# CONFIG_USB_CATC is not set 810# CONFIG_USB_CATC is not set
@@ -853,8 +882,10 @@ CONFIG_SERIAL_CORE_CONSOLE=y
853# CONFIG_SERIAL_JSM is not set 882# CONFIG_SERIAL_JSM is not set
854# CONFIG_SERIAL_OF_PLATFORM is not set 883# CONFIG_SERIAL_OF_PLATFORM is not set
855CONFIG_UNIX98_PTYS=y 884CONFIG_UNIX98_PTYS=y
885# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
856CONFIG_LEGACY_PTYS=y 886CONFIG_LEGACY_PTYS=y
857CONFIG_LEGACY_PTY_COUNT=256 887CONFIG_LEGACY_PTY_COUNT=256
888# CONFIG_HVC_UDBG is not set
858# CONFIG_IPMI_HANDLER is not set 889# CONFIG_IPMI_HANDLER is not set
859CONFIG_HW_RANDOM=y 890CONFIG_HW_RANDOM=y
860# CONFIG_NVRAM is not set 891# CONFIG_NVRAM is not set
@@ -927,7 +958,6 @@ CONFIG_I2C_MPC=y
927# CONFIG_SENSORS_PCF8591 is not set 958# CONFIG_SENSORS_PCF8591 is not set
928# CONFIG_SENSORS_MAX6875 is not set 959# CONFIG_SENSORS_MAX6875 is not set
929# CONFIG_SENSORS_TSL2550 is not set 960# CONFIG_SENSORS_TSL2550 is not set
930# CONFIG_MCU_MPC8349EMITX is not set
931# CONFIG_I2C_DEBUG_CORE is not set 961# CONFIG_I2C_DEBUG_CORE is not set
932# CONFIG_I2C_DEBUG_ALGO is not set 962# CONFIG_I2C_DEBUG_ALGO is not set
933# CONFIG_I2C_DEBUG_BUS is not set 963# CONFIG_I2C_DEBUG_BUS is not set
@@ -963,8 +993,10 @@ CONFIG_HWMON=y
963# CONFIG_SENSORS_ADM1029 is not set 993# CONFIG_SENSORS_ADM1029 is not set
964# CONFIG_SENSORS_ADM1031 is not set 994# CONFIG_SENSORS_ADM1031 is not set
965# CONFIG_SENSORS_ADM9240 is not set 995# CONFIG_SENSORS_ADM9240 is not set
996# CONFIG_SENSORS_ADT7462 is not set
966# CONFIG_SENSORS_ADT7470 is not set 997# CONFIG_SENSORS_ADT7470 is not set
967# CONFIG_SENSORS_ADT7473 is not set 998# CONFIG_SENSORS_ADT7473 is not set
999# CONFIG_SENSORS_ADT7475 is not set
968# CONFIG_SENSORS_ATXP1 is not set 1000# CONFIG_SENSORS_ATXP1 is not set
969# CONFIG_SENSORS_DS1621 is not set 1001# CONFIG_SENSORS_DS1621 is not set
970# CONFIG_SENSORS_I5K_AMB is not set 1002# CONFIG_SENSORS_I5K_AMB is not set
@@ -986,6 +1018,7 @@ CONFIG_HWMON=y
986# CONFIG_SENSORS_LM90 is not set 1018# CONFIG_SENSORS_LM90 is not set
987# CONFIG_SENSORS_LM92 is not set 1019# CONFIG_SENSORS_LM92 is not set
988# CONFIG_SENSORS_LM93 is not set 1020# CONFIG_SENSORS_LM93 is not set
1021# CONFIG_SENSORS_LTC4245 is not set
989# CONFIG_SENSORS_MAX1111 is not set 1022# CONFIG_SENSORS_MAX1111 is not set
990# CONFIG_SENSORS_MAX1619 is not set 1023# CONFIG_SENSORS_MAX1619 is not set
991# CONFIG_SENSORS_MAX6650 is not set 1024# CONFIG_SENSORS_MAX6650 is not set
@@ -1032,11 +1065,11 @@ CONFIG_WATCHDOG=y
1032# USB-based Watchdog Cards 1065# USB-based Watchdog Cards
1033# 1066#
1034# CONFIG_USBPCWATCHDOG is not set 1067# CONFIG_USBPCWATCHDOG is not set
1068CONFIG_SSB_POSSIBLE=y
1035 1069
1036# 1070#
1037# Sonics Silicon Backplane 1071# Sonics Silicon Backplane
1038# 1072#
1039CONFIG_SSB_POSSIBLE=y
1040# CONFIG_SSB is not set 1073# CONFIG_SSB is not set
1041 1074
1042# 1075#
@@ -1045,18 +1078,13 @@ CONFIG_SSB_POSSIBLE=y
1045# CONFIG_MFD_CORE is not set 1078# CONFIG_MFD_CORE is not set
1046# CONFIG_MFD_SM501 is not set 1079# CONFIG_MFD_SM501 is not set
1047# CONFIG_HTC_PASIC3 is not set 1080# CONFIG_HTC_PASIC3 is not set
1081# CONFIG_TWL4030_CORE is not set
1048# CONFIG_MFD_TMIO is not set 1082# CONFIG_MFD_TMIO is not set
1049# CONFIG_PMIC_DA903X is not set 1083# CONFIG_PMIC_DA903X is not set
1050# CONFIG_MFD_WM8400 is not set 1084# CONFIG_MFD_WM8400 is not set
1051# CONFIG_MFD_WM8350_I2C is not set 1085# CONFIG_MFD_WM8350_I2C is not set
1052 1086# CONFIG_MFD_PCF50633 is not set
1053#
1054# Voltage and Current regulators
1055#
1056# CONFIG_REGULATOR is not set 1087# CONFIG_REGULATOR is not set
1057# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
1058# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
1059# CONFIG_REGULATOR_BQ24022 is not set
1060 1088
1061# 1089#
1062# Multimedia devices 1090# Multimedia devices
@@ -1141,6 +1169,7 @@ CONFIG_USB_EHCI_ROOT_HUB_TT=y
1141# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1169# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1142CONFIG_USB_EHCI_FSL=y 1170CONFIG_USB_EHCI_FSL=y
1143CONFIG_USB_EHCI_HCD_PPC_OF=y 1171CONFIG_USB_EHCI_HCD_PPC_OF=y
1172# CONFIG_USB_OXU210HP_HCD is not set
1144# CONFIG_USB_ISP116X_HCD is not set 1173# CONFIG_USB_ISP116X_HCD is not set
1145# CONFIG_USB_ISP1760_HCD is not set 1174# CONFIG_USB_ISP1760_HCD is not set
1146CONFIG_USB_OHCI_HCD=y 1175CONFIG_USB_OHCI_HCD=y
@@ -1167,18 +1196,17 @@ CONFIG_USB_UHCI_HCD=y
1167# CONFIG_USB_TMC is not set 1196# CONFIG_USB_TMC is not set
1168 1197
1169# 1198#
1170# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1199# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
1171# 1200#
1172 1201
1173# 1202#
1174# may also be needed; see USB_STORAGE Help for more information 1203# see USB_STORAGE Help for more information
1175# 1204#
1176CONFIG_USB_STORAGE=y 1205CONFIG_USB_STORAGE=y
1177# CONFIG_USB_STORAGE_DEBUG is not set 1206# CONFIG_USB_STORAGE_DEBUG is not set
1178# CONFIG_USB_STORAGE_DATAFAB is not set 1207# CONFIG_USB_STORAGE_DATAFAB is not set
1179# CONFIG_USB_STORAGE_FREECOM is not set 1208# CONFIG_USB_STORAGE_FREECOM is not set
1180# CONFIG_USB_STORAGE_ISD200 is not set 1209# CONFIG_USB_STORAGE_ISD200 is not set
1181# CONFIG_USB_STORAGE_DPCM is not set
1182# CONFIG_USB_STORAGE_USBAT is not set 1210# CONFIG_USB_STORAGE_USBAT is not set
1183# CONFIG_USB_STORAGE_SDDR09 is not set 1211# CONFIG_USB_STORAGE_SDDR09 is not set
1184# CONFIG_USB_STORAGE_SDDR55 is not set 1212# CONFIG_USB_STORAGE_SDDR55 is not set
@@ -1238,9 +1266,11 @@ CONFIG_USB_GADGET_SELECTED=y
1238# CONFIG_USB_GADGET_PXA25X is not set 1266# CONFIG_USB_GADGET_PXA25X is not set
1239# CONFIG_USB_GADGET_PXA27X is not set 1267# CONFIG_USB_GADGET_PXA27X is not set
1240# CONFIG_USB_GADGET_S3C2410 is not set 1268# CONFIG_USB_GADGET_S3C2410 is not set
1269# CONFIG_USB_GADGET_IMX is not set
1241# CONFIG_USB_GADGET_M66592 is not set 1270# CONFIG_USB_GADGET_M66592 is not set
1242# CONFIG_USB_GADGET_AMD5536UDC is not set 1271# CONFIG_USB_GADGET_AMD5536UDC is not set
1243# CONFIG_USB_GADGET_FSL_QE is not set 1272# CONFIG_USB_GADGET_FSL_QE is not set
1273# CONFIG_USB_GADGET_CI13XXX is not set
1244CONFIG_USB_GADGET_NET2280=y 1274CONFIG_USB_GADGET_NET2280=y
1245CONFIG_USB_NET2280=y 1275CONFIG_USB_NET2280=y
1246# CONFIG_USB_GADGET_GOKU is not set 1276# CONFIG_USB_GADGET_GOKU is not set
@@ -1255,6 +1285,10 @@ CONFIG_USB_ETH_RNDIS=y
1255# CONFIG_USB_MIDI_GADGET is not set 1285# CONFIG_USB_MIDI_GADGET is not set
1256# CONFIG_USB_G_PRINTER is not set 1286# CONFIG_USB_G_PRINTER is not set
1257# CONFIG_USB_CDC_COMPOSITE is not set 1287# CONFIG_USB_CDC_COMPOSITE is not set
1288
1289#
1290# OTG and related infrastructure
1291#
1258# CONFIG_UWB is not set 1292# CONFIG_UWB is not set
1259# CONFIG_MMC is not set 1293# CONFIG_MMC is not set
1260# CONFIG_MEMSTICK is not set 1294# CONFIG_MEMSTICK is not set
@@ -1292,12 +1326,14 @@ CONFIG_RTC_DRV_DS1307=y
1292# CONFIG_RTC_DRV_M41T80 is not set 1326# CONFIG_RTC_DRV_M41T80 is not set
1293# CONFIG_RTC_DRV_S35390A is not set 1327# CONFIG_RTC_DRV_S35390A is not set
1294# CONFIG_RTC_DRV_FM3130 is not set 1328# CONFIG_RTC_DRV_FM3130 is not set
1329# CONFIG_RTC_DRV_RX8581 is not set
1295 1330
1296# 1331#
1297# SPI RTC drivers 1332# SPI RTC drivers
1298# 1333#
1299# CONFIG_RTC_DRV_M41T94 is not set 1334# CONFIG_RTC_DRV_M41T94 is not set
1300# CONFIG_RTC_DRV_DS1305 is not set 1335# CONFIG_RTC_DRV_DS1305 is not set
1336# CONFIG_RTC_DRV_DS1390 is not set
1301# CONFIG_RTC_DRV_MAX6902 is not set 1337# CONFIG_RTC_DRV_MAX6902 is not set
1302# CONFIG_RTC_DRV_R9701 is not set 1338# CONFIG_RTC_DRV_R9701 is not set
1303# CONFIG_RTC_DRV_RS5C348 is not set 1339# CONFIG_RTC_DRV_RS5C348 is not set
@@ -1345,6 +1381,7 @@ CONFIG_FS_MBCACHE=y
1345CONFIG_FILE_LOCKING=y 1381CONFIG_FILE_LOCKING=y
1346# CONFIG_XFS_FS is not set 1382# CONFIG_XFS_FS is not set
1347# CONFIG_OCFS2_FS is not set 1383# CONFIG_OCFS2_FS is not set
1384# CONFIG_BTRFS_FS is not set
1348CONFIG_DNOTIFY=y 1385CONFIG_DNOTIFY=y
1349CONFIG_INOTIFY=y 1386CONFIG_INOTIFY=y
1350CONFIG_INOTIFY_USER=y 1387CONFIG_INOTIFY_USER=y
@@ -1378,10 +1415,7 @@ CONFIG_TMPFS=y
1378# CONFIG_TMPFS_POSIX_ACL is not set 1415# CONFIG_TMPFS_POSIX_ACL is not set
1379# CONFIG_HUGETLB_PAGE is not set 1416# CONFIG_HUGETLB_PAGE is not set
1380# CONFIG_CONFIGFS_FS is not set 1417# CONFIG_CONFIGFS_FS is not set
1381 1418CONFIG_MISC_FILESYSTEMS=y
1382#
1383# Miscellaneous filesystems
1384#
1385# CONFIG_ADFS_FS is not set 1419# CONFIG_ADFS_FS is not set
1386# CONFIG_AFFS_FS is not set 1420# CONFIG_AFFS_FS is not set
1387# CONFIG_HFS_FS is not set 1421# CONFIG_HFS_FS is not set
@@ -1401,6 +1435,7 @@ CONFIG_JFFS2_ZLIB=y
1401CONFIG_JFFS2_RTIME=y 1435CONFIG_JFFS2_RTIME=y
1402# CONFIG_JFFS2_RUBIN is not set 1436# CONFIG_JFFS2_RUBIN is not set
1403# CONFIG_CRAMFS is not set 1437# CONFIG_CRAMFS is not set
1438# CONFIG_SQUASHFS is not set
1404# CONFIG_VXFS_FS is not set 1439# CONFIG_VXFS_FS is not set
1405# CONFIG_MINIX_FS is not set 1440# CONFIG_MINIX_FS is not set
1406# CONFIG_OMFS_FS is not set 1441# CONFIG_OMFS_FS is not set
@@ -1458,6 +1493,7 @@ CONFIG_MSDOS_PARTITION=y
1458# Library routines 1493# Library routines
1459# 1494#
1460CONFIG_BITREVERSE=y 1495CONFIG_BITREVERSE=y
1496CONFIG_GENERIC_FIND_LAST_BIT=y
1461# CONFIG_CRC_CCITT is not set 1497# CONFIG_CRC_CCITT is not set
1462# CONFIG_CRC16 is not set 1498# CONFIG_CRC16 is not set
1463# CONFIG_CRC_T10DIF is not set 1499# CONFIG_CRC_T10DIF is not set
@@ -1509,6 +1545,7 @@ CONFIG_SCHED_DEBUG=y
1509# CONFIG_DEBUG_MEMORY_INIT is not set 1545# CONFIG_DEBUG_MEMORY_INIT is not set
1510# CONFIG_DEBUG_LIST is not set 1546# CONFIG_DEBUG_LIST is not set
1511# CONFIG_DEBUG_SG is not set 1547# CONFIG_DEBUG_SG is not set
1548# CONFIG_DEBUG_NOTIFIERS is not set
1512# CONFIG_BOOT_PRINTK_DELAY is not set 1549# CONFIG_BOOT_PRINTK_DELAY is not set
1513# CONFIG_RCU_TORTURE_TEST is not set 1550# CONFIG_RCU_TORTURE_TEST is not set
1514# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1551# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -1518,6 +1555,8 @@ CONFIG_SCHED_DEBUG=y
1518# CONFIG_LATENCYTOP is not set 1555# CONFIG_LATENCYTOP is not set
1519CONFIG_SYSCTL_SYSCALL_CHECK=y 1556CONFIG_SYSCTL_SYSCALL_CHECK=y
1520CONFIG_HAVE_FUNCTION_TRACER=y 1557CONFIG_HAVE_FUNCTION_TRACER=y
1558CONFIG_HAVE_DYNAMIC_FTRACE=y
1559CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1521 1560
1522# 1561#
1523# Tracers 1562# Tracers
@@ -1526,11 +1565,13 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1526# CONFIG_SCHED_TRACER is not set 1565# CONFIG_SCHED_TRACER is not set
1527# CONFIG_CONTEXT_SWITCH_TRACER is not set 1566# CONFIG_CONTEXT_SWITCH_TRACER is not set
1528# CONFIG_BOOT_TRACER is not set 1567# CONFIG_BOOT_TRACER is not set
1568# CONFIG_TRACE_BRANCH_PROFILING is not set
1529# CONFIG_STACK_TRACER is not set 1569# CONFIG_STACK_TRACER is not set
1530# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1570# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1531# CONFIG_SAMPLES is not set 1571# CONFIG_SAMPLES is not set
1532CONFIG_HAVE_ARCH_KGDB=y 1572CONFIG_HAVE_ARCH_KGDB=y
1533# CONFIG_KGDB is not set 1573# CONFIG_KGDB is not set
1574CONFIG_PRINT_STACK_DEPTH=64
1534# CONFIG_DEBUG_STACKOVERFLOW is not set 1575# CONFIG_DEBUG_STACKOVERFLOW is not set
1535# CONFIG_DEBUG_STACK_USAGE is not set 1576# CONFIG_DEBUG_STACK_USAGE is not set
1536# CONFIG_DEBUG_PAGEALLOC is not set 1577# CONFIG_DEBUG_PAGEALLOC is not set
@@ -1557,11 +1598,15 @@ CONFIG_CRYPTO=y
1557# 1598#
1558# CONFIG_CRYPTO_FIPS is not set 1599# CONFIG_CRYPTO_FIPS is not set
1559CONFIG_CRYPTO_ALGAPI=y 1600CONFIG_CRYPTO_ALGAPI=y
1560CONFIG_CRYPTO_AEAD=y 1601CONFIG_CRYPTO_ALGAPI2=y
1602CONFIG_CRYPTO_AEAD2=y
1561CONFIG_CRYPTO_BLKCIPHER=y 1603CONFIG_CRYPTO_BLKCIPHER=y
1604CONFIG_CRYPTO_BLKCIPHER2=y
1562CONFIG_CRYPTO_HASH=y 1605CONFIG_CRYPTO_HASH=y
1563CONFIG_CRYPTO_RNG=y 1606CONFIG_CRYPTO_HASH2=y
1607CONFIG_CRYPTO_RNG2=y
1564CONFIG_CRYPTO_MANAGER=y 1608CONFIG_CRYPTO_MANAGER=y
1609CONFIG_CRYPTO_MANAGER2=y
1565# CONFIG_CRYPTO_GF128MUL is not set 1610# CONFIG_CRYPTO_GF128MUL is not set
1566# CONFIG_CRYPTO_NULL is not set 1611# CONFIG_CRYPTO_NULL is not set
1567# CONFIG_CRYPTO_CRYPTD is not set 1612# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/83xx/mpc832x_mds_defconfig b/arch/powerpc/configs/83xx/mpc832x_mds_defconfig
index 9cb8c8b956e..7cd6a728bde 100644
--- a/arch/powerpc/configs/83xx/mpc832x_mds_defconfig
+++ b/arch/powerpc/configs/83xx/mpc832x_mds_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc3 3# Linux kernel version: 2.6.29-rc2
4# Sat Nov 8 12:39:53 2008 4# Mon Jan 26 15:35:50 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -44,7 +44,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
44CONFIG_PPC=y 44CONFIG_PPC=y
45CONFIG_EARLY_PRINTK=y 45CONFIG_EARLY_PRINTK=y
46CONFIG_GENERIC_NVRAM=y 46CONFIG_GENERIC_NVRAM=y
47CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 47CONFIG_SCHED_OMIT_FRAME_POINTER=y
48CONFIG_ARCH_MAY_HAVE_PC_FDC=y 48CONFIG_ARCH_MAY_HAVE_PC_FDC=y
49CONFIG_PPC_OF=y 49CONFIG_PPC_OF=y
50CONFIG_OF=y 50CONFIG_OF=y
@@ -75,12 +75,12 @@ CONFIG_SYSVIPC_SYSCTL=y
75# CONFIG_AUDIT is not set 75# CONFIG_AUDIT is not set
76# CONFIG_IKCONFIG is not set 76# CONFIG_IKCONFIG is not set
77CONFIG_LOG_BUF_SHIFT=14 77CONFIG_LOG_BUF_SHIFT=14
78# CONFIG_CGROUPS is not set
79CONFIG_GROUP_SCHED=y 78CONFIG_GROUP_SCHED=y
80# CONFIG_FAIR_GROUP_SCHED is not set 79# CONFIG_FAIR_GROUP_SCHED is not set
81# CONFIG_RT_GROUP_SCHED is not set 80# CONFIG_RT_GROUP_SCHED is not set
82CONFIG_USER_SCHED=y 81CONFIG_USER_SCHED=y
83# CONFIG_CGROUP_SCHED is not set 82# CONFIG_CGROUP_SCHED is not set
83# CONFIG_CGROUPS is not set
84CONFIG_SYSFS_DEPRECATED=y 84CONFIG_SYSFS_DEPRECATED=y
85CONFIG_SYSFS_DEPRECATED_V2=y 85CONFIG_SYSFS_DEPRECATED_V2=y
86# CONFIG_RELAY is not set 86# CONFIG_RELAY is not set
@@ -113,7 +113,6 @@ CONFIG_SLUB_DEBUG=y
113CONFIG_SLUB=y 113CONFIG_SLUB=y
114# CONFIG_SLOB is not set 114# CONFIG_SLOB is not set
115# CONFIG_PROFILING is not set 115# CONFIG_PROFILING is not set
116# CONFIG_MARKERS is not set
117CONFIG_HAVE_OPROFILE=y 116CONFIG_HAVE_OPROFILE=y
118CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 117CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
119CONFIG_HAVE_IOREMAP_PROT=y 118CONFIG_HAVE_IOREMAP_PROT=y
@@ -123,7 +122,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
123# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 122# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
124CONFIG_SLABINFO=y 123CONFIG_SLABINFO=y
125CONFIG_RT_MUTEXES=y 124CONFIG_RT_MUTEXES=y
126# CONFIG_TINY_SHMEM is not set
127CONFIG_BASE_SMALL=0 125CONFIG_BASE_SMALL=0
128CONFIG_MODULES=y 126CONFIG_MODULES=y
129# CONFIG_MODULE_FORCE_LOAD is not set 127# CONFIG_MODULE_FORCE_LOAD is not set
@@ -131,11 +129,9 @@ CONFIG_MODULE_UNLOAD=y
131# CONFIG_MODULE_FORCE_UNLOAD is not set 129# CONFIG_MODULE_FORCE_UNLOAD is not set
132# CONFIG_MODVERSIONS is not set 130# CONFIG_MODVERSIONS is not set
133# CONFIG_MODULE_SRCVERSION_ALL is not set 131# CONFIG_MODULE_SRCVERSION_ALL is not set
134CONFIG_KMOD=y
135CONFIG_BLOCK=y 132CONFIG_BLOCK=y
136# CONFIG_LBD is not set 133# CONFIG_LBD is not set
137# CONFIG_BLK_DEV_IO_TRACE is not set 134# CONFIG_BLK_DEV_IO_TRACE is not set
138# CONFIG_LSF is not set
139# CONFIG_BLK_DEV_BSG is not set 135# CONFIG_BLK_DEV_BSG is not set
140# CONFIG_BLK_DEV_INTEGRITY is not set 136# CONFIG_BLK_DEV_INTEGRITY is not set
141 137
@@ -152,6 +148,10 @@ CONFIG_DEFAULT_AS=y
152# CONFIG_DEFAULT_NOOP is not set 148# CONFIG_DEFAULT_NOOP is not set
153CONFIG_DEFAULT_IOSCHED="anticipatory" 149CONFIG_DEFAULT_IOSCHED="anticipatory"
154CONFIG_CLASSIC_RCU=y 150CONFIG_CLASSIC_RCU=y
151# CONFIG_TREE_RCU is not set
152# CONFIG_PREEMPT_RCU is not set
153# CONFIG_TREE_RCU_TRACE is not set
154# CONFIG_PREEMPT_RCU_TRACE is not set
155# CONFIG_FREEZER is not set 155# CONFIG_FREEZER is not set
156 156
157# 157#
@@ -198,6 +198,8 @@ CONFIG_IPIC=y
198CONFIG_QUICC_ENGINE=y 198CONFIG_QUICC_ENGINE=y
199# CONFIG_QE_GPIO is not set 199# CONFIG_QE_GPIO is not set
200# CONFIG_FSL_ULI1575 is not set 200# CONFIG_FSL_ULI1575 is not set
201# CONFIG_SIMPLE_GPIO is not set
202# CONFIG_MCU_MPC8349EMITX is not set
201 203
202# 204#
203# Kernel options 205# Kernel options
@@ -226,6 +228,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
226CONFIG_ARCH_HAS_WALK_MEMORY=y 228CONFIG_ARCH_HAS_WALK_MEMORY=y
227CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 229CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
228# CONFIG_KEXEC is not set 230# CONFIG_KEXEC is not set
231# CONFIG_CRASH_DUMP is not set
229CONFIG_ARCH_FLATMEM_ENABLE=y 232CONFIG_ARCH_FLATMEM_ENABLE=y
230CONFIG_ARCH_POPULATES_NODE_MAP=y 233CONFIG_ARCH_POPULATES_NODE_MAP=y
231CONFIG_SELECT_MEMORY_MODEL=y 234CONFIG_SELECT_MEMORY_MODEL=y
@@ -237,12 +240,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
237CONFIG_PAGEFLAGS_EXTENDED=y 240CONFIG_PAGEFLAGS_EXTENDED=y
238CONFIG_SPLIT_PTLOCK_CPUS=4 241CONFIG_SPLIT_PTLOCK_CPUS=4
239CONFIG_MIGRATION=y 242CONFIG_MIGRATION=y
240# CONFIG_RESOURCES_64BIT is not set
241# CONFIG_PHYS_ADDR_T_64BIT is not set 243# CONFIG_PHYS_ADDR_T_64BIT is not set
242CONFIG_ZONE_DMA_FLAG=1 244CONFIG_ZONE_DMA_FLAG=1
243CONFIG_BOUNCE=y 245CONFIG_BOUNCE=y
244CONFIG_VIRT_TO_BUS=y 246CONFIG_VIRT_TO_BUS=y
245CONFIG_UNEVICTABLE_LRU=y 247CONFIG_UNEVICTABLE_LRU=y
248CONFIG_PPC_4K_PAGES=y
249# CONFIG_PPC_16K_PAGES is not set
250# CONFIG_PPC_64K_PAGES is not set
246CONFIG_FORCE_MAX_ZONEORDER=11 251CONFIG_FORCE_MAX_ZONEORDER=11
247CONFIG_PROC_DEVICETREE=y 252CONFIG_PROC_DEVICETREE=y
248# CONFIG_CMDLINE_BOOL is not set 253# CONFIG_CMDLINE_BOOL is not set
@@ -267,6 +272,7 @@ CONFIG_PCI_SYSCALL=y
267CONFIG_ARCH_SUPPORTS_MSI=y 272CONFIG_ARCH_SUPPORTS_MSI=y
268# CONFIG_PCI_MSI is not set 273# CONFIG_PCI_MSI is not set
269# CONFIG_PCI_LEGACY is not set 274# CONFIG_PCI_LEGACY is not set
275# CONFIG_PCI_STUB is not set
270# CONFIG_PCCARD is not set 276# CONFIG_PCCARD is not set
271# CONFIG_HOTPLUG_PCI is not set 277# CONFIG_HOTPLUG_PCI is not set
272# CONFIG_HAS_RAPIDIO is not set 278# CONFIG_HAS_RAPIDIO is not set
@@ -289,6 +295,7 @@ CONFIG_NET=y
289# 295#
290# Networking options 296# Networking options
291# 297#
298CONFIG_COMPAT_NET_DEV_OPS=y
292CONFIG_PACKET=y 299CONFIG_PACKET=y
293# CONFIG_PACKET_MMAP is not set 300# CONFIG_PACKET_MMAP is not set
294CONFIG_UNIX=y 301CONFIG_UNIX=y
@@ -345,6 +352,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
345# CONFIG_ECONET is not set 352# CONFIG_ECONET is not set
346# CONFIG_WAN_ROUTER is not set 353# CONFIG_WAN_ROUTER is not set
347# CONFIG_NET_SCHED is not set 354# CONFIG_NET_SCHED is not set
355# CONFIG_DCB is not set
348 356
349# 357#
350# Network testing 358# Network testing
@@ -360,8 +368,9 @@ CONFIG_WIRELESS=y
360# CONFIG_CFG80211 is not set 368# CONFIG_CFG80211 is not set
361CONFIG_WIRELESS_OLD_REGULATORY=y 369CONFIG_WIRELESS_OLD_REGULATORY=y
362# CONFIG_WIRELESS_EXT is not set 370# CONFIG_WIRELESS_EXT is not set
371# CONFIG_LIB80211 is not set
363# CONFIG_MAC80211 is not set 372# CONFIG_MAC80211 is not set
364# CONFIG_IEEE80211 is not set 373# CONFIG_WIMAX is not set
365# CONFIG_RFKILL is not set 374# CONFIG_RFKILL is not set
366# CONFIG_NET_9P is not set 375# CONFIG_NET_9P is not set
367 376
@@ -405,8 +414,10 @@ CONFIG_MISC_DEVICES=y
405# CONFIG_EEPROM_93CX6 is not set 414# CONFIG_EEPROM_93CX6 is not set
406# CONFIG_SGI_IOC4 is not set 415# CONFIG_SGI_IOC4 is not set
407# CONFIG_TIFM_CORE is not set 416# CONFIG_TIFM_CORE is not set
417# CONFIG_ICS932S401 is not set
408# CONFIG_ENCLOSURE_SERVICES is not set 418# CONFIG_ENCLOSURE_SERVICES is not set
409# CONFIG_HP_ILO is not set 419# CONFIG_HP_ILO is not set
420# CONFIG_C2PORT is not set
410CONFIG_HAVE_IDE=y 421CONFIG_HAVE_IDE=y
411# CONFIG_IDE is not set 422# CONFIG_IDE is not set
412 423
@@ -449,6 +460,7 @@ CONFIG_SCSI_WAIT_SCAN=m
449# CONFIG_SCSI_SRP_ATTRS is not set 460# CONFIG_SCSI_SRP_ATTRS is not set
450CONFIG_SCSI_LOWLEVEL=y 461CONFIG_SCSI_LOWLEVEL=y
451# CONFIG_ISCSI_TCP is not set 462# CONFIG_ISCSI_TCP is not set
463# CONFIG_SCSI_CXGB3_ISCSI is not set
452# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 464# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
453# CONFIG_SCSI_3W_9XXX is not set 465# CONFIG_SCSI_3W_9XXX is not set
454# CONFIG_SCSI_ACARD is not set 466# CONFIG_SCSI_ACARD is not set
@@ -465,6 +477,8 @@ CONFIG_SCSI_LOWLEVEL=y
465# CONFIG_MEGARAID_SAS is not set 477# CONFIG_MEGARAID_SAS is not set
466# CONFIG_SCSI_HPTIOP is not set 478# CONFIG_SCSI_HPTIOP is not set
467# CONFIG_SCSI_BUSLOGIC is not set 479# CONFIG_SCSI_BUSLOGIC is not set
480# CONFIG_LIBFC is not set
481# CONFIG_FCOE is not set
468# CONFIG_SCSI_DMX3191D is not set 482# CONFIG_SCSI_DMX3191D is not set
469# CONFIG_SCSI_EATA is not set 483# CONFIG_SCSI_EATA is not set
470# CONFIG_SCSI_FUTURE_DOMAIN is not set 484# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -523,6 +537,9 @@ CONFIG_DAVICOM_PHY=y
523# CONFIG_BROADCOM_PHY is not set 537# CONFIG_BROADCOM_PHY is not set
524# CONFIG_ICPLUS_PHY is not set 538# CONFIG_ICPLUS_PHY is not set
525# CONFIG_REALTEK_PHY is not set 539# CONFIG_REALTEK_PHY is not set
540# CONFIG_NATIONAL_PHY is not set
541# CONFIG_STE10XP is not set
542# CONFIG_LSI_ET1011C_PHY is not set
526# CONFIG_FIXED_PHY is not set 543# CONFIG_FIXED_PHY is not set
527# CONFIG_MDIO_BITBANG is not set 544# CONFIG_MDIO_BITBANG is not set
528CONFIG_NET_ETHERNET=y 545CONFIG_NET_ETHERNET=y
@@ -563,7 +580,6 @@ CONFIG_NETDEV_1000=y
563# CONFIG_GIANFAR is not set 580# CONFIG_GIANFAR is not set
564CONFIG_UCC_GETH=y 581CONFIG_UCC_GETH=y
565# CONFIG_UGETH_MAGIC_PACKET is not set 582# CONFIG_UGETH_MAGIC_PACKET is not set
566# CONFIG_UGETH_FILTERING is not set
567# CONFIG_UGETH_TX_ON_DEMAND is not set 583# CONFIG_UGETH_TX_ON_DEMAND is not set
568# CONFIG_MV643XX_ETH is not set 584# CONFIG_MV643XX_ETH is not set
569# CONFIG_QLA3XXX is not set 585# CONFIG_QLA3XXX is not set
@@ -572,6 +588,7 @@ CONFIG_UCC_GETH=y
572# CONFIG_JME is not set 588# CONFIG_JME is not set
573CONFIG_NETDEV_10000=y 589CONFIG_NETDEV_10000=y
574# CONFIG_CHELSIO_T1 is not set 590# CONFIG_CHELSIO_T1 is not set
591CONFIG_CHELSIO_T3_DEPENDS=y
575# CONFIG_CHELSIO_T3 is not set 592# CONFIG_CHELSIO_T3 is not set
576# CONFIG_ENIC is not set 593# CONFIG_ENIC is not set
577# CONFIG_IXGBE is not set 594# CONFIG_IXGBE is not set
@@ -594,6 +611,10 @@ CONFIG_NETDEV_10000=y
594# CONFIG_WLAN_PRE80211 is not set 611# CONFIG_WLAN_PRE80211 is not set
595# CONFIG_WLAN_80211 is not set 612# CONFIG_WLAN_80211 is not set
596# CONFIG_IWLWIFI_LEDS is not set 613# CONFIG_IWLWIFI_LEDS is not set
614
615#
616# Enable WiMAX (Networking options) to see the WiMAX drivers
617#
597# CONFIG_WAN is not set 618# CONFIG_WAN is not set
598# CONFIG_FDDI is not set 619# CONFIG_FDDI is not set
599# CONFIG_HIPPI is not set 620# CONFIG_HIPPI is not set
@@ -665,8 +686,10 @@ CONFIG_SERIAL_CORE_CONSOLE=y
665# CONFIG_SERIAL_OF_PLATFORM is not set 686# CONFIG_SERIAL_OF_PLATFORM is not set
666# CONFIG_SERIAL_QE is not set 687# CONFIG_SERIAL_QE is not set
667CONFIG_UNIX98_PTYS=y 688CONFIG_UNIX98_PTYS=y
689# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
668CONFIG_LEGACY_PTYS=y 690CONFIG_LEGACY_PTYS=y
669CONFIG_LEGACY_PTY_COUNT=256 691CONFIG_LEGACY_PTY_COUNT=256
692# CONFIG_HVC_UDBG is not set
670# CONFIG_IPMI_HANDLER is not set 693# CONFIG_IPMI_HANDLER is not set
671CONFIG_HW_RANDOM=y 694CONFIG_HW_RANDOM=y
672# CONFIG_NVRAM is not set 695# CONFIG_NVRAM is not set
@@ -738,7 +761,6 @@ CONFIG_I2C_MPC=y
738# CONFIG_SENSORS_PCF8591 is not set 761# CONFIG_SENSORS_PCF8591 is not set
739# CONFIG_SENSORS_MAX6875 is not set 762# CONFIG_SENSORS_MAX6875 is not set
740# CONFIG_SENSORS_TSL2550 is not set 763# CONFIG_SENSORS_TSL2550 is not set
741# CONFIG_MCU_MPC8349EMITX is not set
742# CONFIG_I2C_DEBUG_CORE is not set 764# CONFIG_I2C_DEBUG_CORE is not set
743# CONFIG_I2C_DEBUG_ALGO is not set 765# CONFIG_I2C_DEBUG_ALGO is not set
744# CONFIG_I2C_DEBUG_BUS is not set 766# CONFIG_I2C_DEBUG_BUS is not set
@@ -758,8 +780,10 @@ CONFIG_HWMON=y
758# CONFIG_SENSORS_ADM1029 is not set 780# CONFIG_SENSORS_ADM1029 is not set
759# CONFIG_SENSORS_ADM1031 is not set 781# CONFIG_SENSORS_ADM1031 is not set
760# CONFIG_SENSORS_ADM9240 is not set 782# CONFIG_SENSORS_ADM9240 is not set
783# CONFIG_SENSORS_ADT7462 is not set
761# CONFIG_SENSORS_ADT7470 is not set 784# CONFIG_SENSORS_ADT7470 is not set
762# CONFIG_SENSORS_ADT7473 is not set 785# CONFIG_SENSORS_ADT7473 is not set
786# CONFIG_SENSORS_ADT7475 is not set
763# CONFIG_SENSORS_ATXP1 is not set 787# CONFIG_SENSORS_ATXP1 is not set
764# CONFIG_SENSORS_DS1621 is not set 788# CONFIG_SENSORS_DS1621 is not set
765# CONFIG_SENSORS_I5K_AMB is not set 789# CONFIG_SENSORS_I5K_AMB is not set
@@ -780,6 +804,7 @@ CONFIG_HWMON=y
780# CONFIG_SENSORS_LM90 is not set 804# CONFIG_SENSORS_LM90 is not set
781# CONFIG_SENSORS_LM92 is not set 805# CONFIG_SENSORS_LM92 is not set
782# CONFIG_SENSORS_LM93 is not set 806# CONFIG_SENSORS_LM93 is not set
807# CONFIG_SENSORS_LTC4245 is not set
783# CONFIG_SENSORS_MAX1619 is not set 808# CONFIG_SENSORS_MAX1619 is not set
784# CONFIG_SENSORS_MAX6650 is not set 809# CONFIG_SENSORS_MAX6650 is not set
785# CONFIG_SENSORS_PC87360 is not set 810# CONFIG_SENSORS_PC87360 is not set
@@ -820,11 +845,11 @@ CONFIG_WATCHDOG=y
820# 845#
821# CONFIG_PCIPCWATCHDOG is not set 846# CONFIG_PCIPCWATCHDOG is not set
822# CONFIG_WDTPCI is not set 847# CONFIG_WDTPCI is not set
848CONFIG_SSB_POSSIBLE=y
823 849
824# 850#
825# Sonics Silicon Backplane 851# Sonics Silicon Backplane
826# 852#
827CONFIG_SSB_POSSIBLE=y
828# CONFIG_SSB is not set 853# CONFIG_SSB is not set
829 854
830# 855#
@@ -833,18 +858,13 @@ CONFIG_SSB_POSSIBLE=y
833# CONFIG_MFD_CORE is not set 858# CONFIG_MFD_CORE is not set
834# CONFIG_MFD_SM501 is not set 859# CONFIG_MFD_SM501 is not set
835# CONFIG_HTC_PASIC3 is not set 860# CONFIG_HTC_PASIC3 is not set
861# CONFIG_TWL4030_CORE is not set
836# CONFIG_MFD_TMIO is not set 862# CONFIG_MFD_TMIO is not set
837# CONFIG_PMIC_DA903X is not set 863# CONFIG_PMIC_DA903X is not set
838# CONFIG_MFD_WM8400 is not set 864# CONFIG_MFD_WM8400 is not set
839# CONFIG_MFD_WM8350_I2C is not set 865# CONFIG_MFD_WM8350_I2C is not set
840 866# CONFIG_MFD_PCF50633 is not set
841#
842# Voltage and Current regulators
843#
844# CONFIG_REGULATOR is not set 867# CONFIG_REGULATOR is not set
845# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
846# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
847# CONFIG_REGULATOR_BQ24022 is not set
848 868
849# 869#
850# Multimedia devices 870# Multimedia devices
@@ -900,9 +920,13 @@ CONFIG_USB_ARCH_HAS_EHCI=y
900# 920#
901 921
902# 922#
903# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 923# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
904# 924#
905# CONFIG_USB_GADGET is not set 925# CONFIG_USB_GADGET is not set
926
927#
928# OTG and related infrastructure
929#
906# CONFIG_UWB is not set 930# CONFIG_UWB is not set
907# CONFIG_MMC is not set 931# CONFIG_MMC is not set
908# CONFIG_MEMSTICK is not set 932# CONFIG_MEMSTICK is not set
@@ -940,6 +964,7 @@ CONFIG_RTC_DRV_DS1374=y
940# CONFIG_RTC_DRV_M41T80 is not set 964# CONFIG_RTC_DRV_M41T80 is not set
941# CONFIG_RTC_DRV_S35390A is not set 965# CONFIG_RTC_DRV_S35390A is not set
942# CONFIG_RTC_DRV_FM3130 is not set 966# CONFIG_RTC_DRV_FM3130 is not set
967# CONFIG_RTC_DRV_RX8581 is not set
943 968
944# 969#
945# SPI RTC drivers 970# SPI RTC drivers
@@ -987,6 +1012,7 @@ CONFIG_FS_MBCACHE=y
987CONFIG_FILE_LOCKING=y 1012CONFIG_FILE_LOCKING=y
988# CONFIG_XFS_FS is not set 1013# CONFIG_XFS_FS is not set
989# CONFIG_OCFS2_FS is not set 1014# CONFIG_OCFS2_FS is not set
1015# CONFIG_BTRFS_FS is not set
990CONFIG_DNOTIFY=y 1016CONFIG_DNOTIFY=y
991CONFIG_INOTIFY=y 1017CONFIG_INOTIFY=y
992CONFIG_INOTIFY_USER=y 1018CONFIG_INOTIFY_USER=y
@@ -1020,10 +1046,7 @@ CONFIG_TMPFS=y
1020# CONFIG_TMPFS_POSIX_ACL is not set 1046# CONFIG_TMPFS_POSIX_ACL is not set
1021# CONFIG_HUGETLB_PAGE is not set 1047# CONFIG_HUGETLB_PAGE is not set
1022# CONFIG_CONFIGFS_FS is not set 1048# CONFIG_CONFIGFS_FS is not set
1023 1049CONFIG_MISC_FILESYSTEMS=y
1024#
1025# Miscellaneous filesystems
1026#
1027# CONFIG_ADFS_FS is not set 1050# CONFIG_ADFS_FS is not set
1028# CONFIG_AFFS_FS is not set 1051# CONFIG_AFFS_FS is not set
1029# CONFIG_HFS_FS is not set 1052# CONFIG_HFS_FS is not set
@@ -1032,6 +1055,7 @@ CONFIG_TMPFS=y
1032# CONFIG_BFS_FS is not set 1055# CONFIG_BFS_FS is not set
1033# CONFIG_EFS_FS is not set 1056# CONFIG_EFS_FS is not set
1034# CONFIG_CRAMFS is not set 1057# CONFIG_CRAMFS is not set
1058# CONFIG_SQUASHFS is not set
1035# CONFIG_VXFS_FS is not set 1059# CONFIG_VXFS_FS is not set
1036# CONFIG_MINIX_FS is not set 1060# CONFIG_MINIX_FS is not set
1037# CONFIG_OMFS_FS is not set 1061# CONFIG_OMFS_FS is not set
@@ -1087,6 +1111,7 @@ CONFIG_UCC=y
1087# Library routines 1111# Library routines
1088# 1112#
1089CONFIG_BITREVERSE=y 1113CONFIG_BITREVERSE=y
1114CONFIG_GENERIC_FIND_LAST_BIT=y
1090# CONFIG_CRC_CCITT is not set 1115# CONFIG_CRC_CCITT is not set
1091# CONFIG_CRC16 is not set 1116# CONFIG_CRC16 is not set
1092# CONFIG_CRC_T10DIF is not set 1117# CONFIG_CRC_T10DIF is not set
@@ -1120,6 +1145,8 @@ CONFIG_FRAME_WARN=1024
1120# CONFIG_LATENCYTOP is not set 1145# CONFIG_LATENCYTOP is not set
1121CONFIG_SYSCTL_SYSCALL_CHECK=y 1146CONFIG_SYSCTL_SYSCALL_CHECK=y
1122CONFIG_HAVE_FUNCTION_TRACER=y 1147CONFIG_HAVE_FUNCTION_TRACER=y
1148CONFIG_HAVE_DYNAMIC_FTRACE=y
1149CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1123 1150
1124# 1151#
1125# Tracers 1152# Tracers
@@ -1127,6 +1154,7 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1127# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1154# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1128# CONFIG_SAMPLES is not set 1155# CONFIG_SAMPLES is not set
1129CONFIG_HAVE_ARCH_KGDB=y 1156CONFIG_HAVE_ARCH_KGDB=y
1157CONFIG_PRINT_STACK_DEPTH=64
1130# CONFIG_IRQSTACKS is not set 1158# CONFIG_IRQSTACKS is not set
1131# CONFIG_BOOTX_TEXT is not set 1159# CONFIG_BOOTX_TEXT is not set
1132# CONFIG_PPC_EARLY_DEBUG is not set 1160# CONFIG_PPC_EARLY_DEBUG is not set
@@ -1145,11 +1173,15 @@ CONFIG_CRYPTO=y
1145# 1173#
1146# CONFIG_CRYPTO_FIPS is not set 1174# CONFIG_CRYPTO_FIPS is not set
1147CONFIG_CRYPTO_ALGAPI=y 1175CONFIG_CRYPTO_ALGAPI=y
1148CONFIG_CRYPTO_AEAD=y 1176CONFIG_CRYPTO_ALGAPI2=y
1177CONFIG_CRYPTO_AEAD2=y
1149CONFIG_CRYPTO_BLKCIPHER=y 1178CONFIG_CRYPTO_BLKCIPHER=y
1179CONFIG_CRYPTO_BLKCIPHER2=y
1150CONFIG_CRYPTO_HASH=y 1180CONFIG_CRYPTO_HASH=y
1151CONFIG_CRYPTO_RNG=y 1181CONFIG_CRYPTO_HASH2=y
1182CONFIG_CRYPTO_RNG2=y
1152CONFIG_CRYPTO_MANAGER=y 1183CONFIG_CRYPTO_MANAGER=y
1184CONFIG_CRYPTO_MANAGER2=y
1153# CONFIG_CRYPTO_GF128MUL is not set 1185# CONFIG_CRYPTO_GF128MUL is not set
1154# CONFIG_CRYPTO_NULL is not set 1186# CONFIG_CRYPTO_NULL is not set
1155# CONFIG_CRYPTO_CRYPTD is not set 1187# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig b/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig
index 9cc976f010c..4e46a435d01 100644
--- a/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig
+++ b/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc3 3# Linux kernel version: 2.6.29-rc2
4# Sat Nov 8 12:39:54 2008 4# Mon Jan 26 15:35:52 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -44,7 +44,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
44CONFIG_PPC=y 44CONFIG_PPC=y
45CONFIG_EARLY_PRINTK=y 45CONFIG_EARLY_PRINTK=y
46CONFIG_GENERIC_NVRAM=y 46CONFIG_GENERIC_NVRAM=y
47CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 47CONFIG_SCHED_OMIT_FRAME_POINTER=y
48CONFIG_ARCH_MAY_HAVE_PC_FDC=y 48CONFIG_ARCH_MAY_HAVE_PC_FDC=y
49CONFIG_PPC_OF=y 49CONFIG_PPC_OF=y
50CONFIG_OF=y 50CONFIG_OF=y
@@ -75,12 +75,12 @@ CONFIG_SYSVIPC_SYSCTL=y
75# CONFIG_AUDIT is not set 75# CONFIG_AUDIT is not set
76# CONFIG_IKCONFIG is not set 76# CONFIG_IKCONFIG is not set
77CONFIG_LOG_BUF_SHIFT=14 77CONFIG_LOG_BUF_SHIFT=14
78# CONFIG_CGROUPS is not set
79CONFIG_GROUP_SCHED=y 78CONFIG_GROUP_SCHED=y
80# CONFIG_FAIR_GROUP_SCHED is not set 79# CONFIG_FAIR_GROUP_SCHED is not set
81# CONFIG_RT_GROUP_SCHED is not set 80# CONFIG_RT_GROUP_SCHED is not set
82CONFIG_USER_SCHED=y 81CONFIG_USER_SCHED=y
83# CONFIG_CGROUP_SCHED is not set 82# CONFIG_CGROUP_SCHED is not set
83# CONFIG_CGROUPS is not set
84CONFIG_SYSFS_DEPRECATED=y 84CONFIG_SYSFS_DEPRECATED=y
85CONFIG_SYSFS_DEPRECATED_V2=y 85CONFIG_SYSFS_DEPRECATED_V2=y
86# CONFIG_RELAY is not set 86# CONFIG_RELAY is not set
@@ -113,7 +113,6 @@ CONFIG_SLUB_DEBUG=y
113CONFIG_SLUB=y 113CONFIG_SLUB=y
114# CONFIG_SLOB is not set 114# CONFIG_SLOB is not set
115# CONFIG_PROFILING is not set 115# CONFIG_PROFILING is not set
116# CONFIG_MARKERS is not set
117CONFIG_HAVE_OPROFILE=y 116CONFIG_HAVE_OPROFILE=y
118CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 117CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
119CONFIG_HAVE_IOREMAP_PROT=y 118CONFIG_HAVE_IOREMAP_PROT=y
@@ -123,7 +122,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
123# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 122# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
124CONFIG_SLABINFO=y 123CONFIG_SLABINFO=y
125CONFIG_RT_MUTEXES=y 124CONFIG_RT_MUTEXES=y
126# CONFIG_TINY_SHMEM is not set
127CONFIG_BASE_SMALL=0 125CONFIG_BASE_SMALL=0
128CONFIG_MODULES=y 126CONFIG_MODULES=y
129# CONFIG_MODULE_FORCE_LOAD is not set 127# CONFIG_MODULE_FORCE_LOAD is not set
@@ -131,11 +129,9 @@ CONFIG_MODULE_UNLOAD=y
131# CONFIG_MODULE_FORCE_UNLOAD is not set 129# CONFIG_MODULE_FORCE_UNLOAD is not set
132# CONFIG_MODVERSIONS is not set 130# CONFIG_MODVERSIONS is not set
133# CONFIG_MODULE_SRCVERSION_ALL is not set 131# CONFIG_MODULE_SRCVERSION_ALL is not set
134CONFIG_KMOD=y
135CONFIG_BLOCK=y 132CONFIG_BLOCK=y
136# CONFIG_LBD is not set 133# CONFIG_LBD is not set
137# CONFIG_BLK_DEV_IO_TRACE is not set 134# CONFIG_BLK_DEV_IO_TRACE is not set
138# CONFIG_LSF is not set
139# CONFIG_BLK_DEV_BSG is not set 135# CONFIG_BLK_DEV_BSG is not set
140# CONFIG_BLK_DEV_INTEGRITY is not set 136# CONFIG_BLK_DEV_INTEGRITY is not set
141 137
@@ -152,6 +148,10 @@ CONFIG_DEFAULT_AS=y
152# CONFIG_DEFAULT_NOOP is not set 148# CONFIG_DEFAULT_NOOP is not set
153CONFIG_DEFAULT_IOSCHED="anticipatory" 149CONFIG_DEFAULT_IOSCHED="anticipatory"
154CONFIG_CLASSIC_RCU=y 150CONFIG_CLASSIC_RCU=y
151# CONFIG_TREE_RCU is not set
152# CONFIG_PREEMPT_RCU is not set
153# CONFIG_TREE_RCU_TRACE is not set
154# CONFIG_PREEMPT_RCU_TRACE is not set
155# CONFIG_FREEZER is not set 155# CONFIG_FREEZER is not set
156 156
157# 157#
@@ -198,6 +198,8 @@ CONFIG_IPIC=y
198CONFIG_QUICC_ENGINE=y 198CONFIG_QUICC_ENGINE=y
199# CONFIG_QE_GPIO is not set 199# CONFIG_QE_GPIO is not set
200# CONFIG_FSL_ULI1575 is not set 200# CONFIG_FSL_ULI1575 is not set
201# CONFIG_SIMPLE_GPIO is not set
202# CONFIG_MCU_MPC8349EMITX is not set
201 203
202# 204#
203# Kernel options 205# Kernel options
@@ -226,6 +228,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
226CONFIG_ARCH_HAS_WALK_MEMORY=y 228CONFIG_ARCH_HAS_WALK_MEMORY=y
227CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 229CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
228# CONFIG_KEXEC is not set 230# CONFIG_KEXEC is not set
231# CONFIG_CRASH_DUMP is not set
229CONFIG_ARCH_FLATMEM_ENABLE=y 232CONFIG_ARCH_FLATMEM_ENABLE=y
230CONFIG_ARCH_POPULATES_NODE_MAP=y 233CONFIG_ARCH_POPULATES_NODE_MAP=y
231CONFIG_SELECT_MEMORY_MODEL=y 234CONFIG_SELECT_MEMORY_MODEL=y
@@ -237,12 +240,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
237CONFIG_PAGEFLAGS_EXTENDED=y 240CONFIG_PAGEFLAGS_EXTENDED=y
238CONFIG_SPLIT_PTLOCK_CPUS=4 241CONFIG_SPLIT_PTLOCK_CPUS=4
239CONFIG_MIGRATION=y 242CONFIG_MIGRATION=y
240# CONFIG_RESOURCES_64BIT is not set
241# CONFIG_PHYS_ADDR_T_64BIT is not set 243# CONFIG_PHYS_ADDR_T_64BIT is not set
242CONFIG_ZONE_DMA_FLAG=1 244CONFIG_ZONE_DMA_FLAG=1
243CONFIG_BOUNCE=y 245CONFIG_BOUNCE=y
244CONFIG_VIRT_TO_BUS=y 246CONFIG_VIRT_TO_BUS=y
245CONFIG_UNEVICTABLE_LRU=y 247CONFIG_UNEVICTABLE_LRU=y
248CONFIG_PPC_4K_PAGES=y
249# CONFIG_PPC_16K_PAGES is not set
250# CONFIG_PPC_64K_PAGES is not set
246CONFIG_FORCE_MAX_ZONEORDER=11 251CONFIG_FORCE_MAX_ZONEORDER=11
247CONFIG_PROC_DEVICETREE=y 252CONFIG_PROC_DEVICETREE=y
248# CONFIG_CMDLINE_BOOL is not set 253# CONFIG_CMDLINE_BOOL is not set
@@ -267,6 +272,7 @@ CONFIG_PCI_SYSCALL=y
267CONFIG_ARCH_SUPPORTS_MSI=y 272CONFIG_ARCH_SUPPORTS_MSI=y
268# CONFIG_PCI_MSI is not set 273# CONFIG_PCI_MSI is not set
269# CONFIG_PCI_LEGACY is not set 274# CONFIG_PCI_LEGACY is not set
275# CONFIG_PCI_STUB is not set
270# CONFIG_PCCARD is not set 276# CONFIG_PCCARD is not set
271# CONFIG_HOTPLUG_PCI is not set 277# CONFIG_HOTPLUG_PCI is not set
272# CONFIG_HAS_RAPIDIO is not set 278# CONFIG_HAS_RAPIDIO is not set
@@ -289,6 +295,7 @@ CONFIG_NET=y
289# 295#
290# Networking options 296# Networking options
291# 297#
298CONFIG_COMPAT_NET_DEV_OPS=y
292CONFIG_PACKET=y 299CONFIG_PACKET=y
293# CONFIG_PACKET_MMAP is not set 300# CONFIG_PACKET_MMAP is not set
294CONFIG_UNIX=y 301CONFIG_UNIX=y
@@ -345,6 +352,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
345# CONFIG_ECONET is not set 352# CONFIG_ECONET is not set
346# CONFIG_WAN_ROUTER is not set 353# CONFIG_WAN_ROUTER is not set
347# CONFIG_NET_SCHED is not set 354# CONFIG_NET_SCHED is not set
355# CONFIG_DCB is not set
348 356
349# 357#
350# Network testing 358# Network testing
@@ -360,8 +368,9 @@ CONFIG_WIRELESS=y
360# CONFIG_CFG80211 is not set 368# CONFIG_CFG80211 is not set
361CONFIG_WIRELESS_OLD_REGULATORY=y 369CONFIG_WIRELESS_OLD_REGULATORY=y
362# CONFIG_WIRELESS_EXT is not set 370# CONFIG_WIRELESS_EXT is not set
371# CONFIG_LIB80211 is not set
363# CONFIG_MAC80211 is not set 372# CONFIG_MAC80211 is not set
364# CONFIG_IEEE80211 is not set 373# CONFIG_WIMAX is not set
365# CONFIG_RFKILL is not set 374# CONFIG_RFKILL is not set
366# CONFIG_NET_9P is not set 375# CONFIG_NET_9P is not set
367 376
@@ -407,8 +416,10 @@ CONFIG_MISC_DEVICES=y
407# CONFIG_EEPROM_93CX6 is not set 416# CONFIG_EEPROM_93CX6 is not set
408# CONFIG_SGI_IOC4 is not set 417# CONFIG_SGI_IOC4 is not set
409# CONFIG_TIFM_CORE is not set 418# CONFIG_TIFM_CORE is not set
419# CONFIG_ICS932S401 is not set
410# CONFIG_ENCLOSURE_SERVICES is not set 420# CONFIG_ENCLOSURE_SERVICES is not set
411# CONFIG_HP_ILO is not set 421# CONFIG_HP_ILO is not set
422# CONFIG_C2PORT is not set
412CONFIG_HAVE_IDE=y 423CONFIG_HAVE_IDE=y
413# CONFIG_IDE is not set 424# CONFIG_IDE is not set
414 425
@@ -451,6 +462,7 @@ CONFIG_SCSI_WAIT_SCAN=m
451# CONFIG_SCSI_SRP_ATTRS is not set 462# CONFIG_SCSI_SRP_ATTRS is not set
452CONFIG_SCSI_LOWLEVEL=y 463CONFIG_SCSI_LOWLEVEL=y
453# CONFIG_ISCSI_TCP is not set 464# CONFIG_ISCSI_TCP is not set
465# CONFIG_SCSI_CXGB3_ISCSI is not set
454# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 466# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
455# CONFIG_SCSI_3W_9XXX is not set 467# CONFIG_SCSI_3W_9XXX is not set
456# CONFIG_SCSI_ACARD is not set 468# CONFIG_SCSI_ACARD is not set
@@ -467,6 +479,8 @@ CONFIG_SCSI_LOWLEVEL=y
467# CONFIG_MEGARAID_SAS is not set 479# CONFIG_MEGARAID_SAS is not set
468# CONFIG_SCSI_HPTIOP is not set 480# CONFIG_SCSI_HPTIOP is not set
469# CONFIG_SCSI_BUSLOGIC is not set 481# CONFIG_SCSI_BUSLOGIC is not set
482# CONFIG_LIBFC is not set
483# CONFIG_FCOE is not set
470# CONFIG_SCSI_DMX3191D is not set 484# CONFIG_SCSI_DMX3191D is not set
471# CONFIG_SCSI_EATA is not set 485# CONFIG_SCSI_EATA is not set
472# CONFIG_SCSI_FUTURE_DOMAIN is not set 486# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -525,6 +539,9 @@ CONFIG_PHYLIB=y
525# CONFIG_BROADCOM_PHY is not set 539# CONFIG_BROADCOM_PHY is not set
526CONFIG_ICPLUS_PHY=y 540CONFIG_ICPLUS_PHY=y
527# CONFIG_REALTEK_PHY is not set 541# CONFIG_REALTEK_PHY is not set
542# CONFIG_NATIONAL_PHY is not set
543# CONFIG_STE10XP is not set
544# CONFIG_LSI_ET1011C_PHY is not set
528# CONFIG_FIXED_PHY is not set 545# CONFIG_FIXED_PHY is not set
529# CONFIG_MDIO_BITBANG is not set 546# CONFIG_MDIO_BITBANG is not set
530CONFIG_NET_ETHERNET=y 547CONFIG_NET_ETHERNET=y
@@ -566,7 +583,6 @@ CONFIG_E1000=y
566# CONFIG_GIANFAR is not set 583# CONFIG_GIANFAR is not set
567CONFIG_UCC_GETH=y 584CONFIG_UCC_GETH=y
568# CONFIG_UGETH_MAGIC_PACKET is not set 585# CONFIG_UGETH_MAGIC_PACKET is not set
569# CONFIG_UGETH_FILTERING is not set
570# CONFIG_UGETH_TX_ON_DEMAND is not set 586# CONFIG_UGETH_TX_ON_DEMAND is not set
571# CONFIG_MV643XX_ETH is not set 587# CONFIG_MV643XX_ETH is not set
572# CONFIG_QLA3XXX is not set 588# CONFIG_QLA3XXX is not set
@@ -575,6 +591,7 @@ CONFIG_UCC_GETH=y
575# CONFIG_JME is not set 591# CONFIG_JME is not set
576CONFIG_NETDEV_10000=y 592CONFIG_NETDEV_10000=y
577# CONFIG_CHELSIO_T1 is not set 593# CONFIG_CHELSIO_T1 is not set
594CONFIG_CHELSIO_T3_DEPENDS=y
578# CONFIG_CHELSIO_T3 is not set 595# CONFIG_CHELSIO_T3 is not set
579# CONFIG_ENIC is not set 596# CONFIG_ENIC is not set
580# CONFIG_IXGBE is not set 597# CONFIG_IXGBE is not set
@@ -599,6 +616,10 @@ CONFIG_NETDEV_10000=y
599# CONFIG_IWLWIFI_LEDS is not set 616# CONFIG_IWLWIFI_LEDS is not set
600 617
601# 618#
619# Enable WiMAX (Networking options) to see the WiMAX drivers
620#
621
622#
602# USB Network Adapters 623# USB Network Adapters
603# 624#
604# CONFIG_USB_CATC is not set 625# CONFIG_USB_CATC is not set
@@ -677,8 +698,10 @@ CONFIG_SERIAL_CORE_CONSOLE=y
677# CONFIG_SERIAL_OF_PLATFORM is not set 698# CONFIG_SERIAL_OF_PLATFORM is not set
678# CONFIG_SERIAL_QE is not set 699# CONFIG_SERIAL_QE is not set
679CONFIG_UNIX98_PTYS=y 700CONFIG_UNIX98_PTYS=y
701# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
680CONFIG_LEGACY_PTYS=y 702CONFIG_LEGACY_PTYS=y
681CONFIG_LEGACY_PTY_COUNT=256 703CONFIG_LEGACY_PTY_COUNT=256
704# CONFIG_HVC_UDBG is not set
682# CONFIG_IPMI_HANDLER is not set 705# CONFIG_IPMI_HANDLER is not set
683CONFIG_HW_RANDOM=y 706CONFIG_HW_RANDOM=y
684# CONFIG_NVRAM is not set 707# CONFIG_NVRAM is not set
@@ -753,7 +776,6 @@ CONFIG_I2C_MPC=y
753# CONFIG_SENSORS_PCF8591 is not set 776# CONFIG_SENSORS_PCF8591 is not set
754# CONFIG_SENSORS_MAX6875 is not set 777# CONFIG_SENSORS_MAX6875 is not set
755# CONFIG_SENSORS_TSL2550 is not set 778# CONFIG_SENSORS_TSL2550 is not set
756# CONFIG_MCU_MPC8349EMITX is not set
757# CONFIG_I2C_DEBUG_CORE is not set 779# CONFIG_I2C_DEBUG_CORE is not set
758# CONFIG_I2C_DEBUG_ALGO is not set 780# CONFIG_I2C_DEBUG_ALGO is not set
759# CONFIG_I2C_DEBUG_BUS is not set 781# CONFIG_I2C_DEBUG_BUS is not set
@@ -788,8 +810,10 @@ CONFIG_HWMON=y
788# CONFIG_SENSORS_ADM1029 is not set 810# CONFIG_SENSORS_ADM1029 is not set
789# CONFIG_SENSORS_ADM1031 is not set 811# CONFIG_SENSORS_ADM1031 is not set
790# CONFIG_SENSORS_ADM9240 is not set 812# CONFIG_SENSORS_ADM9240 is not set
813# CONFIG_SENSORS_ADT7462 is not set
791# CONFIG_SENSORS_ADT7470 is not set 814# CONFIG_SENSORS_ADT7470 is not set
792# CONFIG_SENSORS_ADT7473 is not set 815# CONFIG_SENSORS_ADT7473 is not set
816# CONFIG_SENSORS_ADT7475 is not set
793# CONFIG_SENSORS_ATXP1 is not set 817# CONFIG_SENSORS_ATXP1 is not set
794# CONFIG_SENSORS_DS1621 is not set 818# CONFIG_SENSORS_DS1621 is not set
795# CONFIG_SENSORS_I5K_AMB is not set 819# CONFIG_SENSORS_I5K_AMB is not set
@@ -811,6 +835,7 @@ CONFIG_HWMON=y
811# CONFIG_SENSORS_LM90 is not set 835# CONFIG_SENSORS_LM90 is not set
812# CONFIG_SENSORS_LM92 is not set 836# CONFIG_SENSORS_LM92 is not set
813# CONFIG_SENSORS_LM93 is not set 837# CONFIG_SENSORS_LM93 is not set
838# CONFIG_SENSORS_LTC4245 is not set
814# CONFIG_SENSORS_MAX1111 is not set 839# CONFIG_SENSORS_MAX1111 is not set
815# CONFIG_SENSORS_MAX1619 is not set 840# CONFIG_SENSORS_MAX1619 is not set
816# CONFIG_SENSORS_MAX6650 is not set 841# CONFIG_SENSORS_MAX6650 is not set
@@ -857,11 +882,11 @@ CONFIG_WATCHDOG=y
857# USB-based Watchdog Cards 882# USB-based Watchdog Cards
858# 883#
859# CONFIG_USBPCWATCHDOG is not set 884# CONFIG_USBPCWATCHDOG is not set
885CONFIG_SSB_POSSIBLE=y
860 886
861# 887#
862# Sonics Silicon Backplane 888# Sonics Silicon Backplane
863# 889#
864CONFIG_SSB_POSSIBLE=y
865# CONFIG_SSB is not set 890# CONFIG_SSB is not set
866 891
867# 892#
@@ -870,18 +895,13 @@ CONFIG_SSB_POSSIBLE=y
870# CONFIG_MFD_CORE is not set 895# CONFIG_MFD_CORE is not set
871# CONFIG_MFD_SM501 is not set 896# CONFIG_MFD_SM501 is not set
872# CONFIG_HTC_PASIC3 is not set 897# CONFIG_HTC_PASIC3 is not set
898# CONFIG_TWL4030_CORE is not set
873# CONFIG_MFD_TMIO is not set 899# CONFIG_MFD_TMIO is not set
874# CONFIG_PMIC_DA903X is not set 900# CONFIG_PMIC_DA903X is not set
875# CONFIG_MFD_WM8400 is not set 901# CONFIG_MFD_WM8400 is not set
876# CONFIG_MFD_WM8350_I2C is not set 902# CONFIG_MFD_WM8350_I2C is not set
877 903# CONFIG_MFD_PCF50633 is not set
878#
879# Voltage and Current regulators
880#
881# CONFIG_REGULATOR is not set 904# CONFIG_REGULATOR is not set
882# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
883# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
884# CONFIG_REGULATOR_BQ24022 is not set
885 905
886# 906#
887# Multimedia devices 907# Multimedia devices
@@ -966,6 +986,7 @@ CONFIG_USB_EHCI_HCD=y
966# CONFIG_USB_EHCI_TT_NEWSCHED is not set 986# CONFIG_USB_EHCI_TT_NEWSCHED is not set
967# CONFIG_USB_EHCI_FSL is not set 987# CONFIG_USB_EHCI_FSL is not set
968CONFIG_USB_EHCI_HCD_PPC_OF=y 988CONFIG_USB_EHCI_HCD_PPC_OF=y
989# CONFIG_USB_OXU210HP_HCD is not set
969# CONFIG_USB_ISP116X_HCD is not set 990# CONFIG_USB_ISP116X_HCD is not set
970# CONFIG_USB_ISP1760_HCD is not set 991# CONFIG_USB_ISP1760_HCD is not set
971CONFIG_USB_OHCI_HCD=y 992CONFIG_USB_OHCI_HCD=y
@@ -991,18 +1012,17 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
991# CONFIG_USB_TMC is not set 1012# CONFIG_USB_TMC is not set
992 1013
993# 1014#
994# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1015# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
995# 1016#
996 1017
997# 1018#
998# may also be needed; see USB_STORAGE Help for more information 1019# see USB_STORAGE Help for more information
999# 1020#
1000CONFIG_USB_STORAGE=y 1021CONFIG_USB_STORAGE=y
1001# CONFIG_USB_STORAGE_DEBUG is not set 1022# CONFIG_USB_STORAGE_DEBUG is not set
1002# CONFIG_USB_STORAGE_DATAFAB is not set 1023# CONFIG_USB_STORAGE_DATAFAB is not set
1003# CONFIG_USB_STORAGE_FREECOM is not set 1024# CONFIG_USB_STORAGE_FREECOM is not set
1004# CONFIG_USB_STORAGE_ISD200 is not set 1025# CONFIG_USB_STORAGE_ISD200 is not set
1005# CONFIG_USB_STORAGE_DPCM is not set
1006# CONFIG_USB_STORAGE_USBAT is not set 1026# CONFIG_USB_STORAGE_USBAT is not set
1007# CONFIG_USB_STORAGE_SDDR09 is not set 1027# CONFIG_USB_STORAGE_SDDR09 is not set
1008# CONFIG_USB_STORAGE_SDDR55 is not set 1028# CONFIG_USB_STORAGE_SDDR55 is not set
@@ -1050,6 +1070,10 @@ CONFIG_USB_STORAGE=y
1050# CONFIG_USB_ISIGHTFW is not set 1070# CONFIG_USB_ISIGHTFW is not set
1051# CONFIG_USB_VST is not set 1071# CONFIG_USB_VST is not set
1052# CONFIG_USB_GADGET is not set 1072# CONFIG_USB_GADGET is not set
1073
1074#
1075# OTG and related infrastructure
1076#
1053# CONFIG_UWB is not set 1077# CONFIG_UWB is not set
1054CONFIG_MMC=y 1078CONFIG_MMC=y
1055# CONFIG_MMC_DEBUG is not set 1079# CONFIG_MMC_DEBUG is not set
@@ -1099,6 +1123,7 @@ CONFIG_FS_MBCACHE=y
1099CONFIG_FILE_LOCKING=y 1123CONFIG_FILE_LOCKING=y
1100# CONFIG_XFS_FS is not set 1124# CONFIG_XFS_FS is not set
1101# CONFIG_OCFS2_FS is not set 1125# CONFIG_OCFS2_FS is not set
1126# CONFIG_BTRFS_FS is not set
1102CONFIG_DNOTIFY=y 1127CONFIG_DNOTIFY=y
1103CONFIG_INOTIFY=y 1128CONFIG_INOTIFY=y
1104CONFIG_INOTIFY_USER=y 1129CONFIG_INOTIFY_USER=y
@@ -1135,10 +1160,7 @@ CONFIG_TMPFS=y
1135# CONFIG_TMPFS_POSIX_ACL is not set 1160# CONFIG_TMPFS_POSIX_ACL is not set
1136# CONFIG_HUGETLB_PAGE is not set 1161# CONFIG_HUGETLB_PAGE is not set
1137# CONFIG_CONFIGFS_FS is not set 1162# CONFIG_CONFIGFS_FS is not set
1138 1163CONFIG_MISC_FILESYSTEMS=y
1139#
1140# Miscellaneous filesystems
1141#
1142# CONFIG_ADFS_FS is not set 1164# CONFIG_ADFS_FS is not set
1143# CONFIG_AFFS_FS is not set 1165# CONFIG_AFFS_FS is not set
1144# CONFIG_HFS_FS is not set 1166# CONFIG_HFS_FS is not set
@@ -1147,6 +1169,7 @@ CONFIG_TMPFS=y
1147# CONFIG_BFS_FS is not set 1169# CONFIG_BFS_FS is not set
1148# CONFIG_EFS_FS is not set 1170# CONFIG_EFS_FS is not set
1149# CONFIG_CRAMFS is not set 1171# CONFIG_CRAMFS is not set
1172# CONFIG_SQUASHFS is not set
1150# CONFIG_VXFS_FS is not set 1173# CONFIG_VXFS_FS is not set
1151# CONFIG_MINIX_FS is not set 1174# CONFIG_MINIX_FS is not set
1152# CONFIG_OMFS_FS is not set 1175# CONFIG_OMFS_FS is not set
@@ -1246,6 +1269,7 @@ CONFIG_UCC=y
1246# Library routines 1269# Library routines
1247# 1270#
1248CONFIG_BITREVERSE=y 1271CONFIG_BITREVERSE=y
1272CONFIG_GENERIC_FIND_LAST_BIT=y
1249# CONFIG_CRC_CCITT is not set 1273# CONFIG_CRC_CCITT is not set
1250# CONFIG_CRC16 is not set 1274# CONFIG_CRC16 is not set
1251CONFIG_CRC_T10DIF=y 1275CONFIG_CRC_T10DIF=y
@@ -1279,6 +1303,8 @@ CONFIG_FRAME_WARN=1024
1279# CONFIG_LATENCYTOP is not set 1303# CONFIG_LATENCYTOP is not set
1280CONFIG_SYSCTL_SYSCALL_CHECK=y 1304CONFIG_SYSCTL_SYSCALL_CHECK=y
1281CONFIG_HAVE_FUNCTION_TRACER=y 1305CONFIG_HAVE_FUNCTION_TRACER=y
1306CONFIG_HAVE_DYNAMIC_FTRACE=y
1307CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1282 1308
1283# 1309#
1284# Tracers 1310# Tracers
@@ -1286,6 +1312,7 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1286# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1312# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1287# CONFIG_SAMPLES is not set 1313# CONFIG_SAMPLES is not set
1288CONFIG_HAVE_ARCH_KGDB=y 1314CONFIG_HAVE_ARCH_KGDB=y
1315CONFIG_PRINT_STACK_DEPTH=64
1289# CONFIG_IRQSTACKS is not set 1316# CONFIG_IRQSTACKS is not set
1290# CONFIG_BOOTX_TEXT is not set 1317# CONFIG_BOOTX_TEXT is not set
1291# CONFIG_PPC_EARLY_DEBUG is not set 1318# CONFIG_PPC_EARLY_DEBUG is not set
@@ -1304,11 +1331,15 @@ CONFIG_CRYPTO=y
1304# 1331#
1305# CONFIG_CRYPTO_FIPS is not set 1332# CONFIG_CRYPTO_FIPS is not set
1306CONFIG_CRYPTO_ALGAPI=y 1333CONFIG_CRYPTO_ALGAPI=y
1307CONFIG_CRYPTO_AEAD=y 1334CONFIG_CRYPTO_ALGAPI2=y
1335CONFIG_CRYPTO_AEAD2=y
1308CONFIG_CRYPTO_BLKCIPHER=y 1336CONFIG_CRYPTO_BLKCIPHER=y
1337CONFIG_CRYPTO_BLKCIPHER2=y
1309CONFIG_CRYPTO_HASH=y 1338CONFIG_CRYPTO_HASH=y
1310CONFIG_CRYPTO_RNG=y 1339CONFIG_CRYPTO_HASH2=y
1340CONFIG_CRYPTO_RNG2=y
1311CONFIG_CRYPTO_MANAGER=y 1341CONFIG_CRYPTO_MANAGER=y
1342CONFIG_CRYPTO_MANAGER2=y
1312# CONFIG_CRYPTO_GF128MUL is not set 1343# CONFIG_CRYPTO_GF128MUL is not set
1313# CONFIG_CRYPTO_NULL is not set 1344# CONFIG_CRYPTO_NULL is not set
1314# CONFIG_CRYPTO_CRYPTD is not set 1345# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/83xx/mpc834x_itx_defconfig b/arch/powerpc/configs/83xx/mpc834x_itx_defconfig
index 07a674f5344..7bf34b0c4dc 100644
--- a/arch/powerpc/configs/83xx/mpc834x_itx_defconfig
+++ b/arch/powerpc/configs/83xx/mpc834x_itx_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc3 3# Linux kernel version: 2.6.29-rc2
4# Sat Nov 8 12:39:56 2008 4# Mon Jan 26 15:35:53 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -44,7 +44,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
44CONFIG_PPC=y 44CONFIG_PPC=y
45CONFIG_EARLY_PRINTK=y 45CONFIG_EARLY_PRINTK=y
46CONFIG_GENERIC_NVRAM=y 46CONFIG_GENERIC_NVRAM=y
47CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 47CONFIG_SCHED_OMIT_FRAME_POINTER=y
48CONFIG_ARCH_MAY_HAVE_PC_FDC=y 48CONFIG_ARCH_MAY_HAVE_PC_FDC=y
49CONFIG_PPC_OF=y 49CONFIG_PPC_OF=y
50CONFIG_OF=y 50CONFIG_OF=y
@@ -75,12 +75,12 @@ CONFIG_SYSVIPC_SYSCTL=y
75# CONFIG_AUDIT is not set 75# CONFIG_AUDIT is not set
76# CONFIG_IKCONFIG is not set 76# CONFIG_IKCONFIG is not set
77CONFIG_LOG_BUF_SHIFT=14 77CONFIG_LOG_BUF_SHIFT=14
78# CONFIG_CGROUPS is not set
79CONFIG_GROUP_SCHED=y 78CONFIG_GROUP_SCHED=y
80# CONFIG_FAIR_GROUP_SCHED is not set 79# CONFIG_FAIR_GROUP_SCHED is not set
81# CONFIG_RT_GROUP_SCHED is not set 80# CONFIG_RT_GROUP_SCHED is not set
82CONFIG_USER_SCHED=y 81CONFIG_USER_SCHED=y
83# CONFIG_CGROUP_SCHED is not set 82# CONFIG_CGROUP_SCHED is not set
83# CONFIG_CGROUPS is not set
84CONFIG_SYSFS_DEPRECATED=y 84CONFIG_SYSFS_DEPRECATED=y
85CONFIG_SYSFS_DEPRECATED_V2=y 85CONFIG_SYSFS_DEPRECATED_V2=y
86# CONFIG_RELAY is not set 86# CONFIG_RELAY is not set
@@ -113,7 +113,6 @@ CONFIG_SLUB_DEBUG=y
113CONFIG_SLUB=y 113CONFIG_SLUB=y
114# CONFIG_SLOB is not set 114# CONFIG_SLOB is not set
115# CONFIG_PROFILING is not set 115# CONFIG_PROFILING is not set
116# CONFIG_MARKERS is not set
117CONFIG_HAVE_OPROFILE=y 116CONFIG_HAVE_OPROFILE=y
118CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 117CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
119CONFIG_HAVE_IOREMAP_PROT=y 118CONFIG_HAVE_IOREMAP_PROT=y
@@ -123,7 +122,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
123# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 122# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
124CONFIG_SLABINFO=y 123CONFIG_SLABINFO=y
125CONFIG_RT_MUTEXES=y 124CONFIG_RT_MUTEXES=y
126# CONFIG_TINY_SHMEM is not set
127CONFIG_BASE_SMALL=0 125CONFIG_BASE_SMALL=0
128CONFIG_MODULES=y 126CONFIG_MODULES=y
129# CONFIG_MODULE_FORCE_LOAD is not set 127# CONFIG_MODULE_FORCE_LOAD is not set
@@ -131,11 +129,9 @@ CONFIG_MODULE_UNLOAD=y
131# CONFIG_MODULE_FORCE_UNLOAD is not set 129# CONFIG_MODULE_FORCE_UNLOAD is not set
132# CONFIG_MODVERSIONS is not set 130# CONFIG_MODVERSIONS is not set
133# CONFIG_MODULE_SRCVERSION_ALL is not set 131# CONFIG_MODULE_SRCVERSION_ALL is not set
134CONFIG_KMOD=y
135CONFIG_BLOCK=y 132CONFIG_BLOCK=y
136# CONFIG_LBD is not set 133# CONFIG_LBD is not set
137# CONFIG_BLK_DEV_IO_TRACE is not set 134# CONFIG_BLK_DEV_IO_TRACE is not set
138# CONFIG_LSF is not set
139# CONFIG_BLK_DEV_BSG is not set 135# CONFIG_BLK_DEV_BSG is not set
140# CONFIG_BLK_DEV_INTEGRITY is not set 136# CONFIG_BLK_DEV_INTEGRITY is not set
141 137
@@ -152,6 +148,10 @@ CONFIG_DEFAULT_AS=y
152# CONFIG_DEFAULT_NOOP is not set 148# CONFIG_DEFAULT_NOOP is not set
153CONFIG_DEFAULT_IOSCHED="anticipatory" 149CONFIG_DEFAULT_IOSCHED="anticipatory"
154CONFIG_CLASSIC_RCU=y 150CONFIG_CLASSIC_RCU=y
151# CONFIG_TREE_RCU is not set
152# CONFIG_PREEMPT_RCU is not set
153# CONFIG_TREE_RCU_TRACE is not set
154# CONFIG_PREEMPT_RCU_TRACE is not set
155# CONFIG_FREEZER is not set 155# CONFIG_FREEZER is not set
156 156
157# 157#
@@ -198,6 +198,8 @@ CONFIG_IPIC=y
198# CONFIG_QUICC_ENGINE is not set 198# CONFIG_QUICC_ENGINE is not set
199# CONFIG_FSL_ULI1575 is not set 199# CONFIG_FSL_ULI1575 is not set
200# CONFIG_MPC8xxx_GPIO is not set 200# CONFIG_MPC8xxx_GPIO is not set
201# CONFIG_SIMPLE_GPIO is not set
202# CONFIG_MCU_MPC8349EMITX is not set
201 203
202# 204#
203# Kernel options 205# Kernel options
@@ -225,6 +227,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
225CONFIG_ARCH_HAS_WALK_MEMORY=y 227CONFIG_ARCH_HAS_WALK_MEMORY=y
226CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 228CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
227# CONFIG_KEXEC is not set 229# CONFIG_KEXEC is not set
230# CONFIG_CRASH_DUMP is not set
228CONFIG_ARCH_FLATMEM_ENABLE=y 231CONFIG_ARCH_FLATMEM_ENABLE=y
229CONFIG_ARCH_POPULATES_NODE_MAP=y 232CONFIG_ARCH_POPULATES_NODE_MAP=y
230CONFIG_SELECT_MEMORY_MODEL=y 233CONFIG_SELECT_MEMORY_MODEL=y
@@ -236,12 +239,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
236CONFIG_PAGEFLAGS_EXTENDED=y 239CONFIG_PAGEFLAGS_EXTENDED=y
237CONFIG_SPLIT_PTLOCK_CPUS=4 240CONFIG_SPLIT_PTLOCK_CPUS=4
238CONFIG_MIGRATION=y 241CONFIG_MIGRATION=y
239# CONFIG_RESOURCES_64BIT is not set
240# CONFIG_PHYS_ADDR_T_64BIT is not set 242# CONFIG_PHYS_ADDR_T_64BIT is not set
241CONFIG_ZONE_DMA_FLAG=1 243CONFIG_ZONE_DMA_FLAG=1
242CONFIG_BOUNCE=y 244CONFIG_BOUNCE=y
243CONFIG_VIRT_TO_BUS=y 245CONFIG_VIRT_TO_BUS=y
244CONFIG_UNEVICTABLE_LRU=y 246CONFIG_UNEVICTABLE_LRU=y
247CONFIG_PPC_4K_PAGES=y
248# CONFIG_PPC_16K_PAGES is not set
249# CONFIG_PPC_64K_PAGES is not set
245CONFIG_FORCE_MAX_ZONEORDER=11 250CONFIG_FORCE_MAX_ZONEORDER=11
246CONFIG_PROC_DEVICETREE=y 251CONFIG_PROC_DEVICETREE=y
247# CONFIG_CMDLINE_BOOL is not set 252# CONFIG_CMDLINE_BOOL is not set
@@ -266,6 +271,7 @@ CONFIG_PCI_SYSCALL=y
266CONFIG_ARCH_SUPPORTS_MSI=y 271CONFIG_ARCH_SUPPORTS_MSI=y
267# CONFIG_PCI_MSI is not set 272# CONFIG_PCI_MSI is not set
268# CONFIG_PCI_LEGACY is not set 273# CONFIG_PCI_LEGACY is not set
274# CONFIG_PCI_STUB is not set
269# CONFIG_PCCARD is not set 275# CONFIG_PCCARD is not set
270# CONFIG_HOTPLUG_PCI is not set 276# CONFIG_HOTPLUG_PCI is not set
271# CONFIG_HAS_RAPIDIO is not set 277# CONFIG_HAS_RAPIDIO is not set
@@ -288,6 +294,7 @@ CONFIG_NET=y
288# 294#
289# Networking options 295# Networking options
290# 296#
297CONFIG_COMPAT_NET_DEV_OPS=y
291CONFIG_PACKET=y 298CONFIG_PACKET=y
292# CONFIG_PACKET_MMAP is not set 299# CONFIG_PACKET_MMAP is not set
293CONFIG_UNIX=y 300CONFIG_UNIX=y
@@ -344,6 +351,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
344# CONFIG_ECONET is not set 351# CONFIG_ECONET is not set
345# CONFIG_WAN_ROUTER is not set 352# CONFIG_WAN_ROUTER is not set
346# CONFIG_NET_SCHED is not set 353# CONFIG_NET_SCHED is not set
354# CONFIG_DCB is not set
347 355
348# 356#
349# Network testing 357# Network testing
@@ -359,8 +367,9 @@ CONFIG_WIRELESS=y
359# CONFIG_CFG80211 is not set 367# CONFIG_CFG80211 is not set
360CONFIG_WIRELESS_OLD_REGULATORY=y 368CONFIG_WIRELESS_OLD_REGULATORY=y
361# CONFIG_WIRELESS_EXT is not set 369# CONFIG_WIRELESS_EXT is not set
370# CONFIG_LIB80211 is not set
362# CONFIG_MAC80211 is not set 371# CONFIG_MAC80211 is not set
363# CONFIG_IEEE80211 is not set 372# CONFIG_WIMAX is not set
364# CONFIG_RFKILL is not set 373# CONFIG_RFKILL is not set
365# CONFIG_NET_9P is not set 374# CONFIG_NET_9P is not set
366 375
@@ -381,6 +390,7 @@ CONFIG_MTD=y
381# CONFIG_MTD_DEBUG is not set 390# CONFIG_MTD_DEBUG is not set
382# CONFIG_MTD_CONCAT is not set 391# CONFIG_MTD_CONCAT is not set
383# CONFIG_MTD_PARTITIONS is not set 392# CONFIG_MTD_PARTITIONS is not set
393# CONFIG_MTD_TESTS is not set
384 394
385# 395#
386# User Modules And Translation Layers 396# User Modules And Translation Layers
@@ -426,9 +436,7 @@ CONFIG_MTD_CFI_UTIL=y
426# 436#
427# CONFIG_MTD_COMPLEX_MAPPINGS is not set 437# CONFIG_MTD_COMPLEX_MAPPINGS is not set
428CONFIG_MTD_PHYSMAP=y 438CONFIG_MTD_PHYSMAP=y
429CONFIG_MTD_PHYSMAP_START=0xfe000000 439# CONFIG_MTD_PHYSMAP_COMPAT is not set
430CONFIG_MTD_PHYSMAP_LEN=0x1000000
431CONFIG_MTD_PHYSMAP_BANKWIDTH=2
432# CONFIG_MTD_PHYSMAP_OF is not set 440# CONFIG_MTD_PHYSMAP_OF is not set
433# CONFIG_MTD_INTEL_VR_NOR is not set 441# CONFIG_MTD_INTEL_VR_NOR is not set
434# CONFIG_MTD_PLATRAM is not set 442# CONFIG_MTD_PLATRAM is not set
@@ -454,6 +462,12 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2
454# CONFIG_MTD_ONENAND is not set 462# CONFIG_MTD_ONENAND is not set
455 463
456# 464#
465# LPDDR flash memory drivers
466#
467# CONFIG_MTD_LPDDR is not set
468# CONFIG_MTD_QINFO_PROBE is not set
469
470#
457# UBI - Unsorted block images 471# UBI - Unsorted block images
458# 472#
459# CONFIG_MTD_UBI is not set 473# CONFIG_MTD_UBI is not set
@@ -485,8 +499,10 @@ CONFIG_MISC_DEVICES=y
485# CONFIG_EEPROM_93CX6 is not set 499# CONFIG_EEPROM_93CX6 is not set
486# CONFIG_SGI_IOC4 is not set 500# CONFIG_SGI_IOC4 is not set
487# CONFIG_TIFM_CORE is not set 501# CONFIG_TIFM_CORE is not set
502# CONFIG_ICS932S401 is not set
488# CONFIG_ENCLOSURE_SERVICES is not set 503# CONFIG_ENCLOSURE_SERVICES is not set
489# CONFIG_HP_ILO is not set 504# CONFIG_HP_ILO is not set
505# CONFIG_C2PORT is not set
490CONFIG_HAVE_IDE=y 506CONFIG_HAVE_IDE=y
491CONFIG_IDE=y 507CONFIG_IDE=y
492 508
@@ -499,7 +515,6 @@ CONFIG_IDE_GD_ATA=y
499# CONFIG_IDE_GD_ATAPI is not set 515# CONFIG_IDE_GD_ATAPI is not set
500# CONFIG_BLK_DEV_IDECD is not set 516# CONFIG_BLK_DEV_IDECD is not set
501# CONFIG_BLK_DEV_IDETAPE is not set 517# CONFIG_BLK_DEV_IDETAPE is not set
502# CONFIG_BLK_DEV_IDESCSI is not set
503# CONFIG_IDE_TASK_IOCTL is not set 518# CONFIG_IDE_TASK_IOCTL is not set
504CONFIG_IDE_PROC_FS=y 519CONFIG_IDE_PROC_FS=y
505 520
@@ -524,6 +539,7 @@ CONFIG_IDE_PROC_FS=y
524# CONFIG_BLK_DEV_JMICRON is not set 539# CONFIG_BLK_DEV_JMICRON is not set
525# CONFIG_BLK_DEV_SC1200 is not set 540# CONFIG_BLK_DEV_SC1200 is not set
526# CONFIG_BLK_DEV_PIIX is not set 541# CONFIG_BLK_DEV_PIIX is not set
542# CONFIG_BLK_DEV_IT8172 is not set
527# CONFIG_BLK_DEV_IT8213 is not set 543# CONFIG_BLK_DEV_IT8213 is not set
528# CONFIG_BLK_DEV_IT821X is not set 544# CONFIG_BLK_DEV_IT821X is not set
529# CONFIG_BLK_DEV_NS87415 is not set 545# CONFIG_BLK_DEV_NS87415 is not set
@@ -577,6 +593,7 @@ CONFIG_SCSI_SPI_ATTRS=y
577# CONFIG_SCSI_SRP_ATTRS is not set 593# CONFIG_SCSI_SRP_ATTRS is not set
578CONFIG_SCSI_LOWLEVEL=y 594CONFIG_SCSI_LOWLEVEL=y
579# CONFIG_ISCSI_TCP is not set 595# CONFIG_ISCSI_TCP is not set
596# CONFIG_SCSI_CXGB3_ISCSI is not set
580# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 597# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
581# CONFIG_SCSI_3W_9XXX is not set 598# CONFIG_SCSI_3W_9XXX is not set
582# CONFIG_SCSI_ACARD is not set 599# CONFIG_SCSI_ACARD is not set
@@ -593,6 +610,8 @@ CONFIG_SCSI_LOWLEVEL=y
593# CONFIG_MEGARAID_SAS is not set 610# CONFIG_MEGARAID_SAS is not set
594# CONFIG_SCSI_HPTIOP is not set 611# CONFIG_SCSI_HPTIOP is not set
595# CONFIG_SCSI_BUSLOGIC is not set 612# CONFIG_SCSI_BUSLOGIC is not set
613# CONFIG_LIBFC is not set
614# CONFIG_FCOE is not set
596# CONFIG_SCSI_DMX3191D is not set 615# CONFIG_SCSI_DMX3191D is not set
597# CONFIG_SCSI_EATA is not set 616# CONFIG_SCSI_EATA is not set
598# CONFIG_SCSI_FUTURE_DOMAIN is not set 617# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -723,6 +742,9 @@ CONFIG_CICADA_PHY=y
723# CONFIG_BROADCOM_PHY is not set 742# CONFIG_BROADCOM_PHY is not set
724# CONFIG_ICPLUS_PHY is not set 743# CONFIG_ICPLUS_PHY is not set
725# CONFIG_REALTEK_PHY is not set 744# CONFIG_REALTEK_PHY is not set
745# CONFIG_NATIONAL_PHY is not set
746# CONFIG_STE10XP is not set
747# CONFIG_LSI_ET1011C_PHY is not set
726CONFIG_FIXED_PHY=y 748CONFIG_FIXED_PHY=y
727# CONFIG_MDIO_BITBANG is not set 749# CONFIG_MDIO_BITBANG is not set
728# CONFIG_NET_ETHERNET is not set 750# CONFIG_NET_ETHERNET is not set
@@ -751,6 +773,7 @@ CONFIG_GIANFAR=y
751# CONFIG_JME is not set 773# CONFIG_JME is not set
752CONFIG_NETDEV_10000=y 774CONFIG_NETDEV_10000=y
753# CONFIG_CHELSIO_T1 is not set 775# CONFIG_CHELSIO_T1 is not set
776CONFIG_CHELSIO_T3_DEPENDS=y
754# CONFIG_CHELSIO_T3 is not set 777# CONFIG_CHELSIO_T3 is not set
755# CONFIG_ENIC is not set 778# CONFIG_ENIC is not set
756# CONFIG_IXGBE is not set 779# CONFIG_IXGBE is not set
@@ -775,6 +798,10 @@ CONFIG_NETDEV_10000=y
775# CONFIG_IWLWIFI_LEDS is not set 798# CONFIG_IWLWIFI_LEDS is not set
776 799
777# 800#
801# Enable WiMAX (Networking options) to see the WiMAX drivers
802#
803
804#
778# USB Network Adapters 805# USB Network Adapters
779# 806#
780# CONFIG_USB_CATC is not set 807# CONFIG_USB_CATC is not set
@@ -832,8 +859,10 @@ CONFIG_SERIAL_CORE_CONSOLE=y
832# CONFIG_SERIAL_JSM is not set 859# CONFIG_SERIAL_JSM is not set
833# CONFIG_SERIAL_OF_PLATFORM is not set 860# CONFIG_SERIAL_OF_PLATFORM is not set
834CONFIG_UNIX98_PTYS=y 861CONFIG_UNIX98_PTYS=y
862# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
835CONFIG_LEGACY_PTYS=y 863CONFIG_LEGACY_PTYS=y
836CONFIG_LEGACY_PTY_COUNT=256 864CONFIG_LEGACY_PTY_COUNT=256
865# CONFIG_HVC_UDBG is not set
837# CONFIG_IPMI_HANDLER is not set 866# CONFIG_IPMI_HANDLER is not set
838CONFIG_HW_RANDOM=y 867CONFIG_HW_RANDOM=y
839# CONFIG_NVRAM is not set 868# CONFIG_NVRAM is not set
@@ -906,7 +935,6 @@ CONFIG_SENSORS_PCF8574=y
906# CONFIG_SENSORS_PCF8591 is not set 935# CONFIG_SENSORS_PCF8591 is not set
907# CONFIG_SENSORS_MAX6875 is not set 936# CONFIG_SENSORS_MAX6875 is not set
908# CONFIG_SENSORS_TSL2550 is not set 937# CONFIG_SENSORS_TSL2550 is not set
909# CONFIG_MCU_MPC8349EMITX is not set
910# CONFIG_I2C_DEBUG_CORE is not set 938# CONFIG_I2C_DEBUG_CORE is not set
911# CONFIG_I2C_DEBUG_ALGO is not set 939# CONFIG_I2C_DEBUG_ALGO is not set
912# CONFIG_I2C_DEBUG_BUS is not set 940# CONFIG_I2C_DEBUG_BUS is not set
@@ -953,11 +981,11 @@ CONFIG_WATCHDOG=y
953# USB-based Watchdog Cards 981# USB-based Watchdog Cards
954# 982#
955# CONFIG_USBPCWATCHDOG is not set 983# CONFIG_USBPCWATCHDOG is not set
984CONFIG_SSB_POSSIBLE=y
956 985
957# 986#
958# Sonics Silicon Backplane 987# Sonics Silicon Backplane
959# 988#
960CONFIG_SSB_POSSIBLE=y
961# CONFIG_SSB is not set 989# CONFIG_SSB is not set
962 990
963# 991#
@@ -966,18 +994,13 @@ CONFIG_SSB_POSSIBLE=y
966# CONFIG_MFD_CORE is not set 994# CONFIG_MFD_CORE is not set
967# CONFIG_MFD_SM501 is not set 995# CONFIG_MFD_SM501 is not set
968# CONFIG_HTC_PASIC3 is not set 996# CONFIG_HTC_PASIC3 is not set
997# CONFIG_TWL4030_CORE is not set
969# CONFIG_MFD_TMIO is not set 998# CONFIG_MFD_TMIO is not set
970# CONFIG_PMIC_DA903X is not set 999# CONFIG_PMIC_DA903X is not set
971# CONFIG_MFD_WM8400 is not set 1000# CONFIG_MFD_WM8400 is not set
972# CONFIG_MFD_WM8350_I2C is not set 1001# CONFIG_MFD_WM8350_I2C is not set
973 1002# CONFIG_MFD_PCF50633 is not set
974#
975# Voltage and Current regulators
976#
977# CONFIG_REGULATOR is not set 1003# CONFIG_REGULATOR is not set
978# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
979# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
980# CONFIG_REGULATOR_BQ24022 is not set
981 1004
982# 1005#
983# Multimedia devices 1006# Multimedia devices
@@ -1041,6 +1064,7 @@ CONFIG_USB_EHCI_ROOT_HUB_TT=y
1041# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1064# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1042CONFIG_USB_EHCI_FSL=y 1065CONFIG_USB_EHCI_FSL=y
1043CONFIG_USB_EHCI_HCD_PPC_OF=y 1066CONFIG_USB_EHCI_HCD_PPC_OF=y
1067# CONFIG_USB_OXU210HP_HCD is not set
1044# CONFIG_USB_ISP116X_HCD is not set 1068# CONFIG_USB_ISP116X_HCD is not set
1045# CONFIG_USB_ISP1760_HCD is not set 1069# CONFIG_USB_ISP1760_HCD is not set
1046# CONFIG_USB_OHCI_HCD is not set 1070# CONFIG_USB_OHCI_HCD is not set
@@ -1059,18 +1083,17 @@ CONFIG_USB_UHCI_HCD=y
1059# CONFIG_USB_TMC is not set 1083# CONFIG_USB_TMC is not set
1060 1084
1061# 1085#
1062# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1086# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
1063# 1087#
1064 1088
1065# 1089#
1066# may also be needed; see USB_STORAGE Help for more information 1090# see USB_STORAGE Help for more information
1067# 1091#
1068CONFIG_USB_STORAGE=y 1092CONFIG_USB_STORAGE=y
1069# CONFIG_USB_STORAGE_DEBUG is not set 1093# CONFIG_USB_STORAGE_DEBUG is not set
1070# CONFIG_USB_STORAGE_DATAFAB is not set 1094# CONFIG_USB_STORAGE_DATAFAB is not set
1071# CONFIG_USB_STORAGE_FREECOM is not set 1095# CONFIG_USB_STORAGE_FREECOM is not set
1072# CONFIG_USB_STORAGE_ISD200 is not set 1096# CONFIG_USB_STORAGE_ISD200 is not set
1073# CONFIG_USB_STORAGE_DPCM is not set
1074# CONFIG_USB_STORAGE_USBAT is not set 1097# CONFIG_USB_STORAGE_USBAT is not set
1075# CONFIG_USB_STORAGE_SDDR09 is not set 1098# CONFIG_USB_STORAGE_SDDR09 is not set
1076# CONFIG_USB_STORAGE_SDDR55 is not set 1099# CONFIG_USB_STORAGE_SDDR55 is not set
@@ -1117,6 +1140,10 @@ CONFIG_USB_STORAGE=y
1117# CONFIG_USB_ISIGHTFW is not set 1140# CONFIG_USB_ISIGHTFW is not set
1118# CONFIG_USB_VST is not set 1141# CONFIG_USB_VST is not set
1119# CONFIG_USB_GADGET is not set 1142# CONFIG_USB_GADGET is not set
1143
1144#
1145# OTG and related infrastructure
1146#
1120# CONFIG_UWB is not set 1147# CONFIG_UWB is not set
1121# CONFIG_MMC is not set 1148# CONFIG_MMC is not set
1122# CONFIG_MEMSTICK is not set 1149# CONFIG_MEMSTICK is not set
@@ -1154,12 +1181,14 @@ CONFIG_RTC_DRV_DS1307=y
1154# CONFIG_RTC_DRV_M41T80 is not set 1181# CONFIG_RTC_DRV_M41T80 is not set
1155# CONFIG_RTC_DRV_S35390A is not set 1182# CONFIG_RTC_DRV_S35390A is not set
1156# CONFIG_RTC_DRV_FM3130 is not set 1183# CONFIG_RTC_DRV_FM3130 is not set
1184# CONFIG_RTC_DRV_RX8581 is not set
1157 1185
1158# 1186#
1159# SPI RTC drivers 1187# SPI RTC drivers
1160# 1188#
1161# CONFIG_RTC_DRV_M41T94 is not set 1189# CONFIG_RTC_DRV_M41T94 is not set
1162# CONFIG_RTC_DRV_DS1305 is not set 1190# CONFIG_RTC_DRV_DS1305 is not set
1191# CONFIG_RTC_DRV_DS1390 is not set
1163# CONFIG_RTC_DRV_MAX6902 is not set 1192# CONFIG_RTC_DRV_MAX6902 is not set
1164# CONFIG_RTC_DRV_R9701 is not set 1193# CONFIG_RTC_DRV_R9701 is not set
1165# CONFIG_RTC_DRV_RS5C348 is not set 1194# CONFIG_RTC_DRV_RS5C348 is not set
@@ -1207,6 +1236,7 @@ CONFIG_FS_MBCACHE=y
1207CONFIG_FILE_LOCKING=y 1236CONFIG_FILE_LOCKING=y
1208# CONFIG_XFS_FS is not set 1237# CONFIG_XFS_FS is not set
1209# CONFIG_OCFS2_FS is not set 1238# CONFIG_OCFS2_FS is not set
1239# CONFIG_BTRFS_FS is not set
1210CONFIG_DNOTIFY=y 1240CONFIG_DNOTIFY=y
1211CONFIG_INOTIFY=y 1241CONFIG_INOTIFY=y
1212CONFIG_INOTIFY_USER=y 1242CONFIG_INOTIFY_USER=y
@@ -1243,10 +1273,7 @@ CONFIG_TMPFS=y
1243# CONFIG_TMPFS_POSIX_ACL is not set 1273# CONFIG_TMPFS_POSIX_ACL is not set
1244# CONFIG_HUGETLB_PAGE is not set 1274# CONFIG_HUGETLB_PAGE is not set
1245# CONFIG_CONFIGFS_FS is not set 1275# CONFIG_CONFIGFS_FS is not set
1246 1276CONFIG_MISC_FILESYSTEMS=y
1247#
1248# Miscellaneous filesystems
1249#
1250# CONFIG_ADFS_FS is not set 1277# CONFIG_ADFS_FS is not set
1251# CONFIG_AFFS_FS is not set 1278# CONFIG_AFFS_FS is not set
1252# CONFIG_HFS_FS is not set 1279# CONFIG_HFS_FS is not set
@@ -1256,6 +1283,7 @@ CONFIG_TMPFS=y
1256# CONFIG_EFS_FS is not set 1283# CONFIG_EFS_FS is not set
1257# CONFIG_JFFS2_FS is not set 1284# CONFIG_JFFS2_FS is not set
1258# CONFIG_CRAMFS is not set 1285# CONFIG_CRAMFS is not set
1286# CONFIG_SQUASHFS is not set
1259# CONFIG_VXFS_FS is not set 1287# CONFIG_VXFS_FS is not set
1260# CONFIG_MINIX_FS is not set 1288# CONFIG_MINIX_FS is not set
1261# CONFIG_OMFS_FS is not set 1289# CONFIG_OMFS_FS is not set
@@ -1352,6 +1380,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1352# Library routines 1380# Library routines
1353# 1381#
1354CONFIG_BITREVERSE=y 1382CONFIG_BITREVERSE=y
1383CONFIG_GENERIC_FIND_LAST_BIT=y
1355# CONFIG_CRC_CCITT is not set 1384# CONFIG_CRC_CCITT is not set
1356# CONFIG_CRC16 is not set 1385# CONFIG_CRC16 is not set
1357CONFIG_CRC_T10DIF=y 1386CONFIG_CRC_T10DIF=y
@@ -1385,6 +1414,8 @@ CONFIG_FRAME_WARN=1024
1385# CONFIG_LATENCYTOP is not set 1414# CONFIG_LATENCYTOP is not set
1386CONFIG_SYSCTL_SYSCALL_CHECK=y 1415CONFIG_SYSCTL_SYSCALL_CHECK=y
1387CONFIG_HAVE_FUNCTION_TRACER=y 1416CONFIG_HAVE_FUNCTION_TRACER=y
1417CONFIG_HAVE_DYNAMIC_FTRACE=y
1418CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1388 1419
1389# 1420#
1390# Tracers 1421# Tracers
@@ -1392,6 +1423,7 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1392# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1423# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1393# CONFIG_SAMPLES is not set 1424# CONFIG_SAMPLES is not set
1394CONFIG_HAVE_ARCH_KGDB=y 1425CONFIG_HAVE_ARCH_KGDB=y
1426CONFIG_PRINT_STACK_DEPTH=64
1395# CONFIG_IRQSTACKS is not set 1427# CONFIG_IRQSTACKS is not set
1396# CONFIG_BOOTX_TEXT is not set 1428# CONFIG_BOOTX_TEXT is not set
1397# CONFIG_PPC_EARLY_DEBUG is not set 1429# CONFIG_PPC_EARLY_DEBUG is not set
@@ -1410,11 +1442,15 @@ CONFIG_CRYPTO=y
1410# 1442#
1411# CONFIG_CRYPTO_FIPS is not set 1443# CONFIG_CRYPTO_FIPS is not set
1412CONFIG_CRYPTO_ALGAPI=y 1444CONFIG_CRYPTO_ALGAPI=y
1413CONFIG_CRYPTO_AEAD=y 1445CONFIG_CRYPTO_ALGAPI2=y
1446CONFIG_CRYPTO_AEAD2=y
1414CONFIG_CRYPTO_BLKCIPHER=y 1447CONFIG_CRYPTO_BLKCIPHER=y
1448CONFIG_CRYPTO_BLKCIPHER2=y
1415CONFIG_CRYPTO_HASH=y 1449CONFIG_CRYPTO_HASH=y
1416CONFIG_CRYPTO_RNG=y 1450CONFIG_CRYPTO_HASH2=y
1451CONFIG_CRYPTO_RNG2=y
1417CONFIG_CRYPTO_MANAGER=y 1452CONFIG_CRYPTO_MANAGER=y
1453CONFIG_CRYPTO_MANAGER2=y
1418# CONFIG_CRYPTO_GF128MUL is not set 1454# CONFIG_CRYPTO_GF128MUL is not set
1419# CONFIG_CRYPTO_NULL is not set 1455# CONFIG_CRYPTO_NULL is not set
1420# CONFIG_CRYPTO_CRYPTD is not set 1456# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig b/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig
index 426232cb009..bf6718a5f34 100644
--- a/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig
+++ b/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc3 3# Linux kernel version: 2.6.29-rc2
4# Sat Nov 8 12:39:57 2008 4# Mon Jan 26 15:35:55 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -44,7 +44,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
44CONFIG_PPC=y 44CONFIG_PPC=y
45CONFIG_EARLY_PRINTK=y 45CONFIG_EARLY_PRINTK=y
46CONFIG_GENERIC_NVRAM=y 46CONFIG_GENERIC_NVRAM=y
47CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 47CONFIG_SCHED_OMIT_FRAME_POINTER=y
48CONFIG_ARCH_MAY_HAVE_PC_FDC=y 48CONFIG_ARCH_MAY_HAVE_PC_FDC=y
49CONFIG_PPC_OF=y 49CONFIG_PPC_OF=y
50CONFIG_OF=y 50CONFIG_OF=y
@@ -75,12 +75,12 @@ CONFIG_SYSVIPC_SYSCTL=y
75# CONFIG_AUDIT is not set 75# CONFIG_AUDIT is not set
76# CONFIG_IKCONFIG is not set 76# CONFIG_IKCONFIG is not set
77CONFIG_LOG_BUF_SHIFT=14 77CONFIG_LOG_BUF_SHIFT=14
78# CONFIG_CGROUPS is not set
79CONFIG_GROUP_SCHED=y 78CONFIG_GROUP_SCHED=y
80# CONFIG_FAIR_GROUP_SCHED is not set 79# CONFIG_FAIR_GROUP_SCHED is not set
81# CONFIG_RT_GROUP_SCHED is not set 80# CONFIG_RT_GROUP_SCHED is not set
82CONFIG_USER_SCHED=y 81CONFIG_USER_SCHED=y
83# CONFIG_CGROUP_SCHED is not set 82# CONFIG_CGROUP_SCHED is not set
83# CONFIG_CGROUPS is not set
84CONFIG_SYSFS_DEPRECATED=y 84CONFIG_SYSFS_DEPRECATED=y
85CONFIG_SYSFS_DEPRECATED_V2=y 85CONFIG_SYSFS_DEPRECATED_V2=y
86# CONFIG_RELAY is not set 86# CONFIG_RELAY is not set
@@ -113,7 +113,6 @@ CONFIG_SLUB_DEBUG=y
113CONFIG_SLUB=y 113CONFIG_SLUB=y
114# CONFIG_SLOB is not set 114# CONFIG_SLOB is not set
115# CONFIG_PROFILING is not set 115# CONFIG_PROFILING is not set
116# CONFIG_MARKERS is not set
117CONFIG_HAVE_OPROFILE=y 116CONFIG_HAVE_OPROFILE=y
118CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 117CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
119CONFIG_HAVE_IOREMAP_PROT=y 118CONFIG_HAVE_IOREMAP_PROT=y
@@ -123,7 +122,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
123# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 122# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
124CONFIG_SLABINFO=y 123CONFIG_SLABINFO=y
125CONFIG_RT_MUTEXES=y 124CONFIG_RT_MUTEXES=y
126# CONFIG_TINY_SHMEM is not set
127CONFIG_BASE_SMALL=0 125CONFIG_BASE_SMALL=0
128CONFIG_MODULES=y 126CONFIG_MODULES=y
129# CONFIG_MODULE_FORCE_LOAD is not set 127# CONFIG_MODULE_FORCE_LOAD is not set
@@ -131,11 +129,9 @@ CONFIG_MODULE_UNLOAD=y
131# CONFIG_MODULE_FORCE_UNLOAD is not set 129# CONFIG_MODULE_FORCE_UNLOAD is not set
132# CONFIG_MODVERSIONS is not set 130# CONFIG_MODVERSIONS is not set
133# CONFIG_MODULE_SRCVERSION_ALL is not set 131# CONFIG_MODULE_SRCVERSION_ALL is not set
134CONFIG_KMOD=y
135CONFIG_BLOCK=y 132CONFIG_BLOCK=y
136# CONFIG_LBD is not set 133# CONFIG_LBD is not set
137# CONFIG_BLK_DEV_IO_TRACE is not set 134# CONFIG_BLK_DEV_IO_TRACE is not set
138# CONFIG_LSF is not set
139# CONFIG_BLK_DEV_BSG is not set 135# CONFIG_BLK_DEV_BSG is not set
140# CONFIG_BLK_DEV_INTEGRITY is not set 136# CONFIG_BLK_DEV_INTEGRITY is not set
141 137
@@ -152,6 +148,10 @@ CONFIG_DEFAULT_AS=y
152# CONFIG_DEFAULT_NOOP is not set 148# CONFIG_DEFAULT_NOOP is not set
153CONFIG_DEFAULT_IOSCHED="anticipatory" 149CONFIG_DEFAULT_IOSCHED="anticipatory"
154CONFIG_CLASSIC_RCU=y 150CONFIG_CLASSIC_RCU=y
151# CONFIG_TREE_RCU is not set
152# CONFIG_PREEMPT_RCU is not set
153# CONFIG_TREE_RCU_TRACE is not set
154# CONFIG_PREEMPT_RCU_TRACE is not set
155# CONFIG_FREEZER is not set 155# CONFIG_FREEZER is not set
156 156
157# 157#
@@ -198,6 +198,8 @@ CONFIG_IPIC=y
198# CONFIG_QUICC_ENGINE is not set 198# CONFIG_QUICC_ENGINE is not set
199# CONFIG_FSL_ULI1575 is not set 199# CONFIG_FSL_ULI1575 is not set
200# CONFIG_MPC8xxx_GPIO is not set 200# CONFIG_MPC8xxx_GPIO is not set
201# CONFIG_SIMPLE_GPIO is not set
202# CONFIG_MCU_MPC8349EMITX is not set
201 203
202# 204#
203# Kernel options 205# Kernel options
@@ -225,6 +227,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
225CONFIG_ARCH_HAS_WALK_MEMORY=y 227CONFIG_ARCH_HAS_WALK_MEMORY=y
226CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 228CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
227# CONFIG_KEXEC is not set 229# CONFIG_KEXEC is not set
230# CONFIG_CRASH_DUMP is not set
228CONFIG_ARCH_FLATMEM_ENABLE=y 231CONFIG_ARCH_FLATMEM_ENABLE=y
229CONFIG_ARCH_POPULATES_NODE_MAP=y 232CONFIG_ARCH_POPULATES_NODE_MAP=y
230CONFIG_SELECT_MEMORY_MODEL=y 233CONFIG_SELECT_MEMORY_MODEL=y
@@ -236,12 +239,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
236CONFIG_PAGEFLAGS_EXTENDED=y 239CONFIG_PAGEFLAGS_EXTENDED=y
237CONFIG_SPLIT_PTLOCK_CPUS=4 240CONFIG_SPLIT_PTLOCK_CPUS=4
238CONFIG_MIGRATION=y 241CONFIG_MIGRATION=y
239# CONFIG_RESOURCES_64BIT is not set
240# CONFIG_PHYS_ADDR_T_64BIT is not set 242# CONFIG_PHYS_ADDR_T_64BIT is not set
241CONFIG_ZONE_DMA_FLAG=1 243CONFIG_ZONE_DMA_FLAG=1
242CONFIG_BOUNCE=y 244CONFIG_BOUNCE=y
243CONFIG_VIRT_TO_BUS=y 245CONFIG_VIRT_TO_BUS=y
244CONFIG_UNEVICTABLE_LRU=y 246CONFIG_UNEVICTABLE_LRU=y
247CONFIG_PPC_4K_PAGES=y
248# CONFIG_PPC_16K_PAGES is not set
249# CONFIG_PPC_64K_PAGES is not set
245CONFIG_FORCE_MAX_ZONEORDER=11 250CONFIG_FORCE_MAX_ZONEORDER=11
246CONFIG_PROC_DEVICETREE=y 251CONFIG_PROC_DEVICETREE=y
247# CONFIG_CMDLINE_BOOL is not set 252# CONFIG_CMDLINE_BOOL is not set
@@ -266,6 +271,7 @@ CONFIG_PCI_SYSCALL=y
266CONFIG_ARCH_SUPPORTS_MSI=y 271CONFIG_ARCH_SUPPORTS_MSI=y
267# CONFIG_PCI_MSI is not set 272# CONFIG_PCI_MSI is not set
268# CONFIG_PCI_LEGACY is not set 273# CONFIG_PCI_LEGACY is not set
274# CONFIG_PCI_STUB is not set
269# CONFIG_PCCARD is not set 275# CONFIG_PCCARD is not set
270# CONFIG_HOTPLUG_PCI is not set 276# CONFIG_HOTPLUG_PCI is not set
271# CONFIG_HAS_RAPIDIO is not set 277# CONFIG_HAS_RAPIDIO is not set
@@ -288,6 +294,7 @@ CONFIG_NET=y
288# 294#
289# Networking options 295# Networking options
290# 296#
297CONFIG_COMPAT_NET_DEV_OPS=y
291CONFIG_PACKET=y 298CONFIG_PACKET=y
292# CONFIG_PACKET_MMAP is not set 299# CONFIG_PACKET_MMAP is not set
293CONFIG_UNIX=y 300CONFIG_UNIX=y
@@ -344,6 +351,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
344# CONFIG_ECONET is not set 351# CONFIG_ECONET is not set
345# CONFIG_WAN_ROUTER is not set 352# CONFIG_WAN_ROUTER is not set
346# CONFIG_NET_SCHED is not set 353# CONFIG_NET_SCHED is not set
354# CONFIG_DCB is not set
347 355
348# 356#
349# Network testing 357# Network testing
@@ -359,8 +367,9 @@ CONFIG_WIRELESS=y
359# CONFIG_CFG80211 is not set 367# CONFIG_CFG80211 is not set
360CONFIG_WIRELESS_OLD_REGULATORY=y 368CONFIG_WIRELESS_OLD_REGULATORY=y
361# CONFIG_WIRELESS_EXT is not set 369# CONFIG_WIRELESS_EXT is not set
370# CONFIG_LIB80211 is not set
362# CONFIG_MAC80211 is not set 371# CONFIG_MAC80211 is not set
363# CONFIG_IEEE80211 is not set 372# CONFIG_WIMAX is not set
364# CONFIG_RFKILL is not set 373# CONFIG_RFKILL is not set
365# CONFIG_NET_9P is not set 374# CONFIG_NET_9P is not set
366 375
@@ -381,6 +390,7 @@ CONFIG_MTD=y
381# CONFIG_MTD_DEBUG is not set 390# CONFIG_MTD_DEBUG is not set
382# CONFIG_MTD_CONCAT is not set 391# CONFIG_MTD_CONCAT is not set
383# CONFIG_MTD_PARTITIONS is not set 392# CONFIG_MTD_PARTITIONS is not set
393# CONFIG_MTD_TESTS is not set
384 394
385# 395#
386# User Modules And Translation Layers 396# User Modules And Translation Layers
@@ -426,9 +436,7 @@ CONFIG_MTD_CFI_UTIL=y
426# 436#
427# CONFIG_MTD_COMPLEX_MAPPINGS is not set 437# CONFIG_MTD_COMPLEX_MAPPINGS is not set
428CONFIG_MTD_PHYSMAP=y 438CONFIG_MTD_PHYSMAP=y
429CONFIG_MTD_PHYSMAP_START=0xfe000000 439# CONFIG_MTD_PHYSMAP_COMPAT is not set
430CONFIG_MTD_PHYSMAP_LEN=0x800000
431CONFIG_MTD_PHYSMAP_BANKWIDTH=2
432# CONFIG_MTD_PHYSMAP_OF is not set 440# CONFIG_MTD_PHYSMAP_OF is not set
433# CONFIG_MTD_INTEL_VR_NOR is not set 441# CONFIG_MTD_INTEL_VR_NOR is not set
434# CONFIG_MTD_PLATRAM is not set 442# CONFIG_MTD_PLATRAM is not set
@@ -454,6 +462,12 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2
454# CONFIG_MTD_ONENAND is not set 462# CONFIG_MTD_ONENAND is not set
455 463
456# 464#
465# LPDDR flash memory drivers
466#
467# CONFIG_MTD_LPDDR is not set
468# CONFIG_MTD_QINFO_PROBE is not set
469
470#
457# UBI - Unsorted block images 471# UBI - Unsorted block images
458# 472#
459# CONFIG_MTD_UBI is not set 473# CONFIG_MTD_UBI is not set
@@ -485,8 +499,10 @@ CONFIG_MISC_DEVICES=y
485# CONFIG_EEPROM_93CX6 is not set 499# CONFIG_EEPROM_93CX6 is not set
486# CONFIG_SGI_IOC4 is not set 500# CONFIG_SGI_IOC4 is not set
487# CONFIG_TIFM_CORE is not set 501# CONFIG_TIFM_CORE is not set
502# CONFIG_ICS932S401 is not set
488# CONFIG_ENCLOSURE_SERVICES is not set 503# CONFIG_ENCLOSURE_SERVICES is not set
489# CONFIG_HP_ILO is not set 504# CONFIG_HP_ILO is not set
505# CONFIG_C2PORT is not set
490CONFIG_HAVE_IDE=y 506CONFIG_HAVE_IDE=y
491# CONFIG_IDE is not set 507# CONFIG_IDE is not set
492 508
@@ -529,6 +545,7 @@ CONFIG_SCSI_SPI_ATTRS=y
529# CONFIG_SCSI_SRP_ATTRS is not set 545# CONFIG_SCSI_SRP_ATTRS is not set
530CONFIG_SCSI_LOWLEVEL=y 546CONFIG_SCSI_LOWLEVEL=y
531# CONFIG_ISCSI_TCP is not set 547# CONFIG_ISCSI_TCP is not set
548# CONFIG_SCSI_CXGB3_ISCSI is not set
532# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 549# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
533# CONFIG_SCSI_3W_9XXX is not set 550# CONFIG_SCSI_3W_9XXX is not set
534# CONFIG_SCSI_ACARD is not set 551# CONFIG_SCSI_ACARD is not set
@@ -545,6 +562,8 @@ CONFIG_SCSI_LOWLEVEL=y
545# CONFIG_MEGARAID_SAS is not set 562# CONFIG_MEGARAID_SAS is not set
546# CONFIG_SCSI_HPTIOP is not set 563# CONFIG_SCSI_HPTIOP is not set
547# CONFIG_SCSI_BUSLOGIC is not set 564# CONFIG_SCSI_BUSLOGIC is not set
565# CONFIG_LIBFC is not set
566# CONFIG_FCOE is not set
548# CONFIG_SCSI_DMX3191D is not set 567# CONFIG_SCSI_DMX3191D is not set
549# CONFIG_SCSI_EATA is not set 568# CONFIG_SCSI_EATA is not set
550# CONFIG_SCSI_FUTURE_DOMAIN is not set 569# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -603,6 +622,9 @@ CONFIG_CICADA_PHY=y
603# CONFIG_BROADCOM_PHY is not set 622# CONFIG_BROADCOM_PHY is not set
604# CONFIG_ICPLUS_PHY is not set 623# CONFIG_ICPLUS_PHY is not set
605# CONFIG_REALTEK_PHY is not set 624# CONFIG_REALTEK_PHY is not set
625# CONFIG_NATIONAL_PHY is not set
626# CONFIG_STE10XP is not set
627# CONFIG_LSI_ET1011C_PHY is not set
606# CONFIG_FIXED_PHY is not set 628# CONFIG_FIXED_PHY is not set
607# CONFIG_MDIO_BITBANG is not set 629# CONFIG_MDIO_BITBANG is not set
608# CONFIG_NET_ETHERNET is not set 630# CONFIG_NET_ETHERNET is not set
@@ -631,6 +653,7 @@ CONFIG_GIANFAR=y
631# CONFIG_JME is not set 653# CONFIG_JME is not set
632CONFIG_NETDEV_10000=y 654CONFIG_NETDEV_10000=y
633# CONFIG_CHELSIO_T1 is not set 655# CONFIG_CHELSIO_T1 is not set
656CONFIG_CHELSIO_T3_DEPENDS=y
634# CONFIG_CHELSIO_T3 is not set 657# CONFIG_CHELSIO_T3 is not set
635# CONFIG_ENIC is not set 658# CONFIG_ENIC is not set
636# CONFIG_IXGBE is not set 659# CONFIG_IXGBE is not set
@@ -655,6 +678,10 @@ CONFIG_NETDEV_10000=y
655# CONFIG_IWLWIFI_LEDS is not set 678# CONFIG_IWLWIFI_LEDS is not set
656 679
657# 680#
681# Enable WiMAX (Networking options) to see the WiMAX drivers
682#
683
684#
658# USB Network Adapters 685# USB Network Adapters
659# 686#
660# CONFIG_USB_CATC is not set 687# CONFIG_USB_CATC is not set
@@ -712,8 +739,10 @@ CONFIG_SERIAL_CORE_CONSOLE=y
712# CONFIG_SERIAL_JSM is not set 739# CONFIG_SERIAL_JSM is not set
713# CONFIG_SERIAL_OF_PLATFORM is not set 740# CONFIG_SERIAL_OF_PLATFORM is not set
714CONFIG_UNIX98_PTYS=y 741CONFIG_UNIX98_PTYS=y
742# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
715CONFIG_LEGACY_PTYS=y 743CONFIG_LEGACY_PTYS=y
716CONFIG_LEGACY_PTY_COUNT=256 744CONFIG_LEGACY_PTY_COUNT=256
745# CONFIG_HVC_UDBG is not set
717# CONFIG_IPMI_HANDLER is not set 746# CONFIG_IPMI_HANDLER is not set
718CONFIG_HW_RANDOM=y 747CONFIG_HW_RANDOM=y
719# CONFIG_NVRAM is not set 748# CONFIG_NVRAM is not set
@@ -786,7 +815,6 @@ CONFIG_SENSORS_PCF8574=y
786# CONFIG_SENSORS_PCF8591 is not set 815# CONFIG_SENSORS_PCF8591 is not set
787# CONFIG_SENSORS_MAX6875 is not set 816# CONFIG_SENSORS_MAX6875 is not set
788# CONFIG_SENSORS_TSL2550 is not set 817# CONFIG_SENSORS_TSL2550 is not set
789# CONFIG_MCU_MPC8349EMITX is not set
790# CONFIG_I2C_DEBUG_CORE is not set 818# CONFIG_I2C_DEBUG_CORE is not set
791# CONFIG_I2C_DEBUG_ALGO is not set 819# CONFIG_I2C_DEBUG_ALGO is not set
792# CONFIG_I2C_DEBUG_BUS is not set 820# CONFIG_I2C_DEBUG_BUS is not set
@@ -833,11 +861,11 @@ CONFIG_WATCHDOG=y
833# USB-based Watchdog Cards 861# USB-based Watchdog Cards
834# 862#
835# CONFIG_USBPCWATCHDOG is not set 863# CONFIG_USBPCWATCHDOG is not set
864CONFIG_SSB_POSSIBLE=y
836 865
837# 866#
838# Sonics Silicon Backplane 867# Sonics Silicon Backplane
839# 868#
840CONFIG_SSB_POSSIBLE=y
841# CONFIG_SSB is not set 869# CONFIG_SSB is not set
842 870
843# 871#
@@ -846,18 +874,13 @@ CONFIG_SSB_POSSIBLE=y
846# CONFIG_MFD_CORE is not set 874# CONFIG_MFD_CORE is not set
847# CONFIG_MFD_SM501 is not set 875# CONFIG_MFD_SM501 is not set
848# CONFIG_HTC_PASIC3 is not set 876# CONFIG_HTC_PASIC3 is not set
877# CONFIG_TWL4030_CORE is not set
849# CONFIG_MFD_TMIO is not set 878# CONFIG_MFD_TMIO is not set
850# CONFIG_PMIC_DA903X is not set 879# CONFIG_PMIC_DA903X is not set
851# CONFIG_MFD_WM8400 is not set 880# CONFIG_MFD_WM8400 is not set
852# CONFIG_MFD_WM8350_I2C is not set 881# CONFIG_MFD_WM8350_I2C is not set
853 882# CONFIG_MFD_PCF50633 is not set
854#
855# Voltage and Current regulators
856#
857# CONFIG_REGULATOR is not set 883# CONFIG_REGULATOR is not set
858# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
859# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
860# CONFIG_REGULATOR_BQ24022 is not set
861 884
862# 885#
863# Multimedia devices 886# Multimedia devices
@@ -921,6 +944,7 @@ CONFIG_USB_EHCI_ROOT_HUB_TT=y
921# CONFIG_USB_EHCI_TT_NEWSCHED is not set 944# CONFIG_USB_EHCI_TT_NEWSCHED is not set
922CONFIG_USB_EHCI_FSL=y 945CONFIG_USB_EHCI_FSL=y
923CONFIG_USB_EHCI_HCD_PPC_OF=y 946CONFIG_USB_EHCI_HCD_PPC_OF=y
947# CONFIG_USB_OXU210HP_HCD is not set
924# CONFIG_USB_ISP116X_HCD is not set 948# CONFIG_USB_ISP116X_HCD is not set
925# CONFIG_USB_ISP1760_HCD is not set 949# CONFIG_USB_ISP1760_HCD is not set
926# CONFIG_USB_OHCI_HCD is not set 950# CONFIG_USB_OHCI_HCD is not set
@@ -939,18 +963,17 @@ CONFIG_USB_UHCI_HCD=y
939# CONFIG_USB_TMC is not set 963# CONFIG_USB_TMC is not set
940 964
941# 965#
942# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 966# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
943# 967#
944 968
945# 969#
946# may also be needed; see USB_STORAGE Help for more information 970# see USB_STORAGE Help for more information
947# 971#
948CONFIG_USB_STORAGE=y 972CONFIG_USB_STORAGE=y
949# CONFIG_USB_STORAGE_DEBUG is not set 973# CONFIG_USB_STORAGE_DEBUG is not set
950# CONFIG_USB_STORAGE_DATAFAB is not set 974# CONFIG_USB_STORAGE_DATAFAB is not set
951# CONFIG_USB_STORAGE_FREECOM is not set 975# CONFIG_USB_STORAGE_FREECOM is not set
952# CONFIG_USB_STORAGE_ISD200 is not set 976# CONFIG_USB_STORAGE_ISD200 is not set
953# CONFIG_USB_STORAGE_DPCM is not set
954# CONFIG_USB_STORAGE_USBAT is not set 977# CONFIG_USB_STORAGE_USBAT is not set
955# CONFIG_USB_STORAGE_SDDR09 is not set 978# CONFIG_USB_STORAGE_SDDR09 is not set
956# CONFIG_USB_STORAGE_SDDR55 is not set 979# CONFIG_USB_STORAGE_SDDR55 is not set
@@ -996,6 +1019,10 @@ CONFIG_USB_STORAGE=y
996# CONFIG_USB_ISIGHTFW is not set 1019# CONFIG_USB_ISIGHTFW is not set
997# CONFIG_USB_VST is not set 1020# CONFIG_USB_VST is not set
998# CONFIG_USB_GADGET is not set 1021# CONFIG_USB_GADGET is not set
1022
1023#
1024# OTG and related infrastructure
1025#
999# CONFIG_UWB is not set 1026# CONFIG_UWB is not set
1000# CONFIG_MMC is not set 1027# CONFIG_MMC is not set
1001# CONFIG_MEMSTICK is not set 1028# CONFIG_MEMSTICK is not set
@@ -1033,12 +1060,14 @@ CONFIG_RTC_DRV_DS1307=y
1033# CONFIG_RTC_DRV_M41T80 is not set 1060# CONFIG_RTC_DRV_M41T80 is not set
1034# CONFIG_RTC_DRV_S35390A is not set 1061# CONFIG_RTC_DRV_S35390A is not set
1035# CONFIG_RTC_DRV_FM3130 is not set 1062# CONFIG_RTC_DRV_FM3130 is not set
1063# CONFIG_RTC_DRV_RX8581 is not set
1036 1064
1037# 1065#
1038# SPI RTC drivers 1066# SPI RTC drivers
1039# 1067#
1040# CONFIG_RTC_DRV_M41T94 is not set 1068# CONFIG_RTC_DRV_M41T94 is not set
1041# CONFIG_RTC_DRV_DS1305 is not set 1069# CONFIG_RTC_DRV_DS1305 is not set
1070# CONFIG_RTC_DRV_DS1390 is not set
1042# CONFIG_RTC_DRV_MAX6902 is not set 1071# CONFIG_RTC_DRV_MAX6902 is not set
1043# CONFIG_RTC_DRV_R9701 is not set 1072# CONFIG_RTC_DRV_R9701 is not set
1044# CONFIG_RTC_DRV_RS5C348 is not set 1073# CONFIG_RTC_DRV_RS5C348 is not set
@@ -1086,6 +1115,7 @@ CONFIG_FS_MBCACHE=y
1086CONFIG_FILE_LOCKING=y 1115CONFIG_FILE_LOCKING=y
1087# CONFIG_XFS_FS is not set 1116# CONFIG_XFS_FS is not set
1088# CONFIG_OCFS2_FS is not set 1117# CONFIG_OCFS2_FS is not set
1118# CONFIG_BTRFS_FS is not set
1089CONFIG_DNOTIFY=y 1119CONFIG_DNOTIFY=y
1090CONFIG_INOTIFY=y 1120CONFIG_INOTIFY=y
1091CONFIG_INOTIFY_USER=y 1121CONFIG_INOTIFY_USER=y
@@ -1122,10 +1152,7 @@ CONFIG_TMPFS=y
1122# CONFIG_TMPFS_POSIX_ACL is not set 1152# CONFIG_TMPFS_POSIX_ACL is not set
1123# CONFIG_HUGETLB_PAGE is not set 1153# CONFIG_HUGETLB_PAGE is not set
1124# CONFIG_CONFIGFS_FS is not set 1154# CONFIG_CONFIGFS_FS is not set
1125 1155CONFIG_MISC_FILESYSTEMS=y
1126#
1127# Miscellaneous filesystems
1128#
1129# CONFIG_ADFS_FS is not set 1156# CONFIG_ADFS_FS is not set
1130# CONFIG_AFFS_FS is not set 1157# CONFIG_AFFS_FS is not set
1131# CONFIG_HFS_FS is not set 1158# CONFIG_HFS_FS is not set
@@ -1135,6 +1162,7 @@ CONFIG_TMPFS=y
1135# CONFIG_EFS_FS is not set 1162# CONFIG_EFS_FS is not set
1136# CONFIG_JFFS2_FS is not set 1163# CONFIG_JFFS2_FS is not set
1137# CONFIG_CRAMFS is not set 1164# CONFIG_CRAMFS is not set
1165# CONFIG_SQUASHFS is not set
1138# CONFIG_VXFS_FS is not set 1166# CONFIG_VXFS_FS is not set
1139# CONFIG_MINIX_FS is not set 1167# CONFIG_MINIX_FS is not set
1140# CONFIG_OMFS_FS is not set 1168# CONFIG_OMFS_FS is not set
@@ -1231,6 +1259,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1231# Library routines 1259# Library routines
1232# 1260#
1233CONFIG_BITREVERSE=y 1261CONFIG_BITREVERSE=y
1262CONFIG_GENERIC_FIND_LAST_BIT=y
1234# CONFIG_CRC_CCITT is not set 1263# CONFIG_CRC_CCITT is not set
1235# CONFIG_CRC16 is not set 1264# CONFIG_CRC16 is not set
1236CONFIG_CRC_T10DIF=y 1265CONFIG_CRC_T10DIF=y
@@ -1264,6 +1293,8 @@ CONFIG_FRAME_WARN=1024
1264# CONFIG_LATENCYTOP is not set 1293# CONFIG_LATENCYTOP is not set
1265CONFIG_SYSCTL_SYSCALL_CHECK=y 1294CONFIG_SYSCTL_SYSCALL_CHECK=y
1266CONFIG_HAVE_FUNCTION_TRACER=y 1295CONFIG_HAVE_FUNCTION_TRACER=y
1296CONFIG_HAVE_DYNAMIC_FTRACE=y
1297CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1267 1298
1268# 1299#
1269# Tracers 1300# Tracers
@@ -1271,6 +1302,7 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1271# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1302# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1272# CONFIG_SAMPLES is not set 1303# CONFIG_SAMPLES is not set
1273CONFIG_HAVE_ARCH_KGDB=y 1304CONFIG_HAVE_ARCH_KGDB=y
1305CONFIG_PRINT_STACK_DEPTH=64
1274# CONFIG_IRQSTACKS is not set 1306# CONFIG_IRQSTACKS is not set
1275# CONFIG_BOOTX_TEXT is not set 1307# CONFIG_BOOTX_TEXT is not set
1276# CONFIG_PPC_EARLY_DEBUG is not set 1308# CONFIG_PPC_EARLY_DEBUG is not set
@@ -1289,11 +1321,15 @@ CONFIG_CRYPTO=y
1289# 1321#
1290# CONFIG_CRYPTO_FIPS is not set 1322# CONFIG_CRYPTO_FIPS is not set
1291CONFIG_CRYPTO_ALGAPI=y 1323CONFIG_CRYPTO_ALGAPI=y
1292CONFIG_CRYPTO_AEAD=y 1324CONFIG_CRYPTO_ALGAPI2=y
1325CONFIG_CRYPTO_AEAD2=y
1293CONFIG_CRYPTO_BLKCIPHER=y 1326CONFIG_CRYPTO_BLKCIPHER=y
1327CONFIG_CRYPTO_BLKCIPHER2=y
1294CONFIG_CRYPTO_HASH=y 1328CONFIG_CRYPTO_HASH=y
1295CONFIG_CRYPTO_RNG=y 1329CONFIG_CRYPTO_HASH2=y
1330CONFIG_CRYPTO_RNG2=y
1296CONFIG_CRYPTO_MANAGER=y 1331CONFIG_CRYPTO_MANAGER=y
1332CONFIG_CRYPTO_MANAGER2=y
1297# CONFIG_CRYPTO_GF128MUL is not set 1333# CONFIG_CRYPTO_GF128MUL is not set
1298# CONFIG_CRYPTO_NULL is not set 1334# CONFIG_CRYPTO_NULL is not set
1299# CONFIG_CRYPTO_CRYPTD is not set 1335# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/83xx/mpc834x_mds_defconfig b/arch/powerpc/configs/83xx/mpc834x_mds_defconfig
index 36e2e93a1c5..a7ef7ad42a4 100644
--- a/arch/powerpc/configs/83xx/mpc834x_mds_defconfig
+++ b/arch/powerpc/configs/83xx/mpc834x_mds_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc3 3# Linux kernel version: 2.6.29-rc2
4# Sat Nov 8 12:39:58 2008 4# Mon Jan 26 15:35:56 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -44,7 +44,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
44CONFIG_PPC=y 44CONFIG_PPC=y
45CONFIG_EARLY_PRINTK=y 45CONFIG_EARLY_PRINTK=y
46CONFIG_GENERIC_NVRAM=y 46CONFIG_GENERIC_NVRAM=y
47CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 47CONFIG_SCHED_OMIT_FRAME_POINTER=y
48CONFIG_ARCH_MAY_HAVE_PC_FDC=y 48CONFIG_ARCH_MAY_HAVE_PC_FDC=y
49CONFIG_PPC_OF=y 49CONFIG_PPC_OF=y
50CONFIG_OF=y 50CONFIG_OF=y
@@ -75,12 +75,12 @@ CONFIG_SYSVIPC_SYSCTL=y
75# CONFIG_AUDIT is not set 75# CONFIG_AUDIT is not set
76# CONFIG_IKCONFIG is not set 76# CONFIG_IKCONFIG is not set
77CONFIG_LOG_BUF_SHIFT=14 77CONFIG_LOG_BUF_SHIFT=14
78# CONFIG_CGROUPS is not set
79CONFIG_GROUP_SCHED=y 78CONFIG_GROUP_SCHED=y
80# CONFIG_FAIR_GROUP_SCHED is not set 79# CONFIG_FAIR_GROUP_SCHED is not set
81# CONFIG_RT_GROUP_SCHED is not set 80# CONFIG_RT_GROUP_SCHED is not set
82CONFIG_USER_SCHED=y 81CONFIG_USER_SCHED=y
83# CONFIG_CGROUP_SCHED is not set 82# CONFIG_CGROUP_SCHED is not set
83# CONFIG_CGROUPS is not set
84CONFIG_SYSFS_DEPRECATED=y 84CONFIG_SYSFS_DEPRECATED=y
85CONFIG_SYSFS_DEPRECATED_V2=y 85CONFIG_SYSFS_DEPRECATED_V2=y
86# CONFIG_RELAY is not set 86# CONFIG_RELAY is not set
@@ -113,7 +113,6 @@ CONFIG_SLUB_DEBUG=y
113CONFIG_SLUB=y 113CONFIG_SLUB=y
114# CONFIG_SLOB is not set 114# CONFIG_SLOB is not set
115# CONFIG_PROFILING is not set 115# CONFIG_PROFILING is not set
116# CONFIG_MARKERS is not set
117CONFIG_HAVE_OPROFILE=y 116CONFIG_HAVE_OPROFILE=y
118CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 117CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
119CONFIG_HAVE_IOREMAP_PROT=y 118CONFIG_HAVE_IOREMAP_PROT=y
@@ -123,7 +122,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
123# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 122# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
124CONFIG_SLABINFO=y 123CONFIG_SLABINFO=y
125CONFIG_RT_MUTEXES=y 124CONFIG_RT_MUTEXES=y
126# CONFIG_TINY_SHMEM is not set
127CONFIG_BASE_SMALL=0 125CONFIG_BASE_SMALL=0
128CONFIG_MODULES=y 126CONFIG_MODULES=y
129# CONFIG_MODULE_FORCE_LOAD is not set 127# CONFIG_MODULE_FORCE_LOAD is not set
@@ -131,11 +129,9 @@ CONFIG_MODULE_UNLOAD=y
131# CONFIG_MODULE_FORCE_UNLOAD is not set 129# CONFIG_MODULE_FORCE_UNLOAD is not set
132# CONFIG_MODVERSIONS is not set 130# CONFIG_MODVERSIONS is not set
133# CONFIG_MODULE_SRCVERSION_ALL is not set 131# CONFIG_MODULE_SRCVERSION_ALL is not set
134CONFIG_KMOD=y
135CONFIG_BLOCK=y 132CONFIG_BLOCK=y
136# CONFIG_LBD is not set 133# CONFIG_LBD is not set
137# CONFIG_BLK_DEV_IO_TRACE is not set 134# CONFIG_BLK_DEV_IO_TRACE is not set
138# CONFIG_LSF is not set
139# CONFIG_BLK_DEV_BSG is not set 135# CONFIG_BLK_DEV_BSG is not set
140# CONFIG_BLK_DEV_INTEGRITY is not set 136# CONFIG_BLK_DEV_INTEGRITY is not set
141 137
@@ -152,6 +148,10 @@ CONFIG_DEFAULT_AS=y
152# CONFIG_DEFAULT_NOOP is not set 148# CONFIG_DEFAULT_NOOP is not set
153CONFIG_DEFAULT_IOSCHED="anticipatory" 149CONFIG_DEFAULT_IOSCHED="anticipatory"
154CONFIG_CLASSIC_RCU=y 150CONFIG_CLASSIC_RCU=y
151# CONFIG_TREE_RCU is not set
152# CONFIG_PREEMPT_RCU is not set
153# CONFIG_TREE_RCU_TRACE is not set
154# CONFIG_PREEMPT_RCU_TRACE is not set
155# CONFIG_FREEZER is not set 155# CONFIG_FREEZER is not set
156 156
157# 157#
@@ -198,6 +198,8 @@ CONFIG_IPIC=y
198# CONFIG_QUICC_ENGINE is not set 198# CONFIG_QUICC_ENGINE is not set
199# CONFIG_FSL_ULI1575 is not set 199# CONFIG_FSL_ULI1575 is not set
200# CONFIG_MPC8xxx_GPIO is not set 200# CONFIG_MPC8xxx_GPIO is not set
201# CONFIG_SIMPLE_GPIO is not set
202# CONFIG_MCU_MPC8349EMITX is not set
201 203
202# 204#
203# Kernel options 205# Kernel options
@@ -225,6 +227,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
225CONFIG_ARCH_HAS_WALK_MEMORY=y 227CONFIG_ARCH_HAS_WALK_MEMORY=y
226CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 228CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
227# CONFIG_KEXEC is not set 229# CONFIG_KEXEC is not set
230# CONFIG_CRASH_DUMP is not set
228CONFIG_ARCH_FLATMEM_ENABLE=y 231CONFIG_ARCH_FLATMEM_ENABLE=y
229CONFIG_ARCH_POPULATES_NODE_MAP=y 232CONFIG_ARCH_POPULATES_NODE_MAP=y
230CONFIG_SELECT_MEMORY_MODEL=y 233CONFIG_SELECT_MEMORY_MODEL=y
@@ -236,12 +239,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
236CONFIG_PAGEFLAGS_EXTENDED=y 239CONFIG_PAGEFLAGS_EXTENDED=y
237CONFIG_SPLIT_PTLOCK_CPUS=4 240CONFIG_SPLIT_PTLOCK_CPUS=4
238CONFIG_MIGRATION=y 241CONFIG_MIGRATION=y
239# CONFIG_RESOURCES_64BIT is not set
240# CONFIG_PHYS_ADDR_T_64BIT is not set 242# CONFIG_PHYS_ADDR_T_64BIT is not set
241CONFIG_ZONE_DMA_FLAG=1 243CONFIG_ZONE_DMA_FLAG=1
242CONFIG_BOUNCE=y 244CONFIG_BOUNCE=y
243CONFIG_VIRT_TO_BUS=y 245CONFIG_VIRT_TO_BUS=y
244CONFIG_UNEVICTABLE_LRU=y 246CONFIG_UNEVICTABLE_LRU=y
247CONFIG_PPC_4K_PAGES=y
248# CONFIG_PPC_16K_PAGES is not set
249# CONFIG_PPC_64K_PAGES is not set
245CONFIG_FORCE_MAX_ZONEORDER=11 250CONFIG_FORCE_MAX_ZONEORDER=11
246CONFIG_PROC_DEVICETREE=y 251CONFIG_PROC_DEVICETREE=y
247# CONFIG_CMDLINE_BOOL is not set 252# CONFIG_CMDLINE_BOOL is not set
@@ -266,6 +271,7 @@ CONFIG_PCI_SYSCALL=y
266CONFIG_ARCH_SUPPORTS_MSI=y 271CONFIG_ARCH_SUPPORTS_MSI=y
267# CONFIG_PCI_MSI is not set 272# CONFIG_PCI_MSI is not set
268# CONFIG_PCI_LEGACY is not set 273# CONFIG_PCI_LEGACY is not set
274# CONFIG_PCI_STUB is not set
269# CONFIG_PCCARD is not set 275# CONFIG_PCCARD is not set
270# CONFIG_HOTPLUG_PCI is not set 276# CONFIG_HOTPLUG_PCI is not set
271# CONFIG_HAS_RAPIDIO is not set 277# CONFIG_HAS_RAPIDIO is not set
@@ -288,6 +294,7 @@ CONFIG_NET=y
288# 294#
289# Networking options 295# Networking options
290# 296#
297CONFIG_COMPAT_NET_DEV_OPS=y
291CONFIG_PACKET=y 298CONFIG_PACKET=y
292# CONFIG_PACKET_MMAP is not set 299# CONFIG_PACKET_MMAP is not set
293CONFIG_UNIX=y 300CONFIG_UNIX=y
@@ -344,6 +351,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
344# CONFIG_ECONET is not set 351# CONFIG_ECONET is not set
345# CONFIG_WAN_ROUTER is not set 352# CONFIG_WAN_ROUTER is not set
346# CONFIG_NET_SCHED is not set 353# CONFIG_NET_SCHED is not set
354# CONFIG_DCB is not set
347 355
348# 356#
349# Network testing 357# Network testing
@@ -359,8 +367,9 @@ CONFIG_WIRELESS=y
359# CONFIG_CFG80211 is not set 367# CONFIG_CFG80211 is not set
360CONFIG_WIRELESS_OLD_REGULATORY=y 368CONFIG_WIRELESS_OLD_REGULATORY=y
361# CONFIG_WIRELESS_EXT is not set 369# CONFIG_WIRELESS_EXT is not set
370# CONFIG_LIB80211 is not set
362# CONFIG_MAC80211 is not set 371# CONFIG_MAC80211 is not set
363# CONFIG_IEEE80211 is not set 372# CONFIG_WIMAX is not set
364# CONFIG_RFKILL is not set 373# CONFIG_RFKILL is not set
365# CONFIG_NET_9P is not set 374# CONFIG_NET_9P is not set
366 375
@@ -404,8 +413,10 @@ CONFIG_MISC_DEVICES=y
404# CONFIG_EEPROM_93CX6 is not set 413# CONFIG_EEPROM_93CX6 is not set
405# CONFIG_SGI_IOC4 is not set 414# CONFIG_SGI_IOC4 is not set
406# CONFIG_TIFM_CORE is not set 415# CONFIG_TIFM_CORE is not set
416# CONFIG_ICS932S401 is not set
407# CONFIG_ENCLOSURE_SERVICES is not set 417# CONFIG_ENCLOSURE_SERVICES is not set
408# CONFIG_HP_ILO is not set 418# CONFIG_HP_ILO is not set
419# CONFIG_C2PORT is not set
409CONFIG_HAVE_IDE=y 420CONFIG_HAVE_IDE=y
410# CONFIG_IDE is not set 421# CONFIG_IDE is not set
411 422
@@ -454,6 +465,9 @@ CONFIG_MARVELL_PHY=y
454# CONFIG_BROADCOM_PHY is not set 465# CONFIG_BROADCOM_PHY is not set
455# CONFIG_ICPLUS_PHY is not set 466# CONFIG_ICPLUS_PHY is not set
456# CONFIG_REALTEK_PHY is not set 467# CONFIG_REALTEK_PHY is not set
468# CONFIG_NATIONAL_PHY is not set
469# CONFIG_STE10XP is not set
470# CONFIG_LSI_ET1011C_PHY is not set
457# CONFIG_FIXED_PHY is not set 471# CONFIG_FIXED_PHY is not set
458# CONFIG_MDIO_BITBANG is not set 472# CONFIG_MDIO_BITBANG is not set
459CONFIG_NET_ETHERNET=y 473CONFIG_NET_ETHERNET=y
@@ -477,7 +491,6 @@ CONFIG_NET_PCI=y
477# CONFIG_ADAPTEC_STARFIRE is not set 491# CONFIG_ADAPTEC_STARFIRE is not set
478# CONFIG_B44 is not set 492# CONFIG_B44 is not set
479# CONFIG_FORCEDETH is not set 493# CONFIG_FORCEDETH is not set
480# CONFIG_EEPRO100 is not set
481CONFIG_E100=y 494CONFIG_E100=y
482# CONFIG_FEALNX is not set 495# CONFIG_FEALNX is not set
483# CONFIG_NATSEMI is not set 496# CONFIG_NATSEMI is not set
@@ -487,6 +500,7 @@ CONFIG_E100=y
487# CONFIG_R6040 is not set 500# CONFIG_R6040 is not set
488# CONFIG_SIS900 is not set 501# CONFIG_SIS900 is not set
489# CONFIG_EPIC100 is not set 502# CONFIG_EPIC100 is not set
503# CONFIG_SMSC9420 is not set
490# CONFIG_SUNDANCE is not set 504# CONFIG_SUNDANCE is not set
491# CONFIG_TLAN is not set 505# CONFIG_TLAN is not set
492# CONFIG_VIA_RHINE is not set 506# CONFIG_VIA_RHINE is not set
@@ -517,6 +531,7 @@ CONFIG_GIANFAR=y
517# CONFIG_JME is not set 531# CONFIG_JME is not set
518CONFIG_NETDEV_10000=y 532CONFIG_NETDEV_10000=y
519# CONFIG_CHELSIO_T1 is not set 533# CONFIG_CHELSIO_T1 is not set
534CONFIG_CHELSIO_T3_DEPENDS=y
520# CONFIG_CHELSIO_T3 is not set 535# CONFIG_CHELSIO_T3 is not set
521# CONFIG_ENIC is not set 536# CONFIG_ENIC is not set
522# CONFIG_IXGBE is not set 537# CONFIG_IXGBE is not set
@@ -539,6 +554,10 @@ CONFIG_NETDEV_10000=y
539# CONFIG_WLAN_PRE80211 is not set 554# CONFIG_WLAN_PRE80211 is not set
540# CONFIG_WLAN_80211 is not set 555# CONFIG_WLAN_80211 is not set
541# CONFIG_IWLWIFI_LEDS is not set 556# CONFIG_IWLWIFI_LEDS is not set
557
558#
559# Enable WiMAX (Networking options) to see the WiMAX drivers
560#
542# CONFIG_WAN is not set 561# CONFIG_WAN is not set
543# CONFIG_FDDI is not set 562# CONFIG_FDDI is not set
544# CONFIG_HIPPI is not set 563# CONFIG_HIPPI is not set
@@ -608,8 +627,10 @@ CONFIG_SERIAL_CORE_CONSOLE=y
608# CONFIG_SERIAL_JSM is not set 627# CONFIG_SERIAL_JSM is not set
609# CONFIG_SERIAL_OF_PLATFORM is not set 628# CONFIG_SERIAL_OF_PLATFORM is not set
610CONFIG_UNIX98_PTYS=y 629CONFIG_UNIX98_PTYS=y
630# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
611CONFIG_LEGACY_PTYS=y 631CONFIG_LEGACY_PTYS=y
612CONFIG_LEGACY_PTY_COUNT=256 632CONFIG_LEGACY_PTY_COUNT=256
633# CONFIG_HVC_UDBG is not set
613# CONFIG_IPMI_HANDLER is not set 634# CONFIG_IPMI_HANDLER is not set
614# CONFIG_HW_RANDOM is not set 635# CONFIG_HW_RANDOM is not set
615# CONFIG_NVRAM is not set 636# CONFIG_NVRAM is not set
@@ -681,7 +702,6 @@ CONFIG_I2C_MPC=y
681# CONFIG_SENSORS_PCF8591 is not set 702# CONFIG_SENSORS_PCF8591 is not set
682# CONFIG_SENSORS_MAX6875 is not set 703# CONFIG_SENSORS_MAX6875 is not set
683# CONFIG_SENSORS_TSL2550 is not set 704# CONFIG_SENSORS_TSL2550 is not set
684# CONFIG_MCU_MPC8349EMITX is not set
685# CONFIG_I2C_DEBUG_CORE is not set 705# CONFIG_I2C_DEBUG_CORE is not set
686# CONFIG_I2C_DEBUG_ALGO is not set 706# CONFIG_I2C_DEBUG_ALGO is not set
687# CONFIG_I2C_DEBUG_BUS is not set 707# CONFIG_I2C_DEBUG_BUS is not set
@@ -701,8 +721,10 @@ CONFIG_HWMON=y
701# CONFIG_SENSORS_ADM1029 is not set 721# CONFIG_SENSORS_ADM1029 is not set
702# CONFIG_SENSORS_ADM1031 is not set 722# CONFIG_SENSORS_ADM1031 is not set
703# CONFIG_SENSORS_ADM9240 is not set 723# CONFIG_SENSORS_ADM9240 is not set
724# CONFIG_SENSORS_ADT7462 is not set
704# CONFIG_SENSORS_ADT7470 is not set 725# CONFIG_SENSORS_ADT7470 is not set
705# CONFIG_SENSORS_ADT7473 is not set 726# CONFIG_SENSORS_ADT7473 is not set
727# CONFIG_SENSORS_ADT7475 is not set
706# CONFIG_SENSORS_ATXP1 is not set 728# CONFIG_SENSORS_ATXP1 is not set
707# CONFIG_SENSORS_DS1621 is not set 729# CONFIG_SENSORS_DS1621 is not set
708# CONFIG_SENSORS_I5K_AMB is not set 730# CONFIG_SENSORS_I5K_AMB is not set
@@ -723,6 +745,7 @@ CONFIG_HWMON=y
723# CONFIG_SENSORS_LM90 is not set 745# CONFIG_SENSORS_LM90 is not set
724# CONFIG_SENSORS_LM92 is not set 746# CONFIG_SENSORS_LM92 is not set
725# CONFIG_SENSORS_LM93 is not set 747# CONFIG_SENSORS_LM93 is not set
748# CONFIG_SENSORS_LTC4245 is not set
726# CONFIG_SENSORS_MAX1619 is not set 749# CONFIG_SENSORS_MAX1619 is not set
727# CONFIG_SENSORS_MAX6650 is not set 750# CONFIG_SENSORS_MAX6650 is not set
728# CONFIG_SENSORS_PC87360 is not set 751# CONFIG_SENSORS_PC87360 is not set
@@ -763,11 +786,11 @@ CONFIG_WATCHDOG=y
763# 786#
764# CONFIG_PCIPCWATCHDOG is not set 787# CONFIG_PCIPCWATCHDOG is not set
765# CONFIG_WDTPCI is not set 788# CONFIG_WDTPCI is not set
789CONFIG_SSB_POSSIBLE=y
766 790
767# 791#
768# Sonics Silicon Backplane 792# Sonics Silicon Backplane
769# 793#
770CONFIG_SSB_POSSIBLE=y
771# CONFIG_SSB is not set 794# CONFIG_SSB is not set
772 795
773# 796#
@@ -776,18 +799,13 @@ CONFIG_SSB_POSSIBLE=y
776# CONFIG_MFD_CORE is not set 799# CONFIG_MFD_CORE is not set
777# CONFIG_MFD_SM501 is not set 800# CONFIG_MFD_SM501 is not set
778# CONFIG_HTC_PASIC3 is not set 801# CONFIG_HTC_PASIC3 is not set
802# CONFIG_TWL4030_CORE is not set
779# CONFIG_MFD_TMIO is not set 803# CONFIG_MFD_TMIO is not set
780# CONFIG_PMIC_DA903X is not set 804# CONFIG_PMIC_DA903X is not set
781# CONFIG_MFD_WM8400 is not set 805# CONFIG_MFD_WM8400 is not set
782# CONFIG_MFD_WM8350_I2C is not set 806# CONFIG_MFD_WM8350_I2C is not set
783 807# CONFIG_MFD_PCF50633 is not set
784#
785# Voltage and Current regulators
786#
787# CONFIG_REGULATOR is not set 808# CONFIG_REGULATOR is not set
788# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
789# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
790# CONFIG_REGULATOR_BQ24022 is not set
791 809
792# 810#
793# Multimedia devices 811# Multimedia devices
@@ -843,9 +861,13 @@ CONFIG_USB_ARCH_HAS_EHCI=y
843# 861#
844 862
845# 863#
846# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 864# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
847# 865#
848# CONFIG_USB_GADGET is not set 866# CONFIG_USB_GADGET is not set
867
868#
869# OTG and related infrastructure
870#
849# CONFIG_UWB is not set 871# CONFIG_UWB is not set
850# CONFIG_MMC is not set 872# CONFIG_MMC is not set
851# CONFIG_MEMSTICK is not set 873# CONFIG_MEMSTICK is not set
@@ -883,6 +905,7 @@ CONFIG_RTC_DRV_DS1374=y
883# CONFIG_RTC_DRV_M41T80 is not set 905# CONFIG_RTC_DRV_M41T80 is not set
884# CONFIG_RTC_DRV_S35390A is not set 906# CONFIG_RTC_DRV_S35390A is not set
885# CONFIG_RTC_DRV_FM3130 is not set 907# CONFIG_RTC_DRV_FM3130 is not set
908# CONFIG_RTC_DRV_RX8581 is not set
886 909
887# 910#
888# SPI RTC drivers 911# SPI RTC drivers
@@ -930,6 +953,7 @@ CONFIG_FS_MBCACHE=y
930CONFIG_FILE_LOCKING=y 953CONFIG_FILE_LOCKING=y
931# CONFIG_XFS_FS is not set 954# CONFIG_XFS_FS is not set
932# CONFIG_OCFS2_FS is not set 955# CONFIG_OCFS2_FS is not set
956# CONFIG_BTRFS_FS is not set
933CONFIG_DNOTIFY=y 957CONFIG_DNOTIFY=y
934CONFIG_INOTIFY=y 958CONFIG_INOTIFY=y
935CONFIG_INOTIFY_USER=y 959CONFIG_INOTIFY_USER=y
@@ -963,10 +987,7 @@ CONFIG_TMPFS=y
963# CONFIG_TMPFS_POSIX_ACL is not set 987# CONFIG_TMPFS_POSIX_ACL is not set
964# CONFIG_HUGETLB_PAGE is not set 988# CONFIG_HUGETLB_PAGE is not set
965# CONFIG_CONFIGFS_FS is not set 989# CONFIG_CONFIGFS_FS is not set
966 990CONFIG_MISC_FILESYSTEMS=y
967#
968# Miscellaneous filesystems
969#
970# CONFIG_ADFS_FS is not set 991# CONFIG_ADFS_FS is not set
971# CONFIG_AFFS_FS is not set 992# CONFIG_AFFS_FS is not set
972# CONFIG_HFS_FS is not set 993# CONFIG_HFS_FS is not set
@@ -975,6 +996,7 @@ CONFIG_TMPFS=y
975# CONFIG_BFS_FS is not set 996# CONFIG_BFS_FS is not set
976# CONFIG_EFS_FS is not set 997# CONFIG_EFS_FS is not set
977# CONFIG_CRAMFS is not set 998# CONFIG_CRAMFS is not set
999# CONFIG_SQUASHFS is not set
978# CONFIG_VXFS_FS is not set 1000# CONFIG_VXFS_FS is not set
979# CONFIG_MINIX_FS is not set 1001# CONFIG_MINIX_FS is not set
980# CONFIG_OMFS_FS is not set 1002# CONFIG_OMFS_FS is not set
@@ -1028,6 +1050,7 @@ CONFIG_PARTITION_ADVANCED=y
1028# Library routines 1050# Library routines
1029# 1051#
1030CONFIG_BITREVERSE=y 1052CONFIG_BITREVERSE=y
1053CONFIG_GENERIC_FIND_LAST_BIT=y
1031# CONFIG_CRC_CCITT is not set 1054# CONFIG_CRC_CCITT is not set
1032# CONFIG_CRC16 is not set 1055# CONFIG_CRC16 is not set
1033# CONFIG_CRC_T10DIF is not set 1056# CONFIG_CRC_T10DIF is not set
@@ -1061,6 +1084,8 @@ CONFIG_FRAME_WARN=1024
1061# CONFIG_LATENCYTOP is not set 1084# CONFIG_LATENCYTOP is not set
1062CONFIG_SYSCTL_SYSCALL_CHECK=y 1085CONFIG_SYSCTL_SYSCALL_CHECK=y
1063CONFIG_HAVE_FUNCTION_TRACER=y 1086CONFIG_HAVE_FUNCTION_TRACER=y
1087CONFIG_HAVE_DYNAMIC_FTRACE=y
1088CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1064 1089
1065# 1090#
1066# Tracers 1091# Tracers
@@ -1068,6 +1093,7 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1068# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1093# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1069# CONFIG_SAMPLES is not set 1094# CONFIG_SAMPLES is not set
1070CONFIG_HAVE_ARCH_KGDB=y 1095CONFIG_HAVE_ARCH_KGDB=y
1096CONFIG_PRINT_STACK_DEPTH=64
1071# CONFIG_IRQSTACKS is not set 1097# CONFIG_IRQSTACKS is not set
1072# CONFIG_BOOTX_TEXT is not set 1098# CONFIG_BOOTX_TEXT is not set
1073# CONFIG_PPC_EARLY_DEBUG is not set 1099# CONFIG_PPC_EARLY_DEBUG is not set
@@ -1086,11 +1112,15 @@ CONFIG_CRYPTO=y
1086# 1112#
1087# CONFIG_CRYPTO_FIPS is not set 1113# CONFIG_CRYPTO_FIPS is not set
1088CONFIG_CRYPTO_ALGAPI=y 1114CONFIG_CRYPTO_ALGAPI=y
1089CONFIG_CRYPTO_AEAD=y 1115CONFIG_CRYPTO_ALGAPI2=y
1116CONFIG_CRYPTO_AEAD2=y
1090CONFIG_CRYPTO_BLKCIPHER=y 1117CONFIG_CRYPTO_BLKCIPHER=y
1118CONFIG_CRYPTO_BLKCIPHER2=y
1091CONFIG_CRYPTO_HASH=y 1119CONFIG_CRYPTO_HASH=y
1092CONFIG_CRYPTO_RNG=y 1120CONFIG_CRYPTO_HASH2=y
1121CONFIG_CRYPTO_RNG2=y
1093CONFIG_CRYPTO_MANAGER=y 1122CONFIG_CRYPTO_MANAGER=y
1123CONFIG_CRYPTO_MANAGER2=y
1094# CONFIG_CRYPTO_GF128MUL is not set 1124# CONFIG_CRYPTO_GF128MUL is not set
1095# CONFIG_CRYPTO_NULL is not set 1125# CONFIG_CRYPTO_NULL is not set
1096# CONFIG_CRYPTO_CRYPTD is not set 1126# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/83xx/mpc836x_mds_defconfig b/arch/powerpc/configs/83xx/mpc836x_mds_defconfig
index 80eb6c9a05c..8306e074c3f 100644
--- a/arch/powerpc/configs/83xx/mpc836x_mds_defconfig
+++ b/arch/powerpc/configs/83xx/mpc836x_mds_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc3 3# Linux kernel version: 2.6.29-rc2
4# Sat Nov 8 12:39:59 2008 4# Mon Jan 26 15:35:58 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -44,7 +44,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
44CONFIG_PPC=y 44CONFIG_PPC=y
45CONFIG_EARLY_PRINTK=y 45CONFIG_EARLY_PRINTK=y
46CONFIG_GENERIC_NVRAM=y 46CONFIG_GENERIC_NVRAM=y
47CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 47CONFIG_SCHED_OMIT_FRAME_POINTER=y
48CONFIG_ARCH_MAY_HAVE_PC_FDC=y 48CONFIG_ARCH_MAY_HAVE_PC_FDC=y
49CONFIG_PPC_OF=y 49CONFIG_PPC_OF=y
50CONFIG_OF=y 50CONFIG_OF=y
@@ -75,12 +75,12 @@ CONFIG_SYSVIPC_SYSCTL=y
75# CONFIG_AUDIT is not set 75# CONFIG_AUDIT is not set
76# CONFIG_IKCONFIG is not set 76# CONFIG_IKCONFIG is not set
77CONFIG_LOG_BUF_SHIFT=14 77CONFIG_LOG_BUF_SHIFT=14
78# CONFIG_CGROUPS is not set
79CONFIG_GROUP_SCHED=y 78CONFIG_GROUP_SCHED=y
80# CONFIG_FAIR_GROUP_SCHED is not set 79# CONFIG_FAIR_GROUP_SCHED is not set
81# CONFIG_RT_GROUP_SCHED is not set 80# CONFIG_RT_GROUP_SCHED is not set
82CONFIG_USER_SCHED=y 81CONFIG_USER_SCHED=y
83# CONFIG_CGROUP_SCHED is not set 82# CONFIG_CGROUP_SCHED is not set
83# CONFIG_CGROUPS is not set
84CONFIG_SYSFS_DEPRECATED=y 84CONFIG_SYSFS_DEPRECATED=y
85CONFIG_SYSFS_DEPRECATED_V2=y 85CONFIG_SYSFS_DEPRECATED_V2=y
86# CONFIG_RELAY is not set 86# CONFIG_RELAY is not set
@@ -113,7 +113,6 @@ CONFIG_SLUB_DEBUG=y
113CONFIG_SLUB=y 113CONFIG_SLUB=y
114# CONFIG_SLOB is not set 114# CONFIG_SLOB is not set
115# CONFIG_PROFILING is not set 115# CONFIG_PROFILING is not set
116# CONFIG_MARKERS is not set
117CONFIG_HAVE_OPROFILE=y 116CONFIG_HAVE_OPROFILE=y
118CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 117CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
119CONFIG_HAVE_IOREMAP_PROT=y 118CONFIG_HAVE_IOREMAP_PROT=y
@@ -123,7 +122,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
123# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 122# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
124CONFIG_SLABINFO=y 123CONFIG_SLABINFO=y
125CONFIG_RT_MUTEXES=y 124CONFIG_RT_MUTEXES=y
126# CONFIG_TINY_SHMEM is not set
127CONFIG_BASE_SMALL=0 125CONFIG_BASE_SMALL=0
128CONFIG_MODULES=y 126CONFIG_MODULES=y
129# CONFIG_MODULE_FORCE_LOAD is not set 127# CONFIG_MODULE_FORCE_LOAD is not set
@@ -131,11 +129,9 @@ CONFIG_MODULE_UNLOAD=y
131# CONFIG_MODULE_FORCE_UNLOAD is not set 129# CONFIG_MODULE_FORCE_UNLOAD is not set
132# CONFIG_MODVERSIONS is not set 130# CONFIG_MODVERSIONS is not set
133# CONFIG_MODULE_SRCVERSION_ALL is not set 131# CONFIG_MODULE_SRCVERSION_ALL is not set
134CONFIG_KMOD=y
135CONFIG_BLOCK=y 132CONFIG_BLOCK=y
136# CONFIG_LBD is not set 133# CONFIG_LBD is not set
137# CONFIG_BLK_DEV_IO_TRACE is not set 134# CONFIG_BLK_DEV_IO_TRACE is not set
138# CONFIG_LSF is not set
139# CONFIG_BLK_DEV_BSG is not set 135# CONFIG_BLK_DEV_BSG is not set
140# CONFIG_BLK_DEV_INTEGRITY is not set 136# CONFIG_BLK_DEV_INTEGRITY is not set
141 137
@@ -152,6 +148,10 @@ CONFIG_DEFAULT_AS=y
152# CONFIG_DEFAULT_NOOP is not set 148# CONFIG_DEFAULT_NOOP is not set
153CONFIG_DEFAULT_IOSCHED="anticipatory" 149CONFIG_DEFAULT_IOSCHED="anticipatory"
154CONFIG_CLASSIC_RCU=y 150CONFIG_CLASSIC_RCU=y
151# CONFIG_TREE_RCU is not set
152# CONFIG_PREEMPT_RCU is not set
153# CONFIG_TREE_RCU_TRACE is not set
154# CONFIG_PREEMPT_RCU_TRACE is not set
155# CONFIG_FREEZER is not set 155# CONFIG_FREEZER is not set
156 156
157# 157#
@@ -197,6 +197,8 @@ CONFIG_IPIC=y
197CONFIG_QUICC_ENGINE=y 197CONFIG_QUICC_ENGINE=y
198# CONFIG_QE_GPIO is not set 198# CONFIG_QE_GPIO is not set
199# CONFIG_FSL_ULI1575 is not set 199# CONFIG_FSL_ULI1575 is not set
200# CONFIG_SIMPLE_GPIO is not set
201# CONFIG_MCU_MPC8349EMITX is not set
200 202
201# 203#
202# Kernel options 204# Kernel options
@@ -224,6 +226,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
224CONFIG_ARCH_HAS_WALK_MEMORY=y 226CONFIG_ARCH_HAS_WALK_MEMORY=y
225CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 227CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
226# CONFIG_KEXEC is not set 228# CONFIG_KEXEC is not set
229# CONFIG_CRASH_DUMP is not set
227CONFIG_ARCH_FLATMEM_ENABLE=y 230CONFIG_ARCH_FLATMEM_ENABLE=y
228CONFIG_ARCH_POPULATES_NODE_MAP=y 231CONFIG_ARCH_POPULATES_NODE_MAP=y
229CONFIG_SELECT_MEMORY_MODEL=y 232CONFIG_SELECT_MEMORY_MODEL=y
@@ -235,12 +238,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
235CONFIG_PAGEFLAGS_EXTENDED=y 238CONFIG_PAGEFLAGS_EXTENDED=y
236CONFIG_SPLIT_PTLOCK_CPUS=4 239CONFIG_SPLIT_PTLOCK_CPUS=4
237CONFIG_MIGRATION=y 240CONFIG_MIGRATION=y
238# CONFIG_RESOURCES_64BIT is not set
239# CONFIG_PHYS_ADDR_T_64BIT is not set 241# CONFIG_PHYS_ADDR_T_64BIT is not set
240CONFIG_ZONE_DMA_FLAG=1 242CONFIG_ZONE_DMA_FLAG=1
241CONFIG_BOUNCE=y 243CONFIG_BOUNCE=y
242CONFIG_VIRT_TO_BUS=y 244CONFIG_VIRT_TO_BUS=y
243CONFIG_UNEVICTABLE_LRU=y 245CONFIG_UNEVICTABLE_LRU=y
246CONFIG_PPC_4K_PAGES=y
247# CONFIG_PPC_16K_PAGES is not set
248# CONFIG_PPC_64K_PAGES is not set
244CONFIG_FORCE_MAX_ZONEORDER=11 249CONFIG_FORCE_MAX_ZONEORDER=11
245CONFIG_PROC_DEVICETREE=y 250CONFIG_PROC_DEVICETREE=y
246# CONFIG_CMDLINE_BOOL is not set 251# CONFIG_CMDLINE_BOOL is not set
@@ -265,6 +270,7 @@ CONFIG_PCI_SYSCALL=y
265CONFIG_ARCH_SUPPORTS_MSI=y 270CONFIG_ARCH_SUPPORTS_MSI=y
266# CONFIG_PCI_MSI is not set 271# CONFIG_PCI_MSI is not set
267# CONFIG_PCI_LEGACY is not set 272# CONFIG_PCI_LEGACY is not set
273# CONFIG_PCI_STUB is not set
268# CONFIG_PCCARD is not set 274# CONFIG_PCCARD is not set
269# CONFIG_HOTPLUG_PCI is not set 275# CONFIG_HOTPLUG_PCI is not set
270# CONFIG_HAS_RAPIDIO is not set 276# CONFIG_HAS_RAPIDIO is not set
@@ -287,6 +293,7 @@ CONFIG_NET=y
287# 293#
288# Networking options 294# Networking options
289# 295#
296CONFIG_COMPAT_NET_DEV_OPS=y
290CONFIG_PACKET=y 297CONFIG_PACKET=y
291# CONFIG_PACKET_MMAP is not set 298# CONFIG_PACKET_MMAP is not set
292CONFIG_UNIX=y 299CONFIG_UNIX=y
@@ -343,6 +350,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
343# CONFIG_ECONET is not set 350# CONFIG_ECONET is not set
344# CONFIG_WAN_ROUTER is not set 351# CONFIG_WAN_ROUTER is not set
345# CONFIG_NET_SCHED is not set 352# CONFIG_NET_SCHED is not set
353# CONFIG_DCB is not set
346 354
347# 355#
348# Network testing 356# Network testing
@@ -358,8 +366,9 @@ CONFIG_WIRELESS=y
358# CONFIG_CFG80211 is not set 366# CONFIG_CFG80211 is not set
359CONFIG_WIRELESS_OLD_REGULATORY=y 367CONFIG_WIRELESS_OLD_REGULATORY=y
360# CONFIG_WIRELESS_EXT is not set 368# CONFIG_WIRELESS_EXT is not set
369# CONFIG_LIB80211 is not set
361# CONFIG_MAC80211 is not set 370# CONFIG_MAC80211 is not set
362# CONFIG_IEEE80211 is not set 371# CONFIG_WIMAX is not set
363# CONFIG_RFKILL is not set 372# CONFIG_RFKILL is not set
364# CONFIG_NET_9P is not set 373# CONFIG_NET_9P is not set
365 374
@@ -380,6 +389,7 @@ CONFIG_MTD=y
380# CONFIG_MTD_DEBUG is not set 389# CONFIG_MTD_DEBUG is not set
381# CONFIG_MTD_CONCAT is not set 390# CONFIG_MTD_CONCAT is not set
382CONFIG_MTD_PARTITIONS=y 391CONFIG_MTD_PARTITIONS=y
392# CONFIG_MTD_TESTS is not set
383# CONFIG_MTD_REDBOOT_PARTS is not set 393# CONFIG_MTD_REDBOOT_PARTS is not set
384CONFIG_MTD_CMDLINE_PARTS=y 394CONFIG_MTD_CMDLINE_PARTS=y
385# CONFIG_MTD_OF_PARTS is not set 395# CONFIG_MTD_OF_PARTS is not set
@@ -451,6 +461,12 @@ CONFIG_MTD_PHYSMAP_OF=y
451# CONFIG_MTD_ONENAND is not set 461# CONFIG_MTD_ONENAND is not set
452 462
453# 463#
464# LPDDR flash memory drivers
465#
466# CONFIG_MTD_LPDDR is not set
467# CONFIG_MTD_QINFO_PROBE is not set
468
469#
454# UBI - Unsorted block images 470# UBI - Unsorted block images
455# 471#
456# CONFIG_MTD_UBI is not set 472# CONFIG_MTD_UBI is not set
@@ -480,8 +496,10 @@ CONFIG_MISC_DEVICES=y
480# CONFIG_EEPROM_93CX6 is not set 496# CONFIG_EEPROM_93CX6 is not set
481# CONFIG_SGI_IOC4 is not set 497# CONFIG_SGI_IOC4 is not set
482# CONFIG_TIFM_CORE is not set 498# CONFIG_TIFM_CORE is not set
499# CONFIG_ICS932S401 is not set
483# CONFIG_ENCLOSURE_SERVICES is not set 500# CONFIG_ENCLOSURE_SERVICES is not set
484# CONFIG_HP_ILO is not set 501# CONFIG_HP_ILO is not set
502# CONFIG_C2PORT is not set
485CONFIG_HAVE_IDE=y 503CONFIG_HAVE_IDE=y
486# CONFIG_IDE is not set 504# CONFIG_IDE is not set
487 505
@@ -524,6 +542,7 @@ CONFIG_SCSI_WAIT_SCAN=m
524# CONFIG_SCSI_SRP_ATTRS is not set 542# CONFIG_SCSI_SRP_ATTRS is not set
525CONFIG_SCSI_LOWLEVEL=y 543CONFIG_SCSI_LOWLEVEL=y
526# CONFIG_ISCSI_TCP is not set 544# CONFIG_ISCSI_TCP is not set
545# CONFIG_SCSI_CXGB3_ISCSI is not set
527# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 546# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
528# CONFIG_SCSI_3W_9XXX is not set 547# CONFIG_SCSI_3W_9XXX is not set
529# CONFIG_SCSI_ACARD is not set 548# CONFIG_SCSI_ACARD is not set
@@ -540,6 +559,8 @@ CONFIG_SCSI_LOWLEVEL=y
540# CONFIG_MEGARAID_SAS is not set 559# CONFIG_MEGARAID_SAS is not set
541# CONFIG_SCSI_HPTIOP is not set 560# CONFIG_SCSI_HPTIOP is not set
542# CONFIG_SCSI_BUSLOGIC is not set 561# CONFIG_SCSI_BUSLOGIC is not set
562# CONFIG_LIBFC is not set
563# CONFIG_FCOE is not set
543# CONFIG_SCSI_DMX3191D is not set 564# CONFIG_SCSI_DMX3191D is not set
544# CONFIG_SCSI_EATA is not set 565# CONFIG_SCSI_EATA is not set
545# CONFIG_SCSI_FUTURE_DOMAIN is not set 566# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -598,6 +619,9 @@ CONFIG_MARVELL_PHY=y
598# CONFIG_BROADCOM_PHY is not set 619# CONFIG_BROADCOM_PHY is not set
599# CONFIG_ICPLUS_PHY is not set 620# CONFIG_ICPLUS_PHY is not set
600# CONFIG_REALTEK_PHY is not set 621# CONFIG_REALTEK_PHY is not set
622# CONFIG_NATIONAL_PHY is not set
623# CONFIG_STE10XP is not set
624# CONFIG_LSI_ET1011C_PHY is not set
601# CONFIG_FIXED_PHY is not set 625# CONFIG_FIXED_PHY is not set
602# CONFIG_MDIO_BITBANG is not set 626# CONFIG_MDIO_BITBANG is not set
603CONFIG_NET_ETHERNET=y 627CONFIG_NET_ETHERNET=y
@@ -638,7 +662,6 @@ CONFIG_NETDEV_1000=y
638# CONFIG_GIANFAR is not set 662# CONFIG_GIANFAR is not set
639CONFIG_UCC_GETH=y 663CONFIG_UCC_GETH=y
640# CONFIG_UGETH_MAGIC_PACKET is not set 664# CONFIG_UGETH_MAGIC_PACKET is not set
641# CONFIG_UGETH_FILTERING is not set
642# CONFIG_UGETH_TX_ON_DEMAND is not set 665# CONFIG_UGETH_TX_ON_DEMAND is not set
643# CONFIG_MV643XX_ETH is not set 666# CONFIG_MV643XX_ETH is not set
644# CONFIG_QLA3XXX is not set 667# CONFIG_QLA3XXX is not set
@@ -647,6 +670,7 @@ CONFIG_UCC_GETH=y
647# CONFIG_JME is not set 670# CONFIG_JME is not set
648CONFIG_NETDEV_10000=y 671CONFIG_NETDEV_10000=y
649# CONFIG_CHELSIO_T1 is not set 672# CONFIG_CHELSIO_T1 is not set
673CONFIG_CHELSIO_T3_DEPENDS=y
650# CONFIG_CHELSIO_T3 is not set 674# CONFIG_CHELSIO_T3 is not set
651# CONFIG_ENIC is not set 675# CONFIG_ENIC is not set
652# CONFIG_IXGBE is not set 676# CONFIG_IXGBE is not set
@@ -669,6 +693,10 @@ CONFIG_NETDEV_10000=y
669# CONFIG_WLAN_PRE80211 is not set 693# CONFIG_WLAN_PRE80211 is not set
670# CONFIG_WLAN_80211 is not set 694# CONFIG_WLAN_80211 is not set
671# CONFIG_IWLWIFI_LEDS is not set 695# CONFIG_IWLWIFI_LEDS is not set
696
697#
698# Enable WiMAX (Networking options) to see the WiMAX drivers
699#
672# CONFIG_WAN is not set 700# CONFIG_WAN is not set
673# CONFIG_FDDI is not set 701# CONFIG_FDDI is not set
674# CONFIG_HIPPI is not set 702# CONFIG_HIPPI is not set
@@ -740,8 +768,10 @@ CONFIG_SERIAL_CORE_CONSOLE=y
740# CONFIG_SERIAL_OF_PLATFORM is not set 768# CONFIG_SERIAL_OF_PLATFORM is not set
741# CONFIG_SERIAL_QE is not set 769# CONFIG_SERIAL_QE is not set
742CONFIG_UNIX98_PTYS=y 770CONFIG_UNIX98_PTYS=y
771# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
743CONFIG_LEGACY_PTYS=y 772CONFIG_LEGACY_PTYS=y
744CONFIG_LEGACY_PTY_COUNT=256 773CONFIG_LEGACY_PTY_COUNT=256
774# CONFIG_HVC_UDBG is not set
745# CONFIG_IPMI_HANDLER is not set 775# CONFIG_IPMI_HANDLER is not set
746CONFIG_HW_RANDOM=y 776CONFIG_HW_RANDOM=y
747# CONFIG_NVRAM is not set 777# CONFIG_NVRAM is not set
@@ -813,7 +843,6 @@ CONFIG_I2C_MPC=y
813# CONFIG_SENSORS_PCF8591 is not set 843# CONFIG_SENSORS_PCF8591 is not set
814# CONFIG_SENSORS_MAX6875 is not set 844# CONFIG_SENSORS_MAX6875 is not set
815# CONFIG_SENSORS_TSL2550 is not set 845# CONFIG_SENSORS_TSL2550 is not set
816# CONFIG_MCU_MPC8349EMITX is not set
817# CONFIG_I2C_DEBUG_CORE is not set 846# CONFIG_I2C_DEBUG_CORE is not set
818# CONFIG_I2C_DEBUG_ALGO is not set 847# CONFIG_I2C_DEBUG_ALGO is not set
819# CONFIG_I2C_DEBUG_BUS is not set 848# CONFIG_I2C_DEBUG_BUS is not set
@@ -833,8 +862,10 @@ CONFIG_HWMON=y
833# CONFIG_SENSORS_ADM1029 is not set 862# CONFIG_SENSORS_ADM1029 is not set
834# CONFIG_SENSORS_ADM1031 is not set 863# CONFIG_SENSORS_ADM1031 is not set
835# CONFIG_SENSORS_ADM9240 is not set 864# CONFIG_SENSORS_ADM9240 is not set
865# CONFIG_SENSORS_ADT7462 is not set
836# CONFIG_SENSORS_ADT7470 is not set 866# CONFIG_SENSORS_ADT7470 is not set
837# CONFIG_SENSORS_ADT7473 is not set 867# CONFIG_SENSORS_ADT7473 is not set
868# CONFIG_SENSORS_ADT7475 is not set
838# CONFIG_SENSORS_ATXP1 is not set 869# CONFIG_SENSORS_ATXP1 is not set
839# CONFIG_SENSORS_DS1621 is not set 870# CONFIG_SENSORS_DS1621 is not set
840# CONFIG_SENSORS_I5K_AMB is not set 871# CONFIG_SENSORS_I5K_AMB is not set
@@ -855,6 +886,7 @@ CONFIG_HWMON=y
855# CONFIG_SENSORS_LM90 is not set 886# CONFIG_SENSORS_LM90 is not set
856# CONFIG_SENSORS_LM92 is not set 887# CONFIG_SENSORS_LM92 is not set
857# CONFIG_SENSORS_LM93 is not set 888# CONFIG_SENSORS_LM93 is not set
889# CONFIG_SENSORS_LTC4245 is not set
858# CONFIG_SENSORS_MAX1619 is not set 890# CONFIG_SENSORS_MAX1619 is not set
859# CONFIG_SENSORS_MAX6650 is not set 891# CONFIG_SENSORS_MAX6650 is not set
860# CONFIG_SENSORS_PC87360 is not set 892# CONFIG_SENSORS_PC87360 is not set
@@ -895,11 +927,11 @@ CONFIG_WATCHDOG=y
895# 927#
896# CONFIG_PCIPCWATCHDOG is not set 928# CONFIG_PCIPCWATCHDOG is not set
897# CONFIG_WDTPCI is not set 929# CONFIG_WDTPCI is not set
930CONFIG_SSB_POSSIBLE=y
898 931
899# 932#
900# Sonics Silicon Backplane 933# Sonics Silicon Backplane
901# 934#
902CONFIG_SSB_POSSIBLE=y
903# CONFIG_SSB is not set 935# CONFIG_SSB is not set
904 936
905# 937#
@@ -908,18 +940,13 @@ CONFIG_SSB_POSSIBLE=y
908# CONFIG_MFD_CORE is not set 940# CONFIG_MFD_CORE is not set
909# CONFIG_MFD_SM501 is not set 941# CONFIG_MFD_SM501 is not set
910# CONFIG_HTC_PASIC3 is not set 942# CONFIG_HTC_PASIC3 is not set
943# CONFIG_TWL4030_CORE is not set
911# CONFIG_MFD_TMIO is not set 944# CONFIG_MFD_TMIO is not set
912# CONFIG_PMIC_DA903X is not set 945# CONFIG_PMIC_DA903X is not set
913# CONFIG_MFD_WM8400 is not set 946# CONFIG_MFD_WM8400 is not set
914# CONFIG_MFD_WM8350_I2C is not set 947# CONFIG_MFD_WM8350_I2C is not set
915 948# CONFIG_MFD_PCF50633 is not set
916#
917# Voltage and Current regulators
918#
919# CONFIG_REGULATOR is not set 949# CONFIG_REGULATOR is not set
920# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
921# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
922# CONFIG_REGULATOR_BQ24022 is not set
923 950
924# 951#
925# Multimedia devices 952# Multimedia devices
@@ -975,9 +1002,13 @@ CONFIG_USB_ARCH_HAS_EHCI=y
975# 1002#
976 1003
977# 1004#
978# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1005# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
979# 1006#
980# CONFIG_USB_GADGET is not set 1007# CONFIG_USB_GADGET is not set
1008
1009#
1010# OTG and related infrastructure
1011#
981# CONFIG_UWB is not set 1012# CONFIG_UWB is not set
982# CONFIG_MMC is not set 1013# CONFIG_MMC is not set
983# CONFIG_MEMSTICK is not set 1014# CONFIG_MEMSTICK is not set
@@ -1015,6 +1046,7 @@ CONFIG_RTC_DRV_DS1374=y
1015# CONFIG_RTC_DRV_M41T80 is not set 1046# CONFIG_RTC_DRV_M41T80 is not set
1016# CONFIG_RTC_DRV_S35390A is not set 1047# CONFIG_RTC_DRV_S35390A is not set
1017# CONFIG_RTC_DRV_FM3130 is not set 1048# CONFIG_RTC_DRV_FM3130 is not set
1049# CONFIG_RTC_DRV_RX8581 is not set
1018 1050
1019# 1051#
1020# SPI RTC drivers 1052# SPI RTC drivers
@@ -1062,6 +1094,7 @@ CONFIG_FS_MBCACHE=y
1062CONFIG_FILE_LOCKING=y 1094CONFIG_FILE_LOCKING=y
1063# CONFIG_XFS_FS is not set 1095# CONFIG_XFS_FS is not set
1064# CONFIG_OCFS2_FS is not set 1096# CONFIG_OCFS2_FS is not set
1097# CONFIG_BTRFS_FS is not set
1065CONFIG_DNOTIFY=y 1098CONFIG_DNOTIFY=y
1066CONFIG_INOTIFY=y 1099CONFIG_INOTIFY=y
1067CONFIG_INOTIFY_USER=y 1100CONFIG_INOTIFY_USER=y
@@ -1095,10 +1128,7 @@ CONFIG_TMPFS=y
1095# CONFIG_TMPFS_POSIX_ACL is not set 1128# CONFIG_TMPFS_POSIX_ACL is not set
1096# CONFIG_HUGETLB_PAGE is not set 1129# CONFIG_HUGETLB_PAGE is not set
1097# CONFIG_CONFIGFS_FS is not set 1130# CONFIG_CONFIGFS_FS is not set
1098 1131CONFIG_MISC_FILESYSTEMS=y
1099#
1100# Miscellaneous filesystems
1101#
1102# CONFIG_ADFS_FS is not set 1132# CONFIG_ADFS_FS is not set
1103# CONFIG_AFFS_FS is not set 1133# CONFIG_AFFS_FS is not set
1104# CONFIG_HFS_FS is not set 1134# CONFIG_HFS_FS is not set
@@ -1108,6 +1138,7 @@ CONFIG_TMPFS=y
1108# CONFIG_EFS_FS is not set 1138# CONFIG_EFS_FS is not set
1109# CONFIG_JFFS2_FS is not set 1139# CONFIG_JFFS2_FS is not set
1110# CONFIG_CRAMFS is not set 1140# CONFIG_CRAMFS is not set
1141# CONFIG_SQUASHFS is not set
1111# CONFIG_VXFS_FS is not set 1142# CONFIG_VXFS_FS is not set
1112# CONFIG_MINIX_FS is not set 1143# CONFIG_MINIX_FS is not set
1113# CONFIG_OMFS_FS is not set 1144# CONFIG_OMFS_FS is not set
@@ -1163,6 +1194,7 @@ CONFIG_UCC=y
1163# Library routines 1194# Library routines
1164# 1195#
1165CONFIG_BITREVERSE=y 1196CONFIG_BITREVERSE=y
1197CONFIG_GENERIC_FIND_LAST_BIT=y
1166# CONFIG_CRC_CCITT is not set 1198# CONFIG_CRC_CCITT is not set
1167# CONFIG_CRC16 is not set 1199# CONFIG_CRC16 is not set
1168# CONFIG_CRC_T10DIF is not set 1200# CONFIG_CRC_T10DIF is not set
@@ -1196,6 +1228,8 @@ CONFIG_FRAME_WARN=1024
1196# CONFIG_LATENCYTOP is not set 1228# CONFIG_LATENCYTOP is not set
1197CONFIG_SYSCTL_SYSCALL_CHECK=y 1229CONFIG_SYSCTL_SYSCALL_CHECK=y
1198CONFIG_HAVE_FUNCTION_TRACER=y 1230CONFIG_HAVE_FUNCTION_TRACER=y
1231CONFIG_HAVE_DYNAMIC_FTRACE=y
1232CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1199 1233
1200# 1234#
1201# Tracers 1235# Tracers
@@ -1203,6 +1237,7 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1203# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1237# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1204# CONFIG_SAMPLES is not set 1238# CONFIG_SAMPLES is not set
1205CONFIG_HAVE_ARCH_KGDB=y 1239CONFIG_HAVE_ARCH_KGDB=y
1240CONFIG_PRINT_STACK_DEPTH=64
1206# CONFIG_IRQSTACKS is not set 1241# CONFIG_IRQSTACKS is not set
1207# CONFIG_BOOTX_TEXT is not set 1242# CONFIG_BOOTX_TEXT is not set
1208# CONFIG_PPC_EARLY_DEBUG is not set 1243# CONFIG_PPC_EARLY_DEBUG is not set
@@ -1221,11 +1256,15 @@ CONFIG_CRYPTO=y
1221# 1256#
1222# CONFIG_CRYPTO_FIPS is not set 1257# CONFIG_CRYPTO_FIPS is not set
1223CONFIG_CRYPTO_ALGAPI=y 1258CONFIG_CRYPTO_ALGAPI=y
1224CONFIG_CRYPTO_AEAD=y 1259CONFIG_CRYPTO_ALGAPI2=y
1260CONFIG_CRYPTO_AEAD2=y
1225CONFIG_CRYPTO_BLKCIPHER=y 1261CONFIG_CRYPTO_BLKCIPHER=y
1262CONFIG_CRYPTO_BLKCIPHER2=y
1226CONFIG_CRYPTO_HASH=y 1263CONFIG_CRYPTO_HASH=y
1227CONFIG_CRYPTO_RNG=y 1264CONFIG_CRYPTO_HASH2=y
1265CONFIG_CRYPTO_RNG2=y
1228CONFIG_CRYPTO_MANAGER=y 1266CONFIG_CRYPTO_MANAGER=y
1267CONFIG_CRYPTO_MANAGER2=y
1229# CONFIG_CRYPTO_GF128MUL is not set 1268# CONFIG_CRYPTO_GF128MUL is not set
1230# CONFIG_CRYPTO_NULL is not set 1269# CONFIG_CRYPTO_NULL is not set
1231# CONFIG_CRYPTO_CRYPTD is not set 1270# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig b/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig
index b9b236806e9..c8a21013c67 100644
--- a/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig
+++ b/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc3 3# Linux kernel version: 2.6.29-rc2
4# Sat Nov 8 12:40:00 2008 4# Mon Jan 26 15:36:01 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -45,7 +45,7 @@ CONFIG_GENERIC_GPIO=y
45CONFIG_PPC=y 45CONFIG_PPC=y
46CONFIG_EARLY_PRINTK=y 46CONFIG_EARLY_PRINTK=y
47CONFIG_GENERIC_NVRAM=y 47CONFIG_GENERIC_NVRAM=y
48CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 48CONFIG_SCHED_OMIT_FRAME_POINTER=y
49CONFIG_ARCH_MAY_HAVE_PC_FDC=y 49CONFIG_ARCH_MAY_HAVE_PC_FDC=y
50CONFIG_PPC_OF=y 50CONFIG_PPC_OF=y
51CONFIG_OF=y 51CONFIG_OF=y
@@ -76,12 +76,12 @@ CONFIG_SYSVIPC_SYSCTL=y
76# CONFIG_AUDIT is not set 76# CONFIG_AUDIT is not set
77# CONFIG_IKCONFIG is not set 77# CONFIG_IKCONFIG is not set
78CONFIG_LOG_BUF_SHIFT=14 78CONFIG_LOG_BUF_SHIFT=14
79# CONFIG_CGROUPS is not set
80CONFIG_GROUP_SCHED=y 79CONFIG_GROUP_SCHED=y
81CONFIG_FAIR_GROUP_SCHED=y 80CONFIG_FAIR_GROUP_SCHED=y
82# CONFIG_RT_GROUP_SCHED is not set 81# CONFIG_RT_GROUP_SCHED is not set
83CONFIG_USER_SCHED=y 82CONFIG_USER_SCHED=y
84# CONFIG_CGROUP_SCHED is not set 83# CONFIG_CGROUP_SCHED is not set
84# CONFIG_CGROUPS is not set
85CONFIG_SYSFS_DEPRECATED=y 85CONFIG_SYSFS_DEPRECATED=y
86CONFIG_SYSFS_DEPRECATED_V2=y 86CONFIG_SYSFS_DEPRECATED_V2=y
87# CONFIG_RELAY is not set 87# CONFIG_RELAY is not set
@@ -114,7 +114,6 @@ CONFIG_SLUB_DEBUG=y
114CONFIG_SLUB=y 114CONFIG_SLUB=y
115# CONFIG_SLOB is not set 115# CONFIG_SLOB is not set
116# CONFIG_PROFILING is not set 116# CONFIG_PROFILING is not set
117# CONFIG_MARKERS is not set
118CONFIG_HAVE_OPROFILE=y 117CONFIG_HAVE_OPROFILE=y
119CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 118CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
120CONFIG_HAVE_IOREMAP_PROT=y 119CONFIG_HAVE_IOREMAP_PROT=y
@@ -124,7 +123,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
124# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 123# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
125CONFIG_SLABINFO=y 124CONFIG_SLABINFO=y
126CONFIG_RT_MUTEXES=y 125CONFIG_RT_MUTEXES=y
127# CONFIG_TINY_SHMEM is not set
128CONFIG_BASE_SMALL=0 126CONFIG_BASE_SMALL=0
129CONFIG_MODULES=y 127CONFIG_MODULES=y
130# CONFIG_MODULE_FORCE_LOAD is not set 128# CONFIG_MODULE_FORCE_LOAD is not set
@@ -132,11 +130,9 @@ CONFIG_MODULE_UNLOAD=y
132# CONFIG_MODULE_FORCE_UNLOAD is not set 130# CONFIG_MODULE_FORCE_UNLOAD is not set
133# CONFIG_MODVERSIONS is not set 131# CONFIG_MODVERSIONS is not set
134# CONFIG_MODULE_SRCVERSION_ALL is not set 132# CONFIG_MODULE_SRCVERSION_ALL is not set
135CONFIG_KMOD=y
136CONFIG_BLOCK=y 133CONFIG_BLOCK=y
137# CONFIG_LBD is not set 134# CONFIG_LBD is not set
138# CONFIG_BLK_DEV_IO_TRACE is not set 135# CONFIG_BLK_DEV_IO_TRACE is not set
139# CONFIG_LSF is not set
140# CONFIG_BLK_DEV_BSG is not set 136# CONFIG_BLK_DEV_BSG is not set
141# CONFIG_BLK_DEV_INTEGRITY is not set 137# CONFIG_BLK_DEV_INTEGRITY is not set
142 138
@@ -153,6 +149,10 @@ CONFIG_DEFAULT_AS=y
153# CONFIG_DEFAULT_NOOP is not set 149# CONFIG_DEFAULT_NOOP is not set
154CONFIG_DEFAULT_IOSCHED="anticipatory" 150CONFIG_DEFAULT_IOSCHED="anticipatory"
155CONFIG_CLASSIC_RCU=y 151CONFIG_CLASSIC_RCU=y
152# CONFIG_TREE_RCU is not set
153# CONFIG_PREEMPT_RCU is not set
154# CONFIG_TREE_RCU_TRACE is not set
155# CONFIG_PREEMPT_RCU_TRACE is not set
156# CONFIG_FREEZER is not set 156# CONFIG_FREEZER is not set
157 157
158# 158#
@@ -198,6 +198,8 @@ CONFIG_IPIC=y
198CONFIG_QUICC_ENGINE=y 198CONFIG_QUICC_ENGINE=y
199CONFIG_QE_GPIO=y 199CONFIG_QE_GPIO=y
200# CONFIG_FSL_ULI1575 is not set 200# CONFIG_FSL_ULI1575 is not set
201# CONFIG_SIMPLE_GPIO is not set
202# CONFIG_MCU_MPC8349EMITX is not set
201 203
202# 204#
203# Kernel options 205# Kernel options
@@ -224,6 +226,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
224CONFIG_ARCH_HAS_WALK_MEMORY=y 226CONFIG_ARCH_HAS_WALK_MEMORY=y
225CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 227CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
226# CONFIG_KEXEC is not set 228# CONFIG_KEXEC is not set
229# CONFIG_CRASH_DUMP is not set
227CONFIG_ARCH_FLATMEM_ENABLE=y 230CONFIG_ARCH_FLATMEM_ENABLE=y
228CONFIG_ARCH_POPULATES_NODE_MAP=y 231CONFIG_ARCH_POPULATES_NODE_MAP=y
229CONFIG_SELECT_MEMORY_MODEL=y 232CONFIG_SELECT_MEMORY_MODEL=y
@@ -235,12 +238,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
235CONFIG_PAGEFLAGS_EXTENDED=y 238CONFIG_PAGEFLAGS_EXTENDED=y
236CONFIG_SPLIT_PTLOCK_CPUS=4 239CONFIG_SPLIT_PTLOCK_CPUS=4
237CONFIG_MIGRATION=y 240CONFIG_MIGRATION=y
238# CONFIG_RESOURCES_64BIT is not set
239# CONFIG_PHYS_ADDR_T_64BIT is not set 241# CONFIG_PHYS_ADDR_T_64BIT is not set
240CONFIG_ZONE_DMA_FLAG=1 242CONFIG_ZONE_DMA_FLAG=1
241CONFIG_BOUNCE=y 243CONFIG_BOUNCE=y
242CONFIG_VIRT_TO_BUS=y 244CONFIG_VIRT_TO_BUS=y
243CONFIG_UNEVICTABLE_LRU=y 245CONFIG_UNEVICTABLE_LRU=y
246CONFIG_PPC_4K_PAGES=y
247# CONFIG_PPC_16K_PAGES is not set
248# CONFIG_PPC_64K_PAGES is not set
244CONFIG_FORCE_MAX_ZONEORDER=11 249CONFIG_FORCE_MAX_ZONEORDER=11
245CONFIG_PROC_DEVICETREE=y 250CONFIG_PROC_DEVICETREE=y
246# CONFIG_CMDLINE_BOOL is not set 251# CONFIG_CMDLINE_BOOL is not set
@@ -267,6 +272,7 @@ CONFIG_PCI_SYSCALL=y
267CONFIG_ARCH_SUPPORTS_MSI=y 272CONFIG_ARCH_SUPPORTS_MSI=y
268# CONFIG_PCI_MSI is not set 273# CONFIG_PCI_MSI is not set
269# CONFIG_PCI_LEGACY is not set 274# CONFIG_PCI_LEGACY is not set
275# CONFIG_PCI_STUB is not set
270# CONFIG_PCCARD is not set 276# CONFIG_PCCARD is not set
271# CONFIG_HOTPLUG_PCI is not set 277# CONFIG_HOTPLUG_PCI is not set
272# CONFIG_HAS_RAPIDIO is not set 278# CONFIG_HAS_RAPIDIO is not set
@@ -289,6 +295,7 @@ CONFIG_NET=y
289# 295#
290# Networking options 296# Networking options
291# 297#
298CONFIG_COMPAT_NET_DEV_OPS=y
292CONFIG_PACKET=y 299CONFIG_PACKET=y
293# CONFIG_PACKET_MMAP is not set 300# CONFIG_PACKET_MMAP is not set
294CONFIG_UNIX=y 301CONFIG_UNIX=y
@@ -345,6 +352,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
345# CONFIG_ECONET is not set 352# CONFIG_ECONET is not set
346# CONFIG_WAN_ROUTER is not set 353# CONFIG_WAN_ROUTER is not set
347# CONFIG_NET_SCHED is not set 354# CONFIG_NET_SCHED is not set
355# CONFIG_DCB is not set
348 356
349# 357#
350# Network testing 358# Network testing
@@ -360,8 +368,9 @@ CONFIG_WIRELESS=y
360# CONFIG_CFG80211 is not set 368# CONFIG_CFG80211 is not set
361CONFIG_WIRELESS_OLD_REGULATORY=y 369CONFIG_WIRELESS_OLD_REGULATORY=y
362# CONFIG_WIRELESS_EXT is not set 370# CONFIG_WIRELESS_EXT is not set
371# CONFIG_LIB80211 is not set
363# CONFIG_MAC80211 is not set 372# CONFIG_MAC80211 is not set
364# CONFIG_IEEE80211 is not set 373# CONFIG_WIMAX is not set
365# CONFIG_RFKILL is not set 374# CONFIG_RFKILL is not set
366# CONFIG_NET_9P is not set 375# CONFIG_NET_9P is not set
367 376
@@ -384,6 +393,7 @@ CONFIG_MTD=y
384# CONFIG_MTD_DEBUG is not set 393# CONFIG_MTD_DEBUG is not set
385# CONFIG_MTD_CONCAT is not set 394# CONFIG_MTD_CONCAT is not set
386CONFIG_MTD_PARTITIONS=y 395CONFIG_MTD_PARTITIONS=y
396# CONFIG_MTD_TESTS is not set
387# CONFIG_MTD_REDBOOT_PARTS is not set 397# CONFIG_MTD_REDBOOT_PARTS is not set
388CONFIG_MTD_CMDLINE_PARTS=y 398CONFIG_MTD_CMDLINE_PARTS=y
389# CONFIG_MTD_OF_PARTS is not set 399# CONFIG_MTD_OF_PARTS is not set
@@ -462,6 +472,12 @@ CONFIG_MTD_PHYSMAP_OF=y
462# CONFIG_MTD_ONENAND is not set 472# CONFIG_MTD_ONENAND is not set
463 473
464# 474#
475# LPDDR flash memory drivers
476#
477# CONFIG_MTD_LPDDR is not set
478# CONFIG_MTD_QINFO_PROBE is not set
479
480#
465# UBI - Unsorted block images 481# UBI - Unsorted block images
466# 482#
467# CONFIG_MTD_UBI is not set 483# CONFIG_MTD_UBI is not set
@@ -493,8 +509,10 @@ CONFIG_MISC_DEVICES=y
493# CONFIG_EEPROM_93CX6 is not set 509# CONFIG_EEPROM_93CX6 is not set
494# CONFIG_SGI_IOC4 is not set 510# CONFIG_SGI_IOC4 is not set
495# CONFIG_TIFM_CORE is not set 511# CONFIG_TIFM_CORE is not set
512# CONFIG_ICS932S401 is not set
496# CONFIG_ENCLOSURE_SERVICES is not set 513# CONFIG_ENCLOSURE_SERVICES is not set
497# CONFIG_HP_ILO is not set 514# CONFIG_HP_ILO is not set
515# CONFIG_C2PORT is not set
498CONFIG_HAVE_IDE=y 516CONFIG_HAVE_IDE=y
499# CONFIG_IDE is not set 517# CONFIG_IDE is not set
500 518
@@ -543,6 +561,9 @@ CONFIG_PHYLIB=y
543CONFIG_BROADCOM_PHY=y 561CONFIG_BROADCOM_PHY=y
544# CONFIG_ICPLUS_PHY is not set 562# CONFIG_ICPLUS_PHY is not set
545# CONFIG_REALTEK_PHY is not set 563# CONFIG_REALTEK_PHY is not set
564# CONFIG_NATIONAL_PHY is not set
565# CONFIG_STE10XP is not set
566# CONFIG_LSI_ET1011C_PHY is not set
546# CONFIG_FIXED_PHY is not set 567# CONFIG_FIXED_PHY is not set
547# CONFIG_MDIO_BITBANG is not set 568# CONFIG_MDIO_BITBANG is not set
548# CONFIG_NET_ETHERNET is not set 569# CONFIG_NET_ETHERNET is not set
@@ -566,7 +587,6 @@ CONFIG_NETDEV_1000=y
566# CONFIG_GIANFAR is not set 587# CONFIG_GIANFAR is not set
567CONFIG_UCC_GETH=y 588CONFIG_UCC_GETH=y
568# CONFIG_UGETH_MAGIC_PACKET is not set 589# CONFIG_UGETH_MAGIC_PACKET is not set
569# CONFIG_UGETH_FILTERING is not set
570# CONFIG_UGETH_TX_ON_DEMAND is not set 590# CONFIG_UGETH_TX_ON_DEMAND is not set
571# CONFIG_MV643XX_ETH is not set 591# CONFIG_MV643XX_ETH is not set
572# CONFIG_QLA3XXX is not set 592# CONFIG_QLA3XXX is not set
@@ -582,6 +602,10 @@ CONFIG_UCC_GETH=y
582# CONFIG_WLAN_PRE80211 is not set 602# CONFIG_WLAN_PRE80211 is not set
583# CONFIG_WLAN_80211 is not set 603# CONFIG_WLAN_80211 is not set
584# CONFIG_IWLWIFI_LEDS is not set 604# CONFIG_IWLWIFI_LEDS is not set
605
606#
607# Enable WiMAX (Networking options) to see the WiMAX drivers
608#
585# CONFIG_WAN is not set 609# CONFIG_WAN is not set
586# CONFIG_FDDI is not set 610# CONFIG_FDDI is not set
587# CONFIG_HIPPI is not set 611# CONFIG_HIPPI is not set
@@ -656,8 +680,10 @@ CONFIG_SERIAL_CORE_CONSOLE=y
656# CONFIG_SERIAL_OF_PLATFORM is not set 680# CONFIG_SERIAL_OF_PLATFORM is not set
657CONFIG_SERIAL_QE=y 681CONFIG_SERIAL_QE=y
658CONFIG_UNIX98_PTYS=y 682CONFIG_UNIX98_PTYS=y
683# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
659CONFIG_LEGACY_PTYS=y 684CONFIG_LEGACY_PTYS=y
660CONFIG_LEGACY_PTY_COUNT=256 685CONFIG_LEGACY_PTY_COUNT=256
686# CONFIG_HVC_UDBG is not set
661# CONFIG_IPMI_HANDLER is not set 687# CONFIG_IPMI_HANDLER is not set
662CONFIG_HW_RANDOM=y 688CONFIG_HW_RANDOM=y
663# CONFIG_NVRAM is not set 689# CONFIG_NVRAM is not set
@@ -729,10 +755,8 @@ CONFIG_I2C_MPC=y
729# CONFIG_PCF8575 is not set 755# CONFIG_PCF8575 is not set
730# CONFIG_SENSORS_PCA9539 is not set 756# CONFIG_SENSORS_PCA9539 is not set
731# CONFIG_SENSORS_PCF8591 is not set 757# CONFIG_SENSORS_PCF8591 is not set
732# CONFIG_TPS65010 is not set
733# CONFIG_SENSORS_MAX6875 is not set 758# CONFIG_SENSORS_MAX6875 is not set
734# CONFIG_SENSORS_TSL2550 is not set 759# CONFIG_SENSORS_TSL2550 is not set
735# CONFIG_MCU_MPC8349EMITX is not set
736# CONFIG_I2C_DEBUG_CORE is not set 760# CONFIG_I2C_DEBUG_CORE is not set
737# CONFIG_I2C_DEBUG_ALGO is not set 761# CONFIG_I2C_DEBUG_ALGO is not set
738# CONFIG_I2C_DEBUG_BUS is not set 762# CONFIG_I2C_DEBUG_BUS is not set
@@ -744,6 +768,7 @@ CONFIG_SPI_MASTER=y
744# SPI Master Controller Drivers 768# SPI Master Controller Drivers
745# 769#
746CONFIG_SPI_BITBANG=y 770CONFIG_SPI_BITBANG=y
771# CONFIG_SPI_GPIO is not set
747CONFIG_SPI_MPC83xx=y 772CONFIG_SPI_MPC83xx=y
748 773
749# 774#
@@ -758,6 +783,11 @@ CONFIG_GPIOLIB=y
758# CONFIG_GPIO_SYSFS is not set 783# CONFIG_GPIO_SYSFS is not set
759 784
760# 785#
786# Memory mapped GPIO expanders:
787#
788# CONFIG_GPIO_XILINX is not set
789
790#
761# I2C GPIO expanders: 791# I2C GPIO expanders:
762# 792#
763# CONFIG_GPIO_MAX732X is not set 793# CONFIG_GPIO_MAX732X is not set
@@ -794,11 +824,11 @@ CONFIG_WATCHDOG=y
794# 824#
795# CONFIG_PCIPCWATCHDOG is not set 825# CONFIG_PCIPCWATCHDOG is not set
796# CONFIG_WDTPCI is not set 826# CONFIG_WDTPCI is not set
827CONFIG_SSB_POSSIBLE=y
797 828
798# 829#
799# Sonics Silicon Backplane 830# Sonics Silicon Backplane
800# 831#
801CONFIG_SSB_POSSIBLE=y
802# CONFIG_SSB is not set 832# CONFIG_SSB is not set
803 833
804# 834#
@@ -807,18 +837,14 @@ CONFIG_SSB_POSSIBLE=y
807# CONFIG_MFD_CORE is not set 837# CONFIG_MFD_CORE is not set
808# CONFIG_MFD_SM501 is not set 838# CONFIG_MFD_SM501 is not set
809# CONFIG_HTC_PASIC3 is not set 839# CONFIG_HTC_PASIC3 is not set
840# CONFIG_TPS65010 is not set
841# CONFIG_TWL4030_CORE is not set
810# CONFIG_MFD_TMIO is not set 842# CONFIG_MFD_TMIO is not set
811# CONFIG_PMIC_DA903X is not set 843# CONFIG_PMIC_DA903X is not set
812# CONFIG_MFD_WM8400 is not set 844# CONFIG_MFD_WM8400 is not set
813# CONFIG_MFD_WM8350_I2C is not set 845# CONFIG_MFD_WM8350_I2C is not set
814 846# CONFIG_MFD_PCF50633 is not set
815#
816# Voltage and Current regulators
817#
818# CONFIG_REGULATOR is not set 847# CONFIG_REGULATOR is not set
819# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
820# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
821# CONFIG_REGULATOR_BQ24022 is not set
822 848
823# 849#
824# Multimedia devices 850# Multimedia devices
@@ -897,6 +923,7 @@ CONFIG_FB_OF=y
897# CONFIG_FB_IBM_GXT4500 is not set 923# CONFIG_FB_IBM_GXT4500 is not set
898# CONFIG_FB_VIRTUAL is not set 924# CONFIG_FB_VIRTUAL is not set
899# CONFIG_FB_METRONOME is not set 925# CONFIG_FB_METRONOME is not set
926# CONFIG_FB_MB862XX is not set
900# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 927# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
901 928
902# 929#
@@ -962,6 +989,7 @@ CONFIG_FS_MBCACHE=y
962CONFIG_FILE_LOCKING=y 989CONFIG_FILE_LOCKING=y
963# CONFIG_XFS_FS is not set 990# CONFIG_XFS_FS is not set
964# CONFIG_OCFS2_FS is not set 991# CONFIG_OCFS2_FS is not set
992# CONFIG_BTRFS_FS is not set
965CONFIG_DNOTIFY=y 993CONFIG_DNOTIFY=y
966CONFIG_INOTIFY=y 994CONFIG_INOTIFY=y
967CONFIG_INOTIFY_USER=y 995CONFIG_INOTIFY_USER=y
@@ -995,10 +1023,7 @@ CONFIG_TMPFS=y
995# CONFIG_TMPFS_POSIX_ACL is not set 1023# CONFIG_TMPFS_POSIX_ACL is not set
996# CONFIG_HUGETLB_PAGE is not set 1024# CONFIG_HUGETLB_PAGE is not set
997# CONFIG_CONFIGFS_FS is not set 1025# CONFIG_CONFIGFS_FS is not set
998 1026CONFIG_MISC_FILESYSTEMS=y
999#
1000# Miscellaneous filesystems
1001#
1002# CONFIG_ADFS_FS is not set 1027# CONFIG_ADFS_FS is not set
1003# CONFIG_AFFS_FS is not set 1028# CONFIG_AFFS_FS is not set
1004# CONFIG_HFS_FS is not set 1029# CONFIG_HFS_FS is not set
@@ -1018,6 +1043,7 @@ CONFIG_JFFS2_ZLIB=y
1018CONFIG_JFFS2_RTIME=y 1043CONFIG_JFFS2_RTIME=y
1019# CONFIG_JFFS2_RUBIN is not set 1044# CONFIG_JFFS2_RUBIN is not set
1020# CONFIG_CRAMFS is not set 1045# CONFIG_CRAMFS is not set
1046# CONFIG_SQUASHFS is not set
1021# CONFIG_VXFS_FS is not set 1047# CONFIG_VXFS_FS is not set
1022# CONFIG_MINIX_FS is not set 1048# CONFIG_MINIX_FS is not set
1023# CONFIG_OMFS_FS is not set 1049# CONFIG_OMFS_FS is not set
@@ -1074,6 +1100,7 @@ CONFIG_UCC=y
1074# Library routines 1100# Library routines
1075# 1101#
1076CONFIG_BITREVERSE=y 1102CONFIG_BITREVERSE=y
1103CONFIG_GENERIC_FIND_LAST_BIT=y
1077# CONFIG_CRC_CCITT is not set 1104# CONFIG_CRC_CCITT is not set
1078# CONFIG_CRC16 is not set 1105# CONFIG_CRC16 is not set
1079# CONFIG_CRC_T10DIF is not set 1106# CONFIG_CRC_T10DIF is not set
@@ -1109,6 +1136,8 @@ CONFIG_FRAME_WARN=1024
1109# CONFIG_LATENCYTOP is not set 1136# CONFIG_LATENCYTOP is not set
1110CONFIG_SYSCTL_SYSCALL_CHECK=y 1137CONFIG_SYSCTL_SYSCALL_CHECK=y
1111CONFIG_HAVE_FUNCTION_TRACER=y 1138CONFIG_HAVE_FUNCTION_TRACER=y
1139CONFIG_HAVE_DYNAMIC_FTRACE=y
1140CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1112 1141
1113# 1142#
1114# Tracers 1143# Tracers
@@ -1116,6 +1145,7 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1116# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1145# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1117# CONFIG_SAMPLES is not set 1146# CONFIG_SAMPLES is not set
1118CONFIG_HAVE_ARCH_KGDB=y 1147CONFIG_HAVE_ARCH_KGDB=y
1148CONFIG_PRINT_STACK_DEPTH=64
1119# CONFIG_IRQSTACKS is not set 1149# CONFIG_IRQSTACKS is not set
1120# CONFIG_BOOTX_TEXT is not set 1150# CONFIG_BOOTX_TEXT is not set
1121CONFIG_PPC_EARLY_DEBUG=y 1151CONFIG_PPC_EARLY_DEBUG=y
@@ -1145,11 +1175,15 @@ CONFIG_CRYPTO=y
1145# 1175#
1146# CONFIG_CRYPTO_FIPS is not set 1176# CONFIG_CRYPTO_FIPS is not set
1147CONFIG_CRYPTO_ALGAPI=y 1177CONFIG_CRYPTO_ALGAPI=y
1148CONFIG_CRYPTO_AEAD=y 1178CONFIG_CRYPTO_ALGAPI2=y
1179CONFIG_CRYPTO_AEAD2=y
1149CONFIG_CRYPTO_BLKCIPHER=y 1180CONFIG_CRYPTO_BLKCIPHER=y
1181CONFIG_CRYPTO_BLKCIPHER2=y
1150CONFIG_CRYPTO_HASH=y 1182CONFIG_CRYPTO_HASH=y
1151CONFIG_CRYPTO_RNG=y 1183CONFIG_CRYPTO_HASH2=y
1184CONFIG_CRYPTO_RNG2=y
1152CONFIG_CRYPTO_MANAGER=y 1185CONFIG_CRYPTO_MANAGER=y
1186CONFIG_CRYPTO_MANAGER2=y
1153# CONFIG_CRYPTO_GF128MUL is not set 1187# CONFIG_CRYPTO_GF128MUL is not set
1154# CONFIG_CRYPTO_NULL is not set 1188# CONFIG_CRYPTO_NULL is not set
1155# CONFIG_CRYPTO_CRYPTD is not set 1189# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/83xx/mpc837x_mds_defconfig b/arch/powerpc/configs/83xx/mpc837x_mds_defconfig
index f6350d7e168..89c36df36d7 100644
--- a/arch/powerpc/configs/83xx/mpc837x_mds_defconfig
+++ b/arch/powerpc/configs/83xx/mpc837x_mds_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc3 3# Linux kernel version: 2.6.29-rc2
4# Sat Nov 8 12:40:00 2008 4# Mon Jan 26 15:35:59 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -44,7 +44,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
44CONFIG_PPC=y 44CONFIG_PPC=y
45CONFIG_EARLY_PRINTK=y 45CONFIG_EARLY_PRINTK=y
46CONFIG_GENERIC_NVRAM=y 46CONFIG_GENERIC_NVRAM=y
47CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 47CONFIG_SCHED_OMIT_FRAME_POINTER=y
48CONFIG_ARCH_MAY_HAVE_PC_FDC=y 48CONFIG_ARCH_MAY_HAVE_PC_FDC=y
49CONFIG_PPC_OF=y 49CONFIG_PPC_OF=y
50CONFIG_OF=y 50CONFIG_OF=y
@@ -75,12 +75,12 @@ CONFIG_SYSVIPC_SYSCTL=y
75# CONFIG_AUDIT is not set 75# CONFIG_AUDIT is not set
76# CONFIG_IKCONFIG is not set 76# CONFIG_IKCONFIG is not set
77CONFIG_LOG_BUF_SHIFT=14 77CONFIG_LOG_BUF_SHIFT=14
78# CONFIG_CGROUPS is not set
79CONFIG_GROUP_SCHED=y 78CONFIG_GROUP_SCHED=y
80CONFIG_FAIR_GROUP_SCHED=y 79CONFIG_FAIR_GROUP_SCHED=y
81# CONFIG_RT_GROUP_SCHED is not set 80# CONFIG_RT_GROUP_SCHED is not set
82CONFIG_USER_SCHED=y 81CONFIG_USER_SCHED=y
83# CONFIG_CGROUP_SCHED is not set 82# CONFIG_CGROUP_SCHED is not set
83# CONFIG_CGROUPS is not set
84CONFIG_SYSFS_DEPRECATED=y 84CONFIG_SYSFS_DEPRECATED=y
85CONFIG_SYSFS_DEPRECATED_V2=y 85CONFIG_SYSFS_DEPRECATED_V2=y
86# CONFIG_RELAY is not set 86# CONFIG_RELAY is not set
@@ -113,7 +113,6 @@ CONFIG_SLAB=y
113# CONFIG_SLUB is not set 113# CONFIG_SLUB is not set
114# CONFIG_SLOB is not set 114# CONFIG_SLOB is not set
115# CONFIG_PROFILING is not set 115# CONFIG_PROFILING is not set
116# CONFIG_MARKERS is not set
117CONFIG_HAVE_OPROFILE=y 116CONFIG_HAVE_OPROFILE=y
118# CONFIG_KPROBES is not set 117# CONFIG_KPROBES is not set
119CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 118CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -124,7 +123,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
124# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 123# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
125CONFIG_SLABINFO=y 124CONFIG_SLABINFO=y
126CONFIG_RT_MUTEXES=y 125CONFIG_RT_MUTEXES=y
127# CONFIG_TINY_SHMEM is not set
128CONFIG_BASE_SMALL=0 126CONFIG_BASE_SMALL=0
129CONFIG_MODULES=y 127CONFIG_MODULES=y
130# CONFIG_MODULE_FORCE_LOAD is not set 128# CONFIG_MODULE_FORCE_LOAD is not set
@@ -132,11 +130,9 @@ CONFIG_MODULE_UNLOAD=y
132# CONFIG_MODULE_FORCE_UNLOAD is not set 130# CONFIG_MODULE_FORCE_UNLOAD is not set
133# CONFIG_MODVERSIONS is not set 131# CONFIG_MODVERSIONS is not set
134# CONFIG_MODULE_SRCVERSION_ALL is not set 132# CONFIG_MODULE_SRCVERSION_ALL is not set
135CONFIG_KMOD=y
136CONFIG_BLOCK=y 133CONFIG_BLOCK=y
137# CONFIG_LBD is not set 134# CONFIG_LBD is not set
138# CONFIG_BLK_DEV_IO_TRACE is not set 135# CONFIG_BLK_DEV_IO_TRACE is not set
139# CONFIG_LSF is not set
140# CONFIG_BLK_DEV_BSG is not set 136# CONFIG_BLK_DEV_BSG is not set
141# CONFIG_BLK_DEV_INTEGRITY is not set 137# CONFIG_BLK_DEV_INTEGRITY is not set
142 138
@@ -153,6 +149,10 @@ CONFIG_DEFAULT_AS=y
153# CONFIG_DEFAULT_NOOP is not set 149# CONFIG_DEFAULT_NOOP is not set
154CONFIG_DEFAULT_IOSCHED="anticipatory" 150CONFIG_DEFAULT_IOSCHED="anticipatory"
155CONFIG_CLASSIC_RCU=y 151CONFIG_CLASSIC_RCU=y
152# CONFIG_TREE_RCU is not set
153# CONFIG_PREEMPT_RCU is not set
154# CONFIG_TREE_RCU_TRACE is not set
155# CONFIG_PREEMPT_RCU_TRACE is not set
156# CONFIG_FREEZER is not set 156# CONFIG_FREEZER is not set
157 157
158# 158#
@@ -199,6 +199,8 @@ CONFIG_IPIC=y
199# CONFIG_QUICC_ENGINE is not set 199# CONFIG_QUICC_ENGINE is not set
200# CONFIG_FSL_ULI1575 is not set 200# CONFIG_FSL_ULI1575 is not set
201# CONFIG_MPC8xxx_GPIO is not set 201# CONFIG_MPC8xxx_GPIO is not set
202# CONFIG_SIMPLE_GPIO is not set
203# CONFIG_MCU_MPC8349EMITX is not set
202 204
203# 205#
204# Kernel options 206# Kernel options
@@ -225,6 +227,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
225CONFIG_ARCH_HAS_WALK_MEMORY=y 227CONFIG_ARCH_HAS_WALK_MEMORY=y
226CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 228CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
227# CONFIG_KEXEC is not set 229# CONFIG_KEXEC is not set
230# CONFIG_CRASH_DUMP is not set
228CONFIG_ARCH_FLATMEM_ENABLE=y 231CONFIG_ARCH_FLATMEM_ENABLE=y
229CONFIG_ARCH_POPULATES_NODE_MAP=y 232CONFIG_ARCH_POPULATES_NODE_MAP=y
230CONFIG_SELECT_MEMORY_MODEL=y 233CONFIG_SELECT_MEMORY_MODEL=y
@@ -236,12 +239,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
236CONFIG_PAGEFLAGS_EXTENDED=y 239CONFIG_PAGEFLAGS_EXTENDED=y
237CONFIG_SPLIT_PTLOCK_CPUS=4 240CONFIG_SPLIT_PTLOCK_CPUS=4
238CONFIG_MIGRATION=y 241CONFIG_MIGRATION=y
239# CONFIG_RESOURCES_64BIT is not set
240# CONFIG_PHYS_ADDR_T_64BIT is not set 242# CONFIG_PHYS_ADDR_T_64BIT is not set
241CONFIG_ZONE_DMA_FLAG=1 243CONFIG_ZONE_DMA_FLAG=1
242CONFIG_BOUNCE=y 244CONFIG_BOUNCE=y
243CONFIG_VIRT_TO_BUS=y 245CONFIG_VIRT_TO_BUS=y
244CONFIG_UNEVICTABLE_LRU=y 246CONFIG_UNEVICTABLE_LRU=y
247CONFIG_PPC_4K_PAGES=y
248# CONFIG_PPC_16K_PAGES is not set
249# CONFIG_PPC_64K_PAGES is not set
245CONFIG_FORCE_MAX_ZONEORDER=11 250CONFIG_FORCE_MAX_ZONEORDER=11
246CONFIG_PROC_DEVICETREE=y 251CONFIG_PROC_DEVICETREE=y
247# CONFIG_CMDLINE_BOOL is not set 252# CONFIG_CMDLINE_BOOL is not set
@@ -266,6 +271,7 @@ CONFIG_PCI_SYSCALL=y
266CONFIG_ARCH_SUPPORTS_MSI=y 271CONFIG_ARCH_SUPPORTS_MSI=y
267# CONFIG_PCI_MSI is not set 272# CONFIG_PCI_MSI is not set
268# CONFIG_PCI_LEGACY is not set 273# CONFIG_PCI_LEGACY is not set
274# CONFIG_PCI_STUB is not set
269# CONFIG_PCCARD is not set 275# CONFIG_PCCARD is not set
270# CONFIG_HOTPLUG_PCI is not set 276# CONFIG_HOTPLUG_PCI is not set
271# CONFIG_HAS_RAPIDIO is not set 277# CONFIG_HAS_RAPIDIO is not set
@@ -288,6 +294,7 @@ CONFIG_NET=y
288# 294#
289# Networking options 295# Networking options
290# 296#
297CONFIG_COMPAT_NET_DEV_OPS=y
291CONFIG_PACKET=y 298CONFIG_PACKET=y
292# CONFIG_PACKET_MMAP is not set 299# CONFIG_PACKET_MMAP is not set
293CONFIG_UNIX=y 300CONFIG_UNIX=y
@@ -344,6 +351,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
344# CONFIG_ECONET is not set 351# CONFIG_ECONET is not set
345# CONFIG_WAN_ROUTER is not set 352# CONFIG_WAN_ROUTER is not set
346# CONFIG_NET_SCHED is not set 353# CONFIG_NET_SCHED is not set
354# CONFIG_DCB is not set
347 355
348# 356#
349# Network testing 357# Network testing
@@ -359,8 +367,9 @@ CONFIG_WIRELESS=y
359# CONFIG_CFG80211 is not set 367# CONFIG_CFG80211 is not set
360CONFIG_WIRELESS_OLD_REGULATORY=y 368CONFIG_WIRELESS_OLD_REGULATORY=y
361# CONFIG_WIRELESS_EXT is not set 369# CONFIG_WIRELESS_EXT is not set
370# CONFIG_LIB80211 is not set
362# CONFIG_MAC80211 is not set 371# CONFIG_MAC80211 is not set
363# CONFIG_IEEE80211 is not set 372# CONFIG_WIMAX is not set
364# CONFIG_RFKILL is not set 373# CONFIG_RFKILL is not set
365# CONFIG_NET_9P is not set 374# CONFIG_NET_9P is not set
366 375
@@ -404,8 +413,10 @@ CONFIG_MISC_DEVICES=y
404# CONFIG_EEPROM_93CX6 is not set 413# CONFIG_EEPROM_93CX6 is not set
405# CONFIG_SGI_IOC4 is not set 414# CONFIG_SGI_IOC4 is not set
406# CONFIG_TIFM_CORE is not set 415# CONFIG_TIFM_CORE is not set
416# CONFIG_ICS932S401 is not set
407# CONFIG_ENCLOSURE_SERVICES is not set 417# CONFIG_ENCLOSURE_SERVICES is not set
408# CONFIG_HP_ILO is not set 418# CONFIG_HP_ILO is not set
419# CONFIG_C2PORT is not set
409CONFIG_HAVE_IDE=y 420CONFIG_HAVE_IDE=y
410# CONFIG_IDE is not set 421# CONFIG_IDE is not set
411 422
@@ -448,6 +459,7 @@ CONFIG_SCSI_WAIT_SCAN=m
448# CONFIG_SCSI_SRP_ATTRS is not set 459# CONFIG_SCSI_SRP_ATTRS is not set
449CONFIG_SCSI_LOWLEVEL=y 460CONFIG_SCSI_LOWLEVEL=y
450# CONFIG_ISCSI_TCP is not set 461# CONFIG_ISCSI_TCP is not set
462# CONFIG_SCSI_CXGB3_ISCSI is not set
451# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 463# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
452# CONFIG_SCSI_3W_9XXX is not set 464# CONFIG_SCSI_3W_9XXX is not set
453# CONFIG_SCSI_ACARD is not set 465# CONFIG_SCSI_ACARD is not set
@@ -464,6 +476,8 @@ CONFIG_SCSI_LOWLEVEL=y
464# CONFIG_MEGARAID_SAS is not set 476# CONFIG_MEGARAID_SAS is not set
465# CONFIG_SCSI_HPTIOP is not set 477# CONFIG_SCSI_HPTIOP is not set
466# CONFIG_SCSI_BUSLOGIC is not set 478# CONFIG_SCSI_BUSLOGIC is not set
479# CONFIG_LIBFC is not set
480# CONFIG_FCOE is not set
467# CONFIG_SCSI_DMX3191D is not set 481# CONFIG_SCSI_DMX3191D is not set
468# CONFIG_SCSI_EATA is not set 482# CONFIG_SCSI_EATA is not set
469# CONFIG_SCSI_FUTURE_DOMAIN is not set 483# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -583,6 +597,9 @@ CONFIG_MARVELL_PHY=y
583# CONFIG_BROADCOM_PHY is not set 597# CONFIG_BROADCOM_PHY is not set
584# CONFIG_ICPLUS_PHY is not set 598# CONFIG_ICPLUS_PHY is not set
585# CONFIG_REALTEK_PHY is not set 599# CONFIG_REALTEK_PHY is not set
600# CONFIG_NATIONAL_PHY is not set
601# CONFIG_STE10XP is not set
602# CONFIG_LSI_ET1011C_PHY is not set
586# CONFIG_FIXED_PHY is not set 603# CONFIG_FIXED_PHY is not set
587# CONFIG_MDIO_BITBANG is not set 604# CONFIG_MDIO_BITBANG is not set
588CONFIG_NET_ETHERNET=y 605CONFIG_NET_ETHERNET=y
@@ -628,6 +645,7 @@ CONFIG_GIANFAR=y
628# CONFIG_JME is not set 645# CONFIG_JME is not set
629CONFIG_NETDEV_10000=y 646CONFIG_NETDEV_10000=y
630# CONFIG_CHELSIO_T1 is not set 647# CONFIG_CHELSIO_T1 is not set
648CONFIG_CHELSIO_T3_DEPENDS=y
631# CONFIG_CHELSIO_T3 is not set 649# CONFIG_CHELSIO_T3 is not set
632# CONFIG_ENIC is not set 650# CONFIG_ENIC is not set
633# CONFIG_IXGBE is not set 651# CONFIG_IXGBE is not set
@@ -650,6 +668,10 @@ CONFIG_NETDEV_10000=y
650# CONFIG_WLAN_PRE80211 is not set 668# CONFIG_WLAN_PRE80211 is not set
651# CONFIG_WLAN_80211 is not set 669# CONFIG_WLAN_80211 is not set
652# CONFIG_IWLWIFI_LEDS is not set 670# CONFIG_IWLWIFI_LEDS is not set
671
672#
673# Enable WiMAX (Networking options) to see the WiMAX drivers
674#
653# CONFIG_WAN is not set 675# CONFIG_WAN is not set
654# CONFIG_FDDI is not set 676# CONFIG_FDDI is not set
655# CONFIG_HIPPI is not set 677# CONFIG_HIPPI is not set
@@ -720,8 +742,10 @@ CONFIG_SERIAL_CORE_CONSOLE=y
720# CONFIG_SERIAL_JSM is not set 742# CONFIG_SERIAL_JSM is not set
721# CONFIG_SERIAL_OF_PLATFORM is not set 743# CONFIG_SERIAL_OF_PLATFORM is not set
722CONFIG_UNIX98_PTYS=y 744CONFIG_UNIX98_PTYS=y
745# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
723CONFIG_LEGACY_PTYS=y 746CONFIG_LEGACY_PTYS=y
724CONFIG_LEGACY_PTY_COUNT=256 747CONFIG_LEGACY_PTY_COUNT=256
748# CONFIG_HVC_UDBG is not set
725# CONFIG_IPMI_HANDLER is not set 749# CONFIG_IPMI_HANDLER is not set
726# CONFIG_HW_RANDOM is not set 750# CONFIG_HW_RANDOM is not set
727# CONFIG_NVRAM is not set 751# CONFIG_NVRAM is not set
@@ -795,7 +819,6 @@ CONFIG_I2C_MPC=y
795# CONFIG_SENSORS_PCF8591 is not set 819# CONFIG_SENSORS_PCF8591 is not set
796# CONFIG_SENSORS_MAX6875 is not set 820# CONFIG_SENSORS_MAX6875 is not set
797# CONFIG_SENSORS_TSL2550 is not set 821# CONFIG_SENSORS_TSL2550 is not set
798# CONFIG_MCU_MPC8349EMITX is not set
799# CONFIG_I2C_DEBUG_CORE is not set 822# CONFIG_I2C_DEBUG_CORE is not set
800# CONFIG_I2C_DEBUG_ALGO is not set 823# CONFIG_I2C_DEBUG_ALGO is not set
801# CONFIG_I2C_DEBUG_BUS is not set 824# CONFIG_I2C_DEBUG_BUS is not set
@@ -815,8 +838,10 @@ CONFIG_HWMON=y
815# CONFIG_SENSORS_ADM1029 is not set 838# CONFIG_SENSORS_ADM1029 is not set
816# CONFIG_SENSORS_ADM1031 is not set 839# CONFIG_SENSORS_ADM1031 is not set
817# CONFIG_SENSORS_ADM9240 is not set 840# CONFIG_SENSORS_ADM9240 is not set
841# CONFIG_SENSORS_ADT7462 is not set
818# CONFIG_SENSORS_ADT7470 is not set 842# CONFIG_SENSORS_ADT7470 is not set
819# CONFIG_SENSORS_ADT7473 is not set 843# CONFIG_SENSORS_ADT7473 is not set
844# CONFIG_SENSORS_ADT7475 is not set
820# CONFIG_SENSORS_ATXP1 is not set 845# CONFIG_SENSORS_ATXP1 is not set
821# CONFIG_SENSORS_DS1621 is not set 846# CONFIG_SENSORS_DS1621 is not set
822# CONFIG_SENSORS_I5K_AMB is not set 847# CONFIG_SENSORS_I5K_AMB is not set
@@ -837,6 +862,7 @@ CONFIG_HWMON=y
837# CONFIG_SENSORS_LM90 is not set 862# CONFIG_SENSORS_LM90 is not set
838# CONFIG_SENSORS_LM92 is not set 863# CONFIG_SENSORS_LM92 is not set
839# CONFIG_SENSORS_LM93 is not set 864# CONFIG_SENSORS_LM93 is not set
865# CONFIG_SENSORS_LTC4245 is not set
840# CONFIG_SENSORS_MAX1619 is not set 866# CONFIG_SENSORS_MAX1619 is not set
841# CONFIG_SENSORS_MAX6650 is not set 867# CONFIG_SENSORS_MAX6650 is not set
842# CONFIG_SENSORS_PC87360 is not set 868# CONFIG_SENSORS_PC87360 is not set
@@ -877,11 +903,11 @@ CONFIG_WATCHDOG=y
877# 903#
878# CONFIG_PCIPCWATCHDOG is not set 904# CONFIG_PCIPCWATCHDOG is not set
879# CONFIG_WDTPCI is not set 905# CONFIG_WDTPCI is not set
906CONFIG_SSB_POSSIBLE=y
880 907
881# 908#
882# Sonics Silicon Backplane 909# Sonics Silicon Backplane
883# 910#
884CONFIG_SSB_POSSIBLE=y
885# CONFIG_SSB is not set 911# CONFIG_SSB is not set
886 912
887# 913#
@@ -890,18 +916,13 @@ CONFIG_SSB_POSSIBLE=y
890# CONFIG_MFD_CORE is not set 916# CONFIG_MFD_CORE is not set
891# CONFIG_MFD_SM501 is not set 917# CONFIG_MFD_SM501 is not set
892# CONFIG_HTC_PASIC3 is not set 918# CONFIG_HTC_PASIC3 is not set
919# CONFIG_TWL4030_CORE is not set
893# CONFIG_MFD_TMIO is not set 920# CONFIG_MFD_TMIO is not set
894# CONFIG_PMIC_DA903X is not set 921# CONFIG_PMIC_DA903X is not set
895# CONFIG_MFD_WM8400 is not set 922# CONFIG_MFD_WM8400 is not set
896# CONFIG_MFD_WM8350_I2C is not set 923# CONFIG_MFD_WM8350_I2C is not set
897 924# CONFIG_MFD_PCF50633 is not set
898#
899# Voltage and Current regulators
900#
901# CONFIG_REGULATOR is not set 925# CONFIG_REGULATOR is not set
902# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
903# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
904# CONFIG_REGULATOR_BQ24022 is not set
905 926
906# 927#
907# Multimedia devices 928# Multimedia devices
@@ -957,9 +978,13 @@ CONFIG_USB_ARCH_HAS_EHCI=y
957# 978#
958 979
959# 980#
960# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 981# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
961# 982#
962# CONFIG_USB_GADGET is not set 983# CONFIG_USB_GADGET is not set
984
985#
986# OTG and related infrastructure
987#
963# CONFIG_UWB is not set 988# CONFIG_UWB is not set
964# CONFIG_MMC is not set 989# CONFIG_MMC is not set
965# CONFIG_MEMSTICK is not set 990# CONFIG_MEMSTICK is not set
@@ -991,6 +1016,7 @@ CONFIG_FS_MBCACHE=y
991CONFIG_FILE_LOCKING=y 1016CONFIG_FILE_LOCKING=y
992# CONFIG_XFS_FS is not set 1017# CONFIG_XFS_FS is not set
993# CONFIG_OCFS2_FS is not set 1018# CONFIG_OCFS2_FS is not set
1019# CONFIG_BTRFS_FS is not set
994CONFIG_DNOTIFY=y 1020CONFIG_DNOTIFY=y
995CONFIG_INOTIFY=y 1021CONFIG_INOTIFY=y
996CONFIG_INOTIFY_USER=y 1022CONFIG_INOTIFY_USER=y
@@ -1024,10 +1050,7 @@ CONFIG_TMPFS=y
1024# CONFIG_TMPFS_POSIX_ACL is not set 1050# CONFIG_TMPFS_POSIX_ACL is not set
1025# CONFIG_HUGETLB_PAGE is not set 1051# CONFIG_HUGETLB_PAGE is not set
1026# CONFIG_CONFIGFS_FS is not set 1052# CONFIG_CONFIGFS_FS is not set
1027 1053CONFIG_MISC_FILESYSTEMS=y
1028#
1029# Miscellaneous filesystems
1030#
1031# CONFIG_ADFS_FS is not set 1054# CONFIG_ADFS_FS is not set
1032# CONFIG_AFFS_FS is not set 1055# CONFIG_AFFS_FS is not set
1033# CONFIG_HFS_FS is not set 1056# CONFIG_HFS_FS is not set
@@ -1036,6 +1059,7 @@ CONFIG_TMPFS=y
1036# CONFIG_BFS_FS is not set 1059# CONFIG_BFS_FS is not set
1037# CONFIG_EFS_FS is not set 1060# CONFIG_EFS_FS is not set
1038# CONFIG_CRAMFS is not set 1061# CONFIG_CRAMFS is not set
1062# CONFIG_SQUASHFS is not set
1039# CONFIG_VXFS_FS is not set 1063# CONFIG_VXFS_FS is not set
1040# CONFIG_MINIX_FS is not set 1064# CONFIG_MINIX_FS is not set
1041# CONFIG_OMFS_FS is not set 1065# CONFIG_OMFS_FS is not set
@@ -1093,6 +1117,7 @@ CONFIG_MSDOS_PARTITION=y
1093# Library routines 1117# Library routines
1094# 1118#
1095CONFIG_BITREVERSE=y 1119CONFIG_BITREVERSE=y
1120CONFIG_GENERIC_FIND_LAST_BIT=y
1096# CONFIG_CRC_CCITT is not set 1121# CONFIG_CRC_CCITT is not set
1097# CONFIG_CRC16 is not set 1122# CONFIG_CRC16 is not set
1098CONFIG_CRC_T10DIF=y 1123CONFIG_CRC_T10DIF=y
@@ -1124,6 +1149,8 @@ CONFIG_FRAME_WARN=1024
1124# CONFIG_LATENCYTOP is not set 1149# CONFIG_LATENCYTOP is not set
1125CONFIG_SYSCTL_SYSCALL_CHECK=y 1150CONFIG_SYSCTL_SYSCALL_CHECK=y
1126CONFIG_HAVE_FUNCTION_TRACER=y 1151CONFIG_HAVE_FUNCTION_TRACER=y
1152CONFIG_HAVE_DYNAMIC_FTRACE=y
1153CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1127 1154
1128# 1155#
1129# Tracers 1156# Tracers
@@ -1131,6 +1158,7 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1131# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1158# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1132# CONFIG_SAMPLES is not set 1159# CONFIG_SAMPLES is not set
1133CONFIG_HAVE_ARCH_KGDB=y 1160CONFIG_HAVE_ARCH_KGDB=y
1161CONFIG_PRINT_STACK_DEPTH=64
1134# CONFIG_IRQSTACKS is not set 1162# CONFIG_IRQSTACKS is not set
1135# CONFIG_BOOTX_TEXT is not set 1163# CONFIG_BOOTX_TEXT is not set
1136# CONFIG_PPC_EARLY_DEBUG is not set 1164# CONFIG_PPC_EARLY_DEBUG is not set
@@ -1149,11 +1177,15 @@ CONFIG_CRYPTO=y
1149# 1177#
1150# CONFIG_CRYPTO_FIPS is not set 1178# CONFIG_CRYPTO_FIPS is not set
1151CONFIG_CRYPTO_ALGAPI=y 1179CONFIG_CRYPTO_ALGAPI=y
1152CONFIG_CRYPTO_AEAD=y 1180CONFIG_CRYPTO_ALGAPI2=y
1181CONFIG_CRYPTO_AEAD2=y
1153CONFIG_CRYPTO_BLKCIPHER=y 1182CONFIG_CRYPTO_BLKCIPHER=y
1183CONFIG_CRYPTO_BLKCIPHER2=y
1154CONFIG_CRYPTO_HASH=y 1184CONFIG_CRYPTO_HASH=y
1155CONFIG_CRYPTO_RNG=y 1185CONFIG_CRYPTO_HASH2=y
1186CONFIG_CRYPTO_RNG2=y
1156CONFIG_CRYPTO_MANAGER=y 1187CONFIG_CRYPTO_MANAGER=y
1188CONFIG_CRYPTO_MANAGER2=y
1157# CONFIG_CRYPTO_GF128MUL is not set 1189# CONFIG_CRYPTO_GF128MUL is not set
1158# CONFIG_CRYPTO_NULL is not set 1190# CONFIG_CRYPTO_NULL is not set
1159# CONFIG_CRYPTO_CRYPTD is not set 1191# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig b/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig
index f447de16f75..244ea472086 100644
--- a/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig
+++ b/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc3 3# Linux kernel version: 2.6.29-rc2
4# Sat Nov 8 12:40:01 2008 4# Mon Jan 26 15:36:01 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -44,7 +44,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
44CONFIG_PPC=y 44CONFIG_PPC=y
45CONFIG_EARLY_PRINTK=y 45CONFIG_EARLY_PRINTK=y
46CONFIG_GENERIC_NVRAM=y 46CONFIG_GENERIC_NVRAM=y
47CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 47CONFIG_SCHED_OMIT_FRAME_POINTER=y
48CONFIG_ARCH_MAY_HAVE_PC_FDC=y 48CONFIG_ARCH_MAY_HAVE_PC_FDC=y
49CONFIG_PPC_OF=y 49CONFIG_PPC_OF=y
50CONFIG_OF=y 50CONFIG_OF=y
@@ -75,12 +75,12 @@ CONFIG_SYSVIPC_SYSCTL=y
75# CONFIG_AUDIT is not set 75# CONFIG_AUDIT is not set
76# CONFIG_IKCONFIG is not set 76# CONFIG_IKCONFIG is not set
77CONFIG_LOG_BUF_SHIFT=14 77CONFIG_LOG_BUF_SHIFT=14
78# CONFIG_CGROUPS is not set
79CONFIG_GROUP_SCHED=y 78CONFIG_GROUP_SCHED=y
80CONFIG_FAIR_GROUP_SCHED=y 79CONFIG_FAIR_GROUP_SCHED=y
81# CONFIG_RT_GROUP_SCHED is not set 80# CONFIG_RT_GROUP_SCHED is not set
82CONFIG_USER_SCHED=y 81CONFIG_USER_SCHED=y
83# CONFIG_CGROUP_SCHED is not set 82# CONFIG_CGROUP_SCHED is not set
83# CONFIG_CGROUPS is not set
84CONFIG_SYSFS_DEPRECATED=y 84CONFIG_SYSFS_DEPRECATED=y
85CONFIG_SYSFS_DEPRECATED_V2=y 85CONFIG_SYSFS_DEPRECATED_V2=y
86# CONFIG_RELAY is not set 86# CONFIG_RELAY is not set
@@ -113,7 +113,6 @@ CONFIG_SLAB=y
113# CONFIG_SLUB is not set 113# CONFIG_SLUB is not set
114# CONFIG_SLOB is not set 114# CONFIG_SLOB is not set
115# CONFIG_PROFILING is not set 115# CONFIG_PROFILING is not set
116# CONFIG_MARKERS is not set
117CONFIG_HAVE_OPROFILE=y 116CONFIG_HAVE_OPROFILE=y
118# CONFIG_KPROBES is not set 117# CONFIG_KPROBES is not set
119CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 118CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -124,7 +123,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
124# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 123# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
125CONFIG_SLABINFO=y 124CONFIG_SLABINFO=y
126CONFIG_RT_MUTEXES=y 125CONFIG_RT_MUTEXES=y
127# CONFIG_TINY_SHMEM is not set
128CONFIG_BASE_SMALL=0 126CONFIG_BASE_SMALL=0
129CONFIG_MODULES=y 127CONFIG_MODULES=y
130# CONFIG_MODULE_FORCE_LOAD is not set 128# CONFIG_MODULE_FORCE_LOAD is not set
@@ -132,11 +130,9 @@ CONFIG_MODULE_UNLOAD=y
132# CONFIG_MODULE_FORCE_UNLOAD is not set 130# CONFIG_MODULE_FORCE_UNLOAD is not set
133# CONFIG_MODVERSIONS is not set 131# CONFIG_MODVERSIONS is not set
134# CONFIG_MODULE_SRCVERSION_ALL is not set 132# CONFIG_MODULE_SRCVERSION_ALL is not set
135CONFIG_KMOD=y
136CONFIG_BLOCK=y 133CONFIG_BLOCK=y
137# CONFIG_LBD is not set 134# CONFIG_LBD is not set
138# CONFIG_BLK_DEV_IO_TRACE is not set 135# CONFIG_BLK_DEV_IO_TRACE is not set
139# CONFIG_LSF is not set
140# CONFIG_BLK_DEV_BSG is not set 136# CONFIG_BLK_DEV_BSG is not set
141# CONFIG_BLK_DEV_INTEGRITY is not set 137# CONFIG_BLK_DEV_INTEGRITY is not set
142 138
@@ -153,6 +149,10 @@ CONFIG_DEFAULT_AS=y
153# CONFIG_DEFAULT_NOOP is not set 149# CONFIG_DEFAULT_NOOP is not set
154CONFIG_DEFAULT_IOSCHED="anticipatory" 150CONFIG_DEFAULT_IOSCHED="anticipatory"
155CONFIG_CLASSIC_RCU=y 151CONFIG_CLASSIC_RCU=y
152# CONFIG_TREE_RCU is not set
153# CONFIG_PREEMPT_RCU is not set
154# CONFIG_TREE_RCU_TRACE is not set
155# CONFIG_PREEMPT_RCU_TRACE is not set
156# CONFIG_FREEZER is not set 156# CONFIG_FREEZER is not set
157 157
158# 158#
@@ -199,6 +199,8 @@ CONFIG_IPIC=y
199# CONFIG_QUICC_ENGINE is not set 199# CONFIG_QUICC_ENGINE is not set
200# CONFIG_FSL_ULI1575 is not set 200# CONFIG_FSL_ULI1575 is not set
201# CONFIG_MPC8xxx_GPIO is not set 201# CONFIG_MPC8xxx_GPIO is not set
202# CONFIG_SIMPLE_GPIO is not set
203# CONFIG_MCU_MPC8349EMITX is not set
202 204
203# 205#
204# Kernel options 206# Kernel options
@@ -225,6 +227,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
225CONFIG_ARCH_HAS_WALK_MEMORY=y 227CONFIG_ARCH_HAS_WALK_MEMORY=y
226CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 228CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
227# CONFIG_KEXEC is not set 229# CONFIG_KEXEC is not set
230# CONFIG_CRASH_DUMP is not set
228CONFIG_ARCH_FLATMEM_ENABLE=y 231CONFIG_ARCH_FLATMEM_ENABLE=y
229CONFIG_ARCH_POPULATES_NODE_MAP=y 232CONFIG_ARCH_POPULATES_NODE_MAP=y
230CONFIG_SELECT_MEMORY_MODEL=y 233CONFIG_SELECT_MEMORY_MODEL=y
@@ -236,12 +239,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
236CONFIG_PAGEFLAGS_EXTENDED=y 239CONFIG_PAGEFLAGS_EXTENDED=y
237CONFIG_SPLIT_PTLOCK_CPUS=4 240CONFIG_SPLIT_PTLOCK_CPUS=4
238CONFIG_MIGRATION=y 241CONFIG_MIGRATION=y
239# CONFIG_RESOURCES_64BIT is not set
240# CONFIG_PHYS_ADDR_T_64BIT is not set 242# CONFIG_PHYS_ADDR_T_64BIT is not set
241CONFIG_ZONE_DMA_FLAG=1 243CONFIG_ZONE_DMA_FLAG=1
242CONFIG_BOUNCE=y 244CONFIG_BOUNCE=y
243CONFIG_VIRT_TO_BUS=y 245CONFIG_VIRT_TO_BUS=y
244CONFIG_UNEVICTABLE_LRU=y 246CONFIG_UNEVICTABLE_LRU=y
247CONFIG_PPC_4K_PAGES=y
248# CONFIG_PPC_16K_PAGES is not set
249# CONFIG_PPC_64K_PAGES is not set
245CONFIG_FORCE_MAX_ZONEORDER=11 250CONFIG_FORCE_MAX_ZONEORDER=11
246CONFIG_PROC_DEVICETREE=y 251CONFIG_PROC_DEVICETREE=y
247# CONFIG_CMDLINE_BOOL is not set 252# CONFIG_CMDLINE_BOOL is not set
@@ -266,6 +271,7 @@ CONFIG_PCI_SYSCALL=y
266CONFIG_ARCH_SUPPORTS_MSI=y 271CONFIG_ARCH_SUPPORTS_MSI=y
267# CONFIG_PCI_MSI is not set 272# CONFIG_PCI_MSI is not set
268# CONFIG_PCI_LEGACY is not set 273# CONFIG_PCI_LEGACY is not set
274# CONFIG_PCI_STUB is not set
269# CONFIG_PCCARD is not set 275# CONFIG_PCCARD is not set
270# CONFIG_HOTPLUG_PCI is not set 276# CONFIG_HOTPLUG_PCI is not set
271# CONFIG_HAS_RAPIDIO is not set 277# CONFIG_HAS_RAPIDIO is not set
@@ -288,6 +294,7 @@ CONFIG_NET=y
288# 294#
289# Networking options 295# Networking options
290# 296#
297CONFIG_COMPAT_NET_DEV_OPS=y
291CONFIG_PACKET=y 298CONFIG_PACKET=y
292# CONFIG_PACKET_MMAP is not set 299# CONFIG_PACKET_MMAP is not set
293CONFIG_UNIX=y 300CONFIG_UNIX=y
@@ -339,6 +346,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
339# CONFIG_ECONET is not set 346# CONFIG_ECONET is not set
340# CONFIG_WAN_ROUTER is not set 347# CONFIG_WAN_ROUTER is not set
341# CONFIG_NET_SCHED is not set 348# CONFIG_NET_SCHED is not set
349# CONFIG_DCB is not set
342 350
343# 351#
344# Network testing 352# Network testing
@@ -354,8 +362,9 @@ CONFIG_WIRELESS=y
354# CONFIG_CFG80211 is not set 362# CONFIG_CFG80211 is not set
355CONFIG_WIRELESS_OLD_REGULATORY=y 363CONFIG_WIRELESS_OLD_REGULATORY=y
356# CONFIG_WIRELESS_EXT is not set 364# CONFIG_WIRELESS_EXT is not set
365# CONFIG_LIB80211 is not set
357# CONFIG_MAC80211 is not set 366# CONFIG_MAC80211 is not set
358# CONFIG_IEEE80211 is not set 367# CONFIG_WIMAX is not set
359# CONFIG_RFKILL is not set 368# CONFIG_RFKILL is not set
360# CONFIG_NET_9P is not set 369# CONFIG_NET_9P is not set
361 370
@@ -400,8 +409,10 @@ CONFIG_MISC_DEVICES=y
400# CONFIG_EEPROM_93CX6 is not set 409# CONFIG_EEPROM_93CX6 is not set
401# CONFIG_SGI_IOC4 is not set 410# CONFIG_SGI_IOC4 is not set
402# CONFIG_TIFM_CORE is not set 411# CONFIG_TIFM_CORE is not set
412# CONFIG_ICS932S401 is not set
403# CONFIG_ENCLOSURE_SERVICES is not set 413# CONFIG_ENCLOSURE_SERVICES is not set
404# CONFIG_HP_ILO is not set 414# CONFIG_HP_ILO is not set
415# CONFIG_C2PORT is not set
405CONFIG_HAVE_IDE=y 416CONFIG_HAVE_IDE=y
406# CONFIG_IDE is not set 417# CONFIG_IDE is not set
407 418
@@ -460,6 +471,8 @@ CONFIG_SCSI_LOWLEVEL=y
460# CONFIG_MEGARAID_SAS is not set 471# CONFIG_MEGARAID_SAS is not set
461# CONFIG_SCSI_HPTIOP is not set 472# CONFIG_SCSI_HPTIOP is not set
462# CONFIG_SCSI_BUSLOGIC is not set 473# CONFIG_SCSI_BUSLOGIC is not set
474# CONFIG_LIBFC is not set
475# CONFIG_FCOE is not set
463# CONFIG_SCSI_DMX3191D is not set 476# CONFIG_SCSI_DMX3191D is not set
464# CONFIG_SCSI_EATA is not set 477# CONFIG_SCSI_EATA is not set
465# CONFIG_SCSI_FUTURE_DOMAIN is not set 478# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -590,6 +603,9 @@ CONFIG_MARVELL_PHY=y
590# CONFIG_BROADCOM_PHY is not set 603# CONFIG_BROADCOM_PHY is not set
591# CONFIG_ICPLUS_PHY is not set 604# CONFIG_ICPLUS_PHY is not set
592# CONFIG_REALTEK_PHY is not set 605# CONFIG_REALTEK_PHY is not set
606# CONFIG_NATIONAL_PHY is not set
607# CONFIG_STE10XP is not set
608# CONFIG_LSI_ET1011C_PHY is not set
593CONFIG_FIXED_PHY=y 609CONFIG_FIXED_PHY=y
594# CONFIG_MDIO_BITBANG is not set 610# CONFIG_MDIO_BITBANG is not set
595CONFIG_NET_ETHERNET=y 611CONFIG_NET_ETHERNET=y
@@ -644,6 +660,10 @@ CONFIG_GIANFAR=y
644# CONFIG_IWLWIFI_LEDS is not set 660# CONFIG_IWLWIFI_LEDS is not set
645 661
646# 662#
663# Enable WiMAX (Networking options) to see the WiMAX drivers
664#
665
666#
647# USB Network Adapters 667# USB Network Adapters
648# 668#
649# CONFIG_USB_CATC is not set 669# CONFIG_USB_CATC is not set
@@ -721,8 +741,10 @@ CONFIG_SERIAL_CORE_CONSOLE=y
721# CONFIG_SERIAL_JSM is not set 741# CONFIG_SERIAL_JSM is not set
722# CONFIG_SERIAL_OF_PLATFORM is not set 742# CONFIG_SERIAL_OF_PLATFORM is not set
723CONFIG_UNIX98_PTYS=y 743CONFIG_UNIX98_PTYS=y
744# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
724CONFIG_LEGACY_PTYS=y 745CONFIG_LEGACY_PTYS=y
725CONFIG_LEGACY_PTY_COUNT=256 746CONFIG_LEGACY_PTY_COUNT=256
747# CONFIG_HVC_UDBG is not set
726# CONFIG_IPMI_HANDLER is not set 748# CONFIG_IPMI_HANDLER is not set
727# CONFIG_HW_RANDOM is not set 749# CONFIG_HW_RANDOM is not set
728# CONFIG_NVRAM is not set 750# CONFIG_NVRAM is not set
@@ -797,7 +819,6 @@ CONFIG_I2C_MPC=y
797# CONFIG_SENSORS_PCF8591 is not set 819# CONFIG_SENSORS_PCF8591 is not set
798# CONFIG_SENSORS_MAX6875 is not set 820# CONFIG_SENSORS_MAX6875 is not set
799# CONFIG_SENSORS_TSL2550 is not set 821# CONFIG_SENSORS_TSL2550 is not set
800# CONFIG_MCU_MPC8349EMITX is not set
801# CONFIG_I2C_DEBUG_CORE is not set 822# CONFIG_I2C_DEBUG_CORE is not set
802# CONFIG_I2C_DEBUG_ALGO is not set 823# CONFIG_I2C_DEBUG_ALGO is not set
803# CONFIG_I2C_DEBUG_BUS is not set 824# CONFIG_I2C_DEBUG_BUS is not set
@@ -817,8 +838,10 @@ CONFIG_HWMON=y
817# CONFIG_SENSORS_ADM1029 is not set 838# CONFIG_SENSORS_ADM1029 is not set
818# CONFIG_SENSORS_ADM1031 is not set 839# CONFIG_SENSORS_ADM1031 is not set
819# CONFIG_SENSORS_ADM9240 is not set 840# CONFIG_SENSORS_ADM9240 is not set
841# CONFIG_SENSORS_ADT7462 is not set
820# CONFIG_SENSORS_ADT7470 is not set 842# CONFIG_SENSORS_ADT7470 is not set
821# CONFIG_SENSORS_ADT7473 is not set 843# CONFIG_SENSORS_ADT7473 is not set
844# CONFIG_SENSORS_ADT7475 is not set
822# CONFIG_SENSORS_ATXP1 is not set 845# CONFIG_SENSORS_ATXP1 is not set
823# CONFIG_SENSORS_DS1621 is not set 846# CONFIG_SENSORS_DS1621 is not set
824# CONFIG_SENSORS_I5K_AMB is not set 847# CONFIG_SENSORS_I5K_AMB is not set
@@ -839,6 +862,7 @@ CONFIG_HWMON=y
839# CONFIG_SENSORS_LM90 is not set 862# CONFIG_SENSORS_LM90 is not set
840# CONFIG_SENSORS_LM92 is not set 863# CONFIG_SENSORS_LM92 is not set
841# CONFIG_SENSORS_LM93 is not set 864# CONFIG_SENSORS_LM93 is not set
865# CONFIG_SENSORS_LTC4245 is not set
842# CONFIG_SENSORS_MAX1619 is not set 866# CONFIG_SENSORS_MAX1619 is not set
843# CONFIG_SENSORS_MAX6650 is not set 867# CONFIG_SENSORS_MAX6650 is not set
844# CONFIG_SENSORS_PC87360 is not set 868# CONFIG_SENSORS_PC87360 is not set
@@ -884,11 +908,11 @@ CONFIG_WATCHDOG=y
884# USB-based Watchdog Cards 908# USB-based Watchdog Cards
885# 909#
886# CONFIG_USBPCWATCHDOG is not set 910# CONFIG_USBPCWATCHDOG is not set
911CONFIG_SSB_POSSIBLE=y
887 912
888# 913#
889# Sonics Silicon Backplane 914# Sonics Silicon Backplane
890# 915#
891CONFIG_SSB_POSSIBLE=y
892# CONFIG_SSB is not set 916# CONFIG_SSB is not set
893 917
894# 918#
@@ -897,18 +921,13 @@ CONFIG_SSB_POSSIBLE=y
897# CONFIG_MFD_CORE is not set 921# CONFIG_MFD_CORE is not set
898# CONFIG_MFD_SM501 is not set 922# CONFIG_MFD_SM501 is not set
899# CONFIG_HTC_PASIC3 is not set 923# CONFIG_HTC_PASIC3 is not set
924# CONFIG_TWL4030_CORE is not set
900# CONFIG_MFD_TMIO is not set 925# CONFIG_MFD_TMIO is not set
901# CONFIG_PMIC_DA903X is not set 926# CONFIG_PMIC_DA903X is not set
902# CONFIG_MFD_WM8400 is not set 927# CONFIG_MFD_WM8400 is not set
903# CONFIG_MFD_WM8350_I2C is not set 928# CONFIG_MFD_WM8350_I2C is not set
904 929# CONFIG_MFD_PCF50633 is not set
905#
906# Voltage and Current regulators
907#
908# CONFIG_REGULATOR is not set 930# CONFIG_REGULATOR is not set
909# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
910# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
911# CONFIG_REGULATOR_BQ24022 is not set
912 931
913# 932#
914# Multimedia devices 933# Multimedia devices
@@ -961,11 +980,9 @@ CONFIG_HID_COMPAT=y
961CONFIG_HID_A4TECH=y 980CONFIG_HID_A4TECH=y
962CONFIG_HID_APPLE=y 981CONFIG_HID_APPLE=y
963CONFIG_HID_BELKIN=y 982CONFIG_HID_BELKIN=y
964CONFIG_HID_BRIGHT=y
965CONFIG_HID_CHERRY=y 983CONFIG_HID_CHERRY=y
966CONFIG_HID_CHICONY=y 984CONFIG_HID_CHICONY=y
967CONFIG_HID_CYPRESS=y 985CONFIG_HID_CYPRESS=y
968CONFIG_HID_DELL=y
969CONFIG_HID_EZKEY=y 986CONFIG_HID_EZKEY=y
970CONFIG_HID_GYRATION=y 987CONFIG_HID_GYRATION=y
971CONFIG_HID_LOGITECH=y 988CONFIG_HID_LOGITECH=y
@@ -973,12 +990,15 @@ CONFIG_HID_LOGITECH=y
973# CONFIG_LOGIRUMBLEPAD2_FF is not set 990# CONFIG_LOGIRUMBLEPAD2_FF is not set
974CONFIG_HID_MICROSOFT=y 991CONFIG_HID_MICROSOFT=y
975CONFIG_HID_MONTEREY=y 992CONFIG_HID_MONTEREY=y
993# CONFIG_HID_NTRIG is not set
976CONFIG_HID_PANTHERLORD=y 994CONFIG_HID_PANTHERLORD=y
977# CONFIG_PANTHERLORD_FF is not set 995# CONFIG_PANTHERLORD_FF is not set
978CONFIG_HID_PETALYNX=y 996CONFIG_HID_PETALYNX=y
979CONFIG_HID_SAMSUNG=y 997CONFIG_HID_SAMSUNG=y
980CONFIG_HID_SONY=y 998CONFIG_HID_SONY=y
981CONFIG_HID_SUNPLUS=y 999CONFIG_HID_SUNPLUS=y
1000# CONFIG_GREENASIA_FF is not set
1001# CONFIG_HID_TOPSEED is not set
982CONFIG_THRUSTMASTER_FF=m 1002CONFIG_THRUSTMASTER_FF=m
983CONFIG_ZEROPLUS_FF=m 1003CONFIG_ZEROPLUS_FF=m
984CONFIG_USB_SUPPORT=y 1004CONFIG_USB_SUPPORT=y
@@ -1011,6 +1031,7 @@ CONFIG_USB_EHCI_ROOT_HUB_TT=y
1011# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1031# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1012CONFIG_USB_EHCI_FSL=y 1032CONFIG_USB_EHCI_FSL=y
1013CONFIG_USB_EHCI_HCD_PPC_OF=y 1033CONFIG_USB_EHCI_HCD_PPC_OF=y
1034# CONFIG_USB_OXU210HP_HCD is not set
1014# CONFIG_USB_ISP116X_HCD is not set 1035# CONFIG_USB_ISP116X_HCD is not set
1015# CONFIG_USB_ISP1760_HCD is not set 1036# CONFIG_USB_ISP1760_HCD is not set
1016# CONFIG_USB_OHCI_HCD is not set 1037# CONFIG_USB_OHCI_HCD is not set
@@ -1029,11 +1050,11 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y
1029# CONFIG_USB_TMC is not set 1050# CONFIG_USB_TMC is not set
1030 1051
1031# 1052#
1032# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1053# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
1033# 1054#
1034 1055
1035# 1056#
1036# may also be needed; see USB_STORAGE Help for more information 1057# see USB_STORAGE Help for more information
1037# 1058#
1038# CONFIG_USB_STORAGE is not set 1059# CONFIG_USB_STORAGE is not set
1039# CONFIG_USB_LIBUSUAL is not set 1060# CONFIG_USB_LIBUSUAL is not set
@@ -1074,6 +1095,10 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y
1074# CONFIG_USB_ISIGHTFW is not set 1095# CONFIG_USB_ISIGHTFW is not set
1075# CONFIG_USB_VST is not set 1096# CONFIG_USB_VST is not set
1076# CONFIG_USB_GADGET is not set 1097# CONFIG_USB_GADGET is not set
1098
1099#
1100# OTG and related infrastructure
1101#
1077# CONFIG_UWB is not set 1102# CONFIG_UWB is not set
1078# CONFIG_MMC is not set 1103# CONFIG_MMC is not set
1079# CONFIG_MEMSTICK is not set 1104# CONFIG_MEMSTICK is not set
@@ -1105,6 +1130,7 @@ CONFIG_FS_MBCACHE=y
1105CONFIG_FILE_LOCKING=y 1130CONFIG_FILE_LOCKING=y
1106# CONFIG_XFS_FS is not set 1131# CONFIG_XFS_FS is not set
1107# CONFIG_OCFS2_FS is not set 1132# CONFIG_OCFS2_FS is not set
1133# CONFIG_BTRFS_FS is not set
1108CONFIG_DNOTIFY=y 1134CONFIG_DNOTIFY=y
1109CONFIG_INOTIFY=y 1135CONFIG_INOTIFY=y
1110CONFIG_INOTIFY_USER=y 1136CONFIG_INOTIFY_USER=y
@@ -1138,10 +1164,7 @@ CONFIG_TMPFS=y
1138# CONFIG_TMPFS_POSIX_ACL is not set 1164# CONFIG_TMPFS_POSIX_ACL is not set
1139# CONFIG_HUGETLB_PAGE is not set 1165# CONFIG_HUGETLB_PAGE is not set
1140# CONFIG_CONFIGFS_FS is not set 1166# CONFIG_CONFIGFS_FS is not set
1141 1167CONFIG_MISC_FILESYSTEMS=y
1142#
1143# Miscellaneous filesystems
1144#
1145# CONFIG_ADFS_FS is not set 1168# CONFIG_ADFS_FS is not set
1146# CONFIG_AFFS_FS is not set 1169# CONFIG_AFFS_FS is not set
1147# CONFIG_HFS_FS is not set 1170# CONFIG_HFS_FS is not set
@@ -1150,6 +1173,7 @@ CONFIG_TMPFS=y
1150# CONFIG_BFS_FS is not set 1173# CONFIG_BFS_FS is not set
1151# CONFIG_EFS_FS is not set 1174# CONFIG_EFS_FS is not set
1152# CONFIG_CRAMFS is not set 1175# CONFIG_CRAMFS is not set
1176# CONFIG_SQUASHFS is not set
1153# CONFIG_VXFS_FS is not set 1177# CONFIG_VXFS_FS is not set
1154# CONFIG_MINIX_FS is not set 1178# CONFIG_MINIX_FS is not set
1155# CONFIG_OMFS_FS is not set 1179# CONFIG_OMFS_FS is not set
@@ -1207,6 +1231,7 @@ CONFIG_MSDOS_PARTITION=y
1207# Library routines 1231# Library routines
1208# 1232#
1209CONFIG_BITREVERSE=y 1233CONFIG_BITREVERSE=y
1234CONFIG_GENERIC_FIND_LAST_BIT=y
1210# CONFIG_CRC_CCITT is not set 1235# CONFIG_CRC_CCITT is not set
1211# CONFIG_CRC16 is not set 1236# CONFIG_CRC16 is not set
1212CONFIG_CRC_T10DIF=y 1237CONFIG_CRC_T10DIF=y
@@ -1238,6 +1263,8 @@ CONFIG_FRAME_WARN=1024
1238# CONFIG_LATENCYTOP is not set 1263# CONFIG_LATENCYTOP is not set
1239CONFIG_SYSCTL_SYSCALL_CHECK=y 1264CONFIG_SYSCTL_SYSCALL_CHECK=y
1240CONFIG_HAVE_FUNCTION_TRACER=y 1265CONFIG_HAVE_FUNCTION_TRACER=y
1266CONFIG_HAVE_DYNAMIC_FTRACE=y
1267CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1241 1268
1242# 1269#
1243# Tracers 1270# Tracers
@@ -1245,6 +1272,7 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1245# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1272# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1246# CONFIG_SAMPLES is not set 1273# CONFIG_SAMPLES is not set
1247CONFIG_HAVE_ARCH_KGDB=y 1274CONFIG_HAVE_ARCH_KGDB=y
1275CONFIG_PRINT_STACK_DEPTH=64
1248# CONFIG_IRQSTACKS is not set 1276# CONFIG_IRQSTACKS is not set
1249# CONFIG_BOOTX_TEXT is not set 1277# CONFIG_BOOTX_TEXT is not set
1250# CONFIG_PPC_EARLY_DEBUG is not set 1278# CONFIG_PPC_EARLY_DEBUG is not set
@@ -1267,11 +1295,15 @@ CONFIG_CRYPTO=y
1267# 1295#
1268# CONFIG_CRYPTO_FIPS is not set 1296# CONFIG_CRYPTO_FIPS is not set
1269CONFIG_CRYPTO_ALGAPI=y 1297CONFIG_CRYPTO_ALGAPI=y
1270CONFIG_CRYPTO_AEAD=y 1298CONFIG_CRYPTO_ALGAPI2=y
1299CONFIG_CRYPTO_AEAD2=y
1271CONFIG_CRYPTO_BLKCIPHER=y 1300CONFIG_CRYPTO_BLKCIPHER=y
1301CONFIG_CRYPTO_BLKCIPHER2=y
1272CONFIG_CRYPTO_HASH=y 1302CONFIG_CRYPTO_HASH=y
1273CONFIG_CRYPTO_RNG=y 1303CONFIG_CRYPTO_HASH2=y
1304CONFIG_CRYPTO_RNG2=y
1274CONFIG_CRYPTO_MANAGER=y 1305CONFIG_CRYPTO_MANAGER=y
1306CONFIG_CRYPTO_MANAGER2=y
1275# CONFIG_CRYPTO_GF128MUL is not set 1307# CONFIG_CRYPTO_GF128MUL is not set
1276# CONFIG_CRYPTO_NULL is not set 1308# CONFIG_CRYPTO_NULL is not set
1277# CONFIG_CRYPTO_CRYPTD is not set 1309# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/83xx/sbc834x_defconfig b/arch/powerpc/configs/83xx/sbc834x_defconfig
index 8d2d7eeab5f..b6448c6a587 100644
--- a/arch/powerpc/configs/83xx/sbc834x_defconfig
+++ b/arch/powerpc/configs/83xx/sbc834x_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc3 3# Linux kernel version: 2.6.29-rc2
4# Sat Nov 8 12:40:02 2008 4# Mon Jan 26 15:36:02 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -44,7 +44,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
44CONFIG_PPC=y 44CONFIG_PPC=y
45CONFIG_EARLY_PRINTK=y 45CONFIG_EARLY_PRINTK=y
46CONFIG_GENERIC_NVRAM=y 46CONFIG_GENERIC_NVRAM=y
47CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 47CONFIG_SCHED_OMIT_FRAME_POINTER=y
48CONFIG_ARCH_MAY_HAVE_PC_FDC=y 48CONFIG_ARCH_MAY_HAVE_PC_FDC=y
49CONFIG_PPC_OF=y 49CONFIG_PPC_OF=y
50CONFIG_OF=y 50CONFIG_OF=y
@@ -75,12 +75,12 @@ CONFIG_SYSVIPC_SYSCTL=y
75# CONFIG_AUDIT is not set 75# CONFIG_AUDIT is not set
76# CONFIG_IKCONFIG is not set 76# CONFIG_IKCONFIG is not set
77CONFIG_LOG_BUF_SHIFT=14 77CONFIG_LOG_BUF_SHIFT=14
78# CONFIG_CGROUPS is not set
79CONFIG_GROUP_SCHED=y 78CONFIG_GROUP_SCHED=y
80CONFIG_FAIR_GROUP_SCHED=y 79CONFIG_FAIR_GROUP_SCHED=y
81# CONFIG_RT_GROUP_SCHED is not set 80# CONFIG_RT_GROUP_SCHED is not set
82CONFIG_USER_SCHED=y 81CONFIG_USER_SCHED=y
83# CONFIG_CGROUP_SCHED is not set 82# CONFIG_CGROUP_SCHED is not set
83# CONFIG_CGROUPS is not set
84CONFIG_SYSFS_DEPRECATED=y 84CONFIG_SYSFS_DEPRECATED=y
85CONFIG_SYSFS_DEPRECATED_V2=y 85CONFIG_SYSFS_DEPRECATED_V2=y
86# CONFIG_RELAY is not set 86# CONFIG_RELAY is not set
@@ -112,7 +112,6 @@ CONFIG_SLAB=y
112# CONFIG_SLUB is not set 112# CONFIG_SLUB is not set
113# CONFIG_SLOB is not set 113# CONFIG_SLOB is not set
114# CONFIG_PROFILING is not set 114# CONFIG_PROFILING is not set
115# CONFIG_MARKERS is not set
116CONFIG_HAVE_OPROFILE=y 115CONFIG_HAVE_OPROFILE=y
117CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 116CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
118CONFIG_HAVE_IOREMAP_PROT=y 117CONFIG_HAVE_IOREMAP_PROT=y
@@ -122,7 +121,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
122# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 121# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
123CONFIG_SLABINFO=y 122CONFIG_SLABINFO=y
124CONFIG_RT_MUTEXES=y 123CONFIG_RT_MUTEXES=y
125# CONFIG_TINY_SHMEM is not set
126CONFIG_BASE_SMALL=0 124CONFIG_BASE_SMALL=0
127CONFIG_MODULES=y 125CONFIG_MODULES=y
128# CONFIG_MODULE_FORCE_LOAD is not set 126# CONFIG_MODULE_FORCE_LOAD is not set
@@ -130,11 +128,9 @@ CONFIG_MODULE_UNLOAD=y
130# CONFIG_MODULE_FORCE_UNLOAD is not set 128# CONFIG_MODULE_FORCE_UNLOAD is not set
131# CONFIG_MODVERSIONS is not set 129# CONFIG_MODVERSIONS is not set
132# CONFIG_MODULE_SRCVERSION_ALL is not set 130# CONFIG_MODULE_SRCVERSION_ALL is not set
133CONFIG_KMOD=y
134CONFIG_BLOCK=y 131CONFIG_BLOCK=y
135# CONFIG_LBD is not set 132# CONFIG_LBD is not set
136# CONFIG_BLK_DEV_IO_TRACE is not set 133# CONFIG_BLK_DEV_IO_TRACE is not set
137# CONFIG_LSF is not set
138# CONFIG_BLK_DEV_BSG is not set 134# CONFIG_BLK_DEV_BSG is not set
139# CONFIG_BLK_DEV_INTEGRITY is not set 135# CONFIG_BLK_DEV_INTEGRITY is not set
140 136
@@ -151,6 +147,10 @@ CONFIG_DEFAULT_AS=y
151# CONFIG_DEFAULT_NOOP is not set 147# CONFIG_DEFAULT_NOOP is not set
152CONFIG_DEFAULT_IOSCHED="anticipatory" 148CONFIG_DEFAULT_IOSCHED="anticipatory"
153CONFIG_CLASSIC_RCU=y 149CONFIG_CLASSIC_RCU=y
150# CONFIG_TREE_RCU is not set
151# CONFIG_PREEMPT_RCU is not set
152# CONFIG_TREE_RCU_TRACE is not set
153# CONFIG_PREEMPT_RCU_TRACE is not set
154# CONFIG_FREEZER is not set 154# CONFIG_FREEZER is not set
155 155
156# 156#
@@ -197,6 +197,8 @@ CONFIG_IPIC=y
197# CONFIG_QUICC_ENGINE is not set 197# CONFIG_QUICC_ENGINE is not set
198# CONFIG_FSL_ULI1575 is not set 198# CONFIG_FSL_ULI1575 is not set
199# CONFIG_MPC8xxx_GPIO is not set 199# CONFIG_MPC8xxx_GPIO is not set
200# CONFIG_SIMPLE_GPIO is not set
201# CONFIG_MCU_MPC8349EMITX is not set
200 202
201# 203#
202# Kernel options 204# Kernel options
@@ -223,6 +225,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
223CONFIG_ARCH_HAS_WALK_MEMORY=y 225CONFIG_ARCH_HAS_WALK_MEMORY=y
224CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 226CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
225# CONFIG_KEXEC is not set 227# CONFIG_KEXEC is not set
228# CONFIG_CRASH_DUMP is not set
226CONFIG_ARCH_FLATMEM_ENABLE=y 229CONFIG_ARCH_FLATMEM_ENABLE=y
227CONFIG_ARCH_POPULATES_NODE_MAP=y 230CONFIG_ARCH_POPULATES_NODE_MAP=y
228CONFIG_SELECT_MEMORY_MODEL=y 231CONFIG_SELECT_MEMORY_MODEL=y
@@ -234,12 +237,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
234CONFIG_PAGEFLAGS_EXTENDED=y 237CONFIG_PAGEFLAGS_EXTENDED=y
235CONFIG_SPLIT_PTLOCK_CPUS=4 238CONFIG_SPLIT_PTLOCK_CPUS=4
236CONFIG_MIGRATION=y 239CONFIG_MIGRATION=y
237# CONFIG_RESOURCES_64BIT is not set
238# CONFIG_PHYS_ADDR_T_64BIT is not set 240# CONFIG_PHYS_ADDR_T_64BIT is not set
239CONFIG_ZONE_DMA_FLAG=1 241CONFIG_ZONE_DMA_FLAG=1
240CONFIG_BOUNCE=y 242CONFIG_BOUNCE=y
241CONFIG_VIRT_TO_BUS=y 243CONFIG_VIRT_TO_BUS=y
242CONFIG_UNEVICTABLE_LRU=y 244CONFIG_UNEVICTABLE_LRU=y
245CONFIG_PPC_4K_PAGES=y
246# CONFIG_PPC_16K_PAGES is not set
247# CONFIG_PPC_64K_PAGES is not set
243CONFIG_FORCE_MAX_ZONEORDER=11 248CONFIG_FORCE_MAX_ZONEORDER=11
244CONFIG_PROC_DEVICETREE=y 249CONFIG_PROC_DEVICETREE=y
245# CONFIG_CMDLINE_BOOL is not set 250# CONFIG_CMDLINE_BOOL is not set
@@ -264,6 +269,7 @@ CONFIG_PCI_SYSCALL=y
264CONFIG_ARCH_SUPPORTS_MSI=y 269CONFIG_ARCH_SUPPORTS_MSI=y
265# CONFIG_PCI_MSI is not set 270# CONFIG_PCI_MSI is not set
266# CONFIG_PCI_LEGACY is not set 271# CONFIG_PCI_LEGACY is not set
272# CONFIG_PCI_STUB is not set
267# CONFIG_PCCARD is not set 273# CONFIG_PCCARD is not set
268# CONFIG_HOTPLUG_PCI is not set 274# CONFIG_HOTPLUG_PCI is not set
269# CONFIG_HAS_RAPIDIO is not set 275# CONFIG_HAS_RAPIDIO is not set
@@ -286,6 +292,7 @@ CONFIG_NET=y
286# 292#
287# Networking options 293# Networking options
288# 294#
295CONFIG_COMPAT_NET_DEV_OPS=y
289CONFIG_PACKET=y 296CONFIG_PACKET=y
290# CONFIG_PACKET_MMAP is not set 297# CONFIG_PACKET_MMAP is not set
291CONFIG_UNIX=y 298CONFIG_UNIX=y
@@ -342,6 +349,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
342# CONFIG_ECONET is not set 349# CONFIG_ECONET is not set
343# CONFIG_WAN_ROUTER is not set 350# CONFIG_WAN_ROUTER is not set
344# CONFIG_NET_SCHED is not set 351# CONFIG_NET_SCHED is not set
352# CONFIG_DCB is not set
345 353
346# 354#
347# Network testing 355# Network testing
@@ -357,8 +365,9 @@ CONFIG_WIRELESS=y
357# CONFIG_CFG80211 is not set 365# CONFIG_CFG80211 is not set
358CONFIG_WIRELESS_OLD_REGULATORY=y 366CONFIG_WIRELESS_OLD_REGULATORY=y
359# CONFIG_WIRELESS_EXT is not set 367# CONFIG_WIRELESS_EXT is not set
368# CONFIG_LIB80211 is not set
360# CONFIG_MAC80211 is not set 369# CONFIG_MAC80211 is not set
361# CONFIG_IEEE80211 is not set 370# CONFIG_WIMAX is not set
362# CONFIG_RFKILL is not set 371# CONFIG_RFKILL is not set
363# CONFIG_NET_9P is not set 372# CONFIG_NET_9P is not set
364 373
@@ -402,8 +411,10 @@ CONFIG_MISC_DEVICES=y
402# CONFIG_EEPROM_93CX6 is not set 411# CONFIG_EEPROM_93CX6 is not set
403# CONFIG_SGI_IOC4 is not set 412# CONFIG_SGI_IOC4 is not set
404# CONFIG_TIFM_CORE is not set 413# CONFIG_TIFM_CORE is not set
414# CONFIG_ICS932S401 is not set
405# CONFIG_ENCLOSURE_SERVICES is not set 415# CONFIG_ENCLOSURE_SERVICES is not set
406# CONFIG_HP_ILO is not set 416# CONFIG_HP_ILO is not set
417# CONFIG_C2PORT is not set
407CONFIG_HAVE_IDE=y 418CONFIG_HAVE_IDE=y
408# CONFIG_IDE is not set 419# CONFIG_IDE is not set
409 420
@@ -452,6 +463,9 @@ CONFIG_PHYLIB=y
452CONFIG_BROADCOM_PHY=y 463CONFIG_BROADCOM_PHY=y
453# CONFIG_ICPLUS_PHY is not set 464# CONFIG_ICPLUS_PHY is not set
454# CONFIG_REALTEK_PHY is not set 465# CONFIG_REALTEK_PHY is not set
466# CONFIG_NATIONAL_PHY is not set
467# CONFIG_STE10XP is not set
468# CONFIG_LSI_ET1011C_PHY is not set
455# CONFIG_FIXED_PHY is not set 469# CONFIG_FIXED_PHY is not set
456# CONFIG_MDIO_BITBANG is not set 470# CONFIG_MDIO_BITBANG is not set
457CONFIG_NET_ETHERNET=y 471CONFIG_NET_ETHERNET=y
@@ -504,6 +518,10 @@ CONFIG_GIANFAR=y
504# CONFIG_WLAN_PRE80211 is not set 518# CONFIG_WLAN_PRE80211 is not set
505# CONFIG_WLAN_80211 is not set 519# CONFIG_WLAN_80211 is not set
506# CONFIG_IWLWIFI_LEDS is not set 520# CONFIG_IWLWIFI_LEDS is not set
521
522#
523# Enable WiMAX (Networking options) to see the WiMAX drivers
524#
507# CONFIG_WAN is not set 525# CONFIG_WAN is not set
508# CONFIG_FDDI is not set 526# CONFIG_FDDI is not set
509# CONFIG_HIPPI is not set 527# CONFIG_HIPPI is not set
@@ -573,8 +591,10 @@ CONFIG_SERIAL_CORE_CONSOLE=y
573# CONFIG_SERIAL_JSM is not set 591# CONFIG_SERIAL_JSM is not set
574# CONFIG_SERIAL_OF_PLATFORM is not set 592# CONFIG_SERIAL_OF_PLATFORM is not set
575CONFIG_UNIX98_PTYS=y 593CONFIG_UNIX98_PTYS=y
594# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
576CONFIG_LEGACY_PTYS=y 595CONFIG_LEGACY_PTYS=y
577CONFIG_LEGACY_PTY_COUNT=256 596CONFIG_LEGACY_PTY_COUNT=256
597# CONFIG_HVC_UDBG is not set
578# CONFIG_IPMI_HANDLER is not set 598# CONFIG_IPMI_HANDLER is not set
579# CONFIG_HW_RANDOM is not set 599# CONFIG_HW_RANDOM is not set
580# CONFIG_NVRAM is not set 600# CONFIG_NVRAM is not set
@@ -648,7 +668,6 @@ CONFIG_I2C_MPC=y
648# CONFIG_SENSORS_PCF8591 is not set 668# CONFIG_SENSORS_PCF8591 is not set
649# CONFIG_SENSORS_MAX6875 is not set 669# CONFIG_SENSORS_MAX6875 is not set
650# CONFIG_SENSORS_TSL2550 is not set 670# CONFIG_SENSORS_TSL2550 is not set
651# CONFIG_MCU_MPC8349EMITX is not set
652# CONFIG_I2C_DEBUG_CORE is not set 671# CONFIG_I2C_DEBUG_CORE is not set
653# CONFIG_I2C_DEBUG_ALGO is not set 672# CONFIG_I2C_DEBUG_ALGO is not set
654# CONFIG_I2C_DEBUG_BUS is not set 673# CONFIG_I2C_DEBUG_BUS is not set
@@ -668,8 +687,10 @@ CONFIG_HWMON=y
668# CONFIG_SENSORS_ADM1029 is not set 687# CONFIG_SENSORS_ADM1029 is not set
669# CONFIG_SENSORS_ADM1031 is not set 688# CONFIG_SENSORS_ADM1031 is not set
670# CONFIG_SENSORS_ADM9240 is not set 689# CONFIG_SENSORS_ADM9240 is not set
690# CONFIG_SENSORS_ADT7462 is not set
671# CONFIG_SENSORS_ADT7470 is not set 691# CONFIG_SENSORS_ADT7470 is not set
672# CONFIG_SENSORS_ADT7473 is not set 692# CONFIG_SENSORS_ADT7473 is not set
693# CONFIG_SENSORS_ADT7475 is not set
673# CONFIG_SENSORS_ATXP1 is not set 694# CONFIG_SENSORS_ATXP1 is not set
674# CONFIG_SENSORS_DS1621 is not set 695# CONFIG_SENSORS_DS1621 is not set
675# CONFIG_SENSORS_I5K_AMB is not set 696# CONFIG_SENSORS_I5K_AMB is not set
@@ -690,6 +711,7 @@ CONFIG_HWMON=y
690# CONFIG_SENSORS_LM90 is not set 711# CONFIG_SENSORS_LM90 is not set
691# CONFIG_SENSORS_LM92 is not set 712# CONFIG_SENSORS_LM92 is not set
692# CONFIG_SENSORS_LM93 is not set 713# CONFIG_SENSORS_LM93 is not set
714# CONFIG_SENSORS_LTC4245 is not set
693# CONFIG_SENSORS_MAX1619 is not set 715# CONFIG_SENSORS_MAX1619 is not set
694# CONFIG_SENSORS_MAX6650 is not set 716# CONFIG_SENSORS_MAX6650 is not set
695# CONFIG_SENSORS_PC87360 is not set 717# CONFIG_SENSORS_PC87360 is not set
@@ -730,11 +752,11 @@ CONFIG_WATCHDOG=y
730# 752#
731# CONFIG_PCIPCWATCHDOG is not set 753# CONFIG_PCIPCWATCHDOG is not set
732# CONFIG_WDTPCI is not set 754# CONFIG_WDTPCI is not set
755CONFIG_SSB_POSSIBLE=y
733 756
734# 757#
735# Sonics Silicon Backplane 758# Sonics Silicon Backplane
736# 759#
737CONFIG_SSB_POSSIBLE=y
738# CONFIG_SSB is not set 760# CONFIG_SSB is not set
739 761
740# 762#
@@ -743,18 +765,13 @@ CONFIG_SSB_POSSIBLE=y
743# CONFIG_MFD_CORE is not set 765# CONFIG_MFD_CORE is not set
744# CONFIG_MFD_SM501 is not set 766# CONFIG_MFD_SM501 is not set
745# CONFIG_HTC_PASIC3 is not set 767# CONFIG_HTC_PASIC3 is not set
768# CONFIG_TWL4030_CORE is not set
746# CONFIG_MFD_TMIO is not set 769# CONFIG_MFD_TMIO is not set
747# CONFIG_PMIC_DA903X is not set 770# CONFIG_PMIC_DA903X is not set
748# CONFIG_MFD_WM8400 is not set 771# CONFIG_MFD_WM8400 is not set
749# CONFIG_MFD_WM8350_I2C is not set 772# CONFIG_MFD_WM8350_I2C is not set
750 773# CONFIG_MFD_PCF50633 is not set
751#
752# Voltage and Current regulators
753#
754# CONFIG_REGULATOR is not set 774# CONFIG_REGULATOR is not set
755# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
756# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
757# CONFIG_REGULATOR_BQ24022 is not set
758 775
759# 776#
760# Multimedia devices 777# Multimedia devices
@@ -822,6 +839,7 @@ CONFIG_HID_COMPAT=y
822CONFIG_FILE_LOCKING=y 839CONFIG_FILE_LOCKING=y
823# CONFIG_XFS_FS is not set 840# CONFIG_XFS_FS is not set
824# CONFIG_OCFS2_FS is not set 841# CONFIG_OCFS2_FS is not set
842# CONFIG_BTRFS_FS is not set
825CONFIG_DNOTIFY=y 843CONFIG_DNOTIFY=y
826CONFIG_INOTIFY=y 844CONFIG_INOTIFY=y
827CONFIG_INOTIFY_USER=y 845CONFIG_INOTIFY_USER=y
@@ -855,10 +873,7 @@ CONFIG_TMPFS=y
855# CONFIG_TMPFS_POSIX_ACL is not set 873# CONFIG_TMPFS_POSIX_ACL is not set
856# CONFIG_HUGETLB_PAGE is not set 874# CONFIG_HUGETLB_PAGE is not set
857# CONFIG_CONFIGFS_FS is not set 875# CONFIG_CONFIGFS_FS is not set
858 876CONFIG_MISC_FILESYSTEMS=y
859#
860# Miscellaneous filesystems
861#
862# CONFIG_ADFS_FS is not set 877# CONFIG_ADFS_FS is not set
863# CONFIG_AFFS_FS is not set 878# CONFIG_AFFS_FS is not set
864# CONFIG_HFS_FS is not set 879# CONFIG_HFS_FS is not set
@@ -867,6 +882,7 @@ CONFIG_TMPFS=y
867# CONFIG_BFS_FS is not set 882# CONFIG_BFS_FS is not set
868# CONFIG_EFS_FS is not set 883# CONFIG_EFS_FS is not set
869# CONFIG_CRAMFS is not set 884# CONFIG_CRAMFS is not set
885# CONFIG_SQUASHFS is not set
870# CONFIG_VXFS_FS is not set 886# CONFIG_VXFS_FS is not set
871# CONFIG_MINIX_FS is not set 887# CONFIG_MINIX_FS is not set
872# CONFIG_OMFS_FS is not set 888# CONFIG_OMFS_FS is not set
@@ -908,6 +924,7 @@ CONFIG_MSDOS_PARTITION=y
908# Library routines 924# Library routines
909# 925#
910CONFIG_BITREVERSE=y 926CONFIG_BITREVERSE=y
927CONFIG_GENERIC_FIND_LAST_BIT=y
911# CONFIG_CRC_CCITT is not set 928# CONFIG_CRC_CCITT is not set
912# CONFIG_CRC16 is not set 929# CONFIG_CRC16 is not set
913# CONFIG_CRC_T10DIF is not set 930# CONFIG_CRC_T10DIF is not set
@@ -939,6 +956,8 @@ CONFIG_FRAME_WARN=1024
939# CONFIG_LATENCYTOP is not set 956# CONFIG_LATENCYTOP is not set
940CONFIG_SYSCTL_SYSCALL_CHECK=y 957CONFIG_SYSCTL_SYSCALL_CHECK=y
941CONFIG_HAVE_FUNCTION_TRACER=y 958CONFIG_HAVE_FUNCTION_TRACER=y
959CONFIG_HAVE_DYNAMIC_FTRACE=y
960CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
942 961
943# 962#
944# Tracers 963# Tracers
@@ -946,6 +965,7 @@ CONFIG_HAVE_FUNCTION_TRACER=y
946# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 965# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
947# CONFIG_SAMPLES is not set 966# CONFIG_SAMPLES is not set
948CONFIG_HAVE_ARCH_KGDB=y 967CONFIG_HAVE_ARCH_KGDB=y
968CONFIG_PRINT_STACK_DEPTH=64
949# CONFIG_IRQSTACKS is not set 969# CONFIG_IRQSTACKS is not set
950# CONFIG_BOOTX_TEXT is not set 970# CONFIG_BOOTX_TEXT is not set
951# CONFIG_PPC_EARLY_DEBUG is not set 971# CONFIG_PPC_EARLY_DEBUG is not set
@@ -964,11 +984,15 @@ CONFIG_CRYPTO=y
964# 984#
965# CONFIG_CRYPTO_FIPS is not set 985# CONFIG_CRYPTO_FIPS is not set
966CONFIG_CRYPTO_ALGAPI=y 986CONFIG_CRYPTO_ALGAPI=y
967CONFIG_CRYPTO_AEAD=y 987CONFIG_CRYPTO_ALGAPI2=y
988CONFIG_CRYPTO_AEAD2=y
968CONFIG_CRYPTO_BLKCIPHER=y 989CONFIG_CRYPTO_BLKCIPHER=y
990CONFIG_CRYPTO_BLKCIPHER2=y
969CONFIG_CRYPTO_HASH=y 991CONFIG_CRYPTO_HASH=y
970CONFIG_CRYPTO_RNG=y 992CONFIG_CRYPTO_HASH2=y
993CONFIG_CRYPTO_RNG2=y
971CONFIG_CRYPTO_MANAGER=y 994CONFIG_CRYPTO_MANAGER=y
995CONFIG_CRYPTO_MANAGER2=y
972# CONFIG_CRYPTO_GF128MUL is not set 996# CONFIG_CRYPTO_GF128MUL is not set
973# CONFIG_CRYPTO_NULL is not set 997# CONFIG_CRYPTO_NULL is not set
974# CONFIG_CRYPTO_CRYPTD is not set 998# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/mpc83xx_defconfig b/arch/powerpc/configs/mpc83xx_defconfig
index d582014b0a3..7352afd8f40 100644
--- a/arch/powerpc/configs/mpc83xx_defconfig
+++ b/arch/powerpc/configs/mpc83xx_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc3 3# Linux kernel version: 2.6.29-rc2
4# Sat Nov 8 12:39:42 2008 4# Mon Jan 26 15:35:36 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -45,7 +45,7 @@ CONFIG_GENERIC_GPIO=y
45CONFIG_PPC=y 45CONFIG_PPC=y
46CONFIG_EARLY_PRINTK=y 46CONFIG_EARLY_PRINTK=y
47CONFIG_GENERIC_NVRAM=y 47CONFIG_GENERIC_NVRAM=y
48CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 48CONFIG_SCHED_OMIT_FRAME_POINTER=y
49CONFIG_ARCH_MAY_HAVE_PC_FDC=y 49CONFIG_ARCH_MAY_HAVE_PC_FDC=y
50CONFIG_PPC_OF=y 50CONFIG_PPC_OF=y
51CONFIG_OF=y 51CONFIG_OF=y
@@ -77,12 +77,12 @@ CONFIG_SYSVIPC_SYSCTL=y
77# CONFIG_AUDIT is not set 77# CONFIG_AUDIT is not set
78# CONFIG_IKCONFIG is not set 78# CONFIG_IKCONFIG is not set
79CONFIG_LOG_BUF_SHIFT=14 79CONFIG_LOG_BUF_SHIFT=14
80# CONFIG_CGROUPS is not set
81CONFIG_GROUP_SCHED=y 80CONFIG_GROUP_SCHED=y
82CONFIG_FAIR_GROUP_SCHED=y 81CONFIG_FAIR_GROUP_SCHED=y
83# CONFIG_RT_GROUP_SCHED is not set 82# CONFIG_RT_GROUP_SCHED is not set
84CONFIG_USER_SCHED=y 83CONFIG_USER_SCHED=y
85# CONFIG_CGROUP_SCHED is not set 84# CONFIG_CGROUP_SCHED is not set
85# CONFIG_CGROUPS is not set
86CONFIG_SYSFS_DEPRECATED=y 86CONFIG_SYSFS_DEPRECATED=y
87CONFIG_SYSFS_DEPRECATED_V2=y 87CONFIG_SYSFS_DEPRECATED_V2=y
88# CONFIG_RELAY is not set 88# CONFIG_RELAY is not set
@@ -115,7 +115,6 @@ CONFIG_SLAB=y
115# CONFIG_SLUB is not set 115# CONFIG_SLUB is not set
116# CONFIG_SLOB is not set 116# CONFIG_SLOB is not set
117# CONFIG_PROFILING is not set 117# CONFIG_PROFILING is not set
118# CONFIG_MARKERS is not set
119CONFIG_HAVE_OPROFILE=y 118CONFIG_HAVE_OPROFILE=y
120# CONFIG_KPROBES is not set 119# CONFIG_KPROBES is not set
121CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 120CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -126,7 +125,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
126# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 125# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
127CONFIG_SLABINFO=y 126CONFIG_SLABINFO=y
128CONFIG_RT_MUTEXES=y 127CONFIG_RT_MUTEXES=y
129# CONFIG_TINY_SHMEM is not set
130CONFIG_BASE_SMALL=0 128CONFIG_BASE_SMALL=0
131CONFIG_MODULES=y 129CONFIG_MODULES=y
132# CONFIG_MODULE_FORCE_LOAD is not set 130# CONFIG_MODULE_FORCE_LOAD is not set
@@ -134,11 +132,9 @@ CONFIG_MODULE_UNLOAD=y
134# CONFIG_MODULE_FORCE_UNLOAD is not set 132# CONFIG_MODULE_FORCE_UNLOAD is not set
135# CONFIG_MODVERSIONS is not set 133# CONFIG_MODVERSIONS is not set
136# CONFIG_MODULE_SRCVERSION_ALL is not set 134# CONFIG_MODULE_SRCVERSION_ALL is not set
137CONFIG_KMOD=y
138CONFIG_BLOCK=y 135CONFIG_BLOCK=y
139# CONFIG_LBD is not set 136# CONFIG_LBD is not set
140# CONFIG_BLK_DEV_IO_TRACE is not set 137# CONFIG_BLK_DEV_IO_TRACE is not set
141# CONFIG_LSF is not set
142# CONFIG_BLK_DEV_BSG is not set 138# CONFIG_BLK_DEV_BSG is not set
143# CONFIG_BLK_DEV_INTEGRITY is not set 139# CONFIG_BLK_DEV_INTEGRITY is not set
144 140
@@ -155,6 +151,10 @@ CONFIG_DEFAULT_AS=y
155# CONFIG_DEFAULT_NOOP is not set 151# CONFIG_DEFAULT_NOOP is not set
156CONFIG_DEFAULT_IOSCHED="anticipatory" 152CONFIG_DEFAULT_IOSCHED="anticipatory"
157CONFIG_CLASSIC_RCU=y 153CONFIG_CLASSIC_RCU=y
154# CONFIG_TREE_RCU is not set
155# CONFIG_PREEMPT_RCU is not set
156# CONFIG_TREE_RCU_TRACE is not set
157# CONFIG_PREEMPT_RCU_TRACE is not set
158# CONFIG_FREEZER is not set 158# CONFIG_FREEZER is not set
159 159
160# 160#
@@ -205,6 +205,8 @@ CONFIG_QUICC_ENGINE=y
205CONFIG_QE_GPIO=y 205CONFIG_QE_GPIO=y
206# CONFIG_FSL_ULI1575 is not set 206# CONFIG_FSL_ULI1575 is not set
207# CONFIG_MPC8xxx_GPIO is not set 207# CONFIG_MPC8xxx_GPIO is not set
208# CONFIG_SIMPLE_GPIO is not set
209# CONFIG_MCU_MPC8349EMITX is not set
208 210
209# 211#
210# Kernel options 212# Kernel options
@@ -232,6 +234,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
232CONFIG_ARCH_HAS_WALK_MEMORY=y 234CONFIG_ARCH_HAS_WALK_MEMORY=y
233CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 235CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
234# CONFIG_KEXEC is not set 236# CONFIG_KEXEC is not set
237# CONFIG_CRASH_DUMP is not set
235CONFIG_ARCH_FLATMEM_ENABLE=y 238CONFIG_ARCH_FLATMEM_ENABLE=y
236CONFIG_ARCH_POPULATES_NODE_MAP=y 239CONFIG_ARCH_POPULATES_NODE_MAP=y
237CONFIG_SELECT_MEMORY_MODEL=y 240CONFIG_SELECT_MEMORY_MODEL=y
@@ -243,12 +246,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
243CONFIG_PAGEFLAGS_EXTENDED=y 246CONFIG_PAGEFLAGS_EXTENDED=y
244CONFIG_SPLIT_PTLOCK_CPUS=4 247CONFIG_SPLIT_PTLOCK_CPUS=4
245CONFIG_MIGRATION=y 248CONFIG_MIGRATION=y
246# CONFIG_RESOURCES_64BIT is not set
247# CONFIG_PHYS_ADDR_T_64BIT is not set 249# CONFIG_PHYS_ADDR_T_64BIT is not set
248CONFIG_ZONE_DMA_FLAG=1 250CONFIG_ZONE_DMA_FLAG=1
249CONFIG_BOUNCE=y 251CONFIG_BOUNCE=y
250CONFIG_VIRT_TO_BUS=y 252CONFIG_VIRT_TO_BUS=y
251CONFIG_UNEVICTABLE_LRU=y 253CONFIG_UNEVICTABLE_LRU=y
254CONFIG_PPC_4K_PAGES=y
255# CONFIG_PPC_16K_PAGES is not set
256# CONFIG_PPC_64K_PAGES is not set
252CONFIG_FORCE_MAX_ZONEORDER=11 257CONFIG_FORCE_MAX_ZONEORDER=11
253CONFIG_PROC_DEVICETREE=y 258CONFIG_PROC_DEVICETREE=y
254# CONFIG_CMDLINE_BOOL is not set 259# CONFIG_CMDLINE_BOOL is not set
@@ -275,6 +280,7 @@ CONFIG_PCI_SYSCALL=y
275CONFIG_ARCH_SUPPORTS_MSI=y 280CONFIG_ARCH_SUPPORTS_MSI=y
276# CONFIG_PCI_MSI is not set 281# CONFIG_PCI_MSI is not set
277# CONFIG_PCI_LEGACY is not set 282# CONFIG_PCI_LEGACY is not set
283# CONFIG_PCI_STUB is not set
278# CONFIG_PCCARD is not set 284# CONFIG_PCCARD is not set
279# CONFIG_HOTPLUG_PCI is not set 285# CONFIG_HOTPLUG_PCI is not set
280# CONFIG_HAS_RAPIDIO is not set 286# CONFIG_HAS_RAPIDIO is not set
@@ -297,6 +303,7 @@ CONFIG_NET=y
297# 303#
298# Networking options 304# Networking options
299# 305#
306CONFIG_COMPAT_NET_DEV_OPS=y
300CONFIG_PACKET=y 307CONFIG_PACKET=y
301# CONFIG_PACKET_MMAP is not set 308# CONFIG_PACKET_MMAP is not set
302CONFIG_UNIX=y 309CONFIG_UNIX=y
@@ -353,6 +360,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
353# CONFIG_ECONET is not set 360# CONFIG_ECONET is not set
354# CONFIG_WAN_ROUTER is not set 361# CONFIG_WAN_ROUTER is not set
355# CONFIG_NET_SCHED is not set 362# CONFIG_NET_SCHED is not set
363# CONFIG_DCB is not set
356 364
357# 365#
358# Network testing 366# Network testing
@@ -368,8 +376,9 @@ CONFIG_WIRELESS=y
368# CONFIG_CFG80211 is not set 376# CONFIG_CFG80211 is not set
369CONFIG_WIRELESS_OLD_REGULATORY=y 377CONFIG_WIRELESS_OLD_REGULATORY=y
370# CONFIG_WIRELESS_EXT is not set 378# CONFIG_WIRELESS_EXT is not set
379# CONFIG_LIB80211 is not set
371# CONFIG_MAC80211 is not set 380# CONFIG_MAC80211 is not set
372# CONFIG_IEEE80211 is not set 381# CONFIG_WIMAX is not set
373# CONFIG_RFKILL is not set 382# CONFIG_RFKILL is not set
374# CONFIG_NET_9P is not set 383# CONFIG_NET_9P is not set
375 384
@@ -390,6 +399,7 @@ CONFIG_MTD=y
390# CONFIG_MTD_DEBUG is not set 399# CONFIG_MTD_DEBUG is not set
391# CONFIG_MTD_CONCAT is not set 400# CONFIG_MTD_CONCAT is not set
392CONFIG_MTD_PARTITIONS=y 401CONFIG_MTD_PARTITIONS=y
402# CONFIG_MTD_TESTS is not set
393# CONFIG_MTD_REDBOOT_PARTS is not set 403# CONFIG_MTD_REDBOOT_PARTS is not set
394# CONFIG_MTD_CMDLINE_PARTS is not set 404# CONFIG_MTD_CMDLINE_PARTS is not set
395CONFIG_MTD_OF_PARTS=y 405CONFIG_MTD_OF_PARTS=y
@@ -472,6 +482,12 @@ CONFIG_MTD_NAND_FSL_ELBC=y
472# CONFIG_MTD_ONENAND is not set 482# CONFIG_MTD_ONENAND is not set
473 483
474# 484#
485# LPDDR flash memory drivers
486#
487# CONFIG_MTD_LPDDR is not set
488# CONFIG_MTD_QINFO_PROBE is not set
489
490#
475# UBI - Unsorted block images 491# UBI - Unsorted block images
476# 492#
477# CONFIG_MTD_UBI is not set 493# CONFIG_MTD_UBI is not set
@@ -503,8 +519,10 @@ CONFIG_MISC_DEVICES=y
503# CONFIG_EEPROM_93CX6 is not set 519# CONFIG_EEPROM_93CX6 is not set
504# CONFIG_SGI_IOC4 is not set 520# CONFIG_SGI_IOC4 is not set
505# CONFIG_TIFM_CORE is not set 521# CONFIG_TIFM_CORE is not set
522# CONFIG_ICS932S401 is not set
506# CONFIG_ENCLOSURE_SERVICES is not set 523# CONFIG_ENCLOSURE_SERVICES is not set
507# CONFIG_HP_ILO is not set 524# CONFIG_HP_ILO is not set
525# CONFIG_C2PORT is not set
508CONFIG_HAVE_IDE=y 526CONFIG_HAVE_IDE=y
509# CONFIG_IDE is not set 527# CONFIG_IDE is not set
510 528
@@ -547,6 +565,7 @@ CONFIG_SCSI_WAIT_SCAN=m
547# CONFIG_SCSI_SRP_ATTRS is not set 565# CONFIG_SCSI_SRP_ATTRS is not set
548CONFIG_SCSI_LOWLEVEL=y 566CONFIG_SCSI_LOWLEVEL=y
549# CONFIG_ISCSI_TCP is not set 567# CONFIG_ISCSI_TCP is not set
568# CONFIG_SCSI_CXGB3_ISCSI is not set
550# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 569# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
551# CONFIG_SCSI_3W_9XXX is not set 570# CONFIG_SCSI_3W_9XXX is not set
552# CONFIG_SCSI_ACARD is not set 571# CONFIG_SCSI_ACARD is not set
@@ -563,6 +582,8 @@ CONFIG_SCSI_LOWLEVEL=y
563# CONFIG_MEGARAID_SAS is not set 582# CONFIG_MEGARAID_SAS is not set
564# CONFIG_SCSI_HPTIOP is not set 583# CONFIG_SCSI_HPTIOP is not set
565# CONFIG_SCSI_BUSLOGIC is not set 584# CONFIG_SCSI_BUSLOGIC is not set
585# CONFIG_LIBFC is not set
586# CONFIG_FCOE is not set
566# CONFIG_SCSI_DMX3191D is not set 587# CONFIG_SCSI_DMX3191D is not set
567# CONFIG_SCSI_EATA is not set 588# CONFIG_SCSI_EATA is not set
568# CONFIG_SCSI_FUTURE_DOMAIN is not set 589# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -682,6 +703,9 @@ CONFIG_VITESSE_PHY=y
682# CONFIG_BROADCOM_PHY is not set 703# CONFIG_BROADCOM_PHY is not set
683CONFIG_ICPLUS_PHY=y 704CONFIG_ICPLUS_PHY=y
684# CONFIG_REALTEK_PHY is not set 705# CONFIG_REALTEK_PHY is not set
706# CONFIG_NATIONAL_PHY is not set
707# CONFIG_STE10XP is not set
708# CONFIG_LSI_ET1011C_PHY is not set
685CONFIG_FIXED_PHY=y 709CONFIG_FIXED_PHY=y
686# CONFIG_MDIO_BITBANG is not set 710# CONFIG_MDIO_BITBANG is not set
687CONFIG_NET_ETHERNET=y 711CONFIG_NET_ETHERNET=y
@@ -722,7 +746,6 @@ CONFIG_NETDEV_1000=y
722CONFIG_GIANFAR=y 746CONFIG_GIANFAR=y
723CONFIG_UCC_GETH=y 747CONFIG_UCC_GETH=y
724# CONFIG_UGETH_MAGIC_PACKET is not set 748# CONFIG_UGETH_MAGIC_PACKET is not set
725# CONFIG_UGETH_FILTERING is not set
726# CONFIG_UGETH_TX_ON_DEMAND is not set 749# CONFIG_UGETH_TX_ON_DEMAND is not set
727# CONFIG_MV643XX_ETH is not set 750# CONFIG_MV643XX_ETH is not set
728# CONFIG_QLA3XXX is not set 751# CONFIG_QLA3XXX is not set
@@ -731,6 +754,7 @@ CONFIG_UCC_GETH=y
731# CONFIG_JME is not set 754# CONFIG_JME is not set
732CONFIG_NETDEV_10000=y 755CONFIG_NETDEV_10000=y
733# CONFIG_CHELSIO_T1 is not set 756# CONFIG_CHELSIO_T1 is not set
757CONFIG_CHELSIO_T3_DEPENDS=y
734# CONFIG_CHELSIO_T3 is not set 758# CONFIG_CHELSIO_T3 is not set
735# CONFIG_ENIC is not set 759# CONFIG_ENIC is not set
736# CONFIG_IXGBE is not set 760# CONFIG_IXGBE is not set
@@ -755,6 +779,10 @@ CONFIG_NETDEV_10000=y
755# CONFIG_IWLWIFI_LEDS is not set 779# CONFIG_IWLWIFI_LEDS is not set
756 780
757# 781#
782# Enable WiMAX (Networking options) to see the WiMAX drivers
783#
784
785#
758# USB Network Adapters 786# USB Network Adapters
759# 787#
760# CONFIG_USB_CATC is not set 788# CONFIG_USB_CATC is not set
@@ -833,8 +861,10 @@ CONFIG_SERIAL_CORE_CONSOLE=y
833# CONFIG_SERIAL_OF_PLATFORM is not set 861# CONFIG_SERIAL_OF_PLATFORM is not set
834# CONFIG_SERIAL_QE is not set 862# CONFIG_SERIAL_QE is not set
835CONFIG_UNIX98_PTYS=y 863CONFIG_UNIX98_PTYS=y
864# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
836CONFIG_LEGACY_PTYS=y 865CONFIG_LEGACY_PTYS=y
837CONFIG_LEGACY_PTY_COUNT=256 866CONFIG_LEGACY_PTY_COUNT=256
867# CONFIG_HVC_UDBG is not set
838# CONFIG_IPMI_HANDLER is not set 868# CONFIG_IPMI_HANDLER is not set
839CONFIG_HW_RANDOM=y 869CONFIG_HW_RANDOM=y
840# CONFIG_NVRAM is not set 870# CONFIG_NVRAM is not set
@@ -908,10 +938,8 @@ CONFIG_I2C_MPC=y
908# CONFIG_PCF8575 is not set 938# CONFIG_PCF8575 is not set
909# CONFIG_SENSORS_PCA9539 is not set 939# CONFIG_SENSORS_PCA9539 is not set
910# CONFIG_SENSORS_PCF8591 is not set 940# CONFIG_SENSORS_PCF8591 is not set
911# CONFIG_TPS65010 is not set
912# CONFIG_SENSORS_MAX6875 is not set 941# CONFIG_SENSORS_MAX6875 is not set
913# CONFIG_SENSORS_TSL2550 is not set 942# CONFIG_SENSORS_TSL2550 is not set
914# CONFIG_MCU_MPC8349EMITX is not set
915# CONFIG_I2C_DEBUG_CORE is not set 943# CONFIG_I2C_DEBUG_CORE is not set
916# CONFIG_I2C_DEBUG_ALGO is not set 944# CONFIG_I2C_DEBUG_ALGO is not set
917# CONFIG_I2C_DEBUG_BUS is not set 945# CONFIG_I2C_DEBUG_BUS is not set
@@ -923,6 +951,11 @@ CONFIG_GPIOLIB=y
923# CONFIG_GPIO_SYSFS is not set 951# CONFIG_GPIO_SYSFS is not set
924 952
925# 953#
954# Memory mapped GPIO expanders:
955#
956# CONFIG_GPIO_XILINX is not set
957
958#
926# I2C GPIO expanders: 959# I2C GPIO expanders:
927# 960#
928# CONFIG_GPIO_MAX732X is not set 961# CONFIG_GPIO_MAX732X is not set
@@ -949,8 +982,10 @@ CONFIG_HWMON=y
949# CONFIG_SENSORS_ADM1029 is not set 982# CONFIG_SENSORS_ADM1029 is not set
950# CONFIG_SENSORS_ADM1031 is not set 983# CONFIG_SENSORS_ADM1031 is not set
951# CONFIG_SENSORS_ADM9240 is not set 984# CONFIG_SENSORS_ADM9240 is not set
985# CONFIG_SENSORS_ADT7462 is not set
952# CONFIG_SENSORS_ADT7470 is not set 986# CONFIG_SENSORS_ADT7470 is not set
953# CONFIG_SENSORS_ADT7473 is not set 987# CONFIG_SENSORS_ADT7473 is not set
988# CONFIG_SENSORS_ADT7475 is not set
954# CONFIG_SENSORS_ATXP1 is not set 989# CONFIG_SENSORS_ATXP1 is not set
955# CONFIG_SENSORS_DS1621 is not set 990# CONFIG_SENSORS_DS1621 is not set
956# CONFIG_SENSORS_I5K_AMB is not set 991# CONFIG_SENSORS_I5K_AMB is not set
@@ -971,6 +1006,7 @@ CONFIG_HWMON=y
971# CONFIG_SENSORS_LM90 is not set 1006# CONFIG_SENSORS_LM90 is not set
972# CONFIG_SENSORS_LM92 is not set 1007# CONFIG_SENSORS_LM92 is not set
973# CONFIG_SENSORS_LM93 is not set 1008# CONFIG_SENSORS_LM93 is not set
1009# CONFIG_SENSORS_LTC4245 is not set
974# CONFIG_SENSORS_MAX1619 is not set 1010# CONFIG_SENSORS_MAX1619 is not set
975# CONFIG_SENSORS_MAX6650 is not set 1011# CONFIG_SENSORS_MAX6650 is not set
976# CONFIG_SENSORS_PC87360 is not set 1012# CONFIG_SENSORS_PC87360 is not set
@@ -1016,11 +1052,11 @@ CONFIG_WATCHDOG=y
1016# USB-based Watchdog Cards 1052# USB-based Watchdog Cards
1017# 1053#
1018# CONFIG_USBPCWATCHDOG is not set 1054# CONFIG_USBPCWATCHDOG is not set
1055CONFIG_SSB_POSSIBLE=y
1019 1056
1020# 1057#
1021# Sonics Silicon Backplane 1058# Sonics Silicon Backplane
1022# 1059#
1023CONFIG_SSB_POSSIBLE=y
1024# CONFIG_SSB is not set 1060# CONFIG_SSB is not set
1025 1061
1026# 1062#
@@ -1029,18 +1065,14 @@ CONFIG_SSB_POSSIBLE=y
1029# CONFIG_MFD_CORE is not set 1065# CONFIG_MFD_CORE is not set
1030# CONFIG_MFD_SM501 is not set 1066# CONFIG_MFD_SM501 is not set
1031# CONFIG_HTC_PASIC3 is not set 1067# CONFIG_HTC_PASIC3 is not set
1068# CONFIG_TPS65010 is not set
1069# CONFIG_TWL4030_CORE is not set
1032# CONFIG_MFD_TMIO is not set 1070# CONFIG_MFD_TMIO is not set
1033# CONFIG_PMIC_DA903X is not set 1071# CONFIG_PMIC_DA903X is not set
1034# CONFIG_MFD_WM8400 is not set 1072# CONFIG_MFD_WM8400 is not set
1035# CONFIG_MFD_WM8350_I2C is not set 1073# CONFIG_MFD_WM8350_I2C is not set
1036 1074# CONFIG_MFD_PCF50633 is not set
1037#
1038# Voltage and Current regulators
1039#
1040# CONFIG_REGULATOR is not set 1075# CONFIG_REGULATOR is not set
1041# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
1042# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
1043# CONFIG_REGULATOR_BQ24022 is not set
1044 1076
1045# 1077#
1046# Multimedia devices 1078# Multimedia devices
@@ -1093,11 +1125,9 @@ CONFIG_HID_COMPAT=y
1093CONFIG_HID_A4TECH=y 1125CONFIG_HID_A4TECH=y
1094CONFIG_HID_APPLE=y 1126CONFIG_HID_APPLE=y
1095CONFIG_HID_BELKIN=y 1127CONFIG_HID_BELKIN=y
1096CONFIG_HID_BRIGHT=y
1097CONFIG_HID_CHERRY=y 1128CONFIG_HID_CHERRY=y
1098CONFIG_HID_CHICONY=y 1129CONFIG_HID_CHICONY=y
1099CONFIG_HID_CYPRESS=y 1130CONFIG_HID_CYPRESS=y
1100CONFIG_HID_DELL=y
1101CONFIG_HID_EZKEY=y 1131CONFIG_HID_EZKEY=y
1102CONFIG_HID_GYRATION=y 1132CONFIG_HID_GYRATION=y
1103CONFIG_HID_LOGITECH=y 1133CONFIG_HID_LOGITECH=y
@@ -1105,12 +1135,15 @@ CONFIG_HID_LOGITECH=y
1105# CONFIG_LOGIRUMBLEPAD2_FF is not set 1135# CONFIG_LOGIRUMBLEPAD2_FF is not set
1106CONFIG_HID_MICROSOFT=y 1136CONFIG_HID_MICROSOFT=y
1107CONFIG_HID_MONTEREY=y 1137CONFIG_HID_MONTEREY=y
1138# CONFIG_HID_NTRIG is not set
1108CONFIG_HID_PANTHERLORD=y 1139CONFIG_HID_PANTHERLORD=y
1109# CONFIG_PANTHERLORD_FF is not set 1140# CONFIG_PANTHERLORD_FF is not set
1110CONFIG_HID_PETALYNX=y 1141CONFIG_HID_PETALYNX=y
1111CONFIG_HID_SAMSUNG=y 1142CONFIG_HID_SAMSUNG=y
1112CONFIG_HID_SONY=y 1143CONFIG_HID_SONY=y
1113CONFIG_HID_SUNPLUS=y 1144CONFIG_HID_SUNPLUS=y
1145# CONFIG_GREENASIA_FF is not set
1146# CONFIG_HID_TOPSEED is not set
1114CONFIG_THRUSTMASTER_FF=m 1147CONFIG_THRUSTMASTER_FF=m
1115CONFIG_ZEROPLUS_FF=m 1148CONFIG_ZEROPLUS_FF=m
1116CONFIG_USB_SUPPORT=y 1149CONFIG_USB_SUPPORT=y
@@ -1143,6 +1176,7 @@ CONFIG_USB_EHCI_ROOT_HUB_TT=y
1143# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1176# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1144CONFIG_USB_EHCI_FSL=y 1177CONFIG_USB_EHCI_FSL=y
1145CONFIG_USB_EHCI_HCD_PPC_OF=y 1178CONFIG_USB_EHCI_HCD_PPC_OF=y
1179# CONFIG_USB_OXU210HP_HCD is not set
1146# CONFIG_USB_ISP116X_HCD is not set 1180# CONFIG_USB_ISP116X_HCD is not set
1147# CONFIG_USB_ISP1760_HCD is not set 1181# CONFIG_USB_ISP1760_HCD is not set
1148# CONFIG_USB_OHCI_HCD is not set 1182# CONFIG_USB_OHCI_HCD is not set
@@ -1161,11 +1195,11 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y
1161# CONFIG_USB_TMC is not set 1195# CONFIG_USB_TMC is not set
1162 1196
1163# 1197#
1164# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1198# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
1165# 1199#
1166 1200
1167# 1201#
1168# may also be needed; see USB_STORAGE Help for more information 1202# see USB_STORAGE Help for more information
1169# 1203#
1170# CONFIG_USB_STORAGE is not set 1204# CONFIG_USB_STORAGE is not set
1171# CONFIG_USB_LIBUSUAL is not set 1205# CONFIG_USB_LIBUSUAL is not set
@@ -1206,6 +1240,11 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y
1206# CONFIG_USB_ISIGHTFW is not set 1240# CONFIG_USB_ISIGHTFW is not set
1207# CONFIG_USB_VST is not set 1241# CONFIG_USB_VST is not set
1208# CONFIG_USB_GADGET is not set 1242# CONFIG_USB_GADGET is not set
1243
1244#
1245# OTG and related infrastructure
1246#
1247# CONFIG_USB_GPIO_VBUS is not set
1209# CONFIG_UWB is not set 1248# CONFIG_UWB is not set
1210# CONFIG_MMC is not set 1249# CONFIG_MMC is not set
1211# CONFIG_MEMSTICK is not set 1250# CONFIG_MEMSTICK is not set
@@ -1237,6 +1276,7 @@ CONFIG_FS_MBCACHE=y
1237CONFIG_FILE_LOCKING=y 1276CONFIG_FILE_LOCKING=y
1238# CONFIG_XFS_FS is not set 1277# CONFIG_XFS_FS is not set
1239# CONFIG_OCFS2_FS is not set 1278# CONFIG_OCFS2_FS is not set
1279# CONFIG_BTRFS_FS is not set
1240CONFIG_DNOTIFY=y 1280CONFIG_DNOTIFY=y
1241CONFIG_INOTIFY=y 1281CONFIG_INOTIFY=y
1242CONFIG_INOTIFY_USER=y 1282CONFIG_INOTIFY_USER=y
@@ -1270,10 +1310,7 @@ CONFIG_TMPFS=y
1270# CONFIG_TMPFS_POSIX_ACL is not set 1310# CONFIG_TMPFS_POSIX_ACL is not set
1271# CONFIG_HUGETLB_PAGE is not set 1311# CONFIG_HUGETLB_PAGE is not set
1272# CONFIG_CONFIGFS_FS is not set 1312# CONFIG_CONFIGFS_FS is not set
1273 1313CONFIG_MISC_FILESYSTEMS=y
1274#
1275# Miscellaneous filesystems
1276#
1277# CONFIG_ADFS_FS is not set 1314# CONFIG_ADFS_FS is not set
1278# CONFIG_AFFS_FS is not set 1315# CONFIG_AFFS_FS is not set
1279# CONFIG_HFS_FS is not set 1316# CONFIG_HFS_FS is not set
@@ -1283,6 +1320,7 @@ CONFIG_TMPFS=y
1283# CONFIG_EFS_FS is not set 1320# CONFIG_EFS_FS is not set
1284# CONFIG_JFFS2_FS is not set 1321# CONFIG_JFFS2_FS is not set
1285# CONFIG_CRAMFS is not set 1322# CONFIG_CRAMFS is not set
1323# CONFIG_SQUASHFS is not set
1286# CONFIG_VXFS_FS is not set 1324# CONFIG_VXFS_FS is not set
1287# CONFIG_MINIX_FS is not set 1325# CONFIG_MINIX_FS is not set
1288# CONFIG_OMFS_FS is not set 1326# CONFIG_OMFS_FS is not set
@@ -1342,6 +1380,7 @@ CONFIG_UCC=y
1342# Library routines 1380# Library routines
1343# 1381#
1344CONFIG_BITREVERSE=y 1382CONFIG_BITREVERSE=y
1383CONFIG_GENERIC_FIND_LAST_BIT=y
1345# CONFIG_CRC_CCITT is not set 1384# CONFIG_CRC_CCITT is not set
1346# CONFIG_CRC16 is not set 1385# CONFIG_CRC16 is not set
1347CONFIG_CRC_T10DIF=y 1386CONFIG_CRC_T10DIF=y
@@ -1373,6 +1412,8 @@ CONFIG_FRAME_WARN=1024
1373# CONFIG_LATENCYTOP is not set 1412# CONFIG_LATENCYTOP is not set
1374CONFIG_SYSCTL_SYSCALL_CHECK=y 1413CONFIG_SYSCTL_SYSCALL_CHECK=y
1375CONFIG_HAVE_FUNCTION_TRACER=y 1414CONFIG_HAVE_FUNCTION_TRACER=y
1415CONFIG_HAVE_DYNAMIC_FTRACE=y
1416CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1376 1417
1377# 1418#
1378# Tracers 1419# Tracers
@@ -1380,6 +1421,7 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1380# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1421# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1381# CONFIG_SAMPLES is not set 1422# CONFIG_SAMPLES is not set
1382CONFIG_HAVE_ARCH_KGDB=y 1423CONFIG_HAVE_ARCH_KGDB=y
1424CONFIG_PRINT_STACK_DEPTH=64
1383# CONFIG_IRQSTACKS is not set 1425# CONFIG_IRQSTACKS is not set
1384# CONFIG_BOOTX_TEXT is not set 1426# CONFIG_BOOTX_TEXT is not set
1385# CONFIG_PPC_EARLY_DEBUG is not set 1427# CONFIG_PPC_EARLY_DEBUG is not set
@@ -1398,11 +1440,16 @@ CONFIG_CRYPTO=y
1398# 1440#
1399# CONFIG_CRYPTO_FIPS is not set 1441# CONFIG_CRYPTO_FIPS is not set
1400CONFIG_CRYPTO_ALGAPI=y 1442CONFIG_CRYPTO_ALGAPI=y
1443CONFIG_CRYPTO_ALGAPI2=y
1401CONFIG_CRYPTO_AEAD=y 1444CONFIG_CRYPTO_AEAD=y
1445CONFIG_CRYPTO_AEAD2=y
1402CONFIG_CRYPTO_BLKCIPHER=y 1446CONFIG_CRYPTO_BLKCIPHER=y
1447CONFIG_CRYPTO_BLKCIPHER2=y
1403CONFIG_CRYPTO_HASH=y 1448CONFIG_CRYPTO_HASH=y
1404CONFIG_CRYPTO_RNG=y 1449CONFIG_CRYPTO_HASH2=y
1450CONFIG_CRYPTO_RNG2=y
1405CONFIG_CRYPTO_MANAGER=y 1451CONFIG_CRYPTO_MANAGER=y
1452CONFIG_CRYPTO_MANAGER2=y
1406# CONFIG_CRYPTO_GF128MUL is not set 1453# CONFIG_CRYPTO_GF128MUL is not set
1407# CONFIG_CRYPTO_NULL is not set 1454# CONFIG_CRYPTO_NULL is not set
1408# CONFIG_CRYPTO_CRYPTD is not set 1455# CONFIG_CRYPTO_CRYPTD is not set
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-22 01:48:15 -0400