aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/configs/44x
diff options
context:
space:
mode:
Diffstat (limited to 'arch/powerpc/configs/44x')
-rw-r--r--arch/powerpc/configs/44x/arches_defconfig51
-rw-r--r--arch/powerpc/configs/44x/bamboo_defconfig77
-rw-r--r--arch/powerpc/configs/44x/canyonlands_defconfig61
-rw-r--r--arch/powerpc/configs/44x/ebony_defconfig77
-rw-r--r--arch/powerpc/configs/44x/katmai_defconfig77
-rw-r--r--arch/powerpc/configs/44x/rainier_defconfig73
-rw-r--r--arch/powerpc/configs/44x/sam440ep_defconfig110
-rw-r--r--arch/powerpc/configs/44x/sequoia_defconfig78
-rw-r--r--arch/powerpc/configs/44x/taishan_defconfig77
-rw-r--r--arch/powerpc/configs/44x/warp_defconfig82
10 files changed, 533 insertions, 230 deletions
diff --git a/arch/powerpc/configs/44x/arches_defconfig b/arch/powerpc/configs/44x/arches_defconfig
index 70f46078eb6a..082158d591c5 100644
--- a/arch/powerpc/configs/44x/arches_defconfig
+++ b/arch/powerpc/configs/44x/arches_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.27-rc5 3# Linux kernel version: 2.6.28-rc2
4# Wed Oct 1 15:54:57 2008 4# Tue Oct 28 09:16:04 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -23,7 +23,7 @@ CONFIG_PHYS_64BIT=y
23CONFIG_NOT_COHERENT_CACHE=y 23CONFIG_NOT_COHERENT_CACHE=y
24CONFIG_PPC32=y 24CONFIG_PPC32=y
25CONFIG_WORD_SIZE=32 25CONFIG_WORD_SIZE=32
26CONFIG_PPC_MERGE=y 26CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
27CONFIG_MMU=y 27CONFIG_MMU=y
28CONFIG_GENERIC_CMOS_UPDATE=y 28CONFIG_GENERIC_CMOS_UPDATE=y
29CONFIG_GENERIC_TIME=y 29CONFIG_GENERIC_TIME=y
@@ -103,7 +103,9 @@ CONFIG_SIGNALFD=y
103CONFIG_TIMERFD=y 103CONFIG_TIMERFD=y
104CONFIG_EVENTFD=y 104CONFIG_EVENTFD=y
105CONFIG_SHMEM=y 105CONFIG_SHMEM=y
106CONFIG_AIO=y
106CONFIG_VM_EVENT_COUNTERS=y 107CONFIG_VM_EVENT_COUNTERS=y
108CONFIG_PCI_QUIRKS=y
107CONFIG_SLUB_DEBUG=y 109CONFIG_SLUB_DEBUG=y
108# CONFIG_SLAB is not set 110# CONFIG_SLAB is not set
109CONFIG_SLUB=y 111CONFIG_SLUB=y
@@ -117,10 +119,6 @@ CONFIG_HAVE_IOREMAP_PROT=y
117CONFIG_HAVE_KPROBES=y 119CONFIG_HAVE_KPROBES=y
118CONFIG_HAVE_KRETPROBES=y 120CONFIG_HAVE_KRETPROBES=y
119CONFIG_HAVE_ARCH_TRACEHOOK=y 121CONFIG_HAVE_ARCH_TRACEHOOK=y
120# CONFIG_HAVE_DMA_ATTRS is not set
121# CONFIG_USE_GENERIC_SMP_HELPERS is not set
122# CONFIG_HAVE_CLK is not set
123CONFIG_PROC_PAGE_MONITOR=y
124# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 122# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
125CONFIG_SLABINFO=y 123CONFIG_SLABINFO=y
126CONFIG_RT_MUTEXES=y 124CONFIG_RT_MUTEXES=y
@@ -153,6 +151,7 @@ CONFIG_DEFAULT_AS=y
153# CONFIG_DEFAULT_NOOP is not set 151# CONFIG_DEFAULT_NOOP is not set
154CONFIG_DEFAULT_IOSCHED="anticipatory" 152CONFIG_DEFAULT_IOSCHED="anticipatory"
155CONFIG_CLASSIC_RCU=y 153CONFIG_CLASSIC_RCU=y
154# CONFIG_FREEZER is not set
156CONFIG_PPC4xx_PCI_EXPRESS=y 155CONFIG_PPC4xx_PCI_EXPRESS=y
157 156
158# 157#
@@ -175,6 +174,7 @@ CONFIG_ARCHES=y
175# CONFIG_YOSEMITE is not set 174# CONFIG_YOSEMITE is not set
176# CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set 175# CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set
177CONFIG_PPC44x_SIMPLE=y 176CONFIG_PPC44x_SIMPLE=y
177# CONFIG_PPC4xx_GPIO is not set
178CONFIG_460EX=y 178CONFIG_460EX=y
179# CONFIG_IPIC is not set 179# CONFIG_IPIC is not set
180# CONFIG_MPIC is not set 180# CONFIG_MPIC is not set
@@ -207,6 +207,8 @@ CONFIG_PREEMPT_NONE=y
207# CONFIG_PREEMPT_VOLUNTARY is not set 207# CONFIG_PREEMPT_VOLUNTARY is not set
208# CONFIG_PREEMPT is not set 208# CONFIG_PREEMPT is not set
209CONFIG_BINFMT_ELF=y 209CONFIG_BINFMT_ELF=y
210# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
211# CONFIG_HAVE_AOUT is not set
210# CONFIG_BINFMT_MISC is not set 212# CONFIG_BINFMT_MISC is not set
211# CONFIG_MATH_EMULATION is not set 213# CONFIG_MATH_EMULATION is not set
212# CONFIG_IOMMU_HELPER is not set 214# CONFIG_IOMMU_HELPER is not set
@@ -221,15 +223,15 @@ CONFIG_FLATMEM_MANUAL=y
221# CONFIG_SPARSEMEM_MANUAL is not set 223# CONFIG_SPARSEMEM_MANUAL is not set
222CONFIG_FLATMEM=y 224CONFIG_FLATMEM=y
223CONFIG_FLAT_NODE_MEM_MAP=y 225CONFIG_FLAT_NODE_MEM_MAP=y
224# CONFIG_SPARSEMEM_STATIC is not set
225# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
226CONFIG_PAGEFLAGS_EXTENDED=y 226CONFIG_PAGEFLAGS_EXTENDED=y
227CONFIG_SPLIT_PTLOCK_CPUS=4 227CONFIG_SPLIT_PTLOCK_CPUS=4
228CONFIG_MIGRATION=y 228CONFIG_MIGRATION=y
229CONFIG_RESOURCES_64BIT=y 229CONFIG_RESOURCES_64BIT=y
230CONFIG_PHYS_ADDR_T_64BIT=y
230CONFIG_ZONE_DMA_FLAG=1 231CONFIG_ZONE_DMA_FLAG=1
231CONFIG_BOUNCE=y 232CONFIG_BOUNCE=y
232CONFIG_VIRT_TO_BUS=y 233CONFIG_VIRT_TO_BUS=y
234CONFIG_UNEVICTABLE_LRU=y
233CONFIG_FORCE_MAX_ZONEORDER=11 235CONFIG_FORCE_MAX_ZONEORDER=11
234CONFIG_PROC_DEVICETREE=y 236CONFIG_PROC_DEVICETREE=y
235CONFIG_CMDLINE_BOOL=y 237CONFIG_CMDLINE_BOOL=y
@@ -316,6 +318,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
316# CONFIG_TIPC is not set 318# CONFIG_TIPC is not set
317# CONFIG_ATM is not set 319# CONFIG_ATM is not set
318# CONFIG_BRIDGE is not set 320# CONFIG_BRIDGE is not set
321# CONFIG_NET_DSA is not set
319# CONFIG_VLAN_8021Q is not set 322# CONFIG_VLAN_8021Q is not set
320# CONFIG_DECNET is not set 323# CONFIG_DECNET is not set
321# CONFIG_LLC2 is not set 324# CONFIG_LLC2 is not set
@@ -336,14 +339,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
336# CONFIG_IRDA is not set 339# CONFIG_IRDA is not set
337# CONFIG_BT is not set 340# CONFIG_BT is not set
338# CONFIG_AF_RXRPC is not set 341# CONFIG_AF_RXRPC is not set
339 342# CONFIG_PHONET is not set
340# 343# CONFIG_WIRELESS is not set
341# Wireless
342#
343# CONFIG_CFG80211 is not set
344# CONFIG_WIRELESS_EXT is not set
345# CONFIG_MAC80211 is not set
346# CONFIG_IEEE80211 is not set
347# CONFIG_RFKILL is not set 344# CONFIG_RFKILL is not set
348# CONFIG_NET_9P is not set 345# CONFIG_NET_9P is not set
349 346
@@ -440,8 +437,12 @@ CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
440# CONFIG_IBM_NEW_EMAC_RGMII is not set 437# CONFIG_IBM_NEW_EMAC_RGMII is not set
441CONFIG_IBM_NEW_EMAC_TAH=y 438CONFIG_IBM_NEW_EMAC_TAH=y
442CONFIG_IBM_NEW_EMAC_EMAC4=y 439CONFIG_IBM_NEW_EMAC_EMAC4=y
440# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
441# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
442# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
443# CONFIG_NET_PCI is not set 443# CONFIG_NET_PCI is not set
444# CONFIG_B44 is not set 444# CONFIG_B44 is not set
445# CONFIG_ATL2 is not set
445# CONFIG_NETDEV_1000 is not set 446# CONFIG_NETDEV_1000 is not set
446# CONFIG_NETDEV_10000 is not set 447# CONFIG_NETDEV_10000 is not set
447# CONFIG_TR is not set 448# CONFIG_TR is not set
@@ -540,6 +541,7 @@ CONFIG_SSB_POSSIBLE=y
540# CONFIG_MFD_SM501 is not set 541# CONFIG_MFD_SM501 is not set
541# CONFIG_HTC_PASIC3 is not set 542# CONFIG_HTC_PASIC3 is not set
542# CONFIG_MFD_TMIO is not set 543# CONFIG_MFD_TMIO is not set
544# CONFIG_MFD_WM8400 is not set
543 545
544# 546#
545# Multimedia devices 547# Multimedia devices
@@ -573,6 +575,7 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m
573# CONFIG_DISPLAY_SUPPORT is not set 575# CONFIG_DISPLAY_SUPPORT is not set
574# CONFIG_SOUND is not set 576# CONFIG_SOUND is not set
575# CONFIG_USB_SUPPORT is not set 577# CONFIG_USB_SUPPORT is not set
578# CONFIG_UWB is not set
576# CONFIG_MMC is not set 579# CONFIG_MMC is not set
577# CONFIG_MEMSTICK is not set 580# CONFIG_MEMSTICK is not set
578# CONFIG_NEW_LEDS is not set 581# CONFIG_NEW_LEDS is not set
@@ -582,6 +585,7 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m
582# CONFIG_RTC_CLASS is not set 585# CONFIG_RTC_CLASS is not set
583# CONFIG_DMADEVICES is not set 586# CONFIG_DMADEVICES is not set
584# CONFIG_UIO is not set 587# CONFIG_UIO is not set
588# CONFIG_STAGING is not set
585 589
586# 590#
587# File systems 591# File systems
@@ -590,10 +594,11 @@ CONFIG_EXT2_FS=y
590# CONFIG_EXT2_FS_XATTR is not set 594# CONFIG_EXT2_FS_XATTR is not set
591# CONFIG_EXT2_FS_XIP is not set 595# CONFIG_EXT2_FS_XIP is not set
592# CONFIG_EXT3_FS is not set 596# CONFIG_EXT3_FS is not set
593# CONFIG_EXT4DEV_FS is not set 597# CONFIG_EXT4_FS is not set
594# CONFIG_REISERFS_FS is not set 598# CONFIG_REISERFS_FS is not set
595# CONFIG_JFS_FS is not set 599# CONFIG_JFS_FS is not set
596# CONFIG_FS_POSIX_ACL is not set 600# CONFIG_FS_POSIX_ACL is not set
601CONFIG_FILE_LOCKING=y
597# CONFIG_XFS_FS is not set 602# CONFIG_XFS_FS is not set
598# CONFIG_OCFS2_FS is not set 603# CONFIG_OCFS2_FS is not set
599CONFIG_DNOTIFY=y 604CONFIG_DNOTIFY=y
@@ -623,6 +628,7 @@ CONFIG_INOTIFY_USER=y
623CONFIG_PROC_FS=y 628CONFIG_PROC_FS=y
624CONFIG_PROC_KCORE=y 629CONFIG_PROC_KCORE=y
625CONFIG_PROC_SYSCTL=y 630CONFIG_PROC_SYSCTL=y
631CONFIG_PROC_PAGE_MONITOR=y
626CONFIG_SYSFS=y 632CONFIG_SYSFS=y
627CONFIG_TMPFS=y 633CONFIG_TMPFS=y
628# CONFIG_TMPFS_POSIX_ACL is not set 634# CONFIG_TMPFS_POSIX_ACL is not set
@@ -659,6 +665,7 @@ CONFIG_LOCKD=y
659CONFIG_LOCKD_V4=y 665CONFIG_LOCKD_V4=y
660CONFIG_NFS_COMMON=y 666CONFIG_NFS_COMMON=y
661CONFIG_SUNRPC=y 667CONFIG_SUNRPC=y
668# CONFIG_SUNRPC_REGISTER_V4 is not set
662# CONFIG_RPCSEC_GSS_KRB5 is not set 669# CONFIG_RPCSEC_GSS_KRB5 is not set
663# CONFIG_RPCSEC_GSS_SPKM3 is not set 670# CONFIG_RPCSEC_GSS_SPKM3 is not set
664# CONFIG_SMB_FS is not set 671# CONFIG_SMB_FS is not set
@@ -679,7 +686,6 @@ CONFIG_MSDOS_PARTITION=y
679# Library routines 686# Library routines
680# 687#
681CONFIG_BITREVERSE=y 688CONFIG_BITREVERSE=y
682# CONFIG_GENERIC_FIND_FIRST_BIT is not set
683# CONFIG_CRC_CCITT is not set 689# CONFIG_CRC_CCITT is not set
684# CONFIG_CRC16 is not set 690# CONFIG_CRC16 is not set
685# CONFIG_CRC_T10DIF is not set 691# CONFIG_CRC_T10DIF is not set
@@ -732,15 +738,21 @@ CONFIG_SCHED_DEBUG=y
732# CONFIG_DEBUG_SG is not set 738# CONFIG_DEBUG_SG is not set
733# CONFIG_BOOT_PRINTK_DELAY is not set 739# CONFIG_BOOT_PRINTK_DELAY is not set
734# CONFIG_RCU_TORTURE_TEST is not set 740# CONFIG_RCU_TORTURE_TEST is not set
741# CONFIG_RCU_CPU_STALL_DETECTOR is not set
735# CONFIG_BACKTRACE_SELF_TEST is not set 742# CONFIG_BACKTRACE_SELF_TEST is not set
743# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
736# CONFIG_FAULT_INJECTION is not set 744# CONFIG_FAULT_INJECTION is not set
737# CONFIG_LATENCYTOP is not set 745# CONFIG_LATENCYTOP is not set
738CONFIG_SYSCTL_SYSCALL_CHECK=y 746CONFIG_SYSCTL_SYSCALL_CHECK=y
747CONFIG_NOP_TRACER=y
739CONFIG_HAVE_FTRACE=y 748CONFIG_HAVE_FTRACE=y
740CONFIG_HAVE_DYNAMIC_FTRACE=y 749CONFIG_HAVE_DYNAMIC_FTRACE=y
741# CONFIG_FTRACE is not set 750# CONFIG_FTRACE is not set
742# CONFIG_SCHED_TRACER is not set 751# CONFIG_SCHED_TRACER is not set
743# CONFIG_CONTEXT_SWITCH_TRACER is not set 752# CONFIG_CONTEXT_SWITCH_TRACER is not set
753# CONFIG_BOOT_TRACER is not set
754# CONFIG_STACK_TRACER is not set
755# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
744# CONFIG_SAMPLES is not set 756# CONFIG_SAMPLES is not set
745CONFIG_HAVE_ARCH_KGDB=y 757CONFIG_HAVE_ARCH_KGDB=y
746# CONFIG_KGDB is not set 758# CONFIG_KGDB is not set
@@ -761,6 +773,7 @@ CONFIG_HAVE_ARCH_KGDB=y
761# 773#
762# CONFIG_KEYS is not set 774# CONFIG_KEYS is not set
763# CONFIG_SECURITY is not set 775# CONFIG_SECURITY is not set
776# CONFIG_SECURITYFS is not set
764# CONFIG_SECURITY_FILE_CAPABILITIES is not set 777# CONFIG_SECURITY_FILE_CAPABILITIES is not set
765# CONFIG_CRYPTO is not set 778# CONFIG_CRYPTO is not set
766# CONFIG_PPC_CLOCK is not set 779# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/44x/bamboo_defconfig b/arch/powerpc/configs/44x/bamboo_defconfig
index e920693535af..f47c2f3420f6 100644
--- a/arch/powerpc/configs/44x/bamboo_defconfig
+++ b/arch/powerpc/configs/44x/bamboo_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.27-rc1 3# Linux kernel version: 2.6.28-rc2
4# Tue Aug 5 08:43:44 2008 4# Tue Oct 28 09:16:06 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -23,14 +23,13 @@ CONFIG_PHYS_64BIT=y
23CONFIG_NOT_COHERENT_CACHE=y 23CONFIG_NOT_COHERENT_CACHE=y
24CONFIG_PPC32=y 24CONFIG_PPC32=y
25CONFIG_WORD_SIZE=32 25CONFIG_WORD_SIZE=32
26CONFIG_PPC_MERGE=y 26CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
27CONFIG_MMU=y 27CONFIG_MMU=y
28CONFIG_GENERIC_CMOS_UPDATE=y 28CONFIG_GENERIC_CMOS_UPDATE=y
29CONFIG_GENERIC_TIME=y 29CONFIG_GENERIC_TIME=y
30CONFIG_GENERIC_TIME_VSYSCALL=y 30CONFIG_GENERIC_TIME_VSYSCALL=y
31CONFIG_GENERIC_CLOCKEVENTS=y 31CONFIG_GENERIC_CLOCKEVENTS=y
32CONFIG_GENERIC_HARDIRQS=y 32CONFIG_GENERIC_HARDIRQS=y
33# CONFIG_HAVE_GET_USER_PAGES_FAST is not set
34# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 33# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
35CONFIG_IRQ_PER_CPU=y 34CONFIG_IRQ_PER_CPU=y
36CONFIG_STACKTRACE_SUPPORT=y 35CONFIG_STACKTRACE_SUPPORT=y
@@ -92,7 +91,6 @@ CONFIG_INITRAMFS_SOURCE=""
92CONFIG_SYSCTL=y 91CONFIG_SYSCTL=y
93CONFIG_EMBEDDED=y 92CONFIG_EMBEDDED=y
94CONFIG_SYSCTL_SYSCALL=y 93CONFIG_SYSCTL_SYSCALL=y
95CONFIG_SYSCTL_SYSCALL_CHECK=y
96CONFIG_KALLSYMS=y 94CONFIG_KALLSYMS=y
97# CONFIG_KALLSYMS_ALL is not set 95# CONFIG_KALLSYMS_ALL is not set
98# CONFIG_KALLSYMS_EXTRA_PASS is not set 96# CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -109,7 +107,9 @@ CONFIG_SIGNALFD=y
109CONFIG_TIMERFD=y 107CONFIG_TIMERFD=y
110CONFIG_EVENTFD=y 108CONFIG_EVENTFD=y
111CONFIG_SHMEM=y 109CONFIG_SHMEM=y
110CONFIG_AIO=y
112CONFIG_VM_EVENT_COUNTERS=y 111CONFIG_VM_EVENT_COUNTERS=y
112CONFIG_PCI_QUIRKS=y
113CONFIG_SLUB_DEBUG=y 113CONFIG_SLUB_DEBUG=y
114# CONFIG_SLAB is not set 114# CONFIG_SLAB is not set
115CONFIG_SLUB=y 115CONFIG_SLUB=y
@@ -123,10 +123,6 @@ CONFIG_HAVE_IOREMAP_PROT=y
123CONFIG_HAVE_KPROBES=y 123CONFIG_HAVE_KPROBES=y
124CONFIG_HAVE_KRETPROBES=y 124CONFIG_HAVE_KRETPROBES=y
125CONFIG_HAVE_ARCH_TRACEHOOK=y 125CONFIG_HAVE_ARCH_TRACEHOOK=y
126# CONFIG_HAVE_DMA_ATTRS is not set
127# CONFIG_USE_GENERIC_SMP_HELPERS is not set
128# CONFIG_HAVE_CLK is not set
129CONFIG_PROC_PAGE_MONITOR=y
130# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 126# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
131CONFIG_SLABINFO=y 127CONFIG_SLABINFO=y
132CONFIG_RT_MUTEXES=y 128CONFIG_RT_MUTEXES=y
@@ -159,6 +155,7 @@ CONFIG_DEFAULT_AS=y
159# CONFIG_DEFAULT_NOOP is not set 155# CONFIG_DEFAULT_NOOP is not set
160CONFIG_DEFAULT_IOSCHED="anticipatory" 156CONFIG_DEFAULT_IOSCHED="anticipatory"
161CONFIG_CLASSIC_RCU=y 157CONFIG_CLASSIC_RCU=y
158# CONFIG_FREEZER is not set
162# CONFIG_PPC4xx_PCI_EXPRESS is not set 159# CONFIG_PPC4xx_PCI_EXPRESS is not set
163 160
164# 161#
@@ -175,9 +172,13 @@ CONFIG_BAMBOO=y
175# CONFIG_KATMAI is not set 172# CONFIG_KATMAI is not set
176# CONFIG_RAINIER is not set 173# CONFIG_RAINIER is not set
177# CONFIG_WARP is not set 174# CONFIG_WARP is not set
175# CONFIG_ARCHES is not set
178# CONFIG_CANYONLANDS is not set 176# CONFIG_CANYONLANDS is not set
177# CONFIG_GLACIER is not set
179# CONFIG_YOSEMITE is not set 178# CONFIG_YOSEMITE is not set
180# CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set 179# CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set
180CONFIG_PPC44x_SIMPLE=y
181# CONFIG_PPC4xx_GPIO is not set
181CONFIG_440EP=y 182CONFIG_440EP=y
182CONFIG_IBM440EP_ERR42=y 183CONFIG_IBM440EP_ERR42=y
183# CONFIG_IPIC is not set 184# CONFIG_IPIC is not set
@@ -197,7 +198,6 @@ CONFIG_IBM440EP_ERR42=y
197# Kernel options 198# Kernel options
198# 199#
199# CONFIG_HIGHMEM is not set 200# CONFIG_HIGHMEM is not set
200# CONFIG_TICK_ONESHOT is not set
201# CONFIG_NO_HZ is not set 201# CONFIG_NO_HZ is not set
202# CONFIG_HIGH_RES_TIMERS is not set 202# CONFIG_HIGH_RES_TIMERS is not set
203CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 203CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -211,6 +211,8 @@ CONFIG_PREEMPT_NONE=y
211# CONFIG_PREEMPT_VOLUNTARY is not set 211# CONFIG_PREEMPT_VOLUNTARY is not set
212# CONFIG_PREEMPT is not set 212# CONFIG_PREEMPT is not set
213CONFIG_BINFMT_ELF=y 213CONFIG_BINFMT_ELF=y
214# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
215# CONFIG_HAVE_AOUT is not set
214# CONFIG_BINFMT_MISC is not set 216# CONFIG_BINFMT_MISC is not set
215# CONFIG_MATH_EMULATION is not set 217# CONFIG_MATH_EMULATION is not set
216# CONFIG_IOMMU_HELPER is not set 218# CONFIG_IOMMU_HELPER is not set
@@ -225,15 +227,15 @@ CONFIG_FLATMEM_MANUAL=y
225# CONFIG_SPARSEMEM_MANUAL is not set 227# CONFIG_SPARSEMEM_MANUAL is not set
226CONFIG_FLATMEM=y 228CONFIG_FLATMEM=y
227CONFIG_FLAT_NODE_MEM_MAP=y 229CONFIG_FLAT_NODE_MEM_MAP=y
228# CONFIG_SPARSEMEM_STATIC is not set
229# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
230CONFIG_PAGEFLAGS_EXTENDED=y 230CONFIG_PAGEFLAGS_EXTENDED=y
231CONFIG_SPLIT_PTLOCK_CPUS=4 231CONFIG_SPLIT_PTLOCK_CPUS=4
232CONFIG_MIGRATION=y 232CONFIG_MIGRATION=y
233CONFIG_RESOURCES_64BIT=y 233CONFIG_RESOURCES_64BIT=y
234CONFIG_PHYS_ADDR_T_64BIT=y
234CONFIG_ZONE_DMA_FLAG=1 235CONFIG_ZONE_DMA_FLAG=1
235CONFIG_BOUNCE=y 236CONFIG_BOUNCE=y
236CONFIG_VIRT_TO_BUS=y 237CONFIG_VIRT_TO_BUS=y
238CONFIG_UNEVICTABLE_LRU=y
237CONFIG_FORCE_MAX_ZONEORDER=11 239CONFIG_FORCE_MAX_ZONEORDER=11
238CONFIG_PROC_DEVICETREE=y 240CONFIG_PROC_DEVICETREE=y
239CONFIG_CMDLINE_BOOL=y 241CONFIG_CMDLINE_BOOL=y
@@ -320,6 +322,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
320# CONFIG_TIPC is not set 322# CONFIG_TIPC is not set
321# CONFIG_ATM is not set 323# CONFIG_ATM is not set
322# CONFIG_BRIDGE is not set 324# CONFIG_BRIDGE is not set
325# CONFIG_NET_DSA is not set
323# CONFIG_VLAN_8021Q is not set 326# CONFIG_VLAN_8021Q is not set
324# CONFIG_DECNET is not set 327# CONFIG_DECNET is not set
325# CONFIG_LLC2 is not set 328# CONFIG_LLC2 is not set
@@ -340,14 +343,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
340# CONFIG_IRDA is not set 343# CONFIG_IRDA is not set
341# CONFIG_BT is not set 344# CONFIG_BT is not set
342# CONFIG_AF_RXRPC is not set 345# CONFIG_AF_RXRPC is not set
343 346# CONFIG_PHONET is not set
344# 347# CONFIG_WIRELESS is not set
345# Wireless
346#
347# CONFIG_CFG80211 is not set
348# CONFIG_WIRELESS_EXT is not set
349# CONFIG_MAC80211 is not set
350# CONFIG_IEEE80211 is not set
351# CONFIG_RFKILL is not set 348# CONFIG_RFKILL is not set
352# CONFIG_NET_9P is not set 349# CONFIG_NET_9P is not set
353 350
@@ -450,8 +447,12 @@ CONFIG_IBM_NEW_EMAC_ZMII=y
450# CONFIG_IBM_NEW_EMAC_RGMII is not set 447# CONFIG_IBM_NEW_EMAC_RGMII is not set
451# CONFIG_IBM_NEW_EMAC_TAH is not set 448# CONFIG_IBM_NEW_EMAC_TAH is not set
452# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 449# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
450# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
451# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
452# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
453# CONFIG_NET_PCI is not set 453# CONFIG_NET_PCI is not set
454# CONFIG_B44 is not set 454# CONFIG_B44 is not set
455# CONFIG_ATL2 is not set
455CONFIG_NETDEV_1000=y 456CONFIG_NETDEV_1000=y
456# CONFIG_ACENIC is not set 457# CONFIG_ACENIC is not set
457# CONFIG_DL2K is not set 458# CONFIG_DL2K is not set
@@ -472,18 +473,22 @@ CONFIG_NETDEV_1000=y
472# CONFIG_QLA3XXX is not set 473# CONFIG_QLA3XXX is not set
473# CONFIG_ATL1 is not set 474# CONFIG_ATL1 is not set
474# CONFIG_ATL1E is not set 475# CONFIG_ATL1E is not set
476# CONFIG_JME is not set
475CONFIG_NETDEV_10000=y 477CONFIG_NETDEV_10000=y
476# CONFIG_CHELSIO_T1 is not set 478# CONFIG_CHELSIO_T1 is not set
477# CONFIG_CHELSIO_T3 is not set 479# CONFIG_CHELSIO_T3 is not set
480# CONFIG_ENIC is not set
478# CONFIG_IXGBE is not set 481# CONFIG_IXGBE is not set
479# CONFIG_IXGB is not set 482# CONFIG_IXGB is not set
480# CONFIG_S2IO is not set 483# CONFIG_S2IO is not set
481# CONFIG_MYRI10GE is not set 484# CONFIG_MYRI10GE is not set
482# CONFIG_NETXEN_NIC is not set 485# CONFIG_NETXEN_NIC is not set
483# CONFIG_NIU is not set 486# CONFIG_NIU is not set
487# CONFIG_MLX4_EN is not set
484# CONFIG_MLX4_CORE is not set 488# CONFIG_MLX4_CORE is not set
485# CONFIG_TEHUTI is not set 489# CONFIG_TEHUTI is not set
486# CONFIG_BNX2X is not set 490# CONFIG_BNX2X is not set
491# CONFIG_QLGE is not set
487# CONFIG_SFC is not set 492# CONFIG_SFC is not set
488# CONFIG_TR is not set 493# CONFIG_TR is not set
489 494
@@ -579,6 +584,8 @@ CONFIG_SSB_POSSIBLE=y
579# CONFIG_MFD_CORE is not set 584# CONFIG_MFD_CORE is not set
580# CONFIG_MFD_SM501 is not set 585# CONFIG_MFD_SM501 is not set
581# CONFIG_HTC_PASIC3 is not set 586# CONFIG_HTC_PASIC3 is not set
587# CONFIG_MFD_TMIO is not set
588# CONFIG_MFD_WM8400 is not set
582 589
583# 590#
584# Multimedia devices 591# Multimedia devices
@@ -620,9 +627,14 @@ CONFIG_USB_ARCH_HAS_EHCI=y
620# CONFIG_USB_OTG_BLACKLIST_HUB is not set 627# CONFIG_USB_OTG_BLACKLIST_HUB is not set
621 628
622# 629#
630# Enable Host or Gadget support to see Inventra options
631#
632
633#
623# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 634# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
624# 635#
625# CONFIG_USB_GADGET is not set 636# CONFIG_USB_GADGET is not set
637# CONFIG_UWB is not set
626# CONFIG_MMC is not set 638# CONFIG_MMC is not set
627# CONFIG_MEMSTICK is not set 639# CONFIG_MEMSTICK is not set
628# CONFIG_NEW_LEDS is not set 640# CONFIG_NEW_LEDS is not set
@@ -632,6 +644,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
632# CONFIG_RTC_CLASS is not set 644# CONFIG_RTC_CLASS is not set
633# CONFIG_DMADEVICES is not set 645# CONFIG_DMADEVICES is not set
634# CONFIG_UIO is not set 646# CONFIG_UIO is not set
647# CONFIG_STAGING is not set
635 648
636# 649#
637# File systems 650# File systems
@@ -640,10 +653,11 @@ CONFIG_EXT2_FS=y
640# CONFIG_EXT2_FS_XATTR is not set 653# CONFIG_EXT2_FS_XATTR is not set
641# CONFIG_EXT2_FS_XIP is not set 654# CONFIG_EXT2_FS_XIP is not set
642# CONFIG_EXT3_FS is not set 655# CONFIG_EXT3_FS is not set
643# CONFIG_EXT4DEV_FS is not set 656# CONFIG_EXT4_FS is not set
644# CONFIG_REISERFS_FS is not set 657# CONFIG_REISERFS_FS is not set
645# CONFIG_JFS_FS is not set 658# CONFIG_JFS_FS is not set
646# CONFIG_FS_POSIX_ACL is not set 659# CONFIG_FS_POSIX_ACL is not set
660CONFIG_FILE_LOCKING=y
647# CONFIG_XFS_FS is not set 661# CONFIG_XFS_FS is not set
648# CONFIG_OCFS2_FS is not set 662# CONFIG_OCFS2_FS is not set
649CONFIG_DNOTIFY=y 663CONFIG_DNOTIFY=y
@@ -673,6 +687,7 @@ CONFIG_INOTIFY_USER=y
673CONFIG_PROC_FS=y 687CONFIG_PROC_FS=y
674CONFIG_PROC_KCORE=y 688CONFIG_PROC_KCORE=y
675CONFIG_PROC_SYSCTL=y 689CONFIG_PROC_SYSCTL=y
690CONFIG_PROC_PAGE_MONITOR=y
676CONFIG_SYSFS=y 691CONFIG_SYSFS=y
677CONFIG_TMPFS=y 692CONFIG_TMPFS=y
678# CONFIG_TMPFS_POSIX_ACL is not set 693# CONFIG_TMPFS_POSIX_ACL is not set
@@ -709,6 +724,7 @@ CONFIG_LOCKD=y
709CONFIG_LOCKD_V4=y 724CONFIG_LOCKD_V4=y
710CONFIG_NFS_COMMON=y 725CONFIG_NFS_COMMON=y
711CONFIG_SUNRPC=y 726CONFIG_SUNRPC=y
727# CONFIG_SUNRPC_REGISTER_V4 is not set
712# CONFIG_RPCSEC_GSS_KRB5 is not set 728# CONFIG_RPCSEC_GSS_KRB5 is not set
713# CONFIG_RPCSEC_GSS_SPKM3 is not set 729# CONFIG_RPCSEC_GSS_SPKM3 is not set
714# CONFIG_SMB_FS is not set 730# CONFIG_SMB_FS is not set
@@ -729,7 +745,6 @@ CONFIG_MSDOS_PARTITION=y
729# Library routines 745# Library routines
730# 746#
731CONFIG_BITREVERSE=y 747CONFIG_BITREVERSE=y
732# CONFIG_GENERIC_FIND_FIRST_BIT is not set
733# CONFIG_CRC_CCITT is not set 748# CONFIG_CRC_CCITT is not set
734# CONFIG_CRC16 is not set 749# CONFIG_CRC16 is not set
735# CONFIG_CRC_T10DIF is not set 750# CONFIG_CRC_T10DIF is not set
@@ -782,14 +797,21 @@ CONFIG_SCHED_DEBUG=y
782# CONFIG_DEBUG_SG is not set 797# CONFIG_DEBUG_SG is not set
783# CONFIG_BOOT_PRINTK_DELAY is not set 798# CONFIG_BOOT_PRINTK_DELAY is not set
784# CONFIG_RCU_TORTURE_TEST is not set 799# CONFIG_RCU_TORTURE_TEST is not set
800# CONFIG_RCU_CPU_STALL_DETECTOR is not set
785# CONFIG_BACKTRACE_SELF_TEST is not set 801# CONFIG_BACKTRACE_SELF_TEST is not set
802# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
786# CONFIG_FAULT_INJECTION is not set 803# CONFIG_FAULT_INJECTION is not set
787# CONFIG_LATENCYTOP is not set 804# CONFIG_LATENCYTOP is not set
805CONFIG_SYSCTL_SYSCALL_CHECK=y
806CONFIG_NOP_TRACER=y
788CONFIG_HAVE_FTRACE=y 807CONFIG_HAVE_FTRACE=y
789CONFIG_HAVE_DYNAMIC_FTRACE=y 808CONFIG_HAVE_DYNAMIC_FTRACE=y
790# CONFIG_FTRACE is not set 809# CONFIG_FTRACE is not set
791# CONFIG_SCHED_TRACER is not set 810# CONFIG_SCHED_TRACER is not set
792# CONFIG_CONTEXT_SWITCH_TRACER is not set 811# CONFIG_CONTEXT_SWITCH_TRACER is not set
812# CONFIG_BOOT_TRACER is not set
813# CONFIG_STACK_TRACER is not set
814# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
793# CONFIG_SAMPLES is not set 815# CONFIG_SAMPLES is not set
794CONFIG_HAVE_ARCH_KGDB=y 816CONFIG_HAVE_ARCH_KGDB=y
795# CONFIG_KGDB is not set 817# CONFIG_KGDB is not set
@@ -798,6 +820,7 @@ CONFIG_HAVE_ARCH_KGDB=y
798# CONFIG_DEBUG_PAGEALLOC is not set 820# CONFIG_DEBUG_PAGEALLOC is not set
799# CONFIG_CODE_PATCHING_SELFTEST is not set 821# CONFIG_CODE_PATCHING_SELFTEST is not set
800# CONFIG_FTR_FIXUP_SELFTEST is not set 822# CONFIG_FTR_FIXUP_SELFTEST is not set
823# CONFIG_MSI_BITMAP_SELFTEST is not set
801# CONFIG_XMON is not set 824# CONFIG_XMON is not set
802# CONFIG_IRQSTACKS is not set 825# CONFIG_IRQSTACKS is not set
803# CONFIG_VIRQ_DEBUG is not set 826# CONFIG_VIRQ_DEBUG is not set
@@ -809,14 +832,19 @@ CONFIG_HAVE_ARCH_KGDB=y
809# 832#
810# CONFIG_KEYS is not set 833# CONFIG_KEYS is not set
811# CONFIG_SECURITY is not set 834# CONFIG_SECURITY is not set
835# CONFIG_SECURITYFS is not set
812# CONFIG_SECURITY_FILE_CAPABILITIES is not set 836# CONFIG_SECURITY_FILE_CAPABILITIES is not set
813CONFIG_CRYPTO=y 837CONFIG_CRYPTO=y
814 838
815# 839#
816# Crypto core or helper 840# Crypto core or helper
817# 841#
842# CONFIG_CRYPTO_FIPS is not set
818CONFIG_CRYPTO_ALGAPI=y 843CONFIG_CRYPTO_ALGAPI=y
844CONFIG_CRYPTO_AEAD=y
819CONFIG_CRYPTO_BLKCIPHER=y 845CONFIG_CRYPTO_BLKCIPHER=y
846CONFIG_CRYPTO_HASH=y
847CONFIG_CRYPTO_RNG=y
820CONFIG_CRYPTO_MANAGER=y 848CONFIG_CRYPTO_MANAGER=y
821# CONFIG_CRYPTO_GF128MUL is not set 849# CONFIG_CRYPTO_GF128MUL is not set
822# CONFIG_CRYPTO_NULL is not set 850# CONFIG_CRYPTO_NULL is not set
@@ -889,6 +917,11 @@ CONFIG_CRYPTO_DES=y
889# 917#
890# CONFIG_CRYPTO_DEFLATE is not set 918# CONFIG_CRYPTO_DEFLATE is not set
891# CONFIG_CRYPTO_LZO is not set 919# CONFIG_CRYPTO_LZO is not set
920
921#
922# Random Number Generation
923#
924# CONFIG_CRYPTO_ANSI_CPRNG is not set
892CONFIG_CRYPTO_HW=y 925CONFIG_CRYPTO_HW=y
893# CONFIG_CRYPTO_DEV_HIFN_795X is not set 926# CONFIG_CRYPTO_DEV_HIFN_795X is not set
894# CONFIG_PPC_CLOCK is not set 927# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/44x/canyonlands_defconfig b/arch/powerpc/configs/44x/canyonlands_defconfig
index 74da5c7754a4..0694756ac759 100644
--- a/arch/powerpc/configs/44x/canyonlands_defconfig
+++ b/arch/powerpc/configs/44x/canyonlands_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.27-rc1 3# Linux kernel version: 2.6.28-rc2
4# Tue Aug 5 08:46:14 2008 4# Tue Oct 28 09:16:08 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -23,14 +23,13 @@ CONFIG_PHYS_64BIT=y
23CONFIG_NOT_COHERENT_CACHE=y 23CONFIG_NOT_COHERENT_CACHE=y
24CONFIG_PPC32=y 24CONFIG_PPC32=y
25CONFIG_WORD_SIZE=32 25CONFIG_WORD_SIZE=32
26CONFIG_PPC_MERGE=y 26CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
27CONFIG_MMU=y 27CONFIG_MMU=y
28CONFIG_GENERIC_CMOS_UPDATE=y 28CONFIG_GENERIC_CMOS_UPDATE=y
29CONFIG_GENERIC_TIME=y 29CONFIG_GENERIC_TIME=y
30CONFIG_GENERIC_TIME_VSYSCALL=y 30CONFIG_GENERIC_TIME_VSYSCALL=y
31CONFIG_GENERIC_CLOCKEVENTS=y 31CONFIG_GENERIC_CLOCKEVENTS=y
32CONFIG_GENERIC_HARDIRQS=y 32CONFIG_GENERIC_HARDIRQS=y
33# CONFIG_HAVE_GET_USER_PAGES_FAST is not set
34# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 33# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
35CONFIG_IRQ_PER_CPU=y 34CONFIG_IRQ_PER_CPU=y
36CONFIG_STACKTRACE_SUPPORT=y 35CONFIG_STACKTRACE_SUPPORT=y
@@ -88,7 +87,6 @@ CONFIG_INITRAMFS_SOURCE=""
88CONFIG_SYSCTL=y 87CONFIG_SYSCTL=y
89CONFIG_EMBEDDED=y 88CONFIG_EMBEDDED=y
90CONFIG_SYSCTL_SYSCALL=y 89CONFIG_SYSCTL_SYSCALL=y
91CONFIG_SYSCTL_SYSCALL_CHECK=y
92CONFIG_KALLSYMS=y 90CONFIG_KALLSYMS=y
93# CONFIG_KALLSYMS_ALL is not set 91# CONFIG_KALLSYMS_ALL is not set
94# CONFIG_KALLSYMS_EXTRA_PASS is not set 92# CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -105,7 +103,9 @@ CONFIG_SIGNALFD=y
105CONFIG_TIMERFD=y 103CONFIG_TIMERFD=y
106CONFIG_EVENTFD=y 104CONFIG_EVENTFD=y
107CONFIG_SHMEM=y 105CONFIG_SHMEM=y
106CONFIG_AIO=y
108CONFIG_VM_EVENT_COUNTERS=y 107CONFIG_VM_EVENT_COUNTERS=y
108CONFIG_PCI_QUIRKS=y
109CONFIG_SLUB_DEBUG=y 109CONFIG_SLUB_DEBUG=y
110# CONFIG_SLAB is not set 110# CONFIG_SLAB is not set
111CONFIG_SLUB=y 111CONFIG_SLUB=y
@@ -119,10 +119,6 @@ CONFIG_HAVE_IOREMAP_PROT=y
119CONFIG_HAVE_KPROBES=y 119CONFIG_HAVE_KPROBES=y
120CONFIG_HAVE_KRETPROBES=y 120CONFIG_HAVE_KRETPROBES=y
121CONFIG_HAVE_ARCH_TRACEHOOK=y 121CONFIG_HAVE_ARCH_TRACEHOOK=y
122# CONFIG_HAVE_DMA_ATTRS is not set
123# CONFIG_USE_GENERIC_SMP_HELPERS is not set
124# CONFIG_HAVE_CLK is not set
125CONFIG_PROC_PAGE_MONITOR=y
126# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 122# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
127CONFIG_SLABINFO=y 123CONFIG_SLABINFO=y
128CONFIG_RT_MUTEXES=y 124CONFIG_RT_MUTEXES=y
@@ -155,6 +151,7 @@ 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_FREEZER is not set
158CONFIG_PPC4xx_PCI_EXPRESS=y 155CONFIG_PPC4xx_PCI_EXPRESS=y
159 156
160# 157#
@@ -171,9 +168,13 @@ CONFIG_PPC4xx_PCI_EXPRESS=y
171# CONFIG_KATMAI is not set 168# CONFIG_KATMAI is not set
172# CONFIG_RAINIER is not set 169# CONFIG_RAINIER is not set
173# CONFIG_WARP is not set 170# CONFIG_WARP is not set
171# CONFIG_ARCHES is not set
174CONFIG_CANYONLANDS=y 172CONFIG_CANYONLANDS=y
173# CONFIG_GLACIER is not set
175# CONFIG_YOSEMITE is not set 174# CONFIG_YOSEMITE is not set
176# CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set 175# CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set
176CONFIG_PPC44x_SIMPLE=y
177# CONFIG_PPC4xx_GPIO is not set
177CONFIG_460EX=y 178CONFIG_460EX=y
178# CONFIG_IPIC is not set 179# CONFIG_IPIC is not set
179# CONFIG_MPIC is not set 180# CONFIG_MPIC is not set
@@ -201,11 +202,13 @@ CONFIG_HZ_250=y
201# CONFIG_HZ_300 is not set 202# CONFIG_HZ_300 is not set
202# CONFIG_HZ_1000 is not set 203# CONFIG_HZ_1000 is not set
203CONFIG_HZ=250 204CONFIG_HZ=250
204# CONFIG_SCHED_HRTICK is not set 205CONFIG_SCHED_HRTICK=y
205CONFIG_PREEMPT_NONE=y 206CONFIG_PREEMPT_NONE=y
206# CONFIG_PREEMPT_VOLUNTARY is not set 207# CONFIG_PREEMPT_VOLUNTARY is not set
207# CONFIG_PREEMPT is not set 208# CONFIG_PREEMPT is not set
208CONFIG_BINFMT_ELF=y 209CONFIG_BINFMT_ELF=y
210# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
211# CONFIG_HAVE_AOUT is not set
209# CONFIG_BINFMT_MISC is not set 212# CONFIG_BINFMT_MISC is not set
210# CONFIG_MATH_EMULATION is not set 213# CONFIG_MATH_EMULATION is not set
211# CONFIG_IOMMU_HELPER is not set 214# CONFIG_IOMMU_HELPER is not set
@@ -220,15 +223,15 @@ CONFIG_FLATMEM_MANUAL=y
220# CONFIG_SPARSEMEM_MANUAL is not set 223# CONFIG_SPARSEMEM_MANUAL is not set
221CONFIG_FLATMEM=y 224CONFIG_FLATMEM=y
222CONFIG_FLAT_NODE_MEM_MAP=y 225CONFIG_FLAT_NODE_MEM_MAP=y
223# CONFIG_SPARSEMEM_STATIC is not set
224# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
225CONFIG_PAGEFLAGS_EXTENDED=y 226CONFIG_PAGEFLAGS_EXTENDED=y
226CONFIG_SPLIT_PTLOCK_CPUS=4 227CONFIG_SPLIT_PTLOCK_CPUS=4
227CONFIG_MIGRATION=y 228CONFIG_MIGRATION=y
228CONFIG_RESOURCES_64BIT=y 229CONFIG_RESOURCES_64BIT=y
230CONFIG_PHYS_ADDR_T_64BIT=y
229CONFIG_ZONE_DMA_FLAG=1 231CONFIG_ZONE_DMA_FLAG=1
230CONFIG_BOUNCE=y 232CONFIG_BOUNCE=y
231CONFIG_VIRT_TO_BUS=y 233CONFIG_VIRT_TO_BUS=y
234CONFIG_UNEVICTABLE_LRU=y
232CONFIG_FORCE_MAX_ZONEORDER=11 235CONFIG_FORCE_MAX_ZONEORDER=11
233CONFIG_PROC_DEVICETREE=y 236CONFIG_PROC_DEVICETREE=y
234CONFIG_CMDLINE_BOOL=y 237CONFIG_CMDLINE_BOOL=y
@@ -315,6 +318,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
315# CONFIG_TIPC is not set 318# CONFIG_TIPC is not set
316# CONFIG_ATM is not set 319# CONFIG_ATM is not set
317# CONFIG_BRIDGE is not set 320# CONFIG_BRIDGE is not set
321# CONFIG_NET_DSA is not set
318# CONFIG_VLAN_8021Q is not set 322# CONFIG_VLAN_8021Q is not set
319# CONFIG_DECNET is not set 323# CONFIG_DECNET is not set
320# CONFIG_LLC2 is not set 324# CONFIG_LLC2 is not set
@@ -335,14 +339,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
335# CONFIG_IRDA is not set 339# CONFIG_IRDA is not set
336# CONFIG_BT is not set 340# CONFIG_BT is not set
337# CONFIG_AF_RXRPC is not set 341# CONFIG_AF_RXRPC is not set
338 342# CONFIG_PHONET is not set
339# 343# CONFIG_WIRELESS is not set
340# Wireless
341#
342# CONFIG_CFG80211 is not set
343# CONFIG_WIRELESS_EXT is not set
344# CONFIG_MAC80211 is not set
345# CONFIG_IEEE80211 is not set
346# CONFIG_RFKILL is not set 344# CONFIG_RFKILL is not set
347# CONFIG_NET_9P is not set 345# CONFIG_NET_9P is not set
348 346
@@ -439,8 +437,12 @@ CONFIG_IBM_NEW_EMAC_ZMII=y
439CONFIG_IBM_NEW_EMAC_RGMII=y 437CONFIG_IBM_NEW_EMAC_RGMII=y
440CONFIG_IBM_NEW_EMAC_TAH=y 438CONFIG_IBM_NEW_EMAC_TAH=y
441CONFIG_IBM_NEW_EMAC_EMAC4=y 439CONFIG_IBM_NEW_EMAC_EMAC4=y
440# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
441# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
442# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
442# CONFIG_NET_PCI is not set 443# CONFIG_NET_PCI is not set
443# CONFIG_B44 is not set 444# CONFIG_B44 is not set
445# CONFIG_ATL2 is not set
444# CONFIG_NETDEV_1000 is not set 446# CONFIG_NETDEV_1000 is not set
445# CONFIG_NETDEV_10000 is not set 447# CONFIG_NETDEV_10000 is not set
446# CONFIG_TR is not set 448# CONFIG_TR is not set
@@ -538,6 +540,8 @@ CONFIG_SSB_POSSIBLE=y
538# CONFIG_MFD_CORE is not set 540# CONFIG_MFD_CORE is not set
539# CONFIG_MFD_SM501 is not set 541# CONFIG_MFD_SM501 is not set
540# CONFIG_HTC_PASIC3 is not set 542# CONFIG_HTC_PASIC3 is not set
543# CONFIG_MFD_TMIO is not set
544# CONFIG_MFD_WM8400 is not set
541 545
542# 546#
543# Multimedia devices 547# Multimedia devices
@@ -571,6 +575,7 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m
571# CONFIG_DISPLAY_SUPPORT is not set 575# CONFIG_DISPLAY_SUPPORT is not set
572# CONFIG_SOUND is not set 576# CONFIG_SOUND is not set
573# CONFIG_USB_SUPPORT is not set 577# CONFIG_USB_SUPPORT is not set
578# CONFIG_UWB is not set
574# CONFIG_MMC is not set 579# CONFIG_MMC is not set
575# CONFIG_MEMSTICK is not set 580# CONFIG_MEMSTICK is not set
576# CONFIG_NEW_LEDS is not set 581# CONFIG_NEW_LEDS is not set
@@ -580,6 +585,7 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m
580# CONFIG_RTC_CLASS is not set 585# CONFIG_RTC_CLASS is not set
581# CONFIG_DMADEVICES is not set 586# CONFIG_DMADEVICES is not set
582# CONFIG_UIO is not set 587# CONFIG_UIO is not set
588# CONFIG_STAGING is not set
583 589
584# 590#
585# File systems 591# File systems
@@ -588,10 +594,11 @@ CONFIG_EXT2_FS=y
588# CONFIG_EXT2_FS_XATTR is not set 594# CONFIG_EXT2_FS_XATTR is not set
589# CONFIG_EXT2_FS_XIP is not set 595# CONFIG_EXT2_FS_XIP is not set
590# CONFIG_EXT3_FS is not set 596# CONFIG_EXT3_FS is not set
591# CONFIG_EXT4DEV_FS is not set 597# CONFIG_EXT4_FS is not set
592# CONFIG_REISERFS_FS is not set 598# CONFIG_REISERFS_FS is not set
593# CONFIG_JFS_FS is not set 599# CONFIG_JFS_FS is not set
594# CONFIG_FS_POSIX_ACL is not set 600# CONFIG_FS_POSIX_ACL is not set
601CONFIG_FILE_LOCKING=y
595# CONFIG_XFS_FS is not set 602# CONFIG_XFS_FS is not set
596# CONFIG_OCFS2_FS is not set 603# CONFIG_OCFS2_FS is not set
597CONFIG_DNOTIFY=y 604CONFIG_DNOTIFY=y
@@ -621,6 +628,7 @@ CONFIG_INOTIFY_USER=y
621CONFIG_PROC_FS=y 628CONFIG_PROC_FS=y
622CONFIG_PROC_KCORE=y 629CONFIG_PROC_KCORE=y
623CONFIG_PROC_SYSCTL=y 630CONFIG_PROC_SYSCTL=y
631CONFIG_PROC_PAGE_MONITOR=y
624CONFIG_SYSFS=y 632CONFIG_SYSFS=y
625CONFIG_TMPFS=y 633CONFIG_TMPFS=y
626# CONFIG_TMPFS_POSIX_ACL is not set 634# CONFIG_TMPFS_POSIX_ACL is not set
@@ -657,6 +665,7 @@ CONFIG_LOCKD=y
657CONFIG_LOCKD_V4=y 665CONFIG_LOCKD_V4=y
658CONFIG_NFS_COMMON=y 666CONFIG_NFS_COMMON=y
659CONFIG_SUNRPC=y 667CONFIG_SUNRPC=y
668# CONFIG_SUNRPC_REGISTER_V4 is not set
660# CONFIG_RPCSEC_GSS_KRB5 is not set 669# CONFIG_RPCSEC_GSS_KRB5 is not set
661# CONFIG_RPCSEC_GSS_SPKM3 is not set 670# CONFIG_RPCSEC_GSS_SPKM3 is not set
662# CONFIG_SMB_FS is not set 671# CONFIG_SMB_FS is not set
@@ -677,7 +686,6 @@ CONFIG_MSDOS_PARTITION=y
677# Library routines 686# Library routines
678# 687#
679CONFIG_BITREVERSE=y 688CONFIG_BITREVERSE=y
680# CONFIG_GENERIC_FIND_FIRST_BIT is not set
681# CONFIG_CRC_CCITT is not set 689# CONFIG_CRC_CCITT is not set
682# CONFIG_CRC16 is not set 690# CONFIG_CRC16 is not set
683# CONFIG_CRC_T10DIF is not set 691# CONFIG_CRC_T10DIF is not set
@@ -730,14 +738,21 @@ CONFIG_SCHED_DEBUG=y
730# CONFIG_DEBUG_SG is not set 738# CONFIG_DEBUG_SG is not set
731# CONFIG_BOOT_PRINTK_DELAY is not set 739# CONFIG_BOOT_PRINTK_DELAY is not set
732# CONFIG_RCU_TORTURE_TEST is not set 740# CONFIG_RCU_TORTURE_TEST is not set
741# CONFIG_RCU_CPU_STALL_DETECTOR is not set
733# CONFIG_BACKTRACE_SELF_TEST is not set 742# CONFIG_BACKTRACE_SELF_TEST is not set
743# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
734# CONFIG_FAULT_INJECTION is not set 744# CONFIG_FAULT_INJECTION is not set
735# CONFIG_LATENCYTOP is not set 745# CONFIG_LATENCYTOP is not set
746CONFIG_SYSCTL_SYSCALL_CHECK=y
747CONFIG_NOP_TRACER=y
736CONFIG_HAVE_FTRACE=y 748CONFIG_HAVE_FTRACE=y
737CONFIG_HAVE_DYNAMIC_FTRACE=y 749CONFIG_HAVE_DYNAMIC_FTRACE=y
738# CONFIG_FTRACE is not set 750# CONFIG_FTRACE is not set
739# CONFIG_SCHED_TRACER is not set 751# CONFIG_SCHED_TRACER is not set
740# CONFIG_CONTEXT_SWITCH_TRACER is not set 752# CONFIG_CONTEXT_SWITCH_TRACER is not set
753# CONFIG_BOOT_TRACER is not set
754# CONFIG_STACK_TRACER is not set
755# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
741# CONFIG_SAMPLES is not set 756# CONFIG_SAMPLES is not set
742CONFIG_HAVE_ARCH_KGDB=y 757CONFIG_HAVE_ARCH_KGDB=y
743# CONFIG_KGDB is not set 758# CONFIG_KGDB is not set
@@ -746,6 +761,7 @@ CONFIG_HAVE_ARCH_KGDB=y
746# CONFIG_DEBUG_PAGEALLOC is not set 761# CONFIG_DEBUG_PAGEALLOC is not set
747# CONFIG_CODE_PATCHING_SELFTEST is not set 762# CONFIG_CODE_PATCHING_SELFTEST is not set
748# CONFIG_FTR_FIXUP_SELFTEST is not set 763# CONFIG_FTR_FIXUP_SELFTEST is not set
764# CONFIG_MSI_BITMAP_SELFTEST is not set
749# CONFIG_XMON is not set 765# CONFIG_XMON is not set
750# CONFIG_IRQSTACKS is not set 766# CONFIG_IRQSTACKS is not set
751# CONFIG_VIRQ_DEBUG is not set 767# CONFIG_VIRQ_DEBUG is not set
@@ -757,6 +773,7 @@ CONFIG_HAVE_ARCH_KGDB=y
757# 773#
758# CONFIG_KEYS is not set 774# CONFIG_KEYS is not set
759# CONFIG_SECURITY is not set 775# CONFIG_SECURITY is not set
776# CONFIG_SECURITYFS is not set
760# CONFIG_SECURITY_FILE_CAPABILITIES is not set 777# CONFIG_SECURITY_FILE_CAPABILITIES is not set
761# CONFIG_CRYPTO is not set 778# CONFIG_CRYPTO is not set
762# CONFIG_PPC_CLOCK is not set 779# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/44x/ebony_defconfig b/arch/powerpc/configs/44x/ebony_defconfig
index 17615750b494..c9937578ef7f 100644
--- a/arch/powerpc/configs/44x/ebony_defconfig
+++ b/arch/powerpc/configs/44x/ebony_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.27-rc1 3# Linux kernel version: 2.6.28-rc2
4# Tue Aug 5 09:04:12 2008 4# Tue Oct 28 09:16:09 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -22,14 +22,13 @@ CONFIG_PHYS_64BIT=y
22CONFIG_NOT_COHERENT_CACHE=y 22CONFIG_NOT_COHERENT_CACHE=y
23CONFIG_PPC32=y 23CONFIG_PPC32=y
24CONFIG_WORD_SIZE=32 24CONFIG_WORD_SIZE=32
25CONFIG_PPC_MERGE=y 25CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
26CONFIG_MMU=y 26CONFIG_MMU=y
27CONFIG_GENERIC_CMOS_UPDATE=y 27CONFIG_GENERIC_CMOS_UPDATE=y
28CONFIG_GENERIC_TIME=y 28CONFIG_GENERIC_TIME=y
29CONFIG_GENERIC_TIME_VSYSCALL=y 29CONFIG_GENERIC_TIME_VSYSCALL=y
30CONFIG_GENERIC_CLOCKEVENTS=y 30CONFIG_GENERIC_CLOCKEVENTS=y
31CONFIG_GENERIC_HARDIRQS=y 31CONFIG_GENERIC_HARDIRQS=y
32# CONFIG_HAVE_GET_USER_PAGES_FAST is not set
33# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 32# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
34CONFIG_IRQ_PER_CPU=y 33CONFIG_IRQ_PER_CPU=y
35CONFIG_STACKTRACE_SUPPORT=y 34CONFIG_STACKTRACE_SUPPORT=y
@@ -91,7 +90,6 @@ CONFIG_INITRAMFS_SOURCE=""
91CONFIG_SYSCTL=y 90CONFIG_SYSCTL=y
92CONFIG_EMBEDDED=y 91CONFIG_EMBEDDED=y
93CONFIG_SYSCTL_SYSCALL=y 92CONFIG_SYSCTL_SYSCALL=y
94CONFIG_SYSCTL_SYSCALL_CHECK=y
95CONFIG_KALLSYMS=y 93CONFIG_KALLSYMS=y
96CONFIG_KALLSYMS_ALL=y 94CONFIG_KALLSYMS_ALL=y
97CONFIG_KALLSYMS_EXTRA_PASS=y 95CONFIG_KALLSYMS_EXTRA_PASS=y
@@ -108,7 +106,9 @@ CONFIG_SIGNALFD=y
108CONFIG_TIMERFD=y 106CONFIG_TIMERFD=y
109CONFIG_EVENTFD=y 107CONFIG_EVENTFD=y
110CONFIG_SHMEM=y 108CONFIG_SHMEM=y
109CONFIG_AIO=y
111CONFIG_VM_EVENT_COUNTERS=y 110CONFIG_VM_EVENT_COUNTERS=y
111CONFIG_PCI_QUIRKS=y
112CONFIG_SLUB_DEBUG=y 112CONFIG_SLUB_DEBUG=y
113# CONFIG_SLAB is not set 113# CONFIG_SLAB is not set
114CONFIG_SLUB=y 114CONFIG_SLUB=y
@@ -122,10 +122,6 @@ CONFIG_HAVE_IOREMAP_PROT=y
122CONFIG_HAVE_KPROBES=y 122CONFIG_HAVE_KPROBES=y
123CONFIG_HAVE_KRETPROBES=y 123CONFIG_HAVE_KRETPROBES=y
124CONFIG_HAVE_ARCH_TRACEHOOK=y 124CONFIG_HAVE_ARCH_TRACEHOOK=y
125# CONFIG_HAVE_DMA_ATTRS is not set
126# CONFIG_USE_GENERIC_SMP_HELPERS is not set
127# CONFIG_HAVE_CLK is not set
128CONFIG_PROC_PAGE_MONITOR=y
129# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 125# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
130CONFIG_SLABINFO=y 126CONFIG_SLABINFO=y
131CONFIG_RT_MUTEXES=y 127CONFIG_RT_MUTEXES=y
@@ -158,6 +154,7 @@ CONFIG_DEFAULT_AS=y
158# CONFIG_DEFAULT_NOOP is not set 154# CONFIG_DEFAULT_NOOP is not set
159CONFIG_DEFAULT_IOSCHED="anticipatory" 155CONFIG_DEFAULT_IOSCHED="anticipatory"
160CONFIG_CLASSIC_RCU=y 156CONFIG_CLASSIC_RCU=y
157# CONFIG_FREEZER is not set
161# CONFIG_PPC4xx_PCI_EXPRESS is not set 158# CONFIG_PPC4xx_PCI_EXPRESS is not set
162 159
163# 160#
@@ -174,9 +171,13 @@ CONFIG_EBONY=y
174# CONFIG_KATMAI is not set 171# CONFIG_KATMAI is not set
175# CONFIG_RAINIER is not set 172# CONFIG_RAINIER is not set
176# CONFIG_WARP is not set 173# CONFIG_WARP is not set
174# CONFIG_ARCHES is not set
177# CONFIG_CANYONLANDS is not set 175# CONFIG_CANYONLANDS is not set
176# CONFIG_GLACIER is not set
178# CONFIG_YOSEMITE is not set 177# CONFIG_YOSEMITE is not set
179# CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set 178# CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set
179# CONFIG_PPC44x_SIMPLE is not set
180# CONFIG_PPC4xx_GPIO is not set
180CONFIG_440GP=y 181CONFIG_440GP=y
181# CONFIG_IPIC is not set 182# CONFIG_IPIC is not set
182# CONFIG_MPIC is not set 183# CONFIG_MPIC is not set
@@ -196,7 +197,6 @@ CONFIG_OF_RTC=y
196# Kernel options 197# Kernel options
197# 198#
198# CONFIG_HIGHMEM is not set 199# CONFIG_HIGHMEM is not set
199# CONFIG_TICK_ONESHOT is not set
200# CONFIG_NO_HZ is not set 200# CONFIG_NO_HZ is not set
201# CONFIG_HIGH_RES_TIMERS is not set 201# CONFIG_HIGH_RES_TIMERS is not set
202CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 202CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -210,6 +210,8 @@ CONFIG_PREEMPT_NONE=y
210# CONFIG_PREEMPT_VOLUNTARY is not set 210# CONFIG_PREEMPT_VOLUNTARY is not set
211# CONFIG_PREEMPT is not set 211# CONFIG_PREEMPT is not set
212CONFIG_BINFMT_ELF=y 212CONFIG_BINFMT_ELF=y
213# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
214# CONFIG_HAVE_AOUT is not set
213# CONFIG_BINFMT_MISC is not set 215# CONFIG_BINFMT_MISC is not set
214CONFIG_MATH_EMULATION=y 216CONFIG_MATH_EMULATION=y
215# CONFIG_IOMMU_HELPER is not set 217# CONFIG_IOMMU_HELPER is not set
@@ -224,15 +226,15 @@ CONFIG_FLATMEM_MANUAL=y
224# CONFIG_SPARSEMEM_MANUAL is not set 226# CONFIG_SPARSEMEM_MANUAL is not set
225CONFIG_FLATMEM=y 227CONFIG_FLATMEM=y
226CONFIG_FLAT_NODE_MEM_MAP=y 228CONFIG_FLAT_NODE_MEM_MAP=y
227# CONFIG_SPARSEMEM_STATIC is not set
228# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
229CONFIG_PAGEFLAGS_EXTENDED=y 229CONFIG_PAGEFLAGS_EXTENDED=y
230CONFIG_SPLIT_PTLOCK_CPUS=4 230CONFIG_SPLIT_PTLOCK_CPUS=4
231CONFIG_MIGRATION=y 231CONFIG_MIGRATION=y
232CONFIG_RESOURCES_64BIT=y 232CONFIG_RESOURCES_64BIT=y
233CONFIG_PHYS_ADDR_T_64BIT=y
233CONFIG_ZONE_DMA_FLAG=1 234CONFIG_ZONE_DMA_FLAG=1
234CONFIG_BOUNCE=y 235CONFIG_BOUNCE=y
235CONFIG_VIRT_TO_BUS=y 236CONFIG_VIRT_TO_BUS=y
237CONFIG_UNEVICTABLE_LRU=y
236CONFIG_FORCE_MAX_ZONEORDER=11 238CONFIG_FORCE_MAX_ZONEORDER=11
237CONFIG_PROC_DEVICETREE=y 239CONFIG_PROC_DEVICETREE=y
238# CONFIG_CMDLINE_BOOL is not set 240# CONFIG_CMDLINE_BOOL is not set
@@ -318,6 +320,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
318# CONFIG_TIPC is not set 320# CONFIG_TIPC is not set
319# CONFIG_ATM is not set 321# CONFIG_ATM is not set
320# CONFIG_BRIDGE is not set 322# CONFIG_BRIDGE is not set
323# CONFIG_NET_DSA is not set
321# CONFIG_VLAN_8021Q is not set 324# CONFIG_VLAN_8021Q is not set
322# CONFIG_DECNET is not set 325# CONFIG_DECNET is not set
323# CONFIG_LLC2 is not set 326# CONFIG_LLC2 is not set
@@ -338,14 +341,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
338# CONFIG_IRDA is not set 341# CONFIG_IRDA is not set
339# CONFIG_BT is not set 342# CONFIG_BT is not set
340# CONFIG_AF_RXRPC is not set 343# CONFIG_AF_RXRPC is not set
341 344# CONFIG_PHONET is not set
342# 345# CONFIG_WIRELESS is not set
343# Wireless
344#
345# CONFIG_CFG80211 is not set
346# CONFIG_WIRELESS_EXT is not set
347# CONFIG_MAC80211 is not set
348# CONFIG_IEEE80211 is not set
349# CONFIG_RFKILL is not set 346# CONFIG_RFKILL is not set
350# CONFIG_NET_9P is not set 347# CONFIG_NET_9P is not set
351 348
@@ -525,8 +522,12 @@ CONFIG_IBM_NEW_EMAC_ZMII=y
525# CONFIG_IBM_NEW_EMAC_RGMII is not set 522# CONFIG_IBM_NEW_EMAC_RGMII is not set
526# CONFIG_IBM_NEW_EMAC_TAH is not set 523# CONFIG_IBM_NEW_EMAC_TAH is not set
527# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 524# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
525# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
526# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
527# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
528# CONFIG_NET_PCI is not set 528# CONFIG_NET_PCI is not set
529# CONFIG_B44 is not set 529# CONFIG_B44 is not set
530# CONFIG_ATL2 is not set
530CONFIG_NETDEV_1000=y 531CONFIG_NETDEV_1000=y
531# CONFIG_ACENIC is not set 532# CONFIG_ACENIC is not set
532# CONFIG_DL2K is not set 533# CONFIG_DL2K is not set
@@ -547,18 +548,22 @@ CONFIG_NETDEV_1000=y
547# CONFIG_QLA3XXX is not set 548# CONFIG_QLA3XXX is not set
548# CONFIG_ATL1 is not set 549# CONFIG_ATL1 is not set
549# CONFIG_ATL1E is not set 550# CONFIG_ATL1E is not set
551# CONFIG_JME is not set
550CONFIG_NETDEV_10000=y 552CONFIG_NETDEV_10000=y
551# CONFIG_CHELSIO_T1 is not set 553# CONFIG_CHELSIO_T1 is not set
552# CONFIG_CHELSIO_T3 is not set 554# CONFIG_CHELSIO_T3 is not set
555# CONFIG_ENIC is not set
553# CONFIG_IXGBE is not set 556# CONFIG_IXGBE is not set
554# CONFIG_IXGB is not set 557# CONFIG_IXGB is not set
555# CONFIG_S2IO is not set 558# CONFIG_S2IO is not set
556# CONFIG_MYRI10GE is not set 559# CONFIG_MYRI10GE is not set
557# CONFIG_NETXEN_NIC is not set 560# CONFIG_NETXEN_NIC is not set
558# CONFIG_NIU is not set 561# CONFIG_NIU is not set
562# CONFIG_MLX4_EN is not set
559# CONFIG_MLX4_CORE is not set 563# CONFIG_MLX4_CORE is not set
560# CONFIG_TEHUTI is not set 564# CONFIG_TEHUTI is not set
561# CONFIG_BNX2X is not set 565# CONFIG_BNX2X is not set
566# CONFIG_QLGE is not set
562# CONFIG_SFC is not set 567# CONFIG_SFC is not set
563# CONFIG_TR is not set 568# CONFIG_TR is not set
564 569
@@ -654,6 +659,8 @@ CONFIG_SSB_POSSIBLE=y
654# CONFIG_MFD_CORE is not set 659# CONFIG_MFD_CORE is not set
655# CONFIG_MFD_SM501 is not set 660# CONFIG_MFD_SM501 is not set
656# CONFIG_HTC_PASIC3 is not set 661# CONFIG_HTC_PASIC3 is not set
662# CONFIG_MFD_TMIO is not set
663# CONFIG_MFD_WM8400 is not set
657 664
658# 665#
659# Multimedia devices 666# Multimedia devices
@@ -695,9 +702,14 @@ CONFIG_USB_ARCH_HAS_EHCI=y
695# CONFIG_USB_OTG_BLACKLIST_HUB is not set 702# CONFIG_USB_OTG_BLACKLIST_HUB is not set
696 703
697# 704#
705# Enable Host or Gadget support to see Inventra options
706#
707
708#
698# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 709# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
699# 710#
700# CONFIG_USB_GADGET is not set 711# CONFIG_USB_GADGET is not set
712# CONFIG_UWB is not set
701# CONFIG_MMC is not set 713# CONFIG_MMC is not set
702# CONFIG_MEMSTICK is not set 714# CONFIG_MEMSTICK is not set
703# CONFIG_NEW_LEDS is not set 715# CONFIG_NEW_LEDS is not set
@@ -707,6 +719,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
707# CONFIG_RTC_CLASS is not set 719# CONFIG_RTC_CLASS is not set
708# CONFIG_DMADEVICES is not set 720# CONFIG_DMADEVICES is not set
709# CONFIG_UIO is not set 721# CONFIG_UIO is not set
722# CONFIG_STAGING is not set
710 723
711# 724#
712# File systems 725# File systems
@@ -715,10 +728,11 @@ CONFIG_EXT2_FS=y
715# CONFIG_EXT2_FS_XATTR is not set 728# CONFIG_EXT2_FS_XATTR is not set
716# CONFIG_EXT2_FS_XIP is not set 729# CONFIG_EXT2_FS_XIP is not set
717# CONFIG_EXT3_FS is not set 730# CONFIG_EXT3_FS is not set
718# CONFIG_EXT4DEV_FS is not set 731# CONFIG_EXT4_FS is not set
719# CONFIG_REISERFS_FS is not set 732# CONFIG_REISERFS_FS is not set
720# CONFIG_JFS_FS is not set 733# CONFIG_JFS_FS is not set
721# CONFIG_FS_POSIX_ACL is not set 734# CONFIG_FS_POSIX_ACL is not set
735CONFIG_FILE_LOCKING=y
722# CONFIG_XFS_FS is not set 736# CONFIG_XFS_FS is not set
723# CONFIG_OCFS2_FS is not set 737# CONFIG_OCFS2_FS is not set
724CONFIG_DNOTIFY=y 738CONFIG_DNOTIFY=y
@@ -748,6 +762,7 @@ CONFIG_INOTIFY_USER=y
748CONFIG_PROC_FS=y 762CONFIG_PROC_FS=y
749CONFIG_PROC_KCORE=y 763CONFIG_PROC_KCORE=y
750CONFIG_PROC_SYSCTL=y 764CONFIG_PROC_SYSCTL=y
765CONFIG_PROC_PAGE_MONITOR=y
751CONFIG_SYSFS=y 766CONFIG_SYSFS=y
752CONFIG_TMPFS=y 767CONFIG_TMPFS=y
753# CONFIG_TMPFS_POSIX_ACL is not set 768# CONFIG_TMPFS_POSIX_ACL is not set
@@ -795,6 +810,7 @@ CONFIG_LOCKD=y
795CONFIG_LOCKD_V4=y 810CONFIG_LOCKD_V4=y
796CONFIG_NFS_COMMON=y 811CONFIG_NFS_COMMON=y
797CONFIG_SUNRPC=y 812CONFIG_SUNRPC=y
813# CONFIG_SUNRPC_REGISTER_V4 is not set
798# CONFIG_RPCSEC_GSS_KRB5 is not set 814# CONFIG_RPCSEC_GSS_KRB5 is not set
799# CONFIG_RPCSEC_GSS_SPKM3 is not set 815# CONFIG_RPCSEC_GSS_SPKM3 is not set
800# CONFIG_SMB_FS is not set 816# CONFIG_SMB_FS is not set
@@ -815,7 +831,6 @@ CONFIG_MSDOS_PARTITION=y
815# Library routines 831# Library routines
816# 832#
817CONFIG_BITREVERSE=y 833CONFIG_BITREVERSE=y
818# CONFIG_GENERIC_FIND_FIRST_BIT is not set
819# CONFIG_CRC_CCITT is not set 834# CONFIG_CRC_CCITT is not set
820# CONFIG_CRC16 is not set 835# CONFIG_CRC16 is not set
821# CONFIG_CRC_T10DIF is not set 836# CONFIG_CRC_T10DIF is not set
@@ -869,14 +884,21 @@ CONFIG_DEBUG_BUGVERBOSE=y
869# CONFIG_DEBUG_SG is not set 884# CONFIG_DEBUG_SG is not set
870# CONFIG_BOOT_PRINTK_DELAY is not set 885# CONFIG_BOOT_PRINTK_DELAY is not set
871# CONFIG_RCU_TORTURE_TEST is not set 886# CONFIG_RCU_TORTURE_TEST is not set
887# CONFIG_RCU_CPU_STALL_DETECTOR is not set
872# CONFIG_BACKTRACE_SELF_TEST is not set 888# CONFIG_BACKTRACE_SELF_TEST is not set
889# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
873# CONFIG_FAULT_INJECTION is not set 890# CONFIG_FAULT_INJECTION is not set
874# CONFIG_LATENCYTOP is not set 891# CONFIG_LATENCYTOP is not set
892CONFIG_SYSCTL_SYSCALL_CHECK=y
893CONFIG_NOP_TRACER=y
875CONFIG_HAVE_FTRACE=y 894CONFIG_HAVE_FTRACE=y
876CONFIG_HAVE_DYNAMIC_FTRACE=y 895CONFIG_HAVE_DYNAMIC_FTRACE=y
877# CONFIG_FTRACE is not set 896# CONFIG_FTRACE is not set
878# CONFIG_SCHED_TRACER is not set 897# CONFIG_SCHED_TRACER is not set
879# CONFIG_CONTEXT_SWITCH_TRACER is not set 898# CONFIG_CONTEXT_SWITCH_TRACER is not set
899# CONFIG_BOOT_TRACER is not set
900# CONFIG_STACK_TRACER is not set
901# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
880# CONFIG_SAMPLES is not set 902# CONFIG_SAMPLES is not set
881CONFIG_HAVE_ARCH_KGDB=y 903CONFIG_HAVE_ARCH_KGDB=y
882# CONFIG_KGDB is not set 904# CONFIG_KGDB is not set
@@ -885,6 +907,7 @@ CONFIG_HAVE_ARCH_KGDB=y
885# CONFIG_DEBUG_PAGEALLOC is not set 907# CONFIG_DEBUG_PAGEALLOC is not set
886# CONFIG_CODE_PATCHING_SELFTEST is not set 908# CONFIG_CODE_PATCHING_SELFTEST is not set
887# CONFIG_FTR_FIXUP_SELFTEST is not set 909# CONFIG_FTR_FIXUP_SELFTEST is not set
910# CONFIG_MSI_BITMAP_SELFTEST is not set
888# CONFIG_XMON is not set 911# CONFIG_XMON is not set
889# CONFIG_IRQSTACKS is not set 912# CONFIG_IRQSTACKS is not set
890# CONFIG_VIRQ_DEBUG is not set 913# CONFIG_VIRQ_DEBUG is not set
@@ -896,14 +919,19 @@ CONFIG_HAVE_ARCH_KGDB=y
896# 919#
897# CONFIG_KEYS is not set 920# CONFIG_KEYS is not set
898# CONFIG_SECURITY is not set 921# CONFIG_SECURITY is not set
922# CONFIG_SECURITYFS is not set
899# CONFIG_SECURITY_FILE_CAPABILITIES is not set 923# CONFIG_SECURITY_FILE_CAPABILITIES is not set
900CONFIG_CRYPTO=y 924CONFIG_CRYPTO=y
901 925
902# 926#
903# Crypto core or helper 927# Crypto core or helper
904# 928#
929# CONFIG_CRYPTO_FIPS is not set
905CONFIG_CRYPTO_ALGAPI=y 930CONFIG_CRYPTO_ALGAPI=y
931CONFIG_CRYPTO_AEAD=y
906CONFIG_CRYPTO_BLKCIPHER=y 932CONFIG_CRYPTO_BLKCIPHER=y
933CONFIG_CRYPTO_HASH=y
934CONFIG_CRYPTO_RNG=y
907CONFIG_CRYPTO_MANAGER=y 935CONFIG_CRYPTO_MANAGER=y
908# CONFIG_CRYPTO_GF128MUL is not set 936# CONFIG_CRYPTO_GF128MUL is not set
909# CONFIG_CRYPTO_NULL is not set 937# CONFIG_CRYPTO_NULL is not set
@@ -976,6 +1004,11 @@ CONFIG_CRYPTO_DES=y
976# 1004#
977# CONFIG_CRYPTO_DEFLATE is not set 1005# CONFIG_CRYPTO_DEFLATE is not set
978# CONFIG_CRYPTO_LZO is not set 1006# CONFIG_CRYPTO_LZO is not set
1007
1008#
1009# Random Number Generation
1010#
1011# CONFIG_CRYPTO_ANSI_CPRNG is not set
979# CONFIG_CRYPTO_HW is not set 1012# CONFIG_CRYPTO_HW is not set
980# CONFIG_PPC_CLOCK is not set 1013# CONFIG_PPC_CLOCK is not set
981# CONFIG_VIRTUALIZATION is not set 1014# CONFIG_VIRTUALIZATION is not set
diff --git a/arch/powerpc/configs/44x/katmai_defconfig b/arch/powerpc/configs/44x/katmai_defconfig
index 7bc4082a1c93..e326ee8bd195 100644
--- a/arch/powerpc/configs/44x/katmai_defconfig
+++ b/arch/powerpc/configs/44x/katmai_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.27-rc1 3# Linux kernel version: 2.6.28-rc2
4# Tue Aug 5 09:06:51 2008 4# Tue Oct 28 09:16:11 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -22,14 +22,13 @@ CONFIG_PHYS_64BIT=y
22CONFIG_NOT_COHERENT_CACHE=y 22CONFIG_NOT_COHERENT_CACHE=y
23CONFIG_PPC32=y 23CONFIG_PPC32=y
24CONFIG_WORD_SIZE=32 24CONFIG_WORD_SIZE=32
25CONFIG_PPC_MERGE=y 25CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
26CONFIG_MMU=y 26CONFIG_MMU=y
27CONFIG_GENERIC_CMOS_UPDATE=y 27CONFIG_GENERIC_CMOS_UPDATE=y
28CONFIG_GENERIC_TIME=y 28CONFIG_GENERIC_TIME=y
29CONFIG_GENERIC_TIME_VSYSCALL=y 29CONFIG_GENERIC_TIME_VSYSCALL=y
30CONFIG_GENERIC_CLOCKEVENTS=y 30CONFIG_GENERIC_CLOCKEVENTS=y
31CONFIG_GENERIC_HARDIRQS=y 31CONFIG_GENERIC_HARDIRQS=y
32# CONFIG_HAVE_GET_USER_PAGES_FAST is not set
33# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 32# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
34CONFIG_IRQ_PER_CPU=y 33CONFIG_IRQ_PER_CPU=y
35CONFIG_STACKTRACE_SUPPORT=y 34CONFIG_STACKTRACE_SUPPORT=y
@@ -87,7 +86,6 @@ CONFIG_INITRAMFS_SOURCE=""
87CONFIG_SYSCTL=y 86CONFIG_SYSCTL=y
88CONFIG_EMBEDDED=y 87CONFIG_EMBEDDED=y
89CONFIG_SYSCTL_SYSCALL=y 88CONFIG_SYSCTL_SYSCALL=y
90CONFIG_SYSCTL_SYSCALL_CHECK=y
91CONFIG_KALLSYMS=y 89CONFIG_KALLSYMS=y
92# CONFIG_KALLSYMS_ALL is not set 90# CONFIG_KALLSYMS_ALL is not set
93# CONFIG_KALLSYMS_EXTRA_PASS is not set 91# CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -104,7 +102,9 @@ CONFIG_SIGNALFD=y
104CONFIG_TIMERFD=y 102CONFIG_TIMERFD=y
105CONFIG_EVENTFD=y 103CONFIG_EVENTFD=y
106CONFIG_SHMEM=y 104CONFIG_SHMEM=y
105CONFIG_AIO=y
107CONFIG_VM_EVENT_COUNTERS=y 106CONFIG_VM_EVENT_COUNTERS=y
107CONFIG_PCI_QUIRKS=y
108CONFIG_SLUB_DEBUG=y 108CONFIG_SLUB_DEBUG=y
109# CONFIG_SLAB is not set 109# CONFIG_SLAB is not set
110CONFIG_SLUB=y 110CONFIG_SLUB=y
@@ -118,10 +118,6 @@ CONFIG_HAVE_IOREMAP_PROT=y
118CONFIG_HAVE_KPROBES=y 118CONFIG_HAVE_KPROBES=y
119CONFIG_HAVE_KRETPROBES=y 119CONFIG_HAVE_KRETPROBES=y
120CONFIG_HAVE_ARCH_TRACEHOOK=y 120CONFIG_HAVE_ARCH_TRACEHOOK=y
121# CONFIG_HAVE_DMA_ATTRS is not set
122# CONFIG_USE_GENERIC_SMP_HELPERS is not set
123# CONFIG_HAVE_CLK is not set
124CONFIG_PROC_PAGE_MONITOR=y
125# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 121# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
126CONFIG_SLABINFO=y 122CONFIG_SLABINFO=y
127CONFIG_RT_MUTEXES=y 123CONFIG_RT_MUTEXES=y
@@ -154,6 +150,7 @@ CONFIG_DEFAULT_AS=y
154# CONFIG_DEFAULT_NOOP is not set 150# CONFIG_DEFAULT_NOOP is not set
155CONFIG_DEFAULT_IOSCHED="anticipatory" 151CONFIG_DEFAULT_IOSCHED="anticipatory"
156CONFIG_CLASSIC_RCU=y 152CONFIG_CLASSIC_RCU=y
153# CONFIG_FREEZER is not set
157CONFIG_PPC4xx_PCI_EXPRESS=y 154CONFIG_PPC4xx_PCI_EXPRESS=y
158 155
159# 156#
@@ -170,9 +167,13 @@ CONFIG_PPC4xx_PCI_EXPRESS=y
170CONFIG_KATMAI=y 167CONFIG_KATMAI=y
171# CONFIG_RAINIER is not set 168# CONFIG_RAINIER is not set
172# CONFIG_WARP is not set 169# CONFIG_WARP is not set
170# CONFIG_ARCHES is not set
173# CONFIG_CANYONLANDS is not set 171# CONFIG_CANYONLANDS is not set
172# CONFIG_GLACIER is not set
174# CONFIG_YOSEMITE is not set 173# CONFIG_YOSEMITE is not set
175# CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set 174# CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set
175CONFIG_PPC44x_SIMPLE=y
176# CONFIG_PPC4xx_GPIO is not set
176CONFIG_440SPe=y 177CONFIG_440SPe=y
177# CONFIG_IPIC is not set 178# CONFIG_IPIC is not set
178# CONFIG_MPIC is not set 179# CONFIG_MPIC is not set
@@ -191,7 +192,6 @@ CONFIG_440SPe=y
191# Kernel options 192# Kernel options
192# 193#
193# CONFIG_HIGHMEM is not set 194# CONFIG_HIGHMEM is not set
194# CONFIG_TICK_ONESHOT is not set
195# CONFIG_NO_HZ is not set 195# CONFIG_NO_HZ is not set
196# CONFIG_HIGH_RES_TIMERS is not set 196# CONFIG_HIGH_RES_TIMERS is not set
197CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 197CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -205,6 +205,8 @@ CONFIG_PREEMPT_NONE=y
205# CONFIG_PREEMPT_VOLUNTARY is not set 205# CONFIG_PREEMPT_VOLUNTARY is not set
206# CONFIG_PREEMPT is not set 206# CONFIG_PREEMPT is not set
207CONFIG_BINFMT_ELF=y 207CONFIG_BINFMT_ELF=y
208# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
209# CONFIG_HAVE_AOUT is not set
208# CONFIG_BINFMT_MISC is not set 210# CONFIG_BINFMT_MISC is not set
209# CONFIG_MATH_EMULATION is not set 211# CONFIG_MATH_EMULATION is not set
210# CONFIG_IOMMU_HELPER is not set 212# CONFIG_IOMMU_HELPER is not set
@@ -219,15 +221,15 @@ CONFIG_FLATMEM_MANUAL=y
219# CONFIG_SPARSEMEM_MANUAL is not set 221# CONFIG_SPARSEMEM_MANUAL is not set
220CONFIG_FLATMEM=y 222CONFIG_FLATMEM=y
221CONFIG_FLAT_NODE_MEM_MAP=y 223CONFIG_FLAT_NODE_MEM_MAP=y
222# CONFIG_SPARSEMEM_STATIC is not set
223# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
224CONFIG_PAGEFLAGS_EXTENDED=y 224CONFIG_PAGEFLAGS_EXTENDED=y
225CONFIG_SPLIT_PTLOCK_CPUS=4 225CONFIG_SPLIT_PTLOCK_CPUS=4
226CONFIG_MIGRATION=y 226CONFIG_MIGRATION=y
227CONFIG_RESOURCES_64BIT=y 227CONFIG_RESOURCES_64BIT=y
228CONFIG_PHYS_ADDR_T_64BIT=y
228CONFIG_ZONE_DMA_FLAG=1 229CONFIG_ZONE_DMA_FLAG=1
229CONFIG_BOUNCE=y 230CONFIG_BOUNCE=y
230CONFIG_VIRT_TO_BUS=y 231CONFIG_VIRT_TO_BUS=y
232CONFIG_UNEVICTABLE_LRU=y
231CONFIG_FORCE_MAX_ZONEORDER=11 233CONFIG_FORCE_MAX_ZONEORDER=11
232CONFIG_PROC_DEVICETREE=y 234CONFIG_PROC_DEVICETREE=y
233CONFIG_CMDLINE_BOOL=y 235CONFIG_CMDLINE_BOOL=y
@@ -314,6 +316,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
314# CONFIG_TIPC is not set 316# CONFIG_TIPC is not set
315# CONFIG_ATM is not set 317# CONFIG_ATM is not set
316# CONFIG_BRIDGE is not set 318# CONFIG_BRIDGE is not set
319# CONFIG_NET_DSA is not set
317# CONFIG_VLAN_8021Q is not set 320# CONFIG_VLAN_8021Q is not set
318# CONFIG_DECNET is not set 321# CONFIG_DECNET is not set
319# CONFIG_LLC2 is not set 322# CONFIG_LLC2 is not set
@@ -334,14 +337,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
334# CONFIG_IRDA is not set 337# CONFIG_IRDA is not set
335# CONFIG_BT is not set 338# CONFIG_BT is not set
336# CONFIG_AF_RXRPC is not set 339# CONFIG_AF_RXRPC is not set
337 340# CONFIG_PHONET is not set
338# 341# CONFIG_WIRELESS is not set
339# Wireless
340#
341# CONFIG_CFG80211 is not set
342# CONFIG_WIRELESS_EXT is not set
343# CONFIG_MAC80211 is not set
344# CONFIG_IEEE80211 is not set
345# CONFIG_RFKILL is not set 342# CONFIG_RFKILL is not set
346# CONFIG_NET_9P is not set 343# CONFIG_NET_9P is not set
347 344
@@ -446,8 +443,12 @@ CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
446# CONFIG_IBM_NEW_EMAC_RGMII is not set 443# CONFIG_IBM_NEW_EMAC_RGMII is not set
447# CONFIG_IBM_NEW_EMAC_TAH is not set 444# CONFIG_IBM_NEW_EMAC_TAH is not set
448CONFIG_IBM_NEW_EMAC_EMAC4=y 445CONFIG_IBM_NEW_EMAC_EMAC4=y
446# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
447# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
448# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
449# CONFIG_NET_PCI is not set 449# CONFIG_NET_PCI is not set
450# CONFIG_B44 is not set 450# CONFIG_B44 is not set
451# CONFIG_ATL2 is not set
451CONFIG_NETDEV_1000=y 452CONFIG_NETDEV_1000=y
452# CONFIG_ACENIC is not set 453# CONFIG_ACENIC is not set
453# CONFIG_DL2K is not set 454# CONFIG_DL2K is not set
@@ -468,18 +469,22 @@ CONFIG_NETDEV_1000=y
468# CONFIG_QLA3XXX is not set 469# CONFIG_QLA3XXX is not set
469# CONFIG_ATL1 is not set 470# CONFIG_ATL1 is not set
470# CONFIG_ATL1E is not set 471# CONFIG_ATL1E is not set
472# CONFIG_JME is not set
471CONFIG_NETDEV_10000=y 473CONFIG_NETDEV_10000=y
472# CONFIG_CHELSIO_T1 is not set 474# CONFIG_CHELSIO_T1 is not set
473# CONFIG_CHELSIO_T3 is not set 475# CONFIG_CHELSIO_T3 is not set
476# CONFIG_ENIC is not set
474# CONFIG_IXGBE is not set 477# CONFIG_IXGBE is not set
475# CONFIG_IXGB is not set 478# CONFIG_IXGB is not set
476# CONFIG_S2IO is not set 479# CONFIG_S2IO is not set
477# CONFIG_MYRI10GE is not set 480# CONFIG_MYRI10GE is not set
478# CONFIG_NETXEN_NIC is not set 481# CONFIG_NETXEN_NIC is not set
479# CONFIG_NIU is not set 482# CONFIG_NIU is not set
483# CONFIG_MLX4_EN is not set
480# CONFIG_MLX4_CORE is not set 484# CONFIG_MLX4_CORE is not set
481# CONFIG_TEHUTI is not set 485# CONFIG_TEHUTI is not set
482# CONFIG_BNX2X is not set 486# CONFIG_BNX2X is not set
487# CONFIG_QLGE is not set
483# CONFIG_SFC is not set 488# CONFIG_SFC is not set
484# CONFIG_TR is not set 489# CONFIG_TR is not set
485 490
@@ -576,6 +581,8 @@ CONFIG_SSB_POSSIBLE=y
576# CONFIG_MFD_CORE is not set 581# CONFIG_MFD_CORE is not set
577# CONFIG_MFD_SM501 is not set 582# CONFIG_MFD_SM501 is not set
578# CONFIG_HTC_PASIC3 is not set 583# CONFIG_HTC_PASIC3 is not set
584# CONFIG_MFD_TMIO is not set
585# CONFIG_MFD_WM8400 is not set
579 586
580# 587#
581# Multimedia devices 588# Multimedia devices
@@ -617,9 +624,14 @@ CONFIG_USB_ARCH_HAS_EHCI=y
617# CONFIG_USB_OTG_BLACKLIST_HUB is not set 624# CONFIG_USB_OTG_BLACKLIST_HUB is not set
618 625
619# 626#
627# Enable Host or Gadget support to see Inventra options
628#
629
630#
620# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 631# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
621# 632#
622# CONFIG_USB_GADGET is not set 633# CONFIG_USB_GADGET is not set
634# CONFIG_UWB is not set
623# CONFIG_MMC is not set 635# CONFIG_MMC is not set
624# CONFIG_MEMSTICK is not set 636# CONFIG_MEMSTICK is not set
625# CONFIG_NEW_LEDS is not set 637# CONFIG_NEW_LEDS is not set
@@ -629,6 +641,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
629# CONFIG_RTC_CLASS is not set 641# CONFIG_RTC_CLASS is not set
630# CONFIG_DMADEVICES is not set 642# CONFIG_DMADEVICES is not set
631# CONFIG_UIO is not set 643# CONFIG_UIO is not set
644# CONFIG_STAGING is not set
632 645
633# 646#
634# File systems 647# File systems
@@ -637,10 +650,11 @@ CONFIG_EXT2_FS=y
637# CONFIG_EXT2_FS_XATTR is not set 650# CONFIG_EXT2_FS_XATTR is not set
638# CONFIG_EXT2_FS_XIP is not set 651# CONFIG_EXT2_FS_XIP is not set
639# CONFIG_EXT3_FS is not set 652# CONFIG_EXT3_FS is not set
640# CONFIG_EXT4DEV_FS is not set 653# CONFIG_EXT4_FS is not set
641# CONFIG_REISERFS_FS is not set 654# CONFIG_REISERFS_FS is not set
642# CONFIG_JFS_FS is not set 655# CONFIG_JFS_FS is not set
643# CONFIG_FS_POSIX_ACL is not set 656# CONFIG_FS_POSIX_ACL is not set
657CONFIG_FILE_LOCKING=y
644# CONFIG_XFS_FS is not set 658# CONFIG_XFS_FS is not set
645# CONFIG_OCFS2_FS is not set 659# CONFIG_OCFS2_FS is not set
646CONFIG_DNOTIFY=y 660CONFIG_DNOTIFY=y
@@ -670,6 +684,7 @@ CONFIG_INOTIFY_USER=y
670CONFIG_PROC_FS=y 684CONFIG_PROC_FS=y
671CONFIG_PROC_KCORE=y 685CONFIG_PROC_KCORE=y
672CONFIG_PROC_SYSCTL=y 686CONFIG_PROC_SYSCTL=y
687CONFIG_PROC_PAGE_MONITOR=y
673CONFIG_SYSFS=y 688CONFIG_SYSFS=y
674CONFIG_TMPFS=y 689CONFIG_TMPFS=y
675# CONFIG_TMPFS_POSIX_ACL is not set 690# CONFIG_TMPFS_POSIX_ACL is not set
@@ -706,6 +721,7 @@ CONFIG_LOCKD=y
706CONFIG_LOCKD_V4=y 721CONFIG_LOCKD_V4=y
707CONFIG_NFS_COMMON=y 722CONFIG_NFS_COMMON=y
708CONFIG_SUNRPC=y 723CONFIG_SUNRPC=y
724# CONFIG_SUNRPC_REGISTER_V4 is not set
709# CONFIG_RPCSEC_GSS_KRB5 is not set 725# CONFIG_RPCSEC_GSS_KRB5 is not set
710# CONFIG_RPCSEC_GSS_SPKM3 is not set 726# CONFIG_RPCSEC_GSS_SPKM3 is not set
711# CONFIG_SMB_FS is not set 727# CONFIG_SMB_FS is not set
@@ -726,7 +742,6 @@ CONFIG_MSDOS_PARTITION=y
726# Library routines 742# Library routines
727# 743#
728CONFIG_BITREVERSE=y 744CONFIG_BITREVERSE=y
729# CONFIG_GENERIC_FIND_FIRST_BIT is not set
730# CONFIG_CRC_CCITT is not set 745# CONFIG_CRC_CCITT is not set
731# CONFIG_CRC16 is not set 746# CONFIG_CRC16 is not set
732# CONFIG_CRC_T10DIF is not set 747# CONFIG_CRC_T10DIF is not set
@@ -779,14 +794,21 @@ CONFIG_SCHED_DEBUG=y
779# CONFIG_DEBUG_SG is not set 794# CONFIG_DEBUG_SG is not set
780# CONFIG_BOOT_PRINTK_DELAY is not set 795# CONFIG_BOOT_PRINTK_DELAY is not set
781# CONFIG_RCU_TORTURE_TEST is not set 796# CONFIG_RCU_TORTURE_TEST is not set
797# CONFIG_RCU_CPU_STALL_DETECTOR is not set
782# CONFIG_BACKTRACE_SELF_TEST is not set 798# CONFIG_BACKTRACE_SELF_TEST is not set
799# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
783# CONFIG_FAULT_INJECTION is not set 800# CONFIG_FAULT_INJECTION is not set
784# CONFIG_LATENCYTOP is not set 801# CONFIG_LATENCYTOP is not set
802CONFIG_SYSCTL_SYSCALL_CHECK=y
803CONFIG_NOP_TRACER=y
785CONFIG_HAVE_FTRACE=y 804CONFIG_HAVE_FTRACE=y
786CONFIG_HAVE_DYNAMIC_FTRACE=y 805CONFIG_HAVE_DYNAMIC_FTRACE=y
787# CONFIG_FTRACE is not set 806# CONFIG_FTRACE is not set
788# CONFIG_SCHED_TRACER is not set 807# CONFIG_SCHED_TRACER is not set
789# CONFIG_CONTEXT_SWITCH_TRACER is not set 808# CONFIG_CONTEXT_SWITCH_TRACER is not set
809# CONFIG_BOOT_TRACER is not set
810# CONFIG_STACK_TRACER is not set
811# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
790# CONFIG_SAMPLES is not set 812# CONFIG_SAMPLES is not set
791CONFIG_HAVE_ARCH_KGDB=y 813CONFIG_HAVE_ARCH_KGDB=y
792# CONFIG_KGDB is not set 814# CONFIG_KGDB is not set
@@ -795,6 +817,7 @@ CONFIG_HAVE_ARCH_KGDB=y
795# CONFIG_DEBUG_PAGEALLOC is not set 817# CONFIG_DEBUG_PAGEALLOC is not set
796# CONFIG_CODE_PATCHING_SELFTEST is not set 818# CONFIG_CODE_PATCHING_SELFTEST is not set
797# CONFIG_FTR_FIXUP_SELFTEST is not set 819# CONFIG_FTR_FIXUP_SELFTEST is not set
820# CONFIG_MSI_BITMAP_SELFTEST is not set
798# CONFIG_XMON is not set 821# CONFIG_XMON is not set
799# CONFIG_IRQSTACKS is not set 822# CONFIG_IRQSTACKS is not set
800# CONFIG_BDI_SWITCH is not set 823# CONFIG_BDI_SWITCH is not set
@@ -805,14 +828,19 @@ CONFIG_HAVE_ARCH_KGDB=y
805# 828#
806# CONFIG_KEYS is not set 829# CONFIG_KEYS is not set
807# CONFIG_SECURITY is not set 830# CONFIG_SECURITY is not set
831# CONFIG_SECURITYFS is not set
808# CONFIG_SECURITY_FILE_CAPABILITIES is not set 832# CONFIG_SECURITY_FILE_CAPABILITIES is not set
809CONFIG_CRYPTO=y 833CONFIG_CRYPTO=y
810 834
811# 835#
812# Crypto core or helper 836# Crypto core or helper
813# 837#
838# CONFIG_CRYPTO_FIPS is not set
814CONFIG_CRYPTO_ALGAPI=y 839CONFIG_CRYPTO_ALGAPI=y
840CONFIG_CRYPTO_AEAD=y
815CONFIG_CRYPTO_BLKCIPHER=y 841CONFIG_CRYPTO_BLKCIPHER=y
842CONFIG_CRYPTO_HASH=y
843CONFIG_CRYPTO_RNG=y
816CONFIG_CRYPTO_MANAGER=y 844CONFIG_CRYPTO_MANAGER=y
817# CONFIG_CRYPTO_GF128MUL is not set 845# CONFIG_CRYPTO_GF128MUL is not set
818# CONFIG_CRYPTO_NULL is not set 846# CONFIG_CRYPTO_NULL is not set
@@ -885,6 +913,11 @@ CONFIG_CRYPTO_DES=y
885# 913#
886# CONFIG_CRYPTO_DEFLATE is not set 914# CONFIG_CRYPTO_DEFLATE is not set
887# CONFIG_CRYPTO_LZO is not set 915# CONFIG_CRYPTO_LZO is not set
916
917#
918# Random Number Generation
919#
920# CONFIG_CRYPTO_ANSI_CPRNG is not set
888CONFIG_CRYPTO_HW=y 921CONFIG_CRYPTO_HW=y
889# CONFIG_CRYPTO_DEV_HIFN_795X is not set 922# CONFIG_CRYPTO_DEV_HIFN_795X is not set
890# CONFIG_PPC_CLOCK is not set 923# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/44x/rainier_defconfig b/arch/powerpc/configs/44x/rainier_defconfig
index 0479648a9141..927f829e2087 100644
--- a/arch/powerpc/configs/44x/rainier_defconfig
+++ b/arch/powerpc/configs/44x/rainier_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.27-rc1 3# Linux kernel version: 2.6.28-rc2
4# Tue Aug 5 09:09:35 2008 4# Tue Oct 28 09:16:13 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -22,14 +22,13 @@ CONFIG_PHYS_64BIT=y
22CONFIG_NOT_COHERENT_CACHE=y 22CONFIG_NOT_COHERENT_CACHE=y
23CONFIG_PPC32=y 23CONFIG_PPC32=y
24CONFIG_WORD_SIZE=32 24CONFIG_WORD_SIZE=32
25CONFIG_PPC_MERGE=y 25CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
26CONFIG_MMU=y 26CONFIG_MMU=y
27CONFIG_GENERIC_CMOS_UPDATE=y 27CONFIG_GENERIC_CMOS_UPDATE=y
28CONFIG_GENERIC_TIME=y 28CONFIG_GENERIC_TIME=y
29CONFIG_GENERIC_TIME_VSYSCALL=y 29CONFIG_GENERIC_TIME_VSYSCALL=y
30CONFIG_GENERIC_CLOCKEVENTS=y 30CONFIG_GENERIC_CLOCKEVENTS=y
31CONFIG_GENERIC_HARDIRQS=y 31CONFIG_GENERIC_HARDIRQS=y
32# CONFIG_HAVE_GET_USER_PAGES_FAST is not set
33# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 32# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
34CONFIG_IRQ_PER_CPU=y 33CONFIG_IRQ_PER_CPU=y
35CONFIG_STACKTRACE_SUPPORT=y 34CONFIG_STACKTRACE_SUPPORT=y
@@ -91,7 +90,6 @@ CONFIG_INITRAMFS_SOURCE=""
91CONFIG_SYSCTL=y 90CONFIG_SYSCTL=y
92CONFIG_EMBEDDED=y 91CONFIG_EMBEDDED=y
93CONFIG_SYSCTL_SYSCALL=y 92CONFIG_SYSCTL_SYSCALL=y
94CONFIG_SYSCTL_SYSCALL_CHECK=y
95CONFIG_KALLSYMS=y 93CONFIG_KALLSYMS=y
96# CONFIG_KALLSYMS_ALL is not set 94# CONFIG_KALLSYMS_ALL is not set
97# CONFIG_KALLSYMS_EXTRA_PASS is not set 95# CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -108,7 +106,9 @@ CONFIG_SIGNALFD=y
108CONFIG_TIMERFD=y 106CONFIG_TIMERFD=y
109CONFIG_EVENTFD=y 107CONFIG_EVENTFD=y
110CONFIG_SHMEM=y 108CONFIG_SHMEM=y
109CONFIG_AIO=y
111CONFIG_VM_EVENT_COUNTERS=y 110CONFIG_VM_EVENT_COUNTERS=y
111CONFIG_PCI_QUIRKS=y
112CONFIG_SLUB_DEBUG=y 112CONFIG_SLUB_DEBUG=y
113# CONFIG_SLAB is not set 113# CONFIG_SLAB is not set
114CONFIG_SLUB=y 114CONFIG_SLUB=y
@@ -122,10 +122,6 @@ CONFIG_HAVE_IOREMAP_PROT=y
122CONFIG_HAVE_KPROBES=y 122CONFIG_HAVE_KPROBES=y
123CONFIG_HAVE_KRETPROBES=y 123CONFIG_HAVE_KRETPROBES=y
124CONFIG_HAVE_ARCH_TRACEHOOK=y 124CONFIG_HAVE_ARCH_TRACEHOOK=y
125# CONFIG_HAVE_DMA_ATTRS is not set
126# CONFIG_USE_GENERIC_SMP_HELPERS is not set
127# CONFIG_HAVE_CLK is not set
128CONFIG_PROC_PAGE_MONITOR=y
129# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 125# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
130CONFIG_SLABINFO=y 126CONFIG_SLABINFO=y
131CONFIG_RT_MUTEXES=y 127CONFIG_RT_MUTEXES=y
@@ -158,6 +154,7 @@ CONFIG_DEFAULT_AS=y
158# CONFIG_DEFAULT_NOOP is not set 154# CONFIG_DEFAULT_NOOP is not set
159CONFIG_DEFAULT_IOSCHED="anticipatory" 155CONFIG_DEFAULT_IOSCHED="anticipatory"
160CONFIG_CLASSIC_RCU=y 156CONFIG_CLASSIC_RCU=y
157# CONFIG_FREEZER is not set
161# CONFIG_PPC4xx_PCI_EXPRESS is not set 158# CONFIG_PPC4xx_PCI_EXPRESS is not set
162 159
163# 160#
@@ -174,9 +171,13 @@ CONFIG_CLASSIC_RCU=y
174# CONFIG_KATMAI is not set 171# CONFIG_KATMAI is not set
175CONFIG_RAINIER=y 172CONFIG_RAINIER=y
176# CONFIG_WARP is not set 173# CONFIG_WARP is not set
174# CONFIG_ARCHES is not set
177# CONFIG_CANYONLANDS is not set 175# CONFIG_CANYONLANDS is not set
176# CONFIG_GLACIER is not set
178# CONFIG_YOSEMITE is not set 177# CONFIG_YOSEMITE is not set
179# CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set 178# CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set
179CONFIG_PPC44x_SIMPLE=y
180# CONFIG_PPC4xx_GPIO is not set
180CONFIG_440GRX=y 181CONFIG_440GRX=y
181# CONFIG_IPIC is not set 182# CONFIG_IPIC is not set
182# CONFIG_MPIC is not set 183# CONFIG_MPIC is not set
@@ -195,7 +196,6 @@ CONFIG_440GRX=y
195# Kernel options 196# Kernel options
196# 197#
197# CONFIG_HIGHMEM is not set 198# CONFIG_HIGHMEM is not set
198# CONFIG_TICK_ONESHOT is not set
199# CONFIG_NO_HZ is not set 199# CONFIG_NO_HZ is not set
200# CONFIG_HIGH_RES_TIMERS is not set 200# CONFIG_HIGH_RES_TIMERS is not set
201CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 201CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -209,6 +209,8 @@ CONFIG_PREEMPT_NONE=y
209# CONFIG_PREEMPT_VOLUNTARY is not set 209# CONFIG_PREEMPT_VOLUNTARY is not set
210# CONFIG_PREEMPT is not set 210# CONFIG_PREEMPT is not set
211CONFIG_BINFMT_ELF=y 211CONFIG_BINFMT_ELF=y
212# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
213# CONFIG_HAVE_AOUT is not set
212# CONFIG_BINFMT_MISC is not set 214# CONFIG_BINFMT_MISC is not set
213CONFIG_MATH_EMULATION=y 215CONFIG_MATH_EMULATION=y
214# CONFIG_IOMMU_HELPER is not set 216# CONFIG_IOMMU_HELPER is not set
@@ -223,15 +225,15 @@ CONFIG_FLATMEM_MANUAL=y
223# CONFIG_SPARSEMEM_MANUAL is not set 225# CONFIG_SPARSEMEM_MANUAL is not set
224CONFIG_FLATMEM=y 226CONFIG_FLATMEM=y
225CONFIG_FLAT_NODE_MEM_MAP=y 227CONFIG_FLAT_NODE_MEM_MAP=y
226# CONFIG_SPARSEMEM_STATIC is not set
227# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
228CONFIG_PAGEFLAGS_EXTENDED=y 228CONFIG_PAGEFLAGS_EXTENDED=y
229CONFIG_SPLIT_PTLOCK_CPUS=4 229CONFIG_SPLIT_PTLOCK_CPUS=4
230CONFIG_MIGRATION=y 230CONFIG_MIGRATION=y
231CONFIG_RESOURCES_64BIT=y 231CONFIG_RESOURCES_64BIT=y
232CONFIG_PHYS_ADDR_T_64BIT=y
232CONFIG_ZONE_DMA_FLAG=1 233CONFIG_ZONE_DMA_FLAG=1
233CONFIG_BOUNCE=y 234CONFIG_BOUNCE=y
234CONFIG_VIRT_TO_BUS=y 235CONFIG_VIRT_TO_BUS=y
236CONFIG_UNEVICTABLE_LRU=y
235CONFIG_FORCE_MAX_ZONEORDER=11 237CONFIG_FORCE_MAX_ZONEORDER=11
236CONFIG_PROC_DEVICETREE=y 238CONFIG_PROC_DEVICETREE=y
237CONFIG_CMDLINE_BOOL=y 239CONFIG_CMDLINE_BOOL=y
@@ -318,6 +320,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
318# CONFIG_TIPC is not set 320# CONFIG_TIPC is not set
319# CONFIG_ATM is not set 321# CONFIG_ATM is not set
320# CONFIG_BRIDGE is not set 322# CONFIG_BRIDGE is not set
323# CONFIG_NET_DSA is not set
321# CONFIG_VLAN_8021Q is not set 324# CONFIG_VLAN_8021Q is not set
322# CONFIG_DECNET is not set 325# CONFIG_DECNET is not set
323# CONFIG_LLC2 is not set 326# CONFIG_LLC2 is not set
@@ -338,14 +341,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
338# CONFIG_IRDA is not set 341# CONFIG_IRDA is not set
339# CONFIG_BT is not set 342# CONFIG_BT is not set
340# CONFIG_AF_RXRPC is not set 343# CONFIG_AF_RXRPC is not set
341 344# CONFIG_PHONET is not set
342# 345# CONFIG_WIRELESS is not set
343# Wireless
344#
345# CONFIG_CFG80211 is not set
346# CONFIG_WIRELESS_EXT is not set
347# CONFIG_MAC80211 is not set
348# CONFIG_IEEE80211 is not set
349# CONFIG_RFKILL is not set 346# CONFIG_RFKILL is not set
350# CONFIG_NET_9P is not set 347# CONFIG_NET_9P is not set
351 348
@@ -532,18 +529,22 @@ CONFIG_NETDEV_1000=y
532# CONFIG_QLA3XXX is not set 529# CONFIG_QLA3XXX is not set
533# CONFIG_ATL1 is not set 530# CONFIG_ATL1 is not set
534# CONFIG_ATL1E is not set 531# CONFIG_ATL1E is not set
532# CONFIG_JME is not set
535CONFIG_NETDEV_10000=y 533CONFIG_NETDEV_10000=y
536# CONFIG_CHELSIO_T1 is not set 534# CONFIG_CHELSIO_T1 is not set
537# CONFIG_CHELSIO_T3 is not set 535# CONFIG_CHELSIO_T3 is not set
536# CONFIG_ENIC is not set
538# CONFIG_IXGBE is not set 537# CONFIG_IXGBE is not set
539# CONFIG_IXGB is not set 538# CONFIG_IXGB is not set
540# CONFIG_S2IO is not set 539# CONFIG_S2IO is not set
541# CONFIG_MYRI10GE is not set 540# CONFIG_MYRI10GE is not set
542# CONFIG_NETXEN_NIC is not set 541# CONFIG_NETXEN_NIC is not set
543# CONFIG_NIU is not set 542# CONFIG_NIU is not set
543# CONFIG_MLX4_EN is not set
544# CONFIG_MLX4_CORE is not set 544# CONFIG_MLX4_CORE is not set
545# CONFIG_TEHUTI is not set 545# CONFIG_TEHUTI is not set
546# CONFIG_BNX2X is not set 546# CONFIG_BNX2X is not set
547# CONFIG_QLGE is not set
547# CONFIG_SFC is not set 548# CONFIG_SFC is not set
548# CONFIG_TR is not set 549# CONFIG_TR is not set
549 550
@@ -639,6 +640,8 @@ CONFIG_SSB_POSSIBLE=y
639# CONFIG_MFD_CORE is not set 640# CONFIG_MFD_CORE is not set
640# CONFIG_MFD_SM501 is not set 641# CONFIG_MFD_SM501 is not set
641# CONFIG_HTC_PASIC3 is not set 642# CONFIG_HTC_PASIC3 is not set
643# CONFIG_MFD_TMIO is not set
644# CONFIG_MFD_WM8400 is not set
642 645
643# 646#
644# Multimedia devices 647# Multimedia devices
@@ -680,9 +683,14 @@ CONFIG_USB_ARCH_HAS_EHCI=y
680# CONFIG_USB_OTG_BLACKLIST_HUB is not set 683# CONFIG_USB_OTG_BLACKLIST_HUB is not set
681 684
682# 685#
686# Enable Host or Gadget support to see Inventra options
687#
688
689#
683# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 690# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
684# 691#
685# CONFIG_USB_GADGET is not set 692# CONFIG_USB_GADGET is not set
693# CONFIG_UWB is not set
686# CONFIG_MMC is not set 694# CONFIG_MMC is not set
687# CONFIG_MEMSTICK is not set 695# CONFIG_MEMSTICK is not set
688# CONFIG_NEW_LEDS is not set 696# CONFIG_NEW_LEDS is not set
@@ -692,6 +700,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
692# CONFIG_RTC_CLASS is not set 700# CONFIG_RTC_CLASS is not set
693# CONFIG_DMADEVICES is not set 701# CONFIG_DMADEVICES is not set
694# CONFIG_UIO is not set 702# CONFIG_UIO is not set
703# CONFIG_STAGING is not set
695 704
696# 705#
697# File systems 706# File systems
@@ -700,10 +709,11 @@ CONFIG_EXT2_FS=y
700# CONFIG_EXT2_FS_XATTR is not set 709# CONFIG_EXT2_FS_XATTR is not set
701# CONFIG_EXT2_FS_XIP is not set 710# CONFIG_EXT2_FS_XIP is not set
702# CONFIG_EXT3_FS is not set 711# CONFIG_EXT3_FS is not set
703# CONFIG_EXT4DEV_FS is not set 712# CONFIG_EXT4_FS is not set
704# CONFIG_REISERFS_FS is not set 713# CONFIG_REISERFS_FS is not set
705# CONFIG_JFS_FS is not set 714# CONFIG_JFS_FS is not set
706# CONFIG_FS_POSIX_ACL is not set 715# CONFIG_FS_POSIX_ACL is not set
716CONFIG_FILE_LOCKING=y
707# CONFIG_XFS_FS is not set 717# CONFIG_XFS_FS is not set
708# CONFIG_OCFS2_FS is not set 718# CONFIG_OCFS2_FS is not set
709CONFIG_DNOTIFY=y 719CONFIG_DNOTIFY=y
@@ -733,6 +743,7 @@ CONFIG_INOTIFY_USER=y
733CONFIG_PROC_FS=y 743CONFIG_PROC_FS=y
734CONFIG_PROC_KCORE=y 744CONFIG_PROC_KCORE=y
735CONFIG_PROC_SYSCTL=y 745CONFIG_PROC_SYSCTL=y
746CONFIG_PROC_PAGE_MONITOR=y
736CONFIG_SYSFS=y 747CONFIG_SYSFS=y
737CONFIG_TMPFS=y 748CONFIG_TMPFS=y
738# CONFIG_TMPFS_POSIX_ACL is not set 749# CONFIG_TMPFS_POSIX_ACL is not set
@@ -780,6 +791,7 @@ CONFIG_LOCKD=y
780CONFIG_LOCKD_V4=y 791CONFIG_LOCKD_V4=y
781CONFIG_NFS_COMMON=y 792CONFIG_NFS_COMMON=y
782CONFIG_SUNRPC=y 793CONFIG_SUNRPC=y
794# CONFIG_SUNRPC_REGISTER_V4 is not set
783# CONFIG_RPCSEC_GSS_KRB5 is not set 795# CONFIG_RPCSEC_GSS_KRB5 is not set
784# CONFIG_RPCSEC_GSS_SPKM3 is not set 796# CONFIG_RPCSEC_GSS_SPKM3 is not set
785# CONFIG_SMB_FS is not set 797# CONFIG_SMB_FS is not set
@@ -800,7 +812,6 @@ CONFIG_MSDOS_PARTITION=y
800# Library routines 812# Library routines
801# 813#
802CONFIG_BITREVERSE=y 814CONFIG_BITREVERSE=y
803# CONFIG_GENERIC_FIND_FIRST_BIT is not set
804# CONFIG_CRC_CCITT is not set 815# CONFIG_CRC_CCITT is not set
805# CONFIG_CRC16 is not set 816# CONFIG_CRC16 is not set
806# CONFIG_CRC_T10DIF is not set 817# CONFIG_CRC_T10DIF is not set
@@ -854,14 +865,21 @@ CONFIG_SCHED_DEBUG=y
854# CONFIG_DEBUG_SG is not set 865# CONFIG_DEBUG_SG is not set
855# CONFIG_BOOT_PRINTK_DELAY is not set 866# CONFIG_BOOT_PRINTK_DELAY is not set
856# CONFIG_RCU_TORTURE_TEST is not set 867# CONFIG_RCU_TORTURE_TEST is not set
868# CONFIG_RCU_CPU_STALL_DETECTOR is not set
857# CONFIG_BACKTRACE_SELF_TEST is not set 869# CONFIG_BACKTRACE_SELF_TEST is not set
870# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
858# CONFIG_FAULT_INJECTION is not set 871# CONFIG_FAULT_INJECTION is not set
859# CONFIG_LATENCYTOP is not set 872# CONFIG_LATENCYTOP is not set
873CONFIG_SYSCTL_SYSCALL_CHECK=y
874CONFIG_NOP_TRACER=y
860CONFIG_HAVE_FTRACE=y 875CONFIG_HAVE_FTRACE=y
861CONFIG_HAVE_DYNAMIC_FTRACE=y 876CONFIG_HAVE_DYNAMIC_FTRACE=y
862# CONFIG_FTRACE is not set 877# CONFIG_FTRACE is not set
863# CONFIG_SCHED_TRACER is not set 878# CONFIG_SCHED_TRACER is not set
864# CONFIG_CONTEXT_SWITCH_TRACER is not set 879# CONFIG_CONTEXT_SWITCH_TRACER is not set
880# CONFIG_BOOT_TRACER is not set
881# CONFIG_STACK_TRACER is not set
882# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
865# CONFIG_SAMPLES is not set 883# CONFIG_SAMPLES is not set
866CONFIG_HAVE_ARCH_KGDB=y 884CONFIG_HAVE_ARCH_KGDB=y
867# CONFIG_KGDB is not set 885# CONFIG_KGDB is not set
@@ -870,6 +888,7 @@ CONFIG_HAVE_ARCH_KGDB=y
870# CONFIG_DEBUG_PAGEALLOC is not set 888# CONFIG_DEBUG_PAGEALLOC is not set
871# CONFIG_CODE_PATCHING_SELFTEST is not set 889# CONFIG_CODE_PATCHING_SELFTEST is not set
872# CONFIG_FTR_FIXUP_SELFTEST is not set 890# CONFIG_FTR_FIXUP_SELFTEST is not set
891# CONFIG_MSI_BITMAP_SELFTEST is not set
873# CONFIG_XMON is not set 892# CONFIG_XMON is not set
874# CONFIG_IRQSTACKS is not set 893# CONFIG_IRQSTACKS is not set
875# CONFIG_VIRQ_DEBUG is not set 894# CONFIG_VIRQ_DEBUG is not set
@@ -894,14 +913,19 @@ CONFIG_PPC_EARLY_DEBUG_44x_PHYSHIGH=0x1
894# 913#
895# CONFIG_KEYS is not set 914# CONFIG_KEYS is not set
896# CONFIG_SECURITY is not set 915# CONFIG_SECURITY is not set
916# CONFIG_SECURITYFS is not set
897# CONFIG_SECURITY_FILE_CAPABILITIES is not set 917# CONFIG_SECURITY_FILE_CAPABILITIES is not set
898CONFIG_CRYPTO=y 918CONFIG_CRYPTO=y
899 919
900# 920#
901# Crypto core or helper 921# Crypto core or helper
902# 922#
923# CONFIG_CRYPTO_FIPS is not set
903CONFIG_CRYPTO_ALGAPI=y 924CONFIG_CRYPTO_ALGAPI=y
925CONFIG_CRYPTO_AEAD=y
904CONFIG_CRYPTO_BLKCIPHER=y 926CONFIG_CRYPTO_BLKCIPHER=y
927CONFIG_CRYPTO_HASH=y
928CONFIG_CRYPTO_RNG=y
905CONFIG_CRYPTO_MANAGER=y 929CONFIG_CRYPTO_MANAGER=y
906# CONFIG_CRYPTO_GF128MUL is not set 930# CONFIG_CRYPTO_GF128MUL is not set
907# CONFIG_CRYPTO_NULL is not set 931# CONFIG_CRYPTO_NULL is not set
@@ -974,6 +998,11 @@ CONFIG_CRYPTO_DES=y
974# 998#
975# CONFIG_CRYPTO_DEFLATE is not set 999# CONFIG_CRYPTO_DEFLATE is not set
976# CONFIG_CRYPTO_LZO is not set 1000# CONFIG_CRYPTO_LZO is not set
1001
1002#
1003# Random Number Generation
1004#
1005# CONFIG_CRYPTO_ANSI_CPRNG is not set
977CONFIG_CRYPTO_HW=y 1006CONFIG_CRYPTO_HW=y
978# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1007# CONFIG_CRYPTO_DEV_HIFN_795X is not set
979# CONFIG_PPC_CLOCK is not set 1008# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/44x/sam440ep_defconfig b/arch/powerpc/configs/44x/sam440ep_defconfig
index 0ed2de05f4e8..15f48e03ec2e 100644
--- a/arch/powerpc/configs/44x/sam440ep_defconfig
+++ b/arch/powerpc/configs/44x/sam440ep_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.27-rc1 3# Linux kernel version: 2.6.28-rc2
4# Tue Aug 5 09:12:48 2008 4# Tue Oct 28 09:16:15 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -23,14 +23,13 @@ CONFIG_PHYS_64BIT=y
23CONFIG_NOT_COHERENT_CACHE=y 23CONFIG_NOT_COHERENT_CACHE=y
24CONFIG_PPC32=y 24CONFIG_PPC32=y
25CONFIG_WORD_SIZE=32 25CONFIG_WORD_SIZE=32
26CONFIG_PPC_MERGE=y 26CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
27CONFIG_MMU=y 27CONFIG_MMU=y
28CONFIG_GENERIC_CMOS_UPDATE=y 28CONFIG_GENERIC_CMOS_UPDATE=y
29CONFIG_GENERIC_TIME=y 29CONFIG_GENERIC_TIME=y
30CONFIG_GENERIC_TIME_VSYSCALL=y 30CONFIG_GENERIC_TIME_VSYSCALL=y
31CONFIG_GENERIC_CLOCKEVENTS=y 31CONFIG_GENERIC_CLOCKEVENTS=y
32CONFIG_GENERIC_HARDIRQS=y 32CONFIG_GENERIC_HARDIRQS=y
33# CONFIG_HAVE_GET_USER_PAGES_FAST is not set
34# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 33# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
35CONFIG_IRQ_PER_CPU=y 34CONFIG_IRQ_PER_CPU=y
36CONFIG_STACKTRACE_SUPPORT=y 35CONFIG_STACKTRACE_SUPPORT=y
@@ -93,7 +92,6 @@ CONFIG_INITRAMFS_SOURCE=""
93CONFIG_SYSCTL=y 92CONFIG_SYSCTL=y
94CONFIG_EMBEDDED=y 93CONFIG_EMBEDDED=y
95CONFIG_SYSCTL_SYSCALL=y 94CONFIG_SYSCTL_SYSCALL=y
96CONFIG_SYSCTL_SYSCALL_CHECK=y
97CONFIG_KALLSYMS=y 95CONFIG_KALLSYMS=y
98# CONFIG_KALLSYMS_EXTRA_PASS is not set 96# CONFIG_KALLSYMS_EXTRA_PASS is not set
99CONFIG_HOTPLUG=y 97CONFIG_HOTPLUG=y
@@ -109,7 +107,9 @@ CONFIG_SIGNALFD=y
109CONFIG_TIMERFD=y 107CONFIG_TIMERFD=y
110CONFIG_EVENTFD=y 108CONFIG_EVENTFD=y
111CONFIG_SHMEM=y 109CONFIG_SHMEM=y
110CONFIG_AIO=y
112CONFIG_VM_EVENT_COUNTERS=y 111CONFIG_VM_EVENT_COUNTERS=y
112CONFIG_PCI_QUIRKS=y
113CONFIG_SLUB_DEBUG=y 113CONFIG_SLUB_DEBUG=y
114# CONFIG_SLAB is not set 114# CONFIG_SLAB is not set
115CONFIG_SLUB=y 115CONFIG_SLUB=y
@@ -123,10 +123,6 @@ CONFIG_HAVE_IOREMAP_PROT=y
123CONFIG_HAVE_KPROBES=y 123CONFIG_HAVE_KPROBES=y
124CONFIG_HAVE_KRETPROBES=y 124CONFIG_HAVE_KRETPROBES=y
125CONFIG_HAVE_ARCH_TRACEHOOK=y 125CONFIG_HAVE_ARCH_TRACEHOOK=y
126# CONFIG_HAVE_DMA_ATTRS is not set
127# CONFIG_USE_GENERIC_SMP_HELPERS is not set
128# CONFIG_HAVE_CLK is not set
129CONFIG_PROC_PAGE_MONITOR=y
130# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 126# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
131CONFIG_SLABINFO=y 127CONFIG_SLABINFO=y
132CONFIG_RT_MUTEXES=y 128CONFIG_RT_MUTEXES=y
@@ -159,6 +155,7 @@ CONFIG_DEFAULT_AS=y
159# CONFIG_DEFAULT_NOOP is not set 155# CONFIG_DEFAULT_NOOP is not set
160CONFIG_DEFAULT_IOSCHED="anticipatory" 156CONFIG_DEFAULT_IOSCHED="anticipatory"
161CONFIG_CLASSIC_RCU=y 157CONFIG_CLASSIC_RCU=y
158# CONFIG_FREEZER is not set
162# CONFIG_PPC4xx_PCI_EXPRESS is not set 159# CONFIG_PPC4xx_PCI_EXPRESS is not set
163 160
164# 161#
@@ -175,9 +172,13 @@ CONFIG_SAM440EP=y
175# CONFIG_KATMAI is not set 172# CONFIG_KATMAI is not set
176# CONFIG_RAINIER is not set 173# CONFIG_RAINIER is not set
177# CONFIG_WARP is not set 174# CONFIG_WARP is not set
175# CONFIG_ARCHES is not set
178# CONFIG_CANYONLANDS is not set 176# CONFIG_CANYONLANDS is not set
177# CONFIG_GLACIER is not set
179# CONFIG_YOSEMITE is not set 178# CONFIG_YOSEMITE is not set
180# CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set 179# CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set
180# CONFIG_PPC44x_SIMPLE is not set
181# CONFIG_PPC4xx_GPIO is not set
181CONFIG_440EP=y 182CONFIG_440EP=y
182CONFIG_IBM440EP_ERR42=y 183CONFIG_IBM440EP_ERR42=y
183# CONFIG_IPIC is not set 184# CONFIG_IPIC is not set
@@ -197,7 +198,6 @@ CONFIG_IBM440EP_ERR42=y
197# Kernel options 198# Kernel options
198# 199#
199# CONFIG_HIGHMEM is not set 200# CONFIG_HIGHMEM is not set
200# CONFIG_TICK_ONESHOT is not set
201# CONFIG_NO_HZ is not set 201# CONFIG_NO_HZ is not set
202# CONFIG_HIGH_RES_TIMERS is not set 202# CONFIG_HIGH_RES_TIMERS is not set
203CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 203CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -211,6 +211,8 @@ CONFIG_PREEMPT_NONE=y
211# CONFIG_PREEMPT_VOLUNTARY is not set 211# CONFIG_PREEMPT_VOLUNTARY is not set
212# CONFIG_PREEMPT is not set 212# CONFIG_PREEMPT is not set
213CONFIG_BINFMT_ELF=y 213CONFIG_BINFMT_ELF=y
214# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
215# CONFIG_HAVE_AOUT is not set
214# CONFIG_BINFMT_MISC is not set 216# CONFIG_BINFMT_MISC is not set
215# CONFIG_MATH_EMULATION is not set 217# CONFIG_MATH_EMULATION is not set
216# CONFIG_IOMMU_HELPER is not set 218# CONFIG_IOMMU_HELPER is not set
@@ -225,15 +227,15 @@ CONFIG_FLATMEM_MANUAL=y
225# CONFIG_SPARSEMEM_MANUAL is not set 227# CONFIG_SPARSEMEM_MANUAL is not set
226CONFIG_FLATMEM=y 228CONFIG_FLATMEM=y
227CONFIG_FLAT_NODE_MEM_MAP=y 229CONFIG_FLAT_NODE_MEM_MAP=y
228# CONFIG_SPARSEMEM_STATIC is not set
229# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
230CONFIG_PAGEFLAGS_EXTENDED=y 230CONFIG_PAGEFLAGS_EXTENDED=y
231CONFIG_SPLIT_PTLOCK_CPUS=4 231CONFIG_SPLIT_PTLOCK_CPUS=4
232CONFIG_MIGRATION=y 232CONFIG_MIGRATION=y
233CONFIG_RESOURCES_64BIT=y 233CONFIG_RESOURCES_64BIT=y
234CONFIG_PHYS_ADDR_T_64BIT=y
234CONFIG_ZONE_DMA_FLAG=1 235CONFIG_ZONE_DMA_FLAG=1
235CONFIG_BOUNCE=y 236CONFIG_BOUNCE=y
236CONFIG_VIRT_TO_BUS=y 237CONFIG_VIRT_TO_BUS=y
238CONFIG_UNEVICTABLE_LRU=y
237CONFIG_FORCE_MAX_ZONEORDER=11 239CONFIG_FORCE_MAX_ZONEORDER=11
238CONFIG_PROC_DEVICETREE=y 240CONFIG_PROC_DEVICETREE=y
239CONFIG_CMDLINE_BOOL=y 241CONFIG_CMDLINE_BOOL=y
@@ -319,6 +321,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
319# CONFIG_TIPC is not set 321# CONFIG_TIPC is not set
320# CONFIG_ATM is not set 322# CONFIG_ATM is not set
321# CONFIG_BRIDGE is not set 323# CONFIG_BRIDGE is not set
324# CONFIG_NET_DSA is not set
322# CONFIG_VLAN_8021Q is not set 325# CONFIG_VLAN_8021Q is not set
323# CONFIG_DECNET is not set 326# CONFIG_DECNET is not set
324# CONFIG_LLC2 is not set 327# CONFIG_LLC2 is not set
@@ -339,14 +342,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
339# CONFIG_IRDA is not set 342# CONFIG_IRDA is not set
340# CONFIG_BT is not set 343# CONFIG_BT is not set
341# CONFIG_AF_RXRPC is not set 344# CONFIG_AF_RXRPC is not set
342 345# CONFIG_PHONET is not set
343# 346# CONFIG_WIRELESS is not set
344# Wireless
345#
346# CONFIG_CFG80211 is not set
347# CONFIG_WIRELESS_EXT is not set
348# CONFIG_MAC80211 is not set
349# CONFIG_IEEE80211 is not set
350# CONFIG_RFKILL is not set 347# CONFIG_RFKILL is not set
351# CONFIG_NET_9P is not set 348# CONFIG_NET_9P is not set
352 349
@@ -536,8 +533,12 @@ CONFIG_IBM_NEW_EMAC_ZMII=y
536# CONFIG_IBM_NEW_EMAC_RGMII is not set 533# CONFIG_IBM_NEW_EMAC_RGMII is not set
537# CONFIG_IBM_NEW_EMAC_TAH is not set 534# CONFIG_IBM_NEW_EMAC_TAH is not set
538# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 535# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
536# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
537# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
538# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
539# CONFIG_NET_PCI is not set 539# CONFIG_NET_PCI is not set
540# CONFIG_B44 is not set 540# CONFIG_B44 is not set
541# CONFIG_ATL2 is not set
541# CONFIG_NETDEV_1000 is not set 542# CONFIG_NETDEV_1000 is not set
542# CONFIG_NETDEV_10000 is not set 543# CONFIG_NETDEV_10000 is not set
543# CONFIG_TR is not set 544# CONFIG_TR is not set
@@ -573,7 +574,7 @@ CONFIG_IBM_NEW_EMAC_ZMII=y
573# Input device support 574# Input device support
574# 575#
575CONFIG_INPUT=y 576CONFIG_INPUT=y
576# CONFIG_INPUT_FF_MEMLESS is not set 577CONFIG_INPUT_FF_MEMLESS=m
577# CONFIG_INPUT_POLLDEV is not set 578# CONFIG_INPUT_POLLDEV is not set
578 579
579# 580#
@@ -607,6 +608,7 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y
607# CONFIG_MOUSE_PS2_TOUCHKIT is not set 608# CONFIG_MOUSE_PS2_TOUCHKIT is not set
608# CONFIG_MOUSE_SERIAL is not set 609# CONFIG_MOUSE_SERIAL is not set
609# CONFIG_MOUSE_APPLETOUCH is not set 610# CONFIG_MOUSE_APPLETOUCH is not set
611# CONFIG_MOUSE_BCM5974 is not set
610# CONFIG_MOUSE_VSXXXAA is not set 612# CONFIG_MOUSE_VSXXXAA is not set
611# CONFIG_INPUT_JOYSTICK is not set 613# CONFIG_INPUT_JOYSTICK is not set
612# CONFIG_INPUT_TABLET is not set 614# CONFIG_INPUT_TABLET is not set
@@ -673,6 +675,7 @@ CONFIG_DEVPORT=y
673CONFIG_I2C=y 675CONFIG_I2C=y
674CONFIG_I2C_BOARDINFO=y 676CONFIG_I2C_BOARDINFO=y
675# CONFIG_I2C_CHARDEV is not set 677# CONFIG_I2C_CHARDEV is not set
678CONFIG_I2C_HELPER_AUTO=y
676CONFIG_I2C_ALGOBIT=y 679CONFIG_I2C_ALGOBIT=y
677 680
678# 681#
@@ -761,6 +764,9 @@ CONFIG_SSB_POSSIBLE=y
761# CONFIG_MFD_CORE is not set 764# CONFIG_MFD_CORE is not set
762# CONFIG_MFD_SM501 is not set 765# CONFIG_MFD_SM501 is not set
763# CONFIG_HTC_PASIC3 is not set 766# CONFIG_HTC_PASIC3 is not set
767# CONFIG_MFD_TMIO is not set
768# CONFIG_MFD_WM8400 is not set
769# CONFIG_MFD_WM8350_I2C is not set
764 770
765# 771#
766# Multimedia devices 772# Multimedia devices
@@ -788,6 +794,7 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y
788CONFIG_FB=y 794CONFIG_FB=y
789# CONFIG_FIRMWARE_EDID is not set 795# CONFIG_FIRMWARE_EDID is not set
790CONFIG_FB_DDC=y 796CONFIG_FB_DDC=y
797# CONFIG_FB_BOOT_VESA_SUPPORT is not set
791CONFIG_FB_CFB_FILLRECT=y 798CONFIG_FB_CFB_FILLRECT=y
792CONFIG_FB_CFB_COPYAREA=y 799CONFIG_FB_CFB_COPYAREA=y
793CONFIG_FB_CFB_IMAGEBLIT=y 800CONFIG_FB_CFB_IMAGEBLIT=y
@@ -828,6 +835,7 @@ CONFIG_FB_RADEON_BACKLIGHT=y
828# CONFIG_FB_S3 is not set 835# CONFIG_FB_S3 is not set
829# CONFIG_FB_SAVAGE is not set 836# CONFIG_FB_SAVAGE is not set
830# CONFIG_FB_SIS is not set 837# CONFIG_FB_SIS is not set
838# CONFIG_FB_VIA is not set
831# CONFIG_FB_NEOMAGIC is not set 839# CONFIG_FB_NEOMAGIC is not set
832# CONFIG_FB_KYRO is not set 840# CONFIG_FB_KYRO is not set
833# CONFIG_FB_3DFX is not set 841# CONFIG_FB_3DFX is not set
@@ -839,6 +847,7 @@ CONFIG_FB_RADEON_BACKLIGHT=y
839# CONFIG_FB_CARMINE is not set 847# CONFIG_FB_CARMINE is not set
840# CONFIG_FB_IBM_GXT4500 is not set 848# CONFIG_FB_IBM_GXT4500 is not set
841# CONFIG_FB_VIRTUAL is not set 849# CONFIG_FB_VIRTUAL is not set
850# CONFIG_FB_METRONOME is not set
842CONFIG_BACKLIGHT_LCD_SUPPORT=y 851CONFIG_BACKLIGHT_LCD_SUPPORT=y
843CONFIG_LCD_CLASS_DEVICE=y 852CONFIG_LCD_CLASS_DEVICE=y
844# CONFIG_LCD_ILI9320 is not set 853# CONFIG_LCD_ILI9320 is not set
@@ -875,9 +884,36 @@ CONFIG_HID=y
875# USB Input Devices 884# USB Input Devices
876# 885#
877CONFIG_USB_HID=y 886CONFIG_USB_HID=y
878# CONFIG_USB_HIDINPUT_POWERBOOK is not set 887# CONFIG_HID_PID is not set
879# CONFIG_HID_FF is not set
880# CONFIG_USB_HIDDEV is not set 888# CONFIG_USB_HIDDEV is not set
889
890#
891# Special HID drivers
892#
893CONFIG_HID_COMPAT=y
894CONFIG_HID_A4TECH=y
895CONFIG_HID_APPLE=y
896CONFIG_HID_BELKIN=y
897CONFIG_HID_BRIGHT=y
898CONFIG_HID_CHERRY=y
899CONFIG_HID_CHICONY=y
900CONFIG_HID_CYPRESS=y
901CONFIG_HID_DELL=y
902CONFIG_HID_EZKEY=y
903CONFIG_HID_GYRATION=y
904CONFIG_HID_LOGITECH=y
905# CONFIG_LOGITECH_FF is not set
906# CONFIG_LOGIRUMBLEPAD2_FF is not set
907CONFIG_HID_MICROSOFT=y
908CONFIG_HID_MONTEREY=y
909CONFIG_HID_PANTHERLORD=y
910# CONFIG_PANTHERLORD_FF is not set
911CONFIG_HID_PETALYNX=y
912CONFIG_HID_SAMSUNG=y
913CONFIG_HID_SONY=y
914CONFIG_HID_SUNPLUS=y
915CONFIG_THRUSTMASTER_FF=m
916CONFIG_ZEROPLUS_FF=m
881CONFIG_USB_SUPPORT=y 917CONFIG_USB_SUPPORT=y
882CONFIG_USB_ARCH_HAS_HCD=y 918CONFIG_USB_ARCH_HAS_HCD=y
883CONFIG_USB_ARCH_HAS_OHCI=y 919CONFIG_USB_ARCH_HAS_OHCI=y
@@ -895,6 +931,9 @@ CONFIG_USB_DEVICEFS=y
895# CONFIG_USB_OTG is not set 931# CONFIG_USB_OTG is not set
896# CONFIG_USB_OTG_WHITELIST is not set 932# CONFIG_USB_OTG_WHITELIST is not set
897# CONFIG_USB_OTG_BLACKLIST_HUB is not set 933# CONFIG_USB_OTG_BLACKLIST_HUB is not set
934# CONFIG_USB_MON is not set
935# CONFIG_USB_WUSB is not set
936# CONFIG_USB_WUSB_CBAF is not set
898 937
899# 938#
900# USB Host Controller Drivers 939# USB Host Controller Drivers
@@ -917,6 +956,8 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
917# CONFIG_USB_UHCI_HCD is not set 956# CONFIG_USB_UHCI_HCD is not set
918# CONFIG_USB_SL811_HCD is not set 957# CONFIG_USB_SL811_HCD is not set
919# CONFIG_USB_R8A66597_HCD is not set 958# CONFIG_USB_R8A66597_HCD is not set
959# CONFIG_USB_WHCI_HCD is not set
960# CONFIG_USB_HWA_HCD is not set
920 961
921# 962#
922# USB Device Class drivers 963# USB Device Class drivers
@@ -924,6 +965,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
924# CONFIG_USB_ACM is not set 965# CONFIG_USB_ACM is not set
925# CONFIG_USB_PRINTER is not set 966# CONFIG_USB_PRINTER is not set
926# CONFIG_USB_WDM is not set 967# CONFIG_USB_WDM is not set
968# CONFIG_USB_TMC is not set
927 969
928# 970#
929# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 971# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -953,7 +995,6 @@ CONFIG_USB_STORAGE=m
953# 995#
954# CONFIG_USB_MDC800 is not set 996# CONFIG_USB_MDC800 is not set
955# CONFIG_USB_MICROTEK is not set 997# CONFIG_USB_MICROTEK is not set
956# CONFIG_USB_MON is not set
957 998
958# 999#
959# USB port drivers 1000# USB port drivers
@@ -966,7 +1007,7 @@ CONFIG_USB_STORAGE=m
966# CONFIG_USB_EMI62 is not set 1007# CONFIG_USB_EMI62 is not set
967# CONFIG_USB_EMI26 is not set 1008# CONFIG_USB_EMI26 is not set
968# CONFIG_USB_ADUTUX is not set 1009# CONFIG_USB_ADUTUX is not set
969# CONFIG_USB_AUERSWALD is not set 1010# CONFIG_USB_SEVSEG is not set
970# CONFIG_USB_RIO500 is not set 1011# CONFIG_USB_RIO500 is not set
971# CONFIG_USB_LEGOTOWER is not set 1012# CONFIG_USB_LEGOTOWER is not set
972# CONFIG_USB_LCD is not set 1013# CONFIG_USB_LCD is not set
@@ -984,7 +1025,9 @@ CONFIG_USB_STORAGE=m
984# CONFIG_USB_IOWARRIOR is not set 1025# CONFIG_USB_IOWARRIOR is not set
985# CONFIG_USB_TEST is not set 1026# CONFIG_USB_TEST is not set
986# CONFIG_USB_ISIGHTFW is not set 1027# CONFIG_USB_ISIGHTFW is not set
1028# CONFIG_USB_VST is not set
987# CONFIG_USB_GADGET is not set 1029# CONFIG_USB_GADGET is not set
1030# CONFIG_UWB is not set
988# CONFIG_MMC is not set 1031# CONFIG_MMC is not set
989# CONFIG_MEMSTICK is not set 1032# CONFIG_MEMSTICK is not set
990# CONFIG_NEW_LEDS is not set 1033# CONFIG_NEW_LEDS is not set
@@ -1031,12 +1074,15 @@ CONFIG_RTC_DRV_M41T80_WDT=y
1031# Platform RTC drivers 1074# Platform RTC drivers
1032# 1075#
1033# CONFIG_RTC_DRV_CMOS is not set 1076# CONFIG_RTC_DRV_CMOS is not set
1077# CONFIG_RTC_DRV_DS1286 is not set
1034# CONFIG_RTC_DRV_DS1511 is not set 1078# CONFIG_RTC_DRV_DS1511 is not set
1035# CONFIG_RTC_DRV_DS1553 is not set 1079# CONFIG_RTC_DRV_DS1553 is not set
1036# CONFIG_RTC_DRV_DS1742 is not set 1080# CONFIG_RTC_DRV_DS1742 is not set
1037# CONFIG_RTC_DRV_STK17TA8 is not set 1081# CONFIG_RTC_DRV_STK17TA8 is not set
1038# CONFIG_RTC_DRV_M48T86 is not set 1082# CONFIG_RTC_DRV_M48T86 is not set
1083# CONFIG_RTC_DRV_M48T35 is not set
1039# CONFIG_RTC_DRV_M48T59 is not set 1084# CONFIG_RTC_DRV_M48T59 is not set
1085# CONFIG_RTC_DRV_BQ4802 is not set
1040# CONFIG_RTC_DRV_V3020 is not set 1086# CONFIG_RTC_DRV_V3020 is not set
1041 1087
1042# 1088#
@@ -1045,6 +1091,7 @@ CONFIG_RTC_DRV_M41T80_WDT=y
1045# CONFIG_RTC_DRV_PPC is not set 1091# CONFIG_RTC_DRV_PPC is not set
1046# CONFIG_DMADEVICES is not set 1092# CONFIG_DMADEVICES is not set
1047# CONFIG_UIO is not set 1093# CONFIG_UIO is not set
1094# CONFIG_STAGING is not set
1048 1095
1049# 1096#
1050# File systems 1097# File systems
@@ -1058,7 +1105,7 @@ CONFIG_EXT3_FS=y
1058CONFIG_EXT3_FS_XATTR=y 1105CONFIG_EXT3_FS_XATTR=y
1059CONFIG_EXT3_FS_POSIX_ACL=y 1106CONFIG_EXT3_FS_POSIX_ACL=y
1060# CONFIG_EXT3_FS_SECURITY is not set 1107# CONFIG_EXT3_FS_SECURITY is not set
1061# CONFIG_EXT4DEV_FS is not set 1108# CONFIG_EXT4_FS is not set
1062CONFIG_JBD=y 1109CONFIG_JBD=y
1063CONFIG_FS_MBCACHE=y 1110CONFIG_FS_MBCACHE=y
1064CONFIG_REISERFS_FS=y 1111CONFIG_REISERFS_FS=y
@@ -1067,6 +1114,7 @@ CONFIG_REISERFS_FS=y
1067# CONFIG_REISERFS_FS_XATTR is not set 1114# CONFIG_REISERFS_FS_XATTR is not set
1068# CONFIG_JFS_FS is not set 1115# CONFIG_JFS_FS is not set
1069CONFIG_FS_POSIX_ACL=y 1116CONFIG_FS_POSIX_ACL=y
1117CONFIG_FILE_LOCKING=y
1070# CONFIG_XFS_FS is not set 1118# CONFIG_XFS_FS is not set
1071# CONFIG_OCFS2_FS is not set 1119# CONFIG_OCFS2_FS is not set
1072CONFIG_DNOTIFY=y 1120CONFIG_DNOTIFY=y
@@ -1102,6 +1150,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
1102CONFIG_PROC_FS=y 1150CONFIG_PROC_FS=y
1103CONFIG_PROC_KCORE=y 1151CONFIG_PROC_KCORE=y
1104CONFIG_PROC_SYSCTL=y 1152CONFIG_PROC_SYSCTL=y
1153CONFIG_PROC_PAGE_MONITOR=y
1105CONFIG_SYSFS=y 1154CONFIG_SYSFS=y
1106CONFIG_TMPFS=y 1155CONFIG_TMPFS=y
1107# CONFIG_TMPFS_POSIX_ACL is not set 1156# CONFIG_TMPFS_POSIX_ACL is not set
@@ -1196,7 +1245,6 @@ CONFIG_NLS_ISO8859_1=y
1196# Library routines 1245# Library routines
1197# 1246#
1198CONFIG_BITREVERSE=y 1247CONFIG_BITREVERSE=y
1199# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1200# CONFIG_CRC_CCITT is not set 1248# CONFIG_CRC_CCITT is not set
1201# CONFIG_CRC16 is not set 1249# CONFIG_CRC16 is not set
1202CONFIG_CRC_T10DIF=y 1250CONFIG_CRC_T10DIF=y
@@ -1227,12 +1275,13 @@ CONFIG_MAGIC_SYSRQ=y
1227# CONFIG_SLUB_STATS is not set 1275# CONFIG_SLUB_STATS is not set
1228# CONFIG_DEBUG_BUGVERBOSE is not set 1276# CONFIG_DEBUG_BUGVERBOSE is not set
1229# CONFIG_DEBUG_MEMORY_INIT is not set 1277# CONFIG_DEBUG_MEMORY_INIT is not set
1278# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1230# CONFIG_LATENCYTOP is not set 1279# CONFIG_LATENCYTOP is not set
1280CONFIG_SYSCTL_SYSCALL_CHECK=y
1281CONFIG_NOP_TRACER=y
1231CONFIG_HAVE_FTRACE=y 1282CONFIG_HAVE_FTRACE=y
1232CONFIG_HAVE_DYNAMIC_FTRACE=y 1283CONFIG_HAVE_DYNAMIC_FTRACE=y
1233# CONFIG_FTRACE is not set 1284# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1234# CONFIG_SCHED_TRACER is not set
1235# CONFIG_CONTEXT_SWITCH_TRACER is not set
1236# CONFIG_SAMPLES is not set 1285# CONFIG_SAMPLES is not set
1237CONFIG_HAVE_ARCH_KGDB=y 1286CONFIG_HAVE_ARCH_KGDB=y
1238# CONFIG_IRQSTACKS is not set 1287# CONFIG_IRQSTACKS is not set
@@ -1243,6 +1292,7 @@ CONFIG_HAVE_ARCH_KGDB=y
1243# 1292#
1244# CONFIG_KEYS is not set 1293# CONFIG_KEYS is not set
1245# CONFIG_SECURITY is not set 1294# CONFIG_SECURITY is not set
1295# CONFIG_SECURITYFS is not set
1246# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1296# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1247# CONFIG_CRYPTO is not set 1297# CONFIG_CRYPTO is not set
1248# CONFIG_PPC_CLOCK is not set 1298# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/44x/sequoia_defconfig b/arch/powerpc/configs/44x/sequoia_defconfig
index e40b1023265c..562beeaab53d 100644
--- a/arch/powerpc/configs/44x/sequoia_defconfig
+++ b/arch/powerpc/configs/44x/sequoia_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.27-rc1 3# Linux kernel version: 2.6.28-rc2
4# Tue Aug 5 09:15:13 2008 4# Tue Oct 28 09:16:16 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -23,14 +23,13 @@ CONFIG_PHYS_64BIT=y
23CONFIG_NOT_COHERENT_CACHE=y 23CONFIG_NOT_COHERENT_CACHE=y
24CONFIG_PPC32=y 24CONFIG_PPC32=y
25CONFIG_WORD_SIZE=32 25CONFIG_WORD_SIZE=32
26CONFIG_PPC_MERGE=y 26CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
27CONFIG_MMU=y 27CONFIG_MMU=y
28CONFIG_GENERIC_CMOS_UPDATE=y 28CONFIG_GENERIC_CMOS_UPDATE=y
29CONFIG_GENERIC_TIME=y 29CONFIG_GENERIC_TIME=y
30CONFIG_GENERIC_TIME_VSYSCALL=y 30CONFIG_GENERIC_TIME_VSYSCALL=y
31CONFIG_GENERIC_CLOCKEVENTS=y 31CONFIG_GENERIC_CLOCKEVENTS=y
32CONFIG_GENERIC_HARDIRQS=y 32CONFIG_GENERIC_HARDIRQS=y
33# CONFIG_HAVE_GET_USER_PAGES_FAST is not set
34# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 33# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
35CONFIG_IRQ_PER_CPU=y 34CONFIG_IRQ_PER_CPU=y
36CONFIG_STACKTRACE_SUPPORT=y 35CONFIG_STACKTRACE_SUPPORT=y
@@ -92,7 +91,6 @@ CONFIG_INITRAMFS_SOURCE=""
92CONFIG_SYSCTL=y 91CONFIG_SYSCTL=y
93CONFIG_EMBEDDED=y 92CONFIG_EMBEDDED=y
94CONFIG_SYSCTL_SYSCALL=y 93CONFIG_SYSCTL_SYSCALL=y
95CONFIG_SYSCTL_SYSCALL_CHECK=y
96CONFIG_KALLSYMS=y 94CONFIG_KALLSYMS=y
97# CONFIG_KALLSYMS_ALL is not set 95# CONFIG_KALLSYMS_ALL is not set
98# CONFIG_KALLSYMS_EXTRA_PASS is not set 96# CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -109,7 +107,9 @@ CONFIG_SIGNALFD=y
109CONFIG_TIMERFD=y 107CONFIG_TIMERFD=y
110CONFIG_EVENTFD=y 108CONFIG_EVENTFD=y
111CONFIG_SHMEM=y 109CONFIG_SHMEM=y
110CONFIG_AIO=y
112CONFIG_VM_EVENT_COUNTERS=y 111CONFIG_VM_EVENT_COUNTERS=y
112CONFIG_PCI_QUIRKS=y
113CONFIG_SLUB_DEBUG=y 113CONFIG_SLUB_DEBUG=y
114# CONFIG_SLAB is not set 114# CONFIG_SLAB is not set
115CONFIG_SLUB=y 115CONFIG_SLUB=y
@@ -123,10 +123,6 @@ CONFIG_HAVE_IOREMAP_PROT=y
123CONFIG_HAVE_KPROBES=y 123CONFIG_HAVE_KPROBES=y
124CONFIG_HAVE_KRETPROBES=y 124CONFIG_HAVE_KRETPROBES=y
125CONFIG_HAVE_ARCH_TRACEHOOK=y 125CONFIG_HAVE_ARCH_TRACEHOOK=y
126# CONFIG_HAVE_DMA_ATTRS is not set
127# CONFIG_USE_GENERIC_SMP_HELPERS is not set
128# CONFIG_HAVE_CLK is not set
129CONFIG_PROC_PAGE_MONITOR=y
130# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 126# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
131CONFIG_SLABINFO=y 127CONFIG_SLABINFO=y
132CONFIG_RT_MUTEXES=y 128CONFIG_RT_MUTEXES=y
@@ -159,6 +155,7 @@ CONFIG_DEFAULT_AS=y
159# CONFIG_DEFAULT_NOOP is not set 155# CONFIG_DEFAULT_NOOP is not set
160CONFIG_DEFAULT_IOSCHED="anticipatory" 156CONFIG_DEFAULT_IOSCHED="anticipatory"
161CONFIG_CLASSIC_RCU=y 157CONFIG_CLASSIC_RCU=y
158# CONFIG_FREEZER is not set
162# CONFIG_PPC4xx_PCI_EXPRESS is not set 159# CONFIG_PPC4xx_PCI_EXPRESS is not set
163 160
164# 161#
@@ -175,9 +172,13 @@ CONFIG_SEQUOIA=y
175# CONFIG_KATMAI is not set 172# CONFIG_KATMAI is not set
176# CONFIG_RAINIER is not set 173# CONFIG_RAINIER is not set
177# CONFIG_WARP is not set 174# CONFIG_WARP is not set
175# CONFIG_ARCHES is not set
178# CONFIG_CANYONLANDS is not set 176# CONFIG_CANYONLANDS is not set
177# CONFIG_GLACIER is not set
179# CONFIG_YOSEMITE is not set 178# CONFIG_YOSEMITE is not set
180# CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set 179# CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set
180CONFIG_PPC44x_SIMPLE=y
181# CONFIG_PPC4xx_GPIO is not set
181CONFIG_440EPX=y 182CONFIG_440EPX=y
182# CONFIG_IPIC is not set 183# CONFIG_IPIC is not set
183# CONFIG_MPIC is not set 184# CONFIG_MPIC is not set
@@ -205,11 +206,13 @@ CONFIG_HZ_250=y
205# CONFIG_HZ_300 is not set 206# CONFIG_HZ_300 is not set
206# CONFIG_HZ_1000 is not set 207# CONFIG_HZ_1000 is not set
207CONFIG_HZ=250 208CONFIG_HZ=250
208# CONFIG_SCHED_HRTICK is not set 209CONFIG_SCHED_HRTICK=y
209CONFIG_PREEMPT_NONE=y 210CONFIG_PREEMPT_NONE=y
210# CONFIG_PREEMPT_VOLUNTARY is not set 211# CONFIG_PREEMPT_VOLUNTARY is not set
211# CONFIG_PREEMPT is not set 212# CONFIG_PREEMPT is not set
212CONFIG_BINFMT_ELF=y 213CONFIG_BINFMT_ELF=y
214# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
215# CONFIG_HAVE_AOUT is not set
213# CONFIG_BINFMT_MISC is not set 216# CONFIG_BINFMT_MISC is not set
214# CONFIG_MATH_EMULATION is not set 217# CONFIG_MATH_EMULATION is not set
215# CONFIG_IOMMU_HELPER is not set 218# CONFIG_IOMMU_HELPER is not set
@@ -224,15 +227,15 @@ CONFIG_FLATMEM_MANUAL=y
224# CONFIG_SPARSEMEM_MANUAL is not set 227# CONFIG_SPARSEMEM_MANUAL is not set
225CONFIG_FLATMEM=y 228CONFIG_FLATMEM=y
226CONFIG_FLAT_NODE_MEM_MAP=y 229CONFIG_FLAT_NODE_MEM_MAP=y
227# CONFIG_SPARSEMEM_STATIC is not set
228# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
229CONFIG_PAGEFLAGS_EXTENDED=y 230CONFIG_PAGEFLAGS_EXTENDED=y
230CONFIG_SPLIT_PTLOCK_CPUS=4 231CONFIG_SPLIT_PTLOCK_CPUS=4
231CONFIG_MIGRATION=y 232CONFIG_MIGRATION=y
232CONFIG_RESOURCES_64BIT=y 233CONFIG_RESOURCES_64BIT=y
234CONFIG_PHYS_ADDR_T_64BIT=y
233CONFIG_ZONE_DMA_FLAG=1 235CONFIG_ZONE_DMA_FLAG=1
234CONFIG_BOUNCE=y 236CONFIG_BOUNCE=y
235CONFIG_VIRT_TO_BUS=y 237CONFIG_VIRT_TO_BUS=y
238CONFIG_UNEVICTABLE_LRU=y
236CONFIG_FORCE_MAX_ZONEORDER=11 239CONFIG_FORCE_MAX_ZONEORDER=11
237CONFIG_PROC_DEVICETREE=y 240CONFIG_PROC_DEVICETREE=y
238CONFIG_CMDLINE_BOOL=y 241CONFIG_CMDLINE_BOOL=y
@@ -319,6 +322,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
319# CONFIG_TIPC is not set 322# CONFIG_TIPC is not set
320# CONFIG_ATM is not set 323# CONFIG_ATM is not set
321# CONFIG_BRIDGE is not set 324# CONFIG_BRIDGE is not set
325# CONFIG_NET_DSA is not set
322# CONFIG_VLAN_8021Q is not set 326# CONFIG_VLAN_8021Q is not set
323# CONFIG_DECNET is not set 327# CONFIG_DECNET is not set
324# CONFIG_LLC2 is not set 328# CONFIG_LLC2 is not set
@@ -339,14 +343,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
339# CONFIG_IRDA is not set 343# CONFIG_IRDA is not set
340# CONFIG_BT is not set 344# CONFIG_BT is not set
341# CONFIG_AF_RXRPC is not set 345# CONFIG_AF_RXRPC is not set
342 346# CONFIG_PHONET is not set
343# 347# CONFIG_WIRELESS is not set
344# Wireless
345#
346# CONFIG_CFG80211 is not set
347# CONFIG_WIRELESS_EXT is not set
348# CONFIG_MAC80211 is not set
349# CONFIG_IEEE80211 is not set
350# CONFIG_RFKILL is not set 348# CONFIG_RFKILL is not set
351# CONFIG_NET_9P is not set 349# CONFIG_NET_9P is not set
352 350
@@ -527,8 +525,12 @@ CONFIG_IBM_NEW_EMAC_ZMII=y
527CONFIG_IBM_NEW_EMAC_RGMII=y 525CONFIG_IBM_NEW_EMAC_RGMII=y
528# CONFIG_IBM_NEW_EMAC_TAH is not set 526# CONFIG_IBM_NEW_EMAC_TAH is not set
529CONFIG_IBM_NEW_EMAC_EMAC4=y 527CONFIG_IBM_NEW_EMAC_EMAC4=y
528# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
529# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
530# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
530# CONFIG_NET_PCI is not set 531# CONFIG_NET_PCI is not set
531# CONFIG_B44 is not set 532# CONFIG_B44 is not set
533# CONFIG_ATL2 is not set
532CONFIG_NETDEV_1000=y 534CONFIG_NETDEV_1000=y
533# CONFIG_ACENIC is not set 535# CONFIG_ACENIC is not set
534# CONFIG_DL2K is not set 536# CONFIG_DL2K is not set
@@ -549,18 +551,22 @@ CONFIG_NETDEV_1000=y
549# CONFIG_QLA3XXX is not set 551# CONFIG_QLA3XXX is not set
550# CONFIG_ATL1 is not set 552# CONFIG_ATL1 is not set
551# CONFIG_ATL1E is not set 553# CONFIG_ATL1E is not set
554# CONFIG_JME is not set
552CONFIG_NETDEV_10000=y 555CONFIG_NETDEV_10000=y
553# CONFIG_CHELSIO_T1 is not set 556# CONFIG_CHELSIO_T1 is not set
554# CONFIG_CHELSIO_T3 is not set 557# CONFIG_CHELSIO_T3 is not set
558# CONFIG_ENIC is not set
555# CONFIG_IXGBE is not set 559# CONFIG_IXGBE is not set
556# CONFIG_IXGB is not set 560# CONFIG_IXGB is not set
557# CONFIG_S2IO is not set 561# CONFIG_S2IO is not set
558# CONFIG_MYRI10GE is not set 562# CONFIG_MYRI10GE is not set
559# CONFIG_NETXEN_NIC is not set 563# CONFIG_NETXEN_NIC is not set
560# CONFIG_NIU is not set 564# CONFIG_NIU is not set
565# CONFIG_MLX4_EN is not set
561# CONFIG_MLX4_CORE is not set 566# CONFIG_MLX4_CORE is not set
562# CONFIG_TEHUTI is not set 567# CONFIG_TEHUTI is not set
563# CONFIG_BNX2X is not set 568# CONFIG_BNX2X is not set
569# CONFIG_QLGE is not set
564# CONFIG_SFC is not set 570# CONFIG_SFC is not set
565# CONFIG_TR is not set 571# CONFIG_TR is not set
566 572
@@ -656,6 +662,8 @@ CONFIG_SSB_POSSIBLE=y
656# CONFIG_MFD_CORE is not set 662# CONFIG_MFD_CORE is not set
657# CONFIG_MFD_SM501 is not set 663# CONFIG_MFD_SM501 is not set
658# CONFIG_HTC_PASIC3 is not set 664# CONFIG_HTC_PASIC3 is not set
665# CONFIG_MFD_TMIO is not set
666# CONFIG_MFD_WM8400 is not set
659 667
660# 668#
661# Multimedia devices 669# Multimedia devices
@@ -697,9 +705,14 @@ CONFIG_USB_ARCH_HAS_EHCI=y
697# CONFIG_USB_OTG_BLACKLIST_HUB is not set 705# CONFIG_USB_OTG_BLACKLIST_HUB is not set
698 706
699# 707#
708# Enable Host or Gadget support to see Inventra options
709#
710
711#
700# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 712# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
701# 713#
702# CONFIG_USB_GADGET is not set 714# CONFIG_USB_GADGET is not set
715# CONFIG_UWB is not set
703# CONFIG_MMC is not set 716# CONFIG_MMC is not set
704# CONFIG_MEMSTICK is not set 717# CONFIG_MEMSTICK is not set
705# CONFIG_NEW_LEDS is not set 718# CONFIG_NEW_LEDS is not set
@@ -709,6 +722,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
709# CONFIG_RTC_CLASS is not set 722# CONFIG_RTC_CLASS is not set
710# CONFIG_DMADEVICES is not set 723# CONFIG_DMADEVICES is not set
711# CONFIG_UIO is not set 724# CONFIG_UIO is not set
725# CONFIG_STAGING is not set
712 726
713# 727#
714# File systems 728# File systems
@@ -717,10 +731,11 @@ CONFIG_EXT2_FS=y
717# CONFIG_EXT2_FS_XATTR is not set 731# CONFIG_EXT2_FS_XATTR is not set
718# CONFIG_EXT2_FS_XIP is not set 732# CONFIG_EXT2_FS_XIP is not set
719# CONFIG_EXT3_FS is not set 733# CONFIG_EXT3_FS is not set
720# CONFIG_EXT4DEV_FS is not set 734# CONFIG_EXT4_FS is not set
721# CONFIG_REISERFS_FS is not set 735# CONFIG_REISERFS_FS is not set
722# CONFIG_JFS_FS is not set 736# CONFIG_JFS_FS is not set
723# CONFIG_FS_POSIX_ACL is not set 737# CONFIG_FS_POSIX_ACL is not set
738CONFIG_FILE_LOCKING=y
724# CONFIG_XFS_FS is not set 739# CONFIG_XFS_FS is not set
725# CONFIG_OCFS2_FS is not set 740# CONFIG_OCFS2_FS is not set
726CONFIG_DNOTIFY=y 741CONFIG_DNOTIFY=y
@@ -750,6 +765,7 @@ CONFIG_INOTIFY_USER=y
750CONFIG_PROC_FS=y 765CONFIG_PROC_FS=y
751CONFIG_PROC_KCORE=y 766CONFIG_PROC_KCORE=y
752CONFIG_PROC_SYSCTL=y 767CONFIG_PROC_SYSCTL=y
768CONFIG_PROC_PAGE_MONITOR=y
753CONFIG_SYSFS=y 769CONFIG_SYSFS=y
754CONFIG_TMPFS=y 770CONFIG_TMPFS=y
755# CONFIG_TMPFS_POSIX_ACL is not set 771# CONFIG_TMPFS_POSIX_ACL is not set
@@ -797,6 +813,7 @@ CONFIG_LOCKD=y
797CONFIG_LOCKD_V4=y 813CONFIG_LOCKD_V4=y
798CONFIG_NFS_COMMON=y 814CONFIG_NFS_COMMON=y
799CONFIG_SUNRPC=y 815CONFIG_SUNRPC=y
816# CONFIG_SUNRPC_REGISTER_V4 is not set
800# CONFIG_RPCSEC_GSS_KRB5 is not set 817# CONFIG_RPCSEC_GSS_KRB5 is not set
801# CONFIG_RPCSEC_GSS_SPKM3 is not set 818# CONFIG_RPCSEC_GSS_SPKM3 is not set
802# CONFIG_SMB_FS is not set 819# CONFIG_SMB_FS is not set
@@ -817,7 +834,6 @@ CONFIG_MSDOS_PARTITION=y
817# Library routines 834# Library routines
818# 835#
819CONFIG_BITREVERSE=y 836CONFIG_BITREVERSE=y
820# CONFIG_GENERIC_FIND_FIRST_BIT is not set
821# CONFIG_CRC_CCITT is not set 837# CONFIG_CRC_CCITT is not set
822# CONFIG_CRC16 is not set 838# CONFIG_CRC16 is not set
823# CONFIG_CRC_T10DIF is not set 839# CONFIG_CRC_T10DIF is not set
@@ -871,14 +887,21 @@ CONFIG_SCHED_DEBUG=y
871# CONFIG_DEBUG_SG is not set 887# CONFIG_DEBUG_SG is not set
872# CONFIG_BOOT_PRINTK_DELAY is not set 888# CONFIG_BOOT_PRINTK_DELAY is not set
873# CONFIG_RCU_TORTURE_TEST is not set 889# CONFIG_RCU_TORTURE_TEST is not set
890# CONFIG_RCU_CPU_STALL_DETECTOR is not set
874# CONFIG_BACKTRACE_SELF_TEST is not set 891# CONFIG_BACKTRACE_SELF_TEST is not set
892# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
875# CONFIG_FAULT_INJECTION is not set 893# CONFIG_FAULT_INJECTION is not set
876# CONFIG_LATENCYTOP is not set 894# CONFIG_LATENCYTOP is not set
895CONFIG_SYSCTL_SYSCALL_CHECK=y
896CONFIG_NOP_TRACER=y
877CONFIG_HAVE_FTRACE=y 897CONFIG_HAVE_FTRACE=y
878CONFIG_HAVE_DYNAMIC_FTRACE=y 898CONFIG_HAVE_DYNAMIC_FTRACE=y
879# CONFIG_FTRACE is not set 899# CONFIG_FTRACE is not set
880# CONFIG_SCHED_TRACER is not set 900# CONFIG_SCHED_TRACER is not set
881# CONFIG_CONTEXT_SWITCH_TRACER is not set 901# CONFIG_CONTEXT_SWITCH_TRACER is not set
902# CONFIG_BOOT_TRACER is not set
903# CONFIG_STACK_TRACER is not set
904# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
882# CONFIG_SAMPLES is not set 905# CONFIG_SAMPLES is not set
883CONFIG_HAVE_ARCH_KGDB=y 906CONFIG_HAVE_ARCH_KGDB=y
884# CONFIG_KGDB is not set 907# CONFIG_KGDB is not set
@@ -887,6 +910,7 @@ CONFIG_HAVE_ARCH_KGDB=y
887# CONFIG_DEBUG_PAGEALLOC is not set 910# CONFIG_DEBUG_PAGEALLOC is not set
888# CONFIG_CODE_PATCHING_SELFTEST is not set 911# CONFIG_CODE_PATCHING_SELFTEST is not set
889# CONFIG_FTR_FIXUP_SELFTEST is not set 912# CONFIG_FTR_FIXUP_SELFTEST is not set
913# CONFIG_MSI_BITMAP_SELFTEST is not set
890# CONFIG_XMON is not set 914# CONFIG_XMON is not set
891# CONFIG_IRQSTACKS is not set 915# CONFIG_IRQSTACKS is not set
892# CONFIG_VIRQ_DEBUG is not set 916# CONFIG_VIRQ_DEBUG is not set
@@ -911,14 +935,19 @@ CONFIG_PPC_EARLY_DEBUG_44x_PHYSHIGH=0x1
911# 935#
912# CONFIG_KEYS is not set 936# CONFIG_KEYS is not set
913# CONFIG_SECURITY is not set 937# CONFIG_SECURITY is not set
938# CONFIG_SECURITYFS is not set
914# CONFIG_SECURITY_FILE_CAPABILITIES is not set 939# CONFIG_SECURITY_FILE_CAPABILITIES is not set
915CONFIG_CRYPTO=y 940CONFIG_CRYPTO=y
916 941
917# 942#
918# Crypto core or helper 943# Crypto core or helper
919# 944#
945# CONFIG_CRYPTO_FIPS is not set
920CONFIG_CRYPTO_ALGAPI=y 946CONFIG_CRYPTO_ALGAPI=y
947CONFIG_CRYPTO_AEAD=y
921CONFIG_CRYPTO_BLKCIPHER=y 948CONFIG_CRYPTO_BLKCIPHER=y
949CONFIG_CRYPTO_HASH=y
950CONFIG_CRYPTO_RNG=y
922CONFIG_CRYPTO_MANAGER=y 951CONFIG_CRYPTO_MANAGER=y
923# CONFIG_CRYPTO_GF128MUL is not set 952# CONFIG_CRYPTO_GF128MUL is not set
924# CONFIG_CRYPTO_NULL is not set 953# CONFIG_CRYPTO_NULL is not set
@@ -991,6 +1020,11 @@ CONFIG_CRYPTO_DES=y
991# 1020#
992# CONFIG_CRYPTO_DEFLATE is not set 1021# CONFIG_CRYPTO_DEFLATE is not set
993# CONFIG_CRYPTO_LZO is not set 1022# CONFIG_CRYPTO_LZO is not set
1023
1024#
1025# Random Number Generation
1026#
1027# CONFIG_CRYPTO_ANSI_CPRNG is not set
994CONFIG_CRYPTO_HW=y 1028CONFIG_CRYPTO_HW=y
995# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1029# CONFIG_CRYPTO_DEV_HIFN_795X is not set
996# CONFIG_PPC_CLOCK is not set 1030# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/44x/taishan_defconfig b/arch/powerpc/configs/44x/taishan_defconfig
index 5075873bdb1b..427bb6a11be5 100644
--- a/arch/powerpc/configs/44x/taishan_defconfig
+++ b/arch/powerpc/configs/44x/taishan_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.27-rc1 3# Linux kernel version: 2.6.28-rc2
4# Tue Aug 5 09:17:48 2008 4# Tue Oct 28 09:16:18 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -22,14 +22,13 @@ CONFIG_PHYS_64BIT=y
22CONFIG_NOT_COHERENT_CACHE=y 22CONFIG_NOT_COHERENT_CACHE=y
23CONFIG_PPC32=y 23CONFIG_PPC32=y
24CONFIG_WORD_SIZE=32 24CONFIG_WORD_SIZE=32
25CONFIG_PPC_MERGE=y 25CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
26CONFIG_MMU=y 26CONFIG_MMU=y
27CONFIG_GENERIC_CMOS_UPDATE=y 27CONFIG_GENERIC_CMOS_UPDATE=y
28CONFIG_GENERIC_TIME=y 28CONFIG_GENERIC_TIME=y
29CONFIG_GENERIC_TIME_VSYSCALL=y 29CONFIG_GENERIC_TIME_VSYSCALL=y
30CONFIG_GENERIC_CLOCKEVENTS=y 30CONFIG_GENERIC_CLOCKEVENTS=y
31CONFIG_GENERIC_HARDIRQS=y 31CONFIG_GENERIC_HARDIRQS=y
32# CONFIG_HAVE_GET_USER_PAGES_FAST is not set
33# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 32# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
34CONFIG_IRQ_PER_CPU=y 33CONFIG_IRQ_PER_CPU=y
35CONFIG_STACKTRACE_SUPPORT=y 34CONFIG_STACKTRACE_SUPPORT=y
@@ -91,7 +90,6 @@ CONFIG_INITRAMFS_SOURCE=""
91CONFIG_SYSCTL=y 90CONFIG_SYSCTL=y
92CONFIG_EMBEDDED=y 91CONFIG_EMBEDDED=y
93CONFIG_SYSCTL_SYSCALL=y 92CONFIG_SYSCTL_SYSCALL=y
94CONFIG_SYSCTL_SYSCALL_CHECK=y
95CONFIG_KALLSYMS=y 93CONFIG_KALLSYMS=y
96# CONFIG_KALLSYMS_ALL is not set 94# CONFIG_KALLSYMS_ALL is not set
97# CONFIG_KALLSYMS_EXTRA_PASS is not set 95# CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -108,7 +106,9 @@ CONFIG_SIGNALFD=y
108CONFIG_TIMERFD=y 106CONFIG_TIMERFD=y
109CONFIG_EVENTFD=y 107CONFIG_EVENTFD=y
110CONFIG_SHMEM=y 108CONFIG_SHMEM=y
109CONFIG_AIO=y
111CONFIG_VM_EVENT_COUNTERS=y 110CONFIG_VM_EVENT_COUNTERS=y
111CONFIG_PCI_QUIRKS=y
112CONFIG_SLUB_DEBUG=y 112CONFIG_SLUB_DEBUG=y
113# CONFIG_SLAB is not set 113# CONFIG_SLAB is not set
114CONFIG_SLUB=y 114CONFIG_SLUB=y
@@ -122,10 +122,6 @@ CONFIG_HAVE_IOREMAP_PROT=y
122CONFIG_HAVE_KPROBES=y 122CONFIG_HAVE_KPROBES=y
123CONFIG_HAVE_KRETPROBES=y 123CONFIG_HAVE_KRETPROBES=y
124CONFIG_HAVE_ARCH_TRACEHOOK=y 124CONFIG_HAVE_ARCH_TRACEHOOK=y
125# CONFIG_HAVE_DMA_ATTRS is not set
126# CONFIG_USE_GENERIC_SMP_HELPERS is not set
127# CONFIG_HAVE_CLK is not set
128CONFIG_PROC_PAGE_MONITOR=y
129# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 125# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
130CONFIG_SLABINFO=y 126CONFIG_SLABINFO=y
131CONFIG_RT_MUTEXES=y 127CONFIG_RT_MUTEXES=y
@@ -158,6 +154,7 @@ CONFIG_DEFAULT_AS=y
158# CONFIG_DEFAULT_NOOP is not set 154# CONFIG_DEFAULT_NOOP is not set
159CONFIG_DEFAULT_IOSCHED="anticipatory" 155CONFIG_DEFAULT_IOSCHED="anticipatory"
160CONFIG_CLASSIC_RCU=y 156CONFIG_CLASSIC_RCU=y
157# CONFIG_FREEZER is not set
161# CONFIG_PPC4xx_PCI_EXPRESS is not set 158# CONFIG_PPC4xx_PCI_EXPRESS is not set
162 159
163# 160#
@@ -174,9 +171,13 @@ CONFIG_TAISHAN=y
174# CONFIG_KATMAI is not set 171# CONFIG_KATMAI is not set
175# CONFIG_RAINIER is not set 172# CONFIG_RAINIER is not set
176# CONFIG_WARP is not set 173# CONFIG_WARP is not set
174# CONFIG_ARCHES is not set
177# CONFIG_CANYONLANDS is not set 175# CONFIG_CANYONLANDS is not set
176# CONFIG_GLACIER is not set
178# CONFIG_YOSEMITE is not set 177# CONFIG_YOSEMITE is not set
179# CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set 178# CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set
179CONFIG_PPC44x_SIMPLE=y
180# CONFIG_PPC4xx_GPIO is not set
180CONFIG_440GX=y 181CONFIG_440GX=y
181# CONFIG_IPIC is not set 182# CONFIG_IPIC is not set
182# CONFIG_MPIC is not set 183# CONFIG_MPIC is not set
@@ -195,7 +196,6 @@ CONFIG_440GX=y
195# Kernel options 196# Kernel options
196# 197#
197# CONFIG_HIGHMEM is not set 198# CONFIG_HIGHMEM is not set
198# CONFIG_TICK_ONESHOT is not set
199# CONFIG_NO_HZ is not set 199# CONFIG_NO_HZ is not set
200# CONFIG_HIGH_RES_TIMERS is not set 200# CONFIG_HIGH_RES_TIMERS is not set
201CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 201CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -209,6 +209,8 @@ CONFIG_PREEMPT_NONE=y
209# CONFIG_PREEMPT_VOLUNTARY is not set 209# CONFIG_PREEMPT_VOLUNTARY is not set
210# CONFIG_PREEMPT is not set 210# CONFIG_PREEMPT is not set
211CONFIG_BINFMT_ELF=y 211CONFIG_BINFMT_ELF=y
212# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
213# CONFIG_HAVE_AOUT is not set
212# CONFIG_BINFMT_MISC is not set 214# CONFIG_BINFMT_MISC is not set
213# CONFIG_MATH_EMULATION is not set 215# CONFIG_MATH_EMULATION is not set
214# CONFIG_IOMMU_HELPER is not set 216# CONFIG_IOMMU_HELPER is not set
@@ -223,15 +225,15 @@ CONFIG_FLATMEM_MANUAL=y
223# CONFIG_SPARSEMEM_MANUAL is not set 225# CONFIG_SPARSEMEM_MANUAL is not set
224CONFIG_FLATMEM=y 226CONFIG_FLATMEM=y
225CONFIG_FLAT_NODE_MEM_MAP=y 227CONFIG_FLAT_NODE_MEM_MAP=y
226# CONFIG_SPARSEMEM_STATIC is not set
227# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
228CONFIG_PAGEFLAGS_EXTENDED=y 228CONFIG_PAGEFLAGS_EXTENDED=y
229CONFIG_SPLIT_PTLOCK_CPUS=4 229CONFIG_SPLIT_PTLOCK_CPUS=4
230CONFIG_MIGRATION=y 230CONFIG_MIGRATION=y
231CONFIG_RESOURCES_64BIT=y 231CONFIG_RESOURCES_64BIT=y
232CONFIG_PHYS_ADDR_T_64BIT=y
232CONFIG_ZONE_DMA_FLAG=1 233CONFIG_ZONE_DMA_FLAG=1
233CONFIG_BOUNCE=y 234CONFIG_BOUNCE=y
234CONFIG_VIRT_TO_BUS=y 235CONFIG_VIRT_TO_BUS=y
236CONFIG_UNEVICTABLE_LRU=y
235CONFIG_FORCE_MAX_ZONEORDER=11 237CONFIG_FORCE_MAX_ZONEORDER=11
236CONFIG_PROC_DEVICETREE=y 238CONFIG_PROC_DEVICETREE=y
237CONFIG_CMDLINE_BOOL=y 239CONFIG_CMDLINE_BOOL=y
@@ -318,6 +320,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
318# CONFIG_TIPC is not set 320# CONFIG_TIPC is not set
319# CONFIG_ATM is not set 321# CONFIG_ATM is not set
320# CONFIG_BRIDGE is not set 322# CONFIG_BRIDGE is not set
323# CONFIG_NET_DSA is not set
321# CONFIG_VLAN_8021Q is not set 324# CONFIG_VLAN_8021Q is not set
322# CONFIG_DECNET is not set 325# CONFIG_DECNET is not set
323# CONFIG_LLC2 is not set 326# CONFIG_LLC2 is not set
@@ -338,14 +341,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
338# CONFIG_IRDA is not set 341# CONFIG_IRDA is not set
339# CONFIG_BT is not set 342# CONFIG_BT is not set
340# CONFIG_AF_RXRPC is not set 343# CONFIG_AF_RXRPC is not set
341 344# CONFIG_PHONET is not set
342# 345# CONFIG_WIRELESS is not set
343# Wireless
344#
345# CONFIG_CFG80211 is not set
346# CONFIG_WIRELESS_EXT is not set
347# CONFIG_MAC80211 is not set
348# CONFIG_IEEE80211 is not set
349# CONFIG_RFKILL is not set 346# CONFIG_RFKILL is not set
350# CONFIG_NET_9P is not set 347# CONFIG_NET_9P is not set
351 348
@@ -528,8 +525,12 @@ CONFIG_IBM_NEW_EMAC_ZMII=y
528CONFIG_IBM_NEW_EMAC_RGMII=y 525CONFIG_IBM_NEW_EMAC_RGMII=y
529CONFIG_IBM_NEW_EMAC_TAH=y 526CONFIG_IBM_NEW_EMAC_TAH=y
530CONFIG_IBM_NEW_EMAC_EMAC4=y 527CONFIG_IBM_NEW_EMAC_EMAC4=y
528# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
529# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
530# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
531# CONFIG_NET_PCI is not set 531# CONFIG_NET_PCI is not set
532# CONFIG_B44 is not set 532# CONFIG_B44 is not set
533# CONFIG_ATL2 is not set
533CONFIG_NETDEV_1000=y 534CONFIG_NETDEV_1000=y
534# CONFIG_ACENIC is not set 535# CONFIG_ACENIC is not set
535# CONFIG_DL2K is not set 536# CONFIG_DL2K is not set
@@ -550,18 +551,22 @@ CONFIG_NETDEV_1000=y
550# CONFIG_QLA3XXX is not set 551# CONFIG_QLA3XXX is not set
551# CONFIG_ATL1 is not set 552# CONFIG_ATL1 is not set
552# CONFIG_ATL1E is not set 553# CONFIG_ATL1E is not set
554# CONFIG_JME is not set
553CONFIG_NETDEV_10000=y 555CONFIG_NETDEV_10000=y
554# CONFIG_CHELSIO_T1 is not set 556# CONFIG_CHELSIO_T1 is not set
555# CONFIG_CHELSIO_T3 is not set 557# CONFIG_CHELSIO_T3 is not set
558# CONFIG_ENIC is not set
556# CONFIG_IXGBE is not set 559# CONFIG_IXGBE is not set
557# CONFIG_IXGB is not set 560# CONFIG_IXGB is not set
558# CONFIG_S2IO is not set 561# CONFIG_S2IO is not set
559# CONFIG_MYRI10GE is not set 562# CONFIG_MYRI10GE is not set
560# CONFIG_NETXEN_NIC is not set 563# CONFIG_NETXEN_NIC is not set
561# CONFIG_NIU is not set 564# CONFIG_NIU is not set
565# CONFIG_MLX4_EN is not set
562# CONFIG_MLX4_CORE is not set 566# CONFIG_MLX4_CORE is not set
563# CONFIG_TEHUTI is not set 567# CONFIG_TEHUTI is not set
564# CONFIG_BNX2X is not set 568# CONFIG_BNX2X is not set
569# CONFIG_QLGE is not set
565# CONFIG_SFC is not set 570# CONFIG_SFC is not set
566# CONFIG_TR is not set 571# CONFIG_TR is not set
567 572
@@ -657,6 +662,8 @@ CONFIG_SSB_POSSIBLE=y
657# CONFIG_MFD_CORE is not set 662# CONFIG_MFD_CORE is not set
658# CONFIG_MFD_SM501 is not set 663# CONFIG_MFD_SM501 is not set
659# CONFIG_HTC_PASIC3 is not set 664# CONFIG_HTC_PASIC3 is not set
665# CONFIG_MFD_TMIO is not set
666# CONFIG_MFD_WM8400 is not set
660 667
661# 668#
662# Multimedia devices 669# Multimedia devices
@@ -698,9 +705,14 @@ CONFIG_USB_ARCH_HAS_EHCI=y
698# CONFIG_USB_OTG_BLACKLIST_HUB is not set 705# CONFIG_USB_OTG_BLACKLIST_HUB is not set
699 706
700# 707#
708# Enable Host or Gadget support to see Inventra options
709#
710
711#
701# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 712# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
702# 713#
703# CONFIG_USB_GADGET is not set 714# CONFIG_USB_GADGET is not set
715# CONFIG_UWB is not set
704# CONFIG_MMC is not set 716# CONFIG_MMC is not set
705# CONFIG_MEMSTICK is not set 717# CONFIG_MEMSTICK is not set
706# CONFIG_NEW_LEDS is not set 718# CONFIG_NEW_LEDS is not set
@@ -710,6 +722,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
710# CONFIG_RTC_CLASS is not set 722# CONFIG_RTC_CLASS is not set
711# CONFIG_DMADEVICES is not set 723# CONFIG_DMADEVICES is not set
712# CONFIG_UIO is not set 724# CONFIG_UIO is not set
725# CONFIG_STAGING is not set
713 726
714# 727#
715# File systems 728# File systems
@@ -718,10 +731,11 @@ CONFIG_EXT2_FS=y
718# CONFIG_EXT2_FS_XATTR is not set 731# CONFIG_EXT2_FS_XATTR is not set
719# CONFIG_EXT2_FS_XIP is not set 732# CONFIG_EXT2_FS_XIP is not set
720# CONFIG_EXT3_FS is not set 733# CONFIG_EXT3_FS is not set
721# CONFIG_EXT4DEV_FS is not set 734# CONFIG_EXT4_FS is not set
722# CONFIG_REISERFS_FS is not set 735# CONFIG_REISERFS_FS is not set
723# CONFIG_JFS_FS is not set 736# CONFIG_JFS_FS is not set
724# CONFIG_FS_POSIX_ACL is not set 737# CONFIG_FS_POSIX_ACL is not set
738CONFIG_FILE_LOCKING=y
725# CONFIG_XFS_FS is not set 739# CONFIG_XFS_FS is not set
726# CONFIG_OCFS2_FS is not set 740# CONFIG_OCFS2_FS is not set
727CONFIG_DNOTIFY=y 741CONFIG_DNOTIFY=y
@@ -751,6 +765,7 @@ CONFIG_INOTIFY_USER=y
751CONFIG_PROC_FS=y 765CONFIG_PROC_FS=y
752CONFIG_PROC_KCORE=y 766CONFIG_PROC_KCORE=y
753CONFIG_PROC_SYSCTL=y 767CONFIG_PROC_SYSCTL=y
768CONFIG_PROC_PAGE_MONITOR=y
754CONFIG_SYSFS=y 769CONFIG_SYSFS=y
755CONFIG_TMPFS=y 770CONFIG_TMPFS=y
756# CONFIG_TMPFS_POSIX_ACL is not set 771# CONFIG_TMPFS_POSIX_ACL is not set
@@ -788,6 +803,7 @@ CONFIG_LOCKD=y
788CONFIG_LOCKD_V4=y 803CONFIG_LOCKD_V4=y
789CONFIG_NFS_COMMON=y 804CONFIG_NFS_COMMON=y
790CONFIG_SUNRPC=y 805CONFIG_SUNRPC=y
806# CONFIG_SUNRPC_REGISTER_V4 is not set
791# CONFIG_RPCSEC_GSS_KRB5 is not set 807# CONFIG_RPCSEC_GSS_KRB5 is not set
792# CONFIG_RPCSEC_GSS_SPKM3 is not set 808# CONFIG_RPCSEC_GSS_SPKM3 is not set
793# CONFIG_SMB_FS is not set 809# CONFIG_SMB_FS is not set
@@ -808,7 +824,6 @@ CONFIG_MSDOS_PARTITION=y
808# Library routines 824# Library routines
809# 825#
810CONFIG_BITREVERSE=y 826CONFIG_BITREVERSE=y
811# CONFIG_GENERIC_FIND_FIRST_BIT is not set
812# CONFIG_CRC_CCITT is not set 827# CONFIG_CRC_CCITT is not set
813# CONFIG_CRC16 is not set 828# CONFIG_CRC16 is not set
814# CONFIG_CRC_T10DIF is not set 829# CONFIG_CRC_T10DIF is not set
@@ -861,14 +876,21 @@ CONFIG_SCHED_DEBUG=y
861# CONFIG_DEBUG_SG is not set 876# CONFIG_DEBUG_SG is not set
862# CONFIG_BOOT_PRINTK_DELAY is not set 877# CONFIG_BOOT_PRINTK_DELAY is not set
863# CONFIG_RCU_TORTURE_TEST is not set 878# CONFIG_RCU_TORTURE_TEST is not set
879# CONFIG_RCU_CPU_STALL_DETECTOR is not set
864# CONFIG_BACKTRACE_SELF_TEST is not set 880# CONFIG_BACKTRACE_SELF_TEST is not set
881# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
865# CONFIG_FAULT_INJECTION is not set 882# CONFIG_FAULT_INJECTION is not set
866# CONFIG_LATENCYTOP is not set 883# CONFIG_LATENCYTOP is not set
884CONFIG_SYSCTL_SYSCALL_CHECK=y
885CONFIG_NOP_TRACER=y
867CONFIG_HAVE_FTRACE=y 886CONFIG_HAVE_FTRACE=y
868CONFIG_HAVE_DYNAMIC_FTRACE=y 887CONFIG_HAVE_DYNAMIC_FTRACE=y
869# CONFIG_FTRACE is not set 888# CONFIG_FTRACE is not set
870# CONFIG_SCHED_TRACER is not set 889# CONFIG_SCHED_TRACER is not set
871# CONFIG_CONTEXT_SWITCH_TRACER is not set 890# CONFIG_CONTEXT_SWITCH_TRACER is not set
891# CONFIG_BOOT_TRACER is not set
892# CONFIG_STACK_TRACER is not set
893# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
872# CONFIG_SAMPLES is not set 894# CONFIG_SAMPLES is not set
873CONFIG_HAVE_ARCH_KGDB=y 895CONFIG_HAVE_ARCH_KGDB=y
874# CONFIG_KGDB is not set 896# CONFIG_KGDB is not set
@@ -877,6 +899,7 @@ CONFIG_HAVE_ARCH_KGDB=y
877# CONFIG_DEBUG_PAGEALLOC is not set 899# CONFIG_DEBUG_PAGEALLOC is not set
878# CONFIG_CODE_PATCHING_SELFTEST is not set 900# CONFIG_CODE_PATCHING_SELFTEST is not set
879# CONFIG_FTR_FIXUP_SELFTEST is not set 901# CONFIG_FTR_FIXUP_SELFTEST is not set
902# CONFIG_MSI_BITMAP_SELFTEST is not set
880# CONFIG_XMON is not set 903# CONFIG_XMON is not set
881# CONFIG_IRQSTACKS is not set 904# CONFIG_IRQSTACKS is not set
882# CONFIG_VIRQ_DEBUG is not set 905# CONFIG_VIRQ_DEBUG is not set
@@ -888,14 +911,19 @@ CONFIG_HAVE_ARCH_KGDB=y
888# 911#
889# CONFIG_KEYS is not set 912# CONFIG_KEYS is not set
890# CONFIG_SECURITY is not set 913# CONFIG_SECURITY is not set
914# CONFIG_SECURITYFS is not set
891# CONFIG_SECURITY_FILE_CAPABILITIES is not set 915# CONFIG_SECURITY_FILE_CAPABILITIES is not set
892CONFIG_CRYPTO=y 916CONFIG_CRYPTO=y
893 917
894# 918#
895# Crypto core or helper 919# Crypto core or helper
896# 920#
921# CONFIG_CRYPTO_FIPS is not set
897CONFIG_CRYPTO_ALGAPI=y 922CONFIG_CRYPTO_ALGAPI=y
923CONFIG_CRYPTO_AEAD=y
898CONFIG_CRYPTO_BLKCIPHER=y 924CONFIG_CRYPTO_BLKCIPHER=y
925CONFIG_CRYPTO_HASH=y
926CONFIG_CRYPTO_RNG=y
899CONFIG_CRYPTO_MANAGER=y 927CONFIG_CRYPTO_MANAGER=y
900# CONFIG_CRYPTO_GF128MUL is not set 928# CONFIG_CRYPTO_GF128MUL is not set
901# CONFIG_CRYPTO_NULL is not set 929# CONFIG_CRYPTO_NULL is not set
@@ -968,6 +996,11 @@ CONFIG_CRYPTO_DES=y
968# 996#
969# CONFIG_CRYPTO_DEFLATE is not set 997# CONFIG_CRYPTO_DEFLATE is not set
970# CONFIG_CRYPTO_LZO is not set 998# CONFIG_CRYPTO_LZO is not set
999
1000#
1001# Random Number Generation
1002#
1003# CONFIG_CRYPTO_ANSI_CPRNG is not set
971CONFIG_CRYPTO_HW=y 1004CONFIG_CRYPTO_HW=y
972# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1005# CONFIG_CRYPTO_DEV_HIFN_795X is not set
973# CONFIG_PPC_CLOCK is not set 1006# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/44x/warp_defconfig b/arch/powerpc/configs/44x/warp_defconfig
index d9375a969c67..59cbd2761ed7 100644
--- a/arch/powerpc/configs/44x/warp_defconfig
+++ b/arch/powerpc/configs/44x/warp_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.27-rc1 3# Linux kernel version: 2.6.28-rc2
4# Tue Aug 5 09:23:39 2008 4# Tue Oct 28 09:16:22 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -23,14 +23,13 @@ CONFIG_PHYS_64BIT=y
23CONFIG_NOT_COHERENT_CACHE=y 23CONFIG_NOT_COHERENT_CACHE=y
24CONFIG_PPC32=y 24CONFIG_PPC32=y
25CONFIG_WORD_SIZE=32 25CONFIG_WORD_SIZE=32
26CONFIG_PPC_MERGE=y 26CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
27CONFIG_MMU=y 27CONFIG_MMU=y
28CONFIG_GENERIC_CMOS_UPDATE=y 28CONFIG_GENERIC_CMOS_UPDATE=y
29CONFIG_GENERIC_TIME=y 29CONFIG_GENERIC_TIME=y
30CONFIG_GENERIC_TIME_VSYSCALL=y 30CONFIG_GENERIC_TIME_VSYSCALL=y
31CONFIG_GENERIC_CLOCKEVENTS=y 31CONFIG_GENERIC_CLOCKEVENTS=y
32CONFIG_GENERIC_HARDIRQS=y 32CONFIG_GENERIC_HARDIRQS=y
33# CONFIG_HAVE_GET_USER_PAGES_FAST is not set
34# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 33# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
35CONFIG_IRQ_PER_CPU=y 34CONFIG_IRQ_PER_CPU=y
36CONFIG_STACKTRACE_SUPPORT=y 35CONFIG_STACKTRACE_SUPPORT=y
@@ -92,7 +91,6 @@ CONFIG_INITRAMFS_SOURCE=""
92CONFIG_SYSCTL=y 91CONFIG_SYSCTL=y
93CONFIG_EMBEDDED=y 92CONFIG_EMBEDDED=y
94CONFIG_SYSCTL_SYSCALL=y 93CONFIG_SYSCTL_SYSCALL=y
95CONFIG_SYSCTL_SYSCALL_CHECK=y
96CONFIG_KALLSYMS=y 94CONFIG_KALLSYMS=y
97# CONFIG_KALLSYMS_ALL is not set 95# CONFIG_KALLSYMS_ALL is not set
98# CONFIG_KALLSYMS_EXTRA_PASS is not set 96# CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -109,6 +107,7 @@ CONFIG_SIGNALFD=y
109CONFIG_TIMERFD=y 107CONFIG_TIMERFD=y
110CONFIG_EVENTFD=y 108CONFIG_EVENTFD=y
111CONFIG_SHMEM=y 109CONFIG_SHMEM=y
110CONFIG_AIO=y
112CONFIG_VM_EVENT_COUNTERS=y 111CONFIG_VM_EVENT_COUNTERS=y
113CONFIG_SLAB=y 112CONFIG_SLAB=y
114# CONFIG_SLUB is not set 113# CONFIG_SLUB is not set
@@ -122,10 +121,6 @@ CONFIG_HAVE_IOREMAP_PROT=y
122CONFIG_HAVE_KPROBES=y 121CONFIG_HAVE_KPROBES=y
123CONFIG_HAVE_KRETPROBES=y 122CONFIG_HAVE_KRETPROBES=y
124CONFIG_HAVE_ARCH_TRACEHOOK=y 123CONFIG_HAVE_ARCH_TRACEHOOK=y
125# CONFIG_HAVE_DMA_ATTRS is not set
126# CONFIG_USE_GENERIC_SMP_HELPERS is not set
127# CONFIG_HAVE_CLK is not set
128CONFIG_PROC_PAGE_MONITOR=y
129# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 124# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
130CONFIG_SLABINFO=y 125CONFIG_SLABINFO=y
131CONFIG_RT_MUTEXES=y 126CONFIG_RT_MUTEXES=y
@@ -158,6 +153,7 @@ CONFIG_DEFAULT_AS=y
158# CONFIG_DEFAULT_NOOP is not set 153# CONFIG_DEFAULT_NOOP is not set
159CONFIG_DEFAULT_IOSCHED="anticipatory" 154CONFIG_DEFAULT_IOSCHED="anticipatory"
160CONFIG_CLASSIC_RCU=y 155CONFIG_CLASSIC_RCU=y
156# CONFIG_FREEZER is not set
161 157
162# 158#
163# Platform support 159# Platform support
@@ -173,9 +169,13 @@ CONFIG_CLASSIC_RCU=y
173# CONFIG_KATMAI is not set 169# CONFIG_KATMAI is not set
174# CONFIG_RAINIER is not set 170# CONFIG_RAINIER is not set
175CONFIG_WARP=y 171CONFIG_WARP=y
172# CONFIG_ARCHES is not set
176# CONFIG_CANYONLANDS is not set 173# CONFIG_CANYONLANDS is not set
174# CONFIG_GLACIER is not set
177# CONFIG_YOSEMITE is not set 175# CONFIG_YOSEMITE is not set
178# CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set 176# CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set
177# CONFIG_PPC44x_SIMPLE is not set
178# CONFIG_PPC4xx_GPIO is not set
179CONFIG_440EP=y 179CONFIG_440EP=y
180CONFIG_IBM440EP_ERR42=y 180CONFIG_IBM440EP_ERR42=y
181# CONFIG_IPIC is not set 181# CONFIG_IPIC is not set
@@ -195,7 +195,6 @@ CONFIG_IBM440EP_ERR42=y
195# Kernel options 195# Kernel options
196# 196#
197# CONFIG_HIGHMEM is not set 197# CONFIG_HIGHMEM is not set
198# CONFIG_TICK_ONESHOT is not set
199# CONFIG_NO_HZ is not set 198# CONFIG_NO_HZ is not set
200# CONFIG_HIGH_RES_TIMERS is not set 199# CONFIG_HIGH_RES_TIMERS is not set
201CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 200CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -209,6 +208,8 @@ CONFIG_PREEMPT_NONE=y
209# CONFIG_PREEMPT_VOLUNTARY is not set 208# CONFIG_PREEMPT_VOLUNTARY is not set
210# CONFIG_PREEMPT is not set 209# CONFIG_PREEMPT is not set
211CONFIG_BINFMT_ELF=y 210CONFIG_BINFMT_ELF=y
211# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
212# CONFIG_HAVE_AOUT is not set
212# CONFIG_BINFMT_MISC is not set 213# CONFIG_BINFMT_MISC is not set
213# CONFIG_MATH_EMULATION is not set 214# CONFIG_MATH_EMULATION is not set
214# CONFIG_IOMMU_HELPER is not set 215# CONFIG_IOMMU_HELPER is not set
@@ -223,15 +224,15 @@ CONFIG_FLATMEM_MANUAL=y
223# CONFIG_SPARSEMEM_MANUAL is not set 224# CONFIG_SPARSEMEM_MANUAL is not set
224CONFIG_FLATMEM=y 225CONFIG_FLATMEM=y
225CONFIG_FLAT_NODE_MEM_MAP=y 226CONFIG_FLAT_NODE_MEM_MAP=y
226# CONFIG_SPARSEMEM_STATIC is not set
227# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
228CONFIG_PAGEFLAGS_EXTENDED=y 227CONFIG_PAGEFLAGS_EXTENDED=y
229CONFIG_SPLIT_PTLOCK_CPUS=4 228CONFIG_SPLIT_PTLOCK_CPUS=4
230CONFIG_MIGRATION=y 229CONFIG_MIGRATION=y
231CONFIG_RESOURCES_64BIT=y 230CONFIG_RESOURCES_64BIT=y
231CONFIG_PHYS_ADDR_T_64BIT=y
232CONFIG_ZONE_DMA_FLAG=1 232CONFIG_ZONE_DMA_FLAG=1
233CONFIG_BOUNCE=y 233CONFIG_BOUNCE=y
234CONFIG_VIRT_TO_BUS=y 234CONFIG_VIRT_TO_BUS=y
235CONFIG_UNEVICTABLE_LRU=y
235CONFIG_FORCE_MAX_ZONEORDER=11 236CONFIG_FORCE_MAX_ZONEORDER=11
236CONFIG_PROC_DEVICETREE=y 237CONFIG_PROC_DEVICETREE=y
237CONFIG_CMDLINE_BOOL=y 238CONFIG_CMDLINE_BOOL=y
@@ -308,7 +309,6 @@ CONFIG_INET_TCP_DIAG=y
308CONFIG_TCP_CONG_CUBIC=y 309CONFIG_TCP_CONG_CUBIC=y
309CONFIG_DEFAULT_TCP_CONG="cubic" 310CONFIG_DEFAULT_TCP_CONG="cubic"
310# CONFIG_TCP_MD5SIG is not set 311# CONFIG_TCP_MD5SIG is not set
311# CONFIG_IP_VS is not set
312# CONFIG_IPV6 is not set 312# CONFIG_IPV6 is not set
313# CONFIG_NETWORK_SECMARK is not set 313# CONFIG_NETWORK_SECMARK is not set
314CONFIG_NETFILTER=y 314CONFIG_NETFILTER=y
@@ -322,10 +322,12 @@ CONFIG_NETFILTER_ADVANCED=y
322# CONFIG_NETFILTER_NETLINK_LOG is not set 322# CONFIG_NETFILTER_NETLINK_LOG is not set
323# CONFIG_NF_CONNTRACK is not set 323# CONFIG_NF_CONNTRACK is not set
324# CONFIG_NETFILTER_XTABLES is not set 324# CONFIG_NETFILTER_XTABLES is not set
325# CONFIG_IP_VS is not set
325 326
326# 327#
327# IP: Netfilter Configuration 328# IP: Netfilter Configuration
328# 329#
330# CONFIG_NF_DEFRAG_IPV4 is not set
329# CONFIG_IP_NF_QUEUE is not set 331# CONFIG_IP_NF_QUEUE is not set
330# CONFIG_IP_NF_IPTABLES is not set 332# CONFIG_IP_NF_IPTABLES is not set
331# CONFIG_IP_NF_ARPTABLES is not set 333# CONFIG_IP_NF_ARPTABLES is not set
@@ -334,6 +336,7 @@ CONFIG_NETFILTER_ADVANCED=y
334# CONFIG_TIPC is not set 336# CONFIG_TIPC is not set
335# CONFIG_ATM is not set 337# CONFIG_ATM is not set
336# CONFIG_BRIDGE is not set 338# CONFIG_BRIDGE is not set
339# CONFIG_NET_DSA is not set
337CONFIG_VLAN_8021Q=y 340CONFIG_VLAN_8021Q=y
338# CONFIG_VLAN_8021Q_GVRP is not set 341# CONFIG_VLAN_8021Q_GVRP is not set
339# CONFIG_DECNET is not set 342# CONFIG_DECNET is not set
@@ -355,14 +358,8 @@ CONFIG_VLAN_8021Q=y
355# CONFIG_IRDA is not set 358# CONFIG_IRDA is not set
356# CONFIG_BT is not set 359# CONFIG_BT is not set
357# CONFIG_AF_RXRPC is not set 360# CONFIG_AF_RXRPC is not set
358 361# CONFIG_PHONET is not set
359# 362# CONFIG_WIRELESS is not set
360# Wireless
361#
362# CONFIG_CFG80211 is not set
363# CONFIG_WIRELESS_EXT is not set
364# CONFIG_MAC80211 is not set
365# CONFIG_IEEE80211 is not set
366# CONFIG_RFKILL is not set 363# CONFIG_RFKILL is not set
367# CONFIG_NET_9P is not set 364# CONFIG_NET_9P is not set
368 365
@@ -550,6 +547,9 @@ CONFIG_IBM_NEW_EMAC_ZMII=y
550# CONFIG_IBM_NEW_EMAC_RGMII is not set 547# CONFIG_IBM_NEW_EMAC_RGMII is not set
551# CONFIG_IBM_NEW_EMAC_TAH is not set 548# CONFIG_IBM_NEW_EMAC_TAH is not set
552# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 549# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
550# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
551# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
552# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
553# CONFIG_B44 is not set 553# CONFIG_B44 is not set
554# CONFIG_NETDEV_1000 is not set 554# CONFIG_NETDEV_1000 is not set
555# CONFIG_NETDEV_10000 is not set 555# CONFIG_NETDEV_10000 is not set
@@ -629,6 +629,7 @@ CONFIG_HW_RANDOM=y
629CONFIG_I2C=y 629CONFIG_I2C=y
630CONFIG_I2C_BOARDINFO=y 630CONFIG_I2C_BOARDINFO=y
631# CONFIG_I2C_CHARDEV is not set 631# CONFIG_I2C_CHARDEV is not set
632CONFIG_I2C_HELPER_AUTO=y
632 633
633# 634#
634# I2C Hardware Bus support 635# I2C Hardware Bus support
@@ -678,6 +679,7 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
678# CONFIG_POWER_SUPPLY is not set 679# CONFIG_POWER_SUPPLY is not set
679CONFIG_HWMON=y 680CONFIG_HWMON=y
680# CONFIG_HWMON_VID is not set 681# CONFIG_HWMON_VID is not set
682# CONFIG_SENSORS_AD7414 is not set
681# CONFIG_SENSORS_AD7418 is not set 683# CONFIG_SENSORS_AD7418 is not set
682# CONFIG_SENSORS_ADM1021 is not set 684# CONFIG_SENSORS_ADM1021 is not set
683# CONFIG_SENSORS_ADM1025 is not set 685# CONFIG_SENSORS_ADM1025 is not set
@@ -742,6 +744,9 @@ CONFIG_SSB_POSSIBLE=y
742# CONFIG_MFD_CORE is not set 744# CONFIG_MFD_CORE is not set
743# CONFIG_MFD_SM501 is not set 745# CONFIG_MFD_SM501 is not set
744# CONFIG_HTC_PASIC3 is not set 746# CONFIG_HTC_PASIC3 is not set
747# CONFIG_MFD_TMIO is not set
748# CONFIG_MFD_WM8400 is not set
749# CONFIG_MFD_WM8350_I2C is not set
745 750
746# 751#
747# Multimedia devices 752# Multimedia devices
@@ -789,6 +794,9 @@ CONFIG_USB_DEVICE_CLASS=y
789# CONFIG_USB_OTG is not set 794# CONFIG_USB_OTG is not set
790# CONFIG_USB_OTG_WHITELIST is not set 795# CONFIG_USB_OTG_WHITELIST is not set
791# CONFIG_USB_OTG_BLACKLIST_HUB is not set 796# CONFIG_USB_OTG_BLACKLIST_HUB is not set
797CONFIG_USB_MON=y
798# CONFIG_USB_WUSB is not set
799# CONFIG_USB_WUSB_CBAF is not set
792 800
793# 801#
794# USB Host Controller Drivers 802# USB Host Controller Drivers
@@ -805,6 +813,7 @@ CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
805CONFIG_USB_OHCI_LITTLE_ENDIAN=y 813CONFIG_USB_OHCI_LITTLE_ENDIAN=y
806# CONFIG_USB_SL811_HCD is not set 814# CONFIG_USB_SL811_HCD is not set
807# CONFIG_USB_R8A66597_HCD is not set 815# CONFIG_USB_R8A66597_HCD is not set
816# CONFIG_USB_HWA_HCD is not set
808 817
809# 818#
810# USB Device Class drivers 819# USB Device Class drivers
@@ -812,6 +821,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
812# CONFIG_USB_ACM is not set 821# CONFIG_USB_ACM is not set
813# CONFIG_USB_PRINTER is not set 822# CONFIG_USB_PRINTER is not set
814# CONFIG_USB_WDM is not set 823# CONFIG_USB_WDM is not set
824# CONFIG_USB_TMC is not set
815 825
816# 826#
817# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 827# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -840,7 +850,6 @@ CONFIG_USB_STORAGE=y
840# 850#
841# CONFIG_USB_MDC800 is not set 851# CONFIG_USB_MDC800 is not set
842# CONFIG_USB_MICROTEK is not set 852# CONFIG_USB_MICROTEK is not set
843CONFIG_USB_MON=y
844 853
845# 854#
846# USB port drivers 855# USB port drivers
@@ -853,7 +862,7 @@ CONFIG_USB_MON=y
853# CONFIG_USB_EMI62 is not set 862# CONFIG_USB_EMI62 is not set
854# CONFIG_USB_EMI26 is not set 863# CONFIG_USB_EMI26 is not set
855# CONFIG_USB_ADUTUX is not set 864# CONFIG_USB_ADUTUX is not set
856# CONFIG_USB_AUERSWALD is not set 865# CONFIG_USB_SEVSEG is not set
857# CONFIG_USB_RIO500 is not set 866# CONFIG_USB_RIO500 is not set
858# CONFIG_USB_LEGOTOWER is not set 867# CONFIG_USB_LEGOTOWER is not set
859# CONFIG_USB_LCD is not set 868# CONFIG_USB_LCD is not set
@@ -869,13 +878,14 @@ CONFIG_USB_MON=y
869# CONFIG_USB_TRANCEVIBRATOR is not set 878# CONFIG_USB_TRANCEVIBRATOR is not set
870# CONFIG_USB_IOWARRIOR is not set 879# CONFIG_USB_IOWARRIOR is not set
871# CONFIG_USB_ISIGHTFW is not set 880# CONFIG_USB_ISIGHTFW is not set
881# CONFIG_USB_VST is not set
872# CONFIG_USB_GADGET is not set 882# CONFIG_USB_GADGET is not set
873CONFIG_MMC=m 883CONFIG_MMC=m
874# CONFIG_MMC_DEBUG is not set 884# CONFIG_MMC_DEBUG is not set
875# CONFIG_MMC_UNSAFE_RESUME is not set 885# CONFIG_MMC_UNSAFE_RESUME is not set
876 886
877# 887#
878# MMC/SD Card Drivers 888# MMC/SD/SDIO Card Drivers
879# 889#
880CONFIG_MMC_BLOCK=m 890CONFIG_MMC_BLOCK=m
881CONFIG_MMC_BLOCK_BOUNCE=y 891CONFIG_MMC_BLOCK_BOUNCE=y
@@ -883,7 +893,7 @@ CONFIG_MMC_BLOCK_BOUNCE=y
883# CONFIG_MMC_TEST is not set 893# CONFIG_MMC_TEST is not set
884 894
885# 895#
886# MMC/SD Host Controller Drivers 896# MMC/SD/SDIO Host Controller Drivers
887# 897#
888# CONFIG_MMC_SDHCI is not set 898# CONFIG_MMC_SDHCI is not set
889# CONFIG_MMC_WBSD is not set 899# CONFIG_MMC_WBSD is not set
@@ -894,6 +904,7 @@ CONFIG_MMC_BLOCK_BOUNCE=y
894# CONFIG_RTC_CLASS is not set 904# CONFIG_RTC_CLASS is not set
895# CONFIG_DMADEVICES is not set 905# CONFIG_DMADEVICES is not set
896# CONFIG_UIO is not set 906# CONFIG_UIO is not set
907# CONFIG_STAGING is not set
897 908
898# 909#
899# File systems 910# File systems
@@ -902,10 +913,11 @@ CONFIG_EXT2_FS=y
902# CONFIG_EXT2_FS_XATTR is not set 913# CONFIG_EXT2_FS_XATTR is not set
903# CONFIG_EXT2_FS_XIP is not set 914# CONFIG_EXT2_FS_XIP is not set
904# CONFIG_EXT3_FS is not set 915# CONFIG_EXT3_FS is not set
905# CONFIG_EXT4DEV_FS is not set 916# CONFIG_EXT4_FS is not set
906# CONFIG_REISERFS_FS is not set 917# CONFIG_REISERFS_FS is not set
907# CONFIG_JFS_FS is not set 918# CONFIG_JFS_FS is not set
908# CONFIG_FS_POSIX_ACL is not set 919# CONFIG_FS_POSIX_ACL is not set
920CONFIG_FILE_LOCKING=y
909# CONFIG_XFS_FS is not set 921# CONFIG_XFS_FS is not set
910# CONFIG_OCFS2_FS is not set 922# CONFIG_OCFS2_FS is not set
911CONFIG_DNOTIFY=y 923CONFIG_DNOTIFY=y
@@ -938,6 +950,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
938CONFIG_PROC_FS=y 950CONFIG_PROC_FS=y
939CONFIG_PROC_KCORE=y 951CONFIG_PROC_KCORE=y
940CONFIG_PROC_SYSCTL=y 952CONFIG_PROC_SYSCTL=y
953CONFIG_PROC_PAGE_MONITOR=y
941CONFIG_SYSFS=y 954CONFIG_SYSFS=y
942# CONFIG_TMPFS is not set 955# CONFIG_TMPFS is not set
943# CONFIG_HUGETLB_PAGE is not set 956# CONFIG_HUGETLB_PAGE is not set
@@ -984,6 +997,7 @@ CONFIG_LOCKD=y
984CONFIG_LOCKD_V4=y 997CONFIG_LOCKD_V4=y
985CONFIG_NFS_COMMON=y 998CONFIG_NFS_COMMON=y
986CONFIG_SUNRPC=y 999CONFIG_SUNRPC=y
1000# CONFIG_SUNRPC_REGISTER_V4 is not set
987# CONFIG_RPCSEC_GSS_KRB5 is not set 1001# CONFIG_RPCSEC_GSS_KRB5 is not set
988# CONFIG_RPCSEC_GSS_SPKM3 is not set 1002# CONFIG_RPCSEC_GSS_SPKM3 is not set
989# CONFIG_SMB_FS is not set 1003# CONFIG_SMB_FS is not set
@@ -1043,7 +1057,6 @@ CONFIG_NLS_UTF8=y
1043# Library routines 1057# Library routines
1044# 1058#
1045CONFIG_BITREVERSE=y 1059CONFIG_BITREVERSE=y
1046# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1047CONFIG_CRC_CCITT=y 1060CONFIG_CRC_CCITT=y
1048# CONFIG_CRC16 is not set 1061# CONFIG_CRC16 is not set
1049CONFIG_CRC_T10DIF=y 1062CONFIG_CRC_T10DIF=y
@@ -1096,14 +1109,21 @@ CONFIG_DEBUG_INFO=y
1096# CONFIG_DEBUG_SG is not set 1109# CONFIG_DEBUG_SG is not set
1097# CONFIG_BOOT_PRINTK_DELAY is not set 1110# CONFIG_BOOT_PRINTK_DELAY is not set
1098# CONFIG_RCU_TORTURE_TEST is not set 1111# CONFIG_RCU_TORTURE_TEST is not set
1112# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1099# CONFIG_BACKTRACE_SELF_TEST is not set 1113# CONFIG_BACKTRACE_SELF_TEST is not set
1114# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1100# CONFIG_FAULT_INJECTION is not set 1115# CONFIG_FAULT_INJECTION is not set
1101# CONFIG_LATENCYTOP is not set 1116# CONFIG_LATENCYTOP is not set
1117CONFIG_SYSCTL_SYSCALL_CHECK=y
1118CONFIG_NOP_TRACER=y
1102CONFIG_HAVE_FTRACE=y 1119CONFIG_HAVE_FTRACE=y
1103CONFIG_HAVE_DYNAMIC_FTRACE=y 1120CONFIG_HAVE_DYNAMIC_FTRACE=y
1104# CONFIG_FTRACE is not set 1121# CONFIG_FTRACE is not set
1105# CONFIG_SCHED_TRACER is not set 1122# CONFIG_SCHED_TRACER is not set
1106# CONFIG_CONTEXT_SWITCH_TRACER is not set 1123# CONFIG_CONTEXT_SWITCH_TRACER is not set
1124# CONFIG_BOOT_TRACER is not set
1125# CONFIG_STACK_TRACER is not set
1126# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1107# CONFIG_SAMPLES is not set 1127# CONFIG_SAMPLES is not set
1108CONFIG_HAVE_ARCH_KGDB=y 1128CONFIG_HAVE_ARCH_KGDB=y
1109# CONFIG_KGDB is not set 1129# CONFIG_KGDB is not set
@@ -1112,6 +1132,7 @@ CONFIG_HAVE_ARCH_KGDB=y
1112# CONFIG_DEBUG_PAGEALLOC is not set 1132# CONFIG_DEBUG_PAGEALLOC is not set
1113# CONFIG_CODE_PATCHING_SELFTEST is not set 1133# CONFIG_CODE_PATCHING_SELFTEST is not set
1114# CONFIG_FTR_FIXUP_SELFTEST is not set 1134# CONFIG_FTR_FIXUP_SELFTEST is not set
1135# CONFIG_MSI_BITMAP_SELFTEST is not set
1115# CONFIG_XMON is not set 1136# CONFIG_XMON is not set
1116# CONFIG_IRQSTACKS is not set 1137# CONFIG_IRQSTACKS is not set
1117# CONFIG_VIRQ_DEBUG is not set 1138# CONFIG_VIRQ_DEBUG is not set
@@ -1123,12 +1144,14 @@ CONFIG_BDI_SWITCH=y
1123# 1144#
1124# CONFIG_KEYS is not set 1145# CONFIG_KEYS is not set
1125# CONFIG_SECURITY is not set 1146# CONFIG_SECURITY is not set
1147# CONFIG_SECURITYFS is not set
1126# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1148# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1127CONFIG_CRYPTO=y 1149CONFIG_CRYPTO=y
1128 1150
1129# 1151#
1130# Crypto core or helper 1152# Crypto core or helper
1131# 1153#
1154# CONFIG_CRYPTO_FIPS is not set
1132# CONFIG_CRYPTO_MANAGER is not set 1155# CONFIG_CRYPTO_MANAGER is not set
1133# CONFIG_CRYPTO_GF128MUL is not set 1156# CONFIG_CRYPTO_GF128MUL is not set
1134# CONFIG_CRYPTO_NULL is not set 1157# CONFIG_CRYPTO_NULL is not set
@@ -1201,6 +1224,11 @@ CONFIG_CRYPTO=y
1201# 1224#
1202# CONFIG_CRYPTO_DEFLATE is not set 1225# CONFIG_CRYPTO_DEFLATE is not set
1203# CONFIG_CRYPTO_LZO is not set 1226# CONFIG_CRYPTO_LZO is not set
1227
1228#
1229# Random Number Generation
1230#
1231# CONFIG_CRYPTO_ANSI_CPRNG is not set
1204CONFIG_CRYPTO_HW=y 1232CONFIG_CRYPTO_HW=y
1205# CONFIG_PPC_CLOCK is not set 1233# CONFIG_PPC_CLOCK is not set
1206# CONFIG_VIRTUALIZATION is not set 1234# CONFIG_VIRTUALIZATION is not set