aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-11-15 03:50:38 -0500
committerIngo Molnar <mingo@elte.hu>2009-11-15 03:50:41 -0500
commit39dc78b6510323848e3356452f7dab9499736978 (patch)
treecf8a8fede74e41b203fd00e3ccd21ead2e851442 /arch
parent4c49b12853fbb5eff4849b7b6a1e895776f027a1 (diff)
parent156171c71a0dc4bce12b4408bb1591f8fe32dc1a (diff)
Merge commit 'v2.6.32-rc7' into perf/core
Merge reason: pick up perf fixlets Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
-rw-r--r--arch/alpha/include/asm/fcntl.h4
-rw-r--r--arch/alpha/include/asm/thread_info.h4
-rw-r--r--arch/arm/configs/ams_delta_defconfig24
-rw-r--r--arch/arm/configs/kirkwood_defconfig260
-rw-r--r--arch/arm/configs/omap3_pandora_defconfig49
-rw-r--r--arch/arm/configs/omap_3430sdp_defconfig9
-rw-r--r--arch/arm/configs/orion5x_defconfig278
-rw-r--r--arch/arm/include/asm/unistd.h9
-rw-r--r--arch/arm/kernel/entry-armv.S7
-rw-r--r--arch/arm/kernel/head-common.S2
-rw-r--r--arch/arm/kernel/smp_scu.c4
-rw-r--r--arch/arm/kernel/traps.c4
-rw-r--r--arch/arm/mach-ep93xx/micro9.c1
-rw-r--r--arch/arm/mach-kirkwood/addr-map.c2
-rw-r--r--arch/arm/mach-kirkwood/common.c2
-rw-r--r--arch/arm/mach-kirkwood/include/mach/io.h2
-rw-r--r--arch/arm/mach-kirkwood/include/mach/kirkwood.h1
-rw-r--r--arch/arm/mach-kirkwood/openrd_base-setup.c12
-rw-r--r--arch/arm/mach-kirkwood/pcie.c6
-rw-r--r--arch/arm/mach-ks8695/include/mach/regs-switch.h2
-rw-r--r--arch/arm/mach-mv78xx0/common.c2
-rw-r--r--arch/arm/mach-mv78xx0/include/mach/mv78xx0.h1
-rw-r--r--arch/arm/mach-omap2/board-omap3beagle.c2
-rw-r--r--arch/arm/mach-omap2/board-omap3pandora.c78
-rw-r--r--arch/arm/mach-omap2/gpmc.c2
-rw-r--r--arch/arm/mach-omap2/mailbox.c2
-rw-r--r--arch/arm/mach-pxa/irq.c11
-rw-r--r--arch/arm/mach-pxa/palmtc.c8
-rw-r--r--arch/arm/mach-pxa/spitz.c39
-rw-r--r--arch/arm/mach-realview/Kconfig5
-rw-r--r--arch/arm/mach-realview/core.c42
-rw-r--r--arch/arm/mach-realview/core.h6
-rw-r--r--arch/arm/mach-realview/include/mach/memory.h49
-rw-r--r--arch/arm/mach-realview/platsmp.c5
-rw-r--r--arch/arm/mach-realview/realview_eb.c1
-rw-r--r--arch/arm/mach-realview/realview_pb1176.c13
-rw-r--r--arch/arm/mach-realview/realview_pb11mp.c1
-rw-r--r--arch/arm/mach-realview/realview_pba8.c1
-rw-r--r--arch/arm/mach-realview/realview_pbx.c21
-rw-r--r--arch/arm/mach-s3c6400/include/mach/dma.h12
-rw-r--r--arch/arm/mach-s3c6410/Kconfig1
-rw-r--r--arch/arm/mach-s3c6410/mach-smdk6410.c3
-rw-r--r--arch/arm/mm/proc-v7.S7
-rw-r--r--arch/arm/plat-omap/cpu-omap.c2
-rw-r--r--arch/arm/plat-omap/dma.c14
-rw-r--r--arch/arm/plat-s3c64xx/dma.c76
-rw-r--r--arch/m32r/Kconfig3
-rw-r--r--arch/m32r/boot/compressed/Makefile18
-rw-r--r--arch/m32r/boot/compressed/misc.c143
-rw-r--r--arch/m32r/kernel/smp.c2
-rw-r--r--arch/m32r/kernel/time.c6
-rw-r--r--arch/m32r/kernel/vmlinux.lds.S2
-rw-r--r--arch/powerpc/Kconfig4
-rw-r--r--arch/powerpc/boot/dts/mpc8377_wlan.dts2
-rw-r--r--arch/powerpc/boot/dts/mpc8569mds.dts4
-rw-r--r--arch/powerpc/boot/dts/sbc8548.dts17
-rw-r--r--arch/powerpc/configs/83xx/asp8347_defconfig60
-rw-r--r--arch/powerpc/configs/83xx/kmeter1_defconfig46
-rw-r--r--arch/powerpc/configs/83xx/mpc8313_rdb_defconfig73
-rw-r--r--arch/powerpc/configs/83xx/mpc8315_rdb_defconfig76
-rw-r--r--arch/powerpc/configs/83xx/mpc832x_mds_defconfig62
-rw-r--r--arch/powerpc/configs/83xx/mpc832x_rdb_defconfig66
-rw-r--r--arch/powerpc/configs/83xx/mpc834x_itx_defconfig60
-rw-r--r--arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig58
-rw-r--r--arch/powerpc/configs/83xx/mpc834x_mds_defconfig58
-rw-r--r--arch/powerpc/configs/83xx/mpc836x_mds_defconfig64
-rw-r--r--arch/powerpc/configs/83xx/mpc836x_rdk_defconfig60
-rw-r--r--arch/powerpc/configs/83xx/mpc837x_mds_defconfig64
-rw-r--r--arch/powerpc/configs/83xx/mpc837x_rdb_defconfig70
-rw-r--r--arch/powerpc/configs/83xx/sbc834x_defconfig61
-rw-r--r--arch/powerpc/configs/85xx/ksi8560_defconfig61
-rw-r--r--arch/powerpc/configs/85xx/mpc8540_ads_defconfig57
-rw-r--r--arch/powerpc/configs/85xx/mpc8560_ads_defconfig63
-rw-r--r--arch/powerpc/configs/85xx/mpc85xx_cds_defconfig58
-rw-r--r--arch/powerpc/configs/85xx/sbc8548_defconfig53
-rw-r--r--arch/powerpc/configs/85xx/sbc8560_defconfig57
-rw-r--r--arch/powerpc/configs/85xx/socrates_defconfig68
-rw-r--r--arch/powerpc/configs/85xx/stx_gp3_defconfig77
-rw-r--r--arch/powerpc/configs/85xx/tqm8540_defconfig59
-rw-r--r--arch/powerpc/configs/85xx/tqm8541_defconfig64
-rw-r--r--arch/powerpc/configs/85xx/tqm8548_defconfig64
-rw-r--r--arch/powerpc/configs/85xx/tqm8555_defconfig64
-rw-r--r--arch/powerpc/configs/85xx/tqm8560_defconfig64
-rw-r--r--arch/powerpc/configs/85xx/xes_mpc85xx_defconfig76
-rw-r--r--arch/powerpc/configs/86xx/gef_ppc9a_defconfig74
-rw-r--r--arch/powerpc/configs/86xx/gef_sbc310_defconfig72
-rw-r--r--arch/powerpc/configs/86xx/gef_sbc610_defconfig80
-rw-r--r--arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig64
-rw-r--r--arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig65
-rw-r--r--arch/powerpc/configs/86xx/sbc8641d_defconfig66
-rw-r--r--arch/powerpc/configs/adder875_defconfig48
-rw-r--r--arch/powerpc/configs/c2k_defconfig77
-rw-r--r--arch/powerpc/configs/ep8248e_defconfig49
-rw-r--r--arch/powerpc/configs/ep88xc_defconfig47
-rw-r--r--arch/powerpc/configs/linkstation_defconfig72
-rw-r--r--arch/powerpc/configs/mgcoge_defconfig51
-rw-r--r--arch/powerpc/configs/mgsuvd_defconfig45
-rw-r--r--arch/powerpc/configs/mpc7448_hpc2_defconfig58
-rw-r--r--arch/powerpc/configs/mpc8272_ads_defconfig52
-rw-r--r--arch/powerpc/configs/mpc83xx_defconfig90
-rw-r--r--arch/powerpc/configs/mpc85xx_defconfig98
-rw-r--r--arch/powerpc/configs/mpc85xx_smp_defconfig99
-rw-r--r--arch/powerpc/configs/mpc866_ads_defconfig54
-rw-r--r--arch/powerpc/configs/mpc86xx_defconfig70
-rw-r--r--arch/powerpc/configs/mpc885_ads_defconfig47
-rw-r--r--arch/powerpc/configs/pasemi_defconfig628
-rw-r--r--arch/powerpc/configs/pq2fads_defconfig55
-rw-r--r--arch/powerpc/configs/prpmc2800_defconfig67
-rw-r--r--arch/powerpc/configs/storcenter_defconfig54
-rw-r--r--arch/powerpc/kernel/time.c15
-rw-r--r--arch/powerpc/kvm/timing.h4
-rw-r--r--arch/powerpc/mm/mmu_context_nohash.c4
-rw-r--r--arch/powerpc/platforms/82xx/ep8248e.c15
-rw-r--r--arch/powerpc/platforms/pseries/msi.c2
-rw-r--r--arch/powerpc/platforms/pseries/xics.c9
-rw-r--r--arch/sh/include/asm/rwsem.h2
-rw-r--r--arch/sh/kernel/dwarf.c2
-rw-r--r--arch/sh/mm/cache-sh4.c5
-rw-r--r--arch/sparc/include/asm/system_64.h4
-rw-r--r--arch/sparc/kernel/prom_common.c4
-rw-r--r--arch/sparc/kernel/visemul.c2
-rw-r--r--arch/x86/include/asm/amd_iommu.h1
-rw-r--r--arch/x86/include/asm/desc.h2
-rw-r--r--arch/x86/include/asm/dma-mapping.h10
-rw-r--r--arch/x86/include/asm/processor.h2
-rw-r--r--arch/x86/include/asm/topology.h2
-rw-r--r--arch/x86/kernel/amd_iommu.c2
-rw-r--r--arch/x86/kernel/amd_iommu_init.c24
-rw-r--r--arch/x86/kernel/cpu/mtrr/cleanup.c2
-rw-r--r--arch/x86/kernel/microcode_amd.c6
-rw-r--r--arch/x86/kernel/pci-dma.c6
-rw-r--r--arch/x86/kernel/process_64.c5
-rw-r--r--arch/x86/kernel/reboot.c8
-rw-r--r--arch/x86/kernel/setup.c7
-rw-r--r--arch/x86/kvm/x86.c4
-rw-r--r--arch/x86/mm/ioremap.c24
-rw-r--r--arch/x86/xen/enlighten.c11
137 files changed, 3542 insertions, 1874 deletions
diff --git a/arch/alpha/include/asm/fcntl.h b/arch/alpha/include/asm/fcntl.h
index e42823e954aa..73126e4dd639 100644
--- a/arch/alpha/include/asm/fcntl.h
+++ b/arch/alpha/include/asm/fcntl.h
@@ -26,8 +26,8 @@
26#define F_GETOWN 6 /* for sockets. */ 26#define F_GETOWN 6 /* for sockets. */
27#define F_SETSIG 10 /* for sockets. */ 27#define F_SETSIG 10 /* for sockets. */
28#define F_GETSIG 11 /* for sockets. */ 28#define F_GETSIG 11 /* for sockets. */
29#define F_SETOWN_EX 12 29#define F_SETOWN_EX 15
30#define F_GETOWN_EX 13 30#define F_GETOWN_EX 16
31 31
32/* for posix fcntl() and lockf() */ 32/* for posix fcntl() and lockf() */
33#define F_RDLCK 1 33#define F_RDLCK 1
diff --git a/arch/alpha/include/asm/thread_info.h b/arch/alpha/include/asm/thread_info.h
index 5076a8860b18..815680b585ed 100644
--- a/arch/alpha/include/asm/thread_info.h
+++ b/arch/alpha/include/asm/thread_info.h
@@ -50,12 +50,12 @@ struct thread_info {
50register struct thread_info *__current_thread_info __asm__("$8"); 50register struct thread_info *__current_thread_info __asm__("$8");
51#define current_thread_info() __current_thread_info 51#define current_thread_info() __current_thread_info
52 52
53#endif /* __ASSEMBLY__ */
54
53/* Thread information allocation. */ 55/* Thread information allocation. */
54#define THREAD_SIZE_ORDER 1 56#define THREAD_SIZE_ORDER 1
55#define THREAD_SIZE (2*PAGE_SIZE) 57#define THREAD_SIZE (2*PAGE_SIZE)
56 58
57#endif /* __ASSEMBLY__ */
58
59#define PREEMPT_ACTIVE 0x40000000 59#define PREEMPT_ACTIVE 0x40000000
60 60
61/* 61/*
diff --git a/arch/arm/configs/ams_delta_defconfig b/arch/arm/configs/ams_delta_defconfig
index 764732529ea3..e8f7380b67d6 100644
--- a/arch/arm/configs/ams_delta_defconfig
+++ b/arch/arm/configs/ams_delta_defconfig
@@ -55,10 +55,10 @@ CONFIG_BLK_DEV_INITRD=y
55CONFIG_INITRAMFS_SOURCE="" 55CONFIG_INITRAMFS_SOURCE=""
56CONFIG_CC_OPTIMIZE_FOR_SIZE=y 56CONFIG_CC_OPTIMIZE_FOR_SIZE=y
57CONFIG_SYSCTL=y 57CONFIG_SYSCTL=y
58# CONFIG_EMBEDDED is not set 58CONFIG_EMBEDDED=y
59CONFIG_UID16=y 59CONFIG_UID16=y
60CONFIG_SYSCTL_SYSCALL=y 60CONFIG_SYSCTL_SYSCALL=y
61CONFIG_KALLSYMS=y 61# CONFIG_KALLSYMS is not set
62# CONFIG_KALLSYMS_ALL is not set 62# CONFIG_KALLSYMS_ALL is not set
63# CONFIG_KALLSYMS_EXTRA_PASS is not set 63# CONFIG_KALLSYMS_EXTRA_PASS is not set
64CONFIG_HOTPLUG=y 64CONFIG_HOTPLUG=y
@@ -224,7 +224,7 @@ CONFIG_CPU_CP15_MMU=y
224# 224#
225# Processor Features 225# Processor Features
226# 226#
227# CONFIG_ARM_THUMB is not set 227CONFIG_ARM_THUMB=y
228# CONFIG_CPU_ICACHE_DISABLE is not set 228# CONFIG_CPU_ICACHE_DISABLE is not set
229# CONFIG_CPU_DCACHE_DISABLE is not set 229# CONFIG_CPU_DCACHE_DISABLE is not set
230CONFIG_CPU_DCACHE_WRITETHROUGH=y 230CONFIG_CPU_DCACHE_WRITETHROUGH=y
@@ -248,7 +248,7 @@ CONFIG_CPU_DCACHE_WRITETHROUGH=y
248# CONFIG_HIGH_RES_TIMERS is not set 248# CONFIG_HIGH_RES_TIMERS is not set
249CONFIG_PREEMPT=y 249CONFIG_PREEMPT=y
250CONFIG_HZ=100 250CONFIG_HZ=100
251# CONFIG_AEABI is not set 251CONFIG_AEABI=y
252# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set 252# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
253CONFIG_SELECT_MEMORY_MODEL=y 253CONFIG_SELECT_MEMORY_MODEL=y
254CONFIG_FLATMEM_MANUAL=y 254CONFIG_FLATMEM_MANUAL=y
@@ -299,7 +299,9 @@ CONFIG_BINFMT_ELF=y
299# 299#
300# Power management options 300# Power management options
301# 301#
302# CONFIG_PM is not set 302CONFIG_PM=y
303# CONFIG_SUSPEND is not set
304CONFIG_PM_RUNTIME=y
303 305
304# 306#
305# Networking 307# Networking
@@ -670,7 +672,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
670CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 672CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
671# CONFIG_INPUT_JOYDEV is not set 673# CONFIG_INPUT_JOYDEV is not set
672# CONFIG_INPUT_TSDEV is not set 674# CONFIG_INPUT_TSDEV is not set
673# CONFIG_INPUT_EVDEV is not set 675CONFIG_INPUT_EVDEV=y
674# CONFIG_INPUT_EVBUG is not set 676# CONFIG_INPUT_EVBUG is not set
675 677
676# 678#
@@ -784,6 +786,7 @@ CONFIG_I2C_OMAP=y
784# 786#
785# CONFIG_SPI is not set 787# CONFIG_SPI is not set
786# CONFIG_SPI_MASTER is not set 788# CONFIG_SPI_MASTER is not set
789CONFIG_GPIO_SYSFS=y
787 790
788# 791#
789# Dallas's 1-wire bus 792# Dallas's 1-wire bus
@@ -820,6 +823,7 @@ CONFIG_LEDS_AMS_DELTA=y
820CONFIG_LEDS_TRIGGERS=y 823CONFIG_LEDS_TRIGGERS=y
821CONFIG_LEDS_TRIGGER_TIMER=y 824CONFIG_LEDS_TRIGGER_TIMER=y
822CONFIG_LEDS_TRIGGER_HEARTBEAT=y 825CONFIG_LEDS_TRIGGER_HEARTBEAT=y
826CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
823 827
824# 828#
825# Multimedia devices 829# Multimedia devices
@@ -896,7 +900,13 @@ CONFIG_LOGO_LINUX_CLUT224=y
896# 900#
897# Sound 901# Sound
898# 902#
899# CONFIG_SOUND is not set 903CONFIG_SOUND=y
904CONFIG_SND=y
905CONFIG_SND_MIXER_OSS=y
906CONFIG_SND_PCM_OSS=y
907CONFIG_SND_SOC=y
908CONFIG_SND_OMAP_SOC=y
909CONFIG_SND_OMAP_SOC_AMS_DELTA=y
900 910
901# 911#
902# HID Devices 912# HID Devices
diff --git a/arch/arm/configs/kirkwood_defconfig b/arch/arm/configs/kirkwood_defconfig
index af74cc2de8b6..bcfade33bca9 100644
--- a/arch/arm/configs/kirkwood_defconfig
+++ b/arch/arm/configs/kirkwood_defconfig
@@ -1,15 +1,13 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.30-rc4 3# Linux kernel version: 2.6.32-rc6
4# Mon May 4 11:58:57 2009 4# Sat Nov 7 20:31:18 2009
5# 5#
6CONFIG_ARM=y 6CONFIG_ARM=y
7CONFIG_SYS_SUPPORTS_APM_EMULATION=y 7CONFIG_SYS_SUPPORTS_APM_EMULATION=y
8CONFIG_GENERIC_GPIO=y 8CONFIG_GENERIC_GPIO=y
9CONFIG_GENERIC_TIME=y 9CONFIG_GENERIC_TIME=y
10CONFIG_GENERIC_CLOCKEVENTS=y 10CONFIG_GENERIC_CLOCKEVENTS=y
11CONFIG_MMU=y
12# CONFIG_NO_IOPORT is not set
13CONFIG_GENERIC_HARDIRQS=y 11CONFIG_GENERIC_HARDIRQS=y
14CONFIG_STACKTRACE_SUPPORT=y 12CONFIG_STACKTRACE_SUPPORT=y
15CONFIG_HAVE_LATENCYTOP_SUPPORT=y 13CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -18,13 +16,12 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
18CONFIG_HARDIRQS_SW_RESEND=y 16CONFIG_HARDIRQS_SW_RESEND=y
19CONFIG_GENERIC_IRQ_PROBE=y 17CONFIG_GENERIC_IRQ_PROBE=y
20CONFIG_RWSEM_GENERIC_SPINLOCK=y 18CONFIG_RWSEM_GENERIC_SPINLOCK=y
21# CONFIG_ARCH_HAS_ILOG2_U32 is not set
22# CONFIG_ARCH_HAS_ILOG2_U64 is not set
23CONFIG_GENERIC_HWEIGHT=y 19CONFIG_GENERIC_HWEIGHT=y
24CONFIG_GENERIC_CALIBRATE_DELAY=y 20CONFIG_GENERIC_CALIBRATE_DELAY=y
25CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 21CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
26CONFIG_VECTORS_BASE=0xffff0000 22CONFIG_VECTORS_BASE=0xffff0000
27CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 23CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
24CONFIG_CONSTRUCTORS=y
28 25
29# 26#
30# General setup 27# General setup
@@ -46,11 +43,12 @@ CONFIG_SYSVIPC_SYSCTL=y
46# 43#
47# RCU Subsystem 44# RCU Subsystem
48# 45#
49CONFIG_CLASSIC_RCU=y 46CONFIG_TREE_RCU=y
50# CONFIG_TREE_RCU is not set 47# CONFIG_TREE_PREEMPT_RCU is not set
51# CONFIG_PREEMPT_RCU is not set 48# CONFIG_RCU_TRACE is not set
49CONFIG_RCU_FANOUT=32
50# CONFIG_RCU_FANOUT_EXACT is not set
52# CONFIG_TREE_RCU_TRACE is not set 51# CONFIG_TREE_RCU_TRACE is not set
53# CONFIG_PREEMPT_RCU_TRACE is not set
54# CONFIG_IKCONFIG is not set 52# CONFIG_IKCONFIG is not set
55CONFIG_LOG_BUF_SHIFT=19 53CONFIG_LOG_BUF_SHIFT=19
56# CONFIG_GROUP_SCHED is not set 54# CONFIG_GROUP_SCHED is not set
@@ -73,7 +71,6 @@ CONFIG_SYSCTL_SYSCALL=y
73CONFIG_KALLSYMS=y 71CONFIG_KALLSYMS=y
74# CONFIG_KALLSYMS_ALL is not set 72# CONFIG_KALLSYMS_ALL is not set
75# CONFIG_KALLSYMS_EXTRA_PASS is not set 73# CONFIG_KALLSYMS_EXTRA_PASS is not set
76# CONFIG_STRIP_ASM_SYMS is not set
77CONFIG_HOTPLUG=y 74CONFIG_HOTPLUG=y
78CONFIG_PRINTK=y 75CONFIG_PRINTK=y
79CONFIG_BUG=y 76CONFIG_BUG=y
@@ -86,6 +83,10 @@ CONFIG_TIMERFD=y
86CONFIG_EVENTFD=y 83CONFIG_EVENTFD=y
87CONFIG_SHMEM=y 84CONFIG_SHMEM=y
88CONFIG_AIO=y 85CONFIG_AIO=y
86
87#
88# Kernel Performance Events And Counters
89#
89CONFIG_VM_EVENT_COUNTERS=y 90CONFIG_VM_EVENT_COUNTERS=y
90CONFIG_PCI_QUIRKS=y 91CONFIG_PCI_QUIRKS=y
91CONFIG_SLUB_DEBUG=y 92CONFIG_SLUB_DEBUG=y
@@ -95,13 +96,17 @@ CONFIG_SLUB=y
95# CONFIG_SLOB is not set 96# CONFIG_SLOB is not set
96CONFIG_PROFILING=y 97CONFIG_PROFILING=y
97CONFIG_TRACEPOINTS=y 98CONFIG_TRACEPOINTS=y
98# CONFIG_MARKERS is not set
99CONFIG_OPROFILE=y 99CONFIG_OPROFILE=y
100CONFIG_HAVE_OPROFILE=y 100CONFIG_HAVE_OPROFILE=y
101CONFIG_KPROBES=y 101CONFIG_KPROBES=y
102CONFIG_KRETPROBES=y 102CONFIG_KRETPROBES=y
103CONFIG_HAVE_KPROBES=y 103CONFIG_HAVE_KPROBES=y
104CONFIG_HAVE_KRETPROBES=y 104CONFIG_HAVE_KRETPROBES=y
105
106#
107# GCOV-based kernel profiling
108#
109# CONFIG_GCOV_KERNEL is not set
105# CONFIG_SLOW_WORK is not set 110# CONFIG_SLOW_WORK is not set
106CONFIG_HAVE_GENERIC_DMA_COHERENT=y 111CONFIG_HAVE_GENERIC_DMA_COHERENT=y
107CONFIG_SLABINFO=y 112CONFIG_SLABINFO=y
@@ -114,7 +119,7 @@ CONFIG_MODULE_UNLOAD=y
114# CONFIG_MODVERSIONS is not set 119# CONFIG_MODVERSIONS is not set
115# CONFIG_MODULE_SRCVERSION_ALL is not set 120# CONFIG_MODULE_SRCVERSION_ALL is not set
116CONFIG_BLOCK=y 121CONFIG_BLOCK=y
117# CONFIG_LBD is not set 122CONFIG_LBDAF=y
118# CONFIG_BLK_DEV_BSG is not set 123# CONFIG_BLK_DEV_BSG is not set
119# CONFIG_BLK_DEV_INTEGRITY is not set 124# CONFIG_BLK_DEV_INTEGRITY is not set
120 125
@@ -135,19 +140,22 @@ CONFIG_DEFAULT_IOSCHED="cfq"
135# 140#
136# System Type 141# System Type
137# 142#
143CONFIG_MMU=y
138# CONFIG_ARCH_AAEC2000 is not set 144# CONFIG_ARCH_AAEC2000 is not set
139# CONFIG_ARCH_INTEGRATOR is not set 145# CONFIG_ARCH_INTEGRATOR is not set
140# CONFIG_ARCH_REALVIEW is not set 146# CONFIG_ARCH_REALVIEW is not set
141# CONFIG_ARCH_VERSATILE is not set 147# CONFIG_ARCH_VERSATILE is not set
142# CONFIG_ARCH_AT91 is not set 148# CONFIG_ARCH_AT91 is not set
143# CONFIG_ARCH_CLPS711X is not set 149# CONFIG_ARCH_CLPS711X is not set
150# CONFIG_ARCH_GEMINI is not set
144# CONFIG_ARCH_EBSA110 is not set 151# CONFIG_ARCH_EBSA110 is not set
145# CONFIG_ARCH_EP93XX is not set 152# CONFIG_ARCH_EP93XX is not set
146# CONFIG_ARCH_GEMINI is not set
147# CONFIG_ARCH_FOOTBRIDGE is not set 153# CONFIG_ARCH_FOOTBRIDGE is not set
154# CONFIG_ARCH_MXC is not set
155# CONFIG_ARCH_STMP3XXX is not set
148# CONFIG_ARCH_NETX is not set 156# CONFIG_ARCH_NETX is not set
149# CONFIG_ARCH_H720X is not set 157# CONFIG_ARCH_H720X is not set
150# CONFIG_ARCH_IMX is not set 158# CONFIG_ARCH_NOMADIK is not set
151# CONFIG_ARCH_IOP13XX is not set 159# CONFIG_ARCH_IOP13XX is not set
152# CONFIG_ARCH_IOP32X is not set 160# CONFIG_ARCH_IOP32X is not set
153# CONFIG_ARCH_IOP33X is not set 161# CONFIG_ARCH_IOP33X is not set
@@ -156,25 +164,27 @@ CONFIG_DEFAULT_IOSCHED="cfq"
156# CONFIG_ARCH_IXP4XX is not set 164# CONFIG_ARCH_IXP4XX is not set
157# CONFIG_ARCH_L7200 is not set 165# CONFIG_ARCH_L7200 is not set
158CONFIG_ARCH_KIRKWOOD=y 166CONFIG_ARCH_KIRKWOOD=y
159# CONFIG_ARCH_KS8695 is not set
160# CONFIG_ARCH_NS9XXX is not set
161# CONFIG_ARCH_LOKI is not set 167# CONFIG_ARCH_LOKI is not set
162# CONFIG_ARCH_MV78XX0 is not set 168# CONFIG_ARCH_MV78XX0 is not set
163# CONFIG_ARCH_MXC is not set
164# CONFIG_ARCH_ORION5X is not set 169# CONFIG_ARCH_ORION5X is not set
170# CONFIG_ARCH_MMP is not set
171# CONFIG_ARCH_KS8695 is not set
172# CONFIG_ARCH_NS9XXX is not set
173# CONFIG_ARCH_W90X900 is not set
165# CONFIG_ARCH_PNX4008 is not set 174# CONFIG_ARCH_PNX4008 is not set
166# CONFIG_ARCH_PXA is not set 175# CONFIG_ARCH_PXA is not set
167# CONFIG_ARCH_MMP is not set 176# CONFIG_ARCH_MSM is not set
168# CONFIG_ARCH_RPC is not set 177# CONFIG_ARCH_RPC is not set
169# CONFIG_ARCH_SA1100 is not set 178# CONFIG_ARCH_SA1100 is not set
170# CONFIG_ARCH_S3C2410 is not set 179# CONFIG_ARCH_S3C2410 is not set
171# CONFIG_ARCH_S3C64XX is not set 180# CONFIG_ARCH_S3C64XX is not set
181# CONFIG_ARCH_S5PC1XX is not set
172# CONFIG_ARCH_SHARK is not set 182# CONFIG_ARCH_SHARK is not set
173# CONFIG_ARCH_LH7A40X is not set 183# CONFIG_ARCH_LH7A40X is not set
184# CONFIG_ARCH_U300 is not set
174# CONFIG_ARCH_DAVINCI is not set 185# CONFIG_ARCH_DAVINCI is not set
175# CONFIG_ARCH_OMAP is not set 186# CONFIG_ARCH_OMAP is not set
176# CONFIG_ARCH_MSM is not set 187# CONFIG_ARCH_BCMRING is not set
177# CONFIG_ARCH_W90X900 is not set
178 188
179# 189#
180# Marvell Kirkwood Implementations 190# Marvell Kirkwood Implementations
@@ -185,6 +195,7 @@ CONFIG_MACH_RD88F6281=y
185CONFIG_MACH_MV88F6281GTW_GE=y 195CONFIG_MACH_MV88F6281GTW_GE=y
186CONFIG_MACH_SHEEVAPLUG=y 196CONFIG_MACH_SHEEVAPLUG=y
187CONFIG_MACH_TS219=y 197CONFIG_MACH_TS219=y
198CONFIG_MACH_OPENRD_BASE=y
188CONFIG_PLAT_ORION=y 199CONFIG_PLAT_ORION=y
189 200
190# 201#
@@ -195,7 +206,7 @@ CONFIG_CPU_FEROCEON=y
195# CONFIG_CPU_FEROCEON_OLD_ID is not set 206# CONFIG_CPU_FEROCEON_OLD_ID is not set
196CONFIG_CPU_32v5=y 207CONFIG_CPU_32v5=y
197CONFIG_CPU_ABRT_EV5T=y 208CONFIG_CPU_ABRT_EV5T=y
198CONFIG_CPU_PABRT_NOIFAR=y 209CONFIG_CPU_PABRT_LEGACY=y
199CONFIG_CPU_CACHE_VIVT=y 210CONFIG_CPU_CACHE_VIVT=y
200CONFIG_CPU_COPY_FEROCEON=y 211CONFIG_CPU_COPY_FEROCEON=y
201CONFIG_CPU_TLB_FEROCEON=y 212CONFIG_CPU_TLB_FEROCEON=y
@@ -211,6 +222,7 @@ CONFIG_ARM_THUMB=y
211CONFIG_OUTER_CACHE=y 222CONFIG_OUTER_CACHE=y
212CONFIG_CACHE_FEROCEON_L2=y 223CONFIG_CACHE_FEROCEON_L2=y
213# CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set 224# CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set
225CONFIG_ARM_L1_CACHE_SHIFT=5
214 226
215# 227#
216# Bus support 228# Bus support
@@ -235,11 +247,12 @@ CONFIG_VMSPLIT_3G=y
235# CONFIG_VMSPLIT_2G is not set 247# CONFIG_VMSPLIT_2G is not set
236# CONFIG_VMSPLIT_1G is not set 248# CONFIG_VMSPLIT_1G is not set
237CONFIG_PAGE_OFFSET=0xC0000000 249CONFIG_PAGE_OFFSET=0xC0000000
250# CONFIG_PREEMPT_NONE is not set
251# CONFIG_PREEMPT_VOLUNTARY is not set
238CONFIG_PREEMPT=y 252CONFIG_PREEMPT=y
239CONFIG_HZ=100 253CONFIG_HZ=100
240CONFIG_AEABI=y 254CONFIG_AEABI=y
241# CONFIG_OABI_COMPAT is not set 255# CONFIG_OABI_COMPAT is not set
242CONFIG_ARCH_FLATMEM_HAS_HOLES=y
243# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set 256# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
244# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set 257# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
245# CONFIG_HIGHMEM is not set 258# CONFIG_HIGHMEM is not set
@@ -254,10 +267,12 @@ CONFIG_SPLIT_PTLOCK_CPUS=4096
254# CONFIG_PHYS_ADDR_T_64BIT is not set 267# CONFIG_PHYS_ADDR_T_64BIT is not set
255CONFIG_ZONE_DMA_FLAG=0 268CONFIG_ZONE_DMA_FLAG=0
256CONFIG_VIRT_TO_BUS=y 269CONFIG_VIRT_TO_BUS=y
257CONFIG_UNEVICTABLE_LRU=y
258CONFIG_HAVE_MLOCK=y 270CONFIG_HAVE_MLOCK=y
259CONFIG_HAVE_MLOCKED_PAGE_BIT=y 271CONFIG_HAVE_MLOCKED_PAGE_BIT=y
272# CONFIG_KSM is not set
273CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
260CONFIG_ALIGNMENT_TRAP=y 274CONFIG_ALIGNMENT_TRAP=y
275CONFIG_UACCESS_WITH_MEMCPY=y
261 276
262# 277#
263# Boot options 278# Boot options
@@ -345,6 +360,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
345# CONFIG_NETFILTER is not set 360# CONFIG_NETFILTER is not set
346# CONFIG_IP_DCCP is not set 361# CONFIG_IP_DCCP is not set
347# CONFIG_IP_SCTP is not set 362# CONFIG_IP_SCTP is not set
363# CONFIG_RDS is not set
348# CONFIG_TIPC is not set 364# CONFIG_TIPC is not set
349# CONFIG_ATM is not set 365# CONFIG_ATM is not set
350# CONFIG_BRIDGE is not set 366# CONFIG_BRIDGE is not set
@@ -367,6 +383,7 @@ CONFIG_NET_DSA_MV88E6123_61_65=y
367# CONFIG_ECONET is not set 383# CONFIG_ECONET is not set
368# CONFIG_WAN_ROUTER is not set 384# CONFIG_WAN_ROUTER is not set
369# CONFIG_PHONET is not set 385# CONFIG_PHONET is not set
386# CONFIG_IEEE802154 is not set
370# CONFIG_NET_SCHED is not set 387# CONFIG_NET_SCHED is not set
371# CONFIG_DCB is not set 388# CONFIG_DCB is not set
372 389
@@ -383,17 +400,18 @@ CONFIG_NET_PKTGEN=m
383# CONFIG_AF_RXRPC is not set 400# CONFIG_AF_RXRPC is not set
384CONFIG_WIRELESS=y 401CONFIG_WIRELESS=y
385CONFIG_CFG80211=y 402CONFIG_CFG80211=y
403# CONFIG_NL80211_TESTMODE is not set
404# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
386# CONFIG_CFG80211_REG_DEBUG is not set 405# CONFIG_CFG80211_REG_DEBUG is not set
406CONFIG_CFG80211_DEFAULT_PS=y
407CONFIG_CFG80211_DEFAULT_PS_VALUE=1
408# CONFIG_CFG80211_DEBUGFS is not set
387CONFIG_WIRELESS_OLD_REGULATORY=y 409CONFIG_WIRELESS_OLD_REGULATORY=y
388CONFIG_WIRELESS_EXT=y 410CONFIG_WIRELESS_EXT=y
389CONFIG_WIRELESS_EXT_SYSFS=y 411CONFIG_WIRELESS_EXT_SYSFS=y
390CONFIG_LIB80211=y 412CONFIG_LIB80211=y
391# CONFIG_LIB80211_DEBUG is not set 413# CONFIG_LIB80211_DEBUG is not set
392CONFIG_MAC80211=y 414CONFIG_MAC80211=y
393
394#
395# Rate control algorithm selection
396#
397CONFIG_MAC80211_RC_MINSTREL=y 415CONFIG_MAC80211_RC_MINSTREL=y
398# CONFIG_MAC80211_RC_DEFAULT_PID is not set 416# CONFIG_MAC80211_RC_DEFAULT_PID is not set
399CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y 417CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
@@ -414,6 +432,7 @@ CONFIG_MAC80211_RC_DEFAULT="minstrel"
414# Generic Driver Options 432# Generic Driver Options
415# 433#
416CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 434CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
435# CONFIG_DEVTMPFS is not set
417CONFIG_STANDALONE=y 436CONFIG_STANDALONE=y
418CONFIG_PREVENT_FIRMWARE_BUILD=y 437CONFIG_PREVENT_FIRMWARE_BUILD=y
419CONFIG_FW_LOADER=y 438CONFIG_FW_LOADER=y
@@ -425,9 +444,9 @@ CONFIG_EXTRA_FIRMWARE=""
425# CONFIG_CONNECTOR is not set 444# CONFIG_CONNECTOR is not set
426CONFIG_MTD=y 445CONFIG_MTD=y
427# CONFIG_MTD_DEBUG is not set 446# CONFIG_MTD_DEBUG is not set
447# CONFIG_MTD_TESTS is not set
428# CONFIG_MTD_CONCAT is not set 448# CONFIG_MTD_CONCAT is not set
429CONFIG_MTD_PARTITIONS=y 449CONFIG_MTD_PARTITIONS=y
430# CONFIG_MTD_TESTS is not set
431# CONFIG_MTD_REDBOOT_PARTS is not set 450# CONFIG_MTD_REDBOOT_PARTS is not set
432CONFIG_MTD_CMDLINE_PARTS=y 451CONFIG_MTD_CMDLINE_PARTS=y
433# CONFIG_MTD_AFS_PARTS is not set 452# CONFIG_MTD_AFS_PARTS is not set
@@ -494,6 +513,7 @@ CONFIG_MTD_PHYSMAP=y
494# CONFIG_MTD_DATAFLASH is not set 513# CONFIG_MTD_DATAFLASH is not set
495CONFIG_MTD_M25P80=y 514CONFIG_MTD_M25P80=y
496CONFIG_M25PXX_USE_FAST_READ=y 515CONFIG_M25PXX_USE_FAST_READ=y
516# CONFIG_MTD_SST25L is not set
497# CONFIG_MTD_SLRAM is not set 517# CONFIG_MTD_SLRAM is not set
498# CONFIG_MTD_PHRAM is not set 518# CONFIG_MTD_PHRAM is not set
499# CONFIG_MTD_MTDRAM is not set 519# CONFIG_MTD_MTDRAM is not set
@@ -543,6 +563,7 @@ CONFIG_BLK_DEV_LOOP=y
543# CONFIG_BLK_DEV_RAM is not set 563# CONFIG_BLK_DEV_RAM is not set
544# CONFIG_CDROM_PKTCDVD is not set 564# CONFIG_CDROM_PKTCDVD is not set
545# CONFIG_ATA_OVER_ETH is not set 565# CONFIG_ATA_OVER_ETH is not set
566# CONFIG_MG_DISK is not set
546# CONFIG_MISC_DEVICES is not set 567# CONFIG_MISC_DEVICES is not set
547CONFIG_HAVE_IDE=y 568CONFIG_HAVE_IDE=y
548# CONFIG_IDE is not set 569# CONFIG_IDE is not set
@@ -567,10 +588,6 @@ CONFIG_BLK_DEV_SR=m
567# CONFIG_BLK_DEV_SR_VENDOR is not set 588# CONFIG_BLK_DEV_SR_VENDOR is not set
568CONFIG_CHR_DEV_SG=m 589CONFIG_CHR_DEV_SG=m
569# CONFIG_CHR_DEV_SCH is not set 590# CONFIG_CHR_DEV_SCH is not set
570
571#
572# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
573#
574# CONFIG_SCSI_MULTI_LUN is not set 591# CONFIG_SCSI_MULTI_LUN is not set
575# CONFIG_SCSI_CONSTANTS is not set 592# CONFIG_SCSI_CONSTANTS is not set
576# CONFIG_SCSI_LOGGING is not set 593# CONFIG_SCSI_LOGGING is not set
@@ -587,6 +604,8 @@ CONFIG_SCSI_WAIT_SCAN=m
587# CONFIG_SCSI_SRP_ATTRS is not set 604# CONFIG_SCSI_SRP_ATTRS is not set
588CONFIG_SCSI_LOWLEVEL=y 605CONFIG_SCSI_LOWLEVEL=y
589# CONFIG_ISCSI_TCP is not set 606# CONFIG_ISCSI_TCP is not set
607# CONFIG_SCSI_BNX2_ISCSI is not set
608# CONFIG_BE2ISCSI is not set
590# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 609# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
591# CONFIG_SCSI_3W_9XXX is not set 610# CONFIG_SCSI_3W_9XXX is not set
592# CONFIG_SCSI_ACARD is not set 611# CONFIG_SCSI_ACARD is not set
@@ -595,6 +614,7 @@ CONFIG_SCSI_LOWLEVEL=y
595# CONFIG_SCSI_AIC7XXX_OLD is not set 614# CONFIG_SCSI_AIC7XXX_OLD is not set
596# CONFIG_SCSI_AIC79XX is not set 615# CONFIG_SCSI_AIC79XX is not set
597# CONFIG_SCSI_AIC94XX is not set 616# CONFIG_SCSI_AIC94XX is not set
617# CONFIG_SCSI_MVSAS is not set
598# CONFIG_SCSI_DPT_I2O is not set 618# CONFIG_SCSI_DPT_I2O is not set
599# CONFIG_SCSI_ADVANSYS is not set 619# CONFIG_SCSI_ADVANSYS is not set
600# CONFIG_SCSI_ARCMSR is not set 620# CONFIG_SCSI_ARCMSR is not set
@@ -611,7 +631,6 @@ CONFIG_SCSI_LOWLEVEL=y
611# CONFIG_SCSI_IPS is not set 631# CONFIG_SCSI_IPS is not set
612# CONFIG_SCSI_INITIO is not set 632# CONFIG_SCSI_INITIO is not set
613# CONFIG_SCSI_INIA100 is not set 633# CONFIG_SCSI_INIA100 is not set
614# CONFIG_SCSI_MVSAS is not set
615# CONFIG_SCSI_STEX is not set 634# CONFIG_SCSI_STEX is not set
616# CONFIG_SCSI_SYM53C8XX_2 is not set 635# CONFIG_SCSI_SYM53C8XX_2 is not set
617# CONFIG_SCSI_IPR is not set 636# CONFIG_SCSI_IPR is not set
@@ -623,11 +642,14 @@ CONFIG_SCSI_LOWLEVEL=y
623# CONFIG_SCSI_DC390T is not set 642# CONFIG_SCSI_DC390T is not set
624# CONFIG_SCSI_NSP32 is not set 643# CONFIG_SCSI_NSP32 is not set
625# CONFIG_SCSI_DEBUG is not set 644# CONFIG_SCSI_DEBUG is not set
645# CONFIG_SCSI_PMCRAID is not set
626# CONFIG_SCSI_SRP is not set 646# CONFIG_SCSI_SRP is not set
647# CONFIG_SCSI_BFA_FC is not set
627# CONFIG_SCSI_DH is not set 648# CONFIG_SCSI_DH is not set
628# CONFIG_SCSI_OSD_INITIATOR is not set 649# CONFIG_SCSI_OSD_INITIATOR is not set
629CONFIG_ATA=y 650CONFIG_ATA=y
630# CONFIG_ATA_NONSTANDARD is not set 651# CONFIG_ATA_NONSTANDARD is not set
652CONFIG_ATA_VERBOSE_ERROR=y
631CONFIG_SATA_PMP=y 653CONFIG_SATA_PMP=y
632CONFIG_SATA_AHCI=y 654CONFIG_SATA_AHCI=y
633# CONFIG_SATA_SIL24 is not set 655# CONFIG_SATA_SIL24 is not set
@@ -649,6 +671,7 @@ CONFIG_SATA_MV=y
649# CONFIG_PATA_ALI is not set 671# CONFIG_PATA_ALI is not set
650# CONFIG_PATA_AMD is not set 672# CONFIG_PATA_AMD is not set
651# CONFIG_PATA_ARTOP is not set 673# CONFIG_PATA_ARTOP is not set
674# CONFIG_PATA_ATP867X is not set
652# CONFIG_PATA_ATIIXP is not set 675# CONFIG_PATA_ATIIXP is not set
653# CONFIG_PATA_CMD640_PCI is not set 676# CONFIG_PATA_CMD640_PCI is not set
654# CONFIG_PATA_CMD64X is not set 677# CONFIG_PATA_CMD64X is not set
@@ -676,6 +699,7 @@ CONFIG_SATA_MV=y
676# CONFIG_PATA_OPTIDMA is not set 699# CONFIG_PATA_OPTIDMA is not set
677# CONFIG_PATA_PDC_OLD is not set 700# CONFIG_PATA_PDC_OLD is not set
678# CONFIG_PATA_RADISYS is not set 701# CONFIG_PATA_RADISYS is not set
702# CONFIG_PATA_RDC is not set
679# CONFIG_PATA_RZ1000 is not set 703# CONFIG_PATA_RZ1000 is not set
680# CONFIG_PATA_SC1200 is not set 704# CONFIG_PATA_SC1200 is not set
681# CONFIG_PATA_SERVERWORKS is not set 705# CONFIG_PATA_SERVERWORKS is not set
@@ -693,13 +717,16 @@ CONFIG_SATA_MV=y
693# 717#
694 718
695# 719#
696# Enable only one of the two stacks, unless you know what you are doing 720# You can enable one or both FireWire driver stacks.
721#
722
723#
724# See the help texts for more information.
697# 725#
698# CONFIG_FIREWIRE is not set 726# CONFIG_FIREWIRE is not set
699# CONFIG_IEEE1394 is not set 727# CONFIG_IEEE1394 is not set
700# CONFIG_I2O is not set 728# CONFIG_I2O is not set
701CONFIG_NETDEVICES=y 729CONFIG_NETDEVICES=y
702CONFIG_COMPAT_NET_DEV_OPS=y
703# CONFIG_DUMMY is not set 730# CONFIG_DUMMY is not set
704# CONFIG_BONDING is not set 731# CONFIG_BONDING is not set
705# CONFIG_MACVLAN is not set 732# CONFIG_MACVLAN is not set
@@ -768,6 +795,9 @@ CONFIG_NET_PCI=y
768# CONFIG_SMSC9420 is not set 795# CONFIG_SMSC9420 is not set
769# CONFIG_SUNDANCE is not set 796# CONFIG_SUNDANCE is not set
770# CONFIG_TLAN is not set 797# CONFIG_TLAN is not set
798# CONFIG_KS8842 is not set
799# CONFIG_KS8851 is not set
800# CONFIG_KS8851_MLL is not set
771# CONFIG_VIA_RHINE is not set 801# CONFIG_VIA_RHINE is not set
772# CONFIG_SC92031 is not set 802# CONFIG_SC92031 is not set
773# CONFIG_ATL2 is not set 803# CONFIG_ATL2 is not set
@@ -789,6 +819,7 @@ CONFIG_NETDEV_1000=y
789# CONFIG_VIA_VELOCITY is not set 819# CONFIG_VIA_VELOCITY is not set
790# CONFIG_TIGON3 is not set 820# CONFIG_TIGON3 is not set
791# CONFIG_BNX2 is not set 821# CONFIG_BNX2 is not set
822# CONFIG_CNIC is not set
792CONFIG_MV643XX_ETH=y 823CONFIG_MV643XX_ETH=y
793# CONFIG_QLA3XXX is not set 824# CONFIG_QLA3XXX is not set
794# CONFIG_ATL1 is not set 825# CONFIG_ATL1 is not set
@@ -797,10 +828,7 @@ CONFIG_MV643XX_ETH=y
797# CONFIG_JME is not set 828# CONFIG_JME is not set
798# CONFIG_NETDEV_10000 is not set 829# CONFIG_NETDEV_10000 is not set
799# CONFIG_TR is not set 830# CONFIG_TR is not set
800 831CONFIG_WLAN=y
801#
802# Wireless LAN
803#
804# CONFIG_WLAN_PRE80211 is not set 832# CONFIG_WLAN_PRE80211 is not set
805CONFIG_WLAN_80211=y 833CONFIG_WLAN_80211=y
806CONFIG_LIBERTAS=y 834CONFIG_LIBERTAS=y
@@ -820,9 +848,7 @@ CONFIG_LIBERTAS_SDIO=y
820# CONFIG_MAC80211_HWSIM is not set 848# CONFIG_MAC80211_HWSIM is not set
821# CONFIG_MWL8K is not set 849# CONFIG_MWL8K is not set
822# CONFIG_P54_COMMON is not set 850# CONFIG_P54_COMMON is not set
823# CONFIG_ATH5K is not set 851# CONFIG_ATH_COMMON is not set
824# CONFIG_ATH9K is not set
825# CONFIG_AR9170_USB is not set
826# CONFIG_IPW2100 is not set 852# CONFIG_IPW2100 is not set
827# CONFIG_IPW2200 is not set 853# CONFIG_IPW2200 is not set
828# CONFIG_IWLWIFI is not set 854# CONFIG_IWLWIFI is not set
@@ -832,6 +858,8 @@ CONFIG_LIBERTAS_SDIO=y
832# CONFIG_ZD1211RW is not set 858# CONFIG_ZD1211RW is not set
833# CONFIG_RT2X00 is not set 859# CONFIG_RT2X00 is not set
834# CONFIG_HERMES is not set 860# CONFIG_HERMES is not set
861# CONFIG_WL12XX is not set
862# CONFIG_IWM is not set
835 863
836# 864#
837# Enable WiMAX (Networking options) to see the WiMAX drivers 865# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -855,6 +883,7 @@ CONFIG_LIBERTAS_SDIO=y
855# CONFIG_NETPOLL is not set 883# CONFIG_NETPOLL is not set
856# CONFIG_NET_POLL_CONTROLLER is not set 884# CONFIG_NET_POLL_CONTROLLER is not set
857# CONFIG_ISDN is not set 885# CONFIG_ISDN is not set
886# CONFIG_PHONE is not set
858 887
859# 888#
860# Input device support 889# Input device support
@@ -878,13 +907,19 @@ CONFIG_INPUT_EVDEV=y
878# Input Device Drivers 907# Input Device Drivers
879# 908#
880CONFIG_INPUT_KEYBOARD=y 909CONFIG_INPUT_KEYBOARD=y
910# CONFIG_KEYBOARD_ADP5588 is not set
881CONFIG_KEYBOARD_ATKBD=y 911CONFIG_KEYBOARD_ATKBD=y
882# CONFIG_KEYBOARD_SUNKBD is not set 912# CONFIG_QT2160 is not set
883# CONFIG_KEYBOARD_LKKBD is not set 913# CONFIG_KEYBOARD_LKKBD is not set
884# CONFIG_KEYBOARD_XTKBD is not set 914CONFIG_KEYBOARD_GPIO=y
915# CONFIG_KEYBOARD_MATRIX is not set
916# CONFIG_KEYBOARD_LM8323 is not set
917# CONFIG_KEYBOARD_MAX7359 is not set
885# CONFIG_KEYBOARD_NEWTON is not set 918# CONFIG_KEYBOARD_NEWTON is not set
919# CONFIG_KEYBOARD_OPENCORES is not set
886# CONFIG_KEYBOARD_STOWAWAY is not set 920# CONFIG_KEYBOARD_STOWAWAY is not set
887CONFIG_KEYBOARD_GPIO=y 921# CONFIG_KEYBOARD_SUNKBD is not set
922# CONFIG_KEYBOARD_XTKBD is not set
888# CONFIG_INPUT_MOUSE is not set 923# CONFIG_INPUT_MOUSE is not set
889# CONFIG_INPUT_JOYSTICK is not set 924# CONFIG_INPUT_JOYSTICK is not set
890# CONFIG_INPUT_TABLET is not set 925# CONFIG_INPUT_TABLET is not set
@@ -943,6 +978,7 @@ CONFIG_LEGACY_PTY_COUNT=16
943CONFIG_DEVPORT=y 978CONFIG_DEVPORT=y
944CONFIG_I2C=y 979CONFIG_I2C=y
945CONFIG_I2C_BOARDINFO=y 980CONFIG_I2C_BOARDINFO=y
981# CONFIG_I2C_COMPAT is not set
946CONFIG_I2C_CHARDEV=y 982CONFIG_I2C_CHARDEV=y
947CONFIG_I2C_HELPER_AUTO=y 983CONFIG_I2C_HELPER_AUTO=y
948 984
@@ -998,10 +1034,6 @@ CONFIG_I2C_MV64XXX=y
998# Miscellaneous I2C Chip support 1034# Miscellaneous I2C Chip support
999# 1035#
1000# CONFIG_DS1682 is not set 1036# CONFIG_DS1682 is not set
1001# CONFIG_SENSORS_PCF8574 is not set
1002# CONFIG_PCF8575 is not set
1003# CONFIG_SENSORS_PCA9539 is not set
1004# CONFIG_SENSORS_MAX6875 is not set
1005# CONFIG_SENSORS_TSL2550 is not set 1037# CONFIG_SENSORS_TSL2550 is not set
1006# CONFIG_I2C_DEBUG_CORE is not set 1038# CONFIG_I2C_DEBUG_CORE is not set
1007# CONFIG_I2C_DEBUG_ALGO is not set 1039# CONFIG_I2C_DEBUG_ALGO is not set
@@ -1023,11 +1055,47 @@ CONFIG_SPI_ORION=y
1023# 1055#
1024# CONFIG_SPI_SPIDEV is not set 1056# CONFIG_SPI_SPIDEV is not set
1025# CONFIG_SPI_TLE62X0 is not set 1057# CONFIG_SPI_TLE62X0 is not set
1058
1059#
1060# PPS support
1061#
1062# CONFIG_PPS is not set
1063CONFIG_ARCH_REQUIRE_GPIOLIB=y
1064CONFIG_GPIOLIB=y
1065# CONFIG_DEBUG_GPIO is not set
1066CONFIG_GPIO_SYSFS=y
1067
1068#
1069# Memory mapped GPIO expanders:
1070#
1071
1072#
1073# I2C GPIO expanders:
1074#
1075# CONFIG_GPIO_MAX732X is not set
1076# CONFIG_GPIO_PCA953X is not set
1077# CONFIG_GPIO_PCF857X is not set
1078
1079#
1080# PCI GPIO expanders:
1081#
1082# CONFIG_GPIO_BT8XX is not set
1083# CONFIG_GPIO_LANGWELL is not set
1084
1085#
1086# SPI GPIO expanders:
1087#
1088# CONFIG_GPIO_MAX7301 is not set
1089# CONFIG_GPIO_MCP23S08 is not set
1090# CONFIG_GPIO_MC33880 is not set
1091
1092#
1093# AC97 GPIO expanders:
1094#
1026# CONFIG_W1 is not set 1095# CONFIG_W1 is not set
1027# CONFIG_POWER_SUPPLY is not set 1096# CONFIG_POWER_SUPPLY is not set
1028# CONFIG_HWMON is not set 1097# CONFIG_HWMON is not set
1029# CONFIG_THERMAL is not set 1098# CONFIG_THERMAL is not set
1030# CONFIG_THERMAL_HWMON is not set
1031# CONFIG_WATCHDOG is not set 1099# CONFIG_WATCHDOG is not set
1032CONFIG_SSB_POSSIBLE=y 1100CONFIG_SSB_POSSIBLE=y
1033 1101
@@ -1041,33 +1109,28 @@ CONFIG_SSB_POSSIBLE=y
1041# 1109#
1042# CONFIG_MFD_CORE is not set 1110# CONFIG_MFD_CORE is not set
1043# CONFIG_MFD_SM501 is not set 1111# CONFIG_MFD_SM501 is not set
1112# CONFIG_MFD_ASIC3 is not set
1113# CONFIG_HTC_EGPIO is not set
1044# CONFIG_HTC_PASIC3 is not set 1114# CONFIG_HTC_PASIC3 is not set
1115# CONFIG_TPS65010 is not set
1045# CONFIG_TWL4030_CORE is not set 1116# CONFIG_TWL4030_CORE is not set
1046# CONFIG_MFD_TMIO is not set 1117# CONFIG_MFD_TMIO is not set
1118# CONFIG_MFD_TC6393XB is not set
1047# CONFIG_PMIC_DA903X is not set 1119# CONFIG_PMIC_DA903X is not set
1048# CONFIG_MFD_WM8400 is not set 1120# CONFIG_MFD_WM8400 is not set
1121# CONFIG_MFD_WM831X is not set
1049# CONFIG_MFD_WM8350_I2C is not set 1122# CONFIG_MFD_WM8350_I2C is not set
1050# CONFIG_MFD_PCF50633 is not set 1123# CONFIG_MFD_PCF50633 is not set
1051 1124# CONFIG_MFD_MC13783 is not set
1052# 1125# CONFIG_AB3100_CORE is not set
1053# Multimedia devices 1126# CONFIG_EZX_PCAP is not set
1054# 1127# CONFIG_REGULATOR is not set
1055 1128# CONFIG_MEDIA_SUPPORT is not set
1056#
1057# Multimedia core support
1058#
1059# CONFIG_VIDEO_DEV is not set
1060# CONFIG_DVB_CORE is not set
1061# CONFIG_VIDEO_MEDIA is not set
1062
1063#
1064# Multimedia drivers
1065#
1066# CONFIG_DAB is not set
1067 1129
1068# 1130#
1069# Graphics support 1131# Graphics support
1070# 1132#
1133CONFIG_VGA_ARB=y
1071# CONFIG_DRM is not set 1134# CONFIG_DRM is not set
1072# CONFIG_VGASTATE is not set 1135# CONFIG_VGASTATE is not set
1073# CONFIG_VIDEO_OUTPUT_CONTROL is not set 1136# CONFIG_VIDEO_OUTPUT_CONTROL is not set
@@ -1087,7 +1150,6 @@ CONFIG_DUMMY_CONSOLE=y
1087# CONFIG_SOUND is not set 1150# CONFIG_SOUND is not set
1088CONFIG_HID_SUPPORT=y 1151CONFIG_HID_SUPPORT=y
1089CONFIG_HID=y 1152CONFIG_HID=y
1090# CONFIG_HID_DEBUG is not set
1091# CONFIG_HIDRAW is not set 1153# CONFIG_HIDRAW is not set
1092 1154
1093# 1155#
@@ -1106,10 +1168,12 @@ CONFIG_HID_BELKIN=y
1106CONFIG_HID_CHERRY=y 1168CONFIG_HID_CHERRY=y
1107CONFIG_HID_CHICONY=y 1169CONFIG_HID_CHICONY=y
1108CONFIG_HID_CYPRESS=y 1170CONFIG_HID_CYPRESS=y
1171CONFIG_HID_DRAGONRISE=y
1109# CONFIG_DRAGONRISE_FF is not set 1172# CONFIG_DRAGONRISE_FF is not set
1110CONFIG_HID_EZKEY=y 1173CONFIG_HID_EZKEY=y
1111CONFIG_HID_KYE=y 1174CONFIG_HID_KYE=y
1112CONFIG_HID_GYRATION=y 1175CONFIG_HID_GYRATION=y
1176CONFIG_HID_TWINHAN=y
1113CONFIG_HID_KENSINGTON=y 1177CONFIG_HID_KENSINGTON=y
1114CONFIG_HID_LOGITECH=y 1178CONFIG_HID_LOGITECH=y
1115# CONFIG_LOGITECH_FF is not set 1179# CONFIG_LOGITECH_FF is not set
@@ -1123,9 +1187,14 @@ CONFIG_HID_PETALYNX=y
1123CONFIG_HID_SAMSUNG=y 1187CONFIG_HID_SAMSUNG=y
1124CONFIG_HID_SONY=y 1188CONFIG_HID_SONY=y
1125CONFIG_HID_SUNPLUS=y 1189CONFIG_HID_SUNPLUS=y
1190CONFIG_HID_GREENASIA=y
1126# CONFIG_GREENASIA_FF is not set 1191# CONFIG_GREENASIA_FF is not set
1192CONFIG_HID_SMARTJOYPLUS=y
1193# CONFIG_SMARTJOYPLUS_FF is not set
1127CONFIG_HID_TOPSEED=y 1194CONFIG_HID_TOPSEED=y
1195CONFIG_HID_THRUSTMASTER=y
1128# CONFIG_THRUSTMASTER_FF is not set 1196# CONFIG_THRUSTMASTER_FF is not set
1197CONFIG_HID_ZEROPLUS=y
1129# CONFIG_ZEROPLUS_FF is not set 1198# CONFIG_ZEROPLUS_FF is not set
1130CONFIG_USB_SUPPORT=y 1199CONFIG_USB_SUPPORT=y
1131CONFIG_USB_ARCH_HAS_HCD=y 1200CONFIG_USB_ARCH_HAS_HCD=y
@@ -1150,18 +1219,21 @@ CONFIG_USB_DEVICE_CLASS=y
1150# USB Host Controller Drivers 1219# USB Host Controller Drivers
1151# 1220#
1152# CONFIG_USB_C67X00_HCD is not set 1221# CONFIG_USB_C67X00_HCD is not set
1222# CONFIG_USB_XHCI_HCD is not set
1153CONFIG_USB_EHCI_HCD=y 1223CONFIG_USB_EHCI_HCD=y
1154CONFIG_USB_EHCI_ROOT_HUB_TT=y 1224CONFIG_USB_EHCI_ROOT_HUB_TT=y
1155CONFIG_USB_EHCI_TT_NEWSCHED=y 1225CONFIG_USB_EHCI_TT_NEWSCHED=y
1156# CONFIG_USB_OXU210HP_HCD is not set 1226# CONFIG_USB_OXU210HP_HCD is not set
1157# CONFIG_USB_ISP116X_HCD is not set 1227# CONFIG_USB_ISP116X_HCD is not set
1158# CONFIG_USB_ISP1760_HCD is not set 1228# CONFIG_USB_ISP1760_HCD is not set
1229# CONFIG_USB_ISP1362_HCD is not set
1159# CONFIG_USB_OHCI_HCD is not set 1230# CONFIG_USB_OHCI_HCD is not set
1160# CONFIG_USB_UHCI_HCD is not set 1231# CONFIG_USB_UHCI_HCD is not set
1161# CONFIG_USB_SL811_HCD is not set 1232# CONFIG_USB_SL811_HCD is not set
1162# CONFIG_USB_R8A66597_HCD is not set 1233# CONFIG_USB_R8A66597_HCD is not set
1163# CONFIG_USB_WHCI_HCD is not set 1234# CONFIG_USB_WHCI_HCD is not set
1164# CONFIG_USB_HWA_HCD is not set 1235# CONFIG_USB_HWA_HCD is not set
1236# CONFIG_USB_MUSB_HDRC is not set
1165 1237
1166# 1238#
1167# USB Device Class drivers 1239# USB Device Class drivers
@@ -1252,11 +1324,14 @@ CONFIG_SDIO_UART=y
1252# MMC/SD/SDIO Host Controller Drivers 1324# MMC/SD/SDIO Host Controller Drivers
1253# 1325#
1254# CONFIG_MMC_SDHCI is not set 1326# CONFIG_MMC_SDHCI is not set
1327# CONFIG_MMC_AT91 is not set
1328# CONFIG_MMC_ATMELMCI is not set
1255# CONFIG_MMC_TIFM_SD is not set 1329# CONFIG_MMC_TIFM_SD is not set
1256CONFIG_MMC_MVSDIO=y 1330CONFIG_MMC_MVSDIO=y
1257# CONFIG_MMC_SPI is not set 1331# CONFIG_MMC_SPI is not set
1332# CONFIG_MMC_CB710 is not set
1333# CONFIG_MMC_VIA_SDMMC is not set
1258# CONFIG_MEMSTICK is not set 1334# CONFIG_MEMSTICK is not set
1259# CONFIG_ACCESSIBILITY is not set
1260CONFIG_NEW_LEDS=y 1335CONFIG_NEW_LEDS=y
1261CONFIG_LEDS_CLASS=y 1336CONFIG_LEDS_CLASS=y
1262 1337
@@ -1266,7 +1341,7 @@ CONFIG_LEDS_CLASS=y
1266# CONFIG_LEDS_PCA9532 is not set 1341# CONFIG_LEDS_PCA9532 is not set
1267CONFIG_LEDS_GPIO=y 1342CONFIG_LEDS_GPIO=y
1268CONFIG_LEDS_GPIO_PLATFORM=y 1343CONFIG_LEDS_GPIO_PLATFORM=y
1269# CONFIG_LEDS_LP5521 is not set 1344# CONFIG_LEDS_LP3944 is not set
1270# CONFIG_LEDS_PCA955X is not set 1345# CONFIG_LEDS_PCA955X is not set
1271# CONFIG_LEDS_DAC124S085 is not set 1346# CONFIG_LEDS_DAC124S085 is not set
1272# CONFIG_LEDS_BD2802 is not set 1347# CONFIG_LEDS_BD2802 is not set
@@ -1278,11 +1353,14 @@ CONFIG_LEDS_TRIGGERS=y
1278CONFIG_LEDS_TRIGGER_TIMER=y 1353CONFIG_LEDS_TRIGGER_TIMER=y
1279CONFIG_LEDS_TRIGGER_HEARTBEAT=y 1354CONFIG_LEDS_TRIGGER_HEARTBEAT=y
1280# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set 1355# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
1356# CONFIG_LEDS_TRIGGER_GPIO is not set
1281CONFIG_LEDS_TRIGGER_DEFAULT_ON=y 1357CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
1282 1358
1283# 1359#
1284# iptables trigger is under Netfilter config (LED target) 1360# iptables trigger is under Netfilter config (LED target)
1285# 1361#
1362# CONFIG_ACCESSIBILITY is not set
1363# CONFIG_INFINIBAND is not set
1286CONFIG_RTC_LIB=y 1364CONFIG_RTC_LIB=y
1287CONFIG_RTC_CLASS=y 1365CONFIG_RTC_CLASS=y
1288CONFIG_RTC_HCTOSYS=y 1366CONFIG_RTC_HCTOSYS=y
@@ -1314,6 +1392,7 @@ CONFIG_RTC_INTF_DEV=y
1314CONFIG_RTC_DRV_S35390A=y 1392CONFIG_RTC_DRV_S35390A=y
1315# CONFIG_RTC_DRV_FM3130 is not set 1393# CONFIG_RTC_DRV_FM3130 is not set
1316# CONFIG_RTC_DRV_RX8581 is not set 1394# CONFIG_RTC_DRV_RX8581 is not set
1395# CONFIG_RTC_DRV_RX8025 is not set
1317 1396
1318# 1397#
1319# SPI RTC drivers 1398# SPI RTC drivers
@@ -1325,6 +1404,7 @@ CONFIG_RTC_DRV_S35390A=y
1325# CONFIG_RTC_DRV_R9701 is not set 1404# CONFIG_RTC_DRV_R9701 is not set
1326# CONFIG_RTC_DRV_RS5C348 is not set 1405# CONFIG_RTC_DRV_RS5C348 is not set
1327# CONFIG_RTC_DRV_DS3234 is not set 1406# CONFIG_RTC_DRV_DS3234 is not set
1407# CONFIG_RTC_DRV_PCF2123 is not set
1328 1408
1329# 1409#
1330# Platform RTC drivers 1410# Platform RTC drivers
@@ -1360,8 +1440,11 @@ CONFIG_DMA_ENGINE=y
1360# CONFIG_ASYNC_TX_DMA is not set 1440# CONFIG_ASYNC_TX_DMA is not set
1361# CONFIG_DMATEST is not set 1441# CONFIG_DMATEST is not set
1362# CONFIG_AUXDISPLAY is not set 1442# CONFIG_AUXDISPLAY is not set
1363# CONFIG_REGULATOR is not set
1364# CONFIG_UIO is not set 1443# CONFIG_UIO is not set
1444
1445#
1446# TI VLYNQ
1447#
1365# CONFIG_STAGING is not set 1448# CONFIG_STAGING is not set
1366 1449
1367# 1450#
@@ -1379,10 +1462,13 @@ CONFIG_JBD=y
1379# CONFIG_REISERFS_FS is not set 1462# CONFIG_REISERFS_FS is not set
1380# CONFIG_JFS_FS is not set 1463# CONFIG_JFS_FS is not set
1381# CONFIG_FS_POSIX_ACL is not set 1464# CONFIG_FS_POSIX_ACL is not set
1382CONFIG_FILE_LOCKING=y
1383# CONFIG_XFS_FS is not set 1465# CONFIG_XFS_FS is not set
1466# CONFIG_GFS2_FS is not set
1384# CONFIG_OCFS2_FS is not set 1467# CONFIG_OCFS2_FS is not set
1385# CONFIG_BTRFS_FS is not set 1468# CONFIG_BTRFS_FS is not set
1469# CONFIG_NILFS2_FS is not set
1470CONFIG_FILE_LOCKING=y
1471CONFIG_FSNOTIFY=y
1386CONFIG_DNOTIFY=y 1472CONFIG_DNOTIFY=y
1387CONFIG_INOTIFY=y 1473CONFIG_INOTIFY=y
1388CONFIG_INOTIFY_USER=y 1474CONFIG_INOTIFY_USER=y
@@ -1455,7 +1541,6 @@ CONFIG_CRAMFS=y
1455# CONFIG_ROMFS_FS is not set 1541# CONFIG_ROMFS_FS is not set
1456# CONFIG_SYSV_FS is not set 1542# CONFIG_SYSV_FS is not set
1457# CONFIG_UFS_FS is not set 1543# CONFIG_UFS_FS is not set
1458# CONFIG_NILFS2_FS is not set
1459CONFIG_NETWORK_FILESYSTEMS=y 1544CONFIG_NETWORK_FILESYSTEMS=y
1460CONFIG_NFS_FS=y 1545CONFIG_NFS_FS=y
1461CONFIG_NFS_V3=y 1546CONFIG_NFS_V3=y
@@ -1530,6 +1615,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
1530CONFIG_ENABLE_MUST_CHECK=y 1615CONFIG_ENABLE_MUST_CHECK=y
1531CONFIG_FRAME_WARN=1024 1616CONFIG_FRAME_WARN=1024
1532CONFIG_MAGIC_SYSRQ=y 1617CONFIG_MAGIC_SYSRQ=y
1618# CONFIG_STRIP_ASM_SYMS is not set
1533# CONFIG_UNUSED_SYMBOLS is not set 1619# CONFIG_UNUSED_SYMBOLS is not set
1534CONFIG_DEBUG_FS=y 1620CONFIG_DEBUG_FS=y
1535# CONFIG_HEADERS_CHECK is not set 1621# CONFIG_HEADERS_CHECK is not set
@@ -1547,6 +1633,7 @@ CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
1547# CONFIG_DEBUG_OBJECTS is not set 1633# CONFIG_DEBUG_OBJECTS is not set
1548# CONFIG_SLUB_DEBUG_ON is not set 1634# CONFIG_SLUB_DEBUG_ON is not set
1549# CONFIG_SLUB_STATS is not set 1635# CONFIG_SLUB_STATS is not set
1636# CONFIG_DEBUG_KMEMLEAK is not set
1550# CONFIG_DEBUG_PREEMPT is not set 1637# CONFIG_DEBUG_PREEMPT is not set
1551# CONFIG_DEBUG_RT_MUTEXES is not set 1638# CONFIG_DEBUG_RT_MUTEXES is not set
1552# CONFIG_RT_MUTEX_TESTER is not set 1639# CONFIG_RT_MUTEX_TESTER is not set
@@ -1567,12 +1654,14 @@ CONFIG_DEBUG_MEMORY_INIT=y
1567# CONFIG_DEBUG_LIST is not set 1654# CONFIG_DEBUG_LIST is not set
1568# CONFIG_DEBUG_SG is not set 1655# CONFIG_DEBUG_SG is not set
1569# CONFIG_DEBUG_NOTIFIERS is not set 1656# CONFIG_DEBUG_NOTIFIERS is not set
1657# CONFIG_DEBUG_CREDENTIALS is not set
1570# CONFIG_BOOT_PRINTK_DELAY is not set 1658# CONFIG_BOOT_PRINTK_DELAY is not set
1571# CONFIG_RCU_TORTURE_TEST is not set 1659# CONFIG_RCU_TORTURE_TEST is not set
1572# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1660# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1573# CONFIG_KPROBES_SANITY_TEST is not set 1661# CONFIG_KPROBES_SANITY_TEST is not set
1574# CONFIG_BACKTRACE_SELF_TEST is not set 1662# CONFIG_BACKTRACE_SELF_TEST is not set
1575# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 1663# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1664# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
1576# CONFIG_LKDTM is not set 1665# CONFIG_LKDTM is not set
1577# CONFIG_FAULT_INJECTION is not set 1666# CONFIG_FAULT_INJECTION is not set
1578# CONFIG_LATENCYTOP is not set 1667# CONFIG_LATENCYTOP is not set
@@ -1581,25 +1670,12 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y
1581CONFIG_NOP_TRACER=y 1670CONFIG_NOP_TRACER=y
1582CONFIG_HAVE_FUNCTION_TRACER=y 1671CONFIG_HAVE_FUNCTION_TRACER=y
1583CONFIG_RING_BUFFER=y 1672CONFIG_RING_BUFFER=y
1673CONFIG_EVENT_TRACING=y
1674CONFIG_CONTEXT_SWITCH_TRACER=y
1675CONFIG_RING_BUFFER_ALLOW_SWAP=y
1584CONFIG_TRACING=y 1676CONFIG_TRACING=y
1585CONFIG_TRACING_SUPPORT=y 1677CONFIG_TRACING_SUPPORT=y
1586 1678# CONFIG_FTRACE is not set
1587#
1588# Tracers
1589#
1590# CONFIG_FUNCTION_TRACER is not set
1591# CONFIG_IRQSOFF_TRACER is not set
1592# CONFIG_PREEMPT_TRACER is not set
1593# CONFIG_SCHED_TRACER is not set
1594# CONFIG_CONTEXT_SWITCH_TRACER is not set
1595# CONFIG_EVENT_TRACER is not set
1596# CONFIG_BOOT_TRACER is not set
1597# CONFIG_TRACE_BRANCH_PROFILING is not set
1598# CONFIG_STACK_TRACER is not set
1599# CONFIG_KMEMTRACE is not set
1600# CONFIG_WORKQUEUE_TRACER is not set
1601# CONFIG_BLK_DEV_IO_TRACE is not set
1602# CONFIG_FTRACE_STARTUP_TEST is not set
1603# CONFIG_DYNAMIC_DEBUG is not set 1679# CONFIG_DYNAMIC_DEBUG is not set
1604# CONFIG_SAMPLES is not set 1680# CONFIG_SAMPLES is not set
1605CONFIG_HAVE_ARCH_KGDB=y 1681CONFIG_HAVE_ARCH_KGDB=y
@@ -1623,7 +1699,6 @@ CONFIG_CRYPTO=y
1623# 1699#
1624# Crypto core or helper 1700# Crypto core or helper
1625# 1701#
1626# CONFIG_CRYPTO_FIPS is not set
1627CONFIG_CRYPTO_ALGAPI=y 1702CONFIG_CRYPTO_ALGAPI=y
1628CONFIG_CRYPTO_ALGAPI2=y 1703CONFIG_CRYPTO_ALGAPI2=y
1629CONFIG_CRYPTO_AEAD2=y 1704CONFIG_CRYPTO_AEAD2=y
@@ -1665,11 +1740,13 @@ CONFIG_CRYPTO_PCBC=m
1665# 1740#
1666# CONFIG_CRYPTO_HMAC is not set 1741# CONFIG_CRYPTO_HMAC is not set
1667# CONFIG_CRYPTO_XCBC is not set 1742# CONFIG_CRYPTO_XCBC is not set
1743# CONFIG_CRYPTO_VMAC is not set
1668 1744
1669# 1745#
1670# Digest 1746# Digest
1671# 1747#
1672CONFIG_CRYPTO_CRC32C=y 1748CONFIG_CRYPTO_CRC32C=y
1749# CONFIG_CRYPTO_GHASH is not set
1673# CONFIG_CRYPTO_MD4 is not set 1750# CONFIG_CRYPTO_MD4 is not set
1674# CONFIG_CRYPTO_MD5 is not set 1751# CONFIG_CRYPTO_MD5 is not set
1675# CONFIG_CRYPTO_MICHAEL_MIC is not set 1752# CONFIG_CRYPTO_MICHAEL_MIC is not set
@@ -1714,6 +1791,7 @@ CONFIG_CRYPTO_ARC4=y
1714# 1791#
1715# CONFIG_CRYPTO_ANSI_CPRNG is not set 1792# CONFIG_CRYPTO_ANSI_CPRNG is not set
1716CONFIG_CRYPTO_HW=y 1793CONFIG_CRYPTO_HW=y
1794CONFIG_CRYPTO_DEV_MV_CESA=y
1717# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1795# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1718CONFIG_BINARY_PRINTF=y 1796CONFIG_BINARY_PRINTF=y
1719 1797
diff --git a/arch/arm/configs/omap3_pandora_defconfig b/arch/arm/configs/omap3_pandora_defconfig
index b54ad2e2da36..150deafb0a6a 100644
--- a/arch/arm/configs/omap3_pandora_defconfig
+++ b/arch/arm/configs/omap3_pandora_defconfig
@@ -611,7 +611,7 @@ CONFIG_INPUT_KEYBOARD=y
611# CONFIG_KEYBOARD_XTKBD is not set 611# CONFIG_KEYBOARD_XTKBD is not set
612# CONFIG_KEYBOARD_NEWTON is not set 612# CONFIG_KEYBOARD_NEWTON is not set
613# CONFIG_KEYBOARD_STOWAWAY is not set 613# CONFIG_KEYBOARD_STOWAWAY is not set
614# CONFIG_KEYBOARD_GPIO is not set 614CONFIG_KEYBOARD_GPIO=y
615CONFIG_INPUT_MOUSE=y 615CONFIG_INPUT_MOUSE=y
616# CONFIG_MOUSE_PS2 is not set 616# CONFIG_MOUSE_PS2 is not set
617# CONFIG_MOUSE_SERIAL is not set 617# CONFIG_MOUSE_SERIAL is not set
@@ -634,7 +634,8 @@ CONFIG_TOUCHSCREEN_ADS7846=y
634# CONFIG_TOUCHSCREEN_TOUCHWIN is not set 634# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
635# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set 635# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
636# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set 636# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
637# CONFIG_INPUT_MISC is not set 637CONFIG_INPUT_MISC=y
638CONFIG_INPUT_TWL4030_PWRBUTTON=y
638 639
639# 640#
640# Hardware I/O ports 641# Hardware I/O ports
@@ -834,7 +835,29 @@ CONFIG_DAB=y
834# 835#
835# CONFIG_VGA_CONSOLE is not set 836# CONFIG_VGA_CONSOLE is not set
836CONFIG_DUMMY_CONSOLE=y 837CONFIG_DUMMY_CONSOLE=y
837# CONFIG_SOUND is not set 838CONFIG_SOUND=y
839CONFIG_SOUND_OSS_CORE=y
840CONFIG_SOUND_OSS_CORE_PRECLAIM=y
841CONFIG_SND=y
842CONFIG_SND_TIMER=y
843CONFIG_SND_PCM=y
844CONFIG_SND_JACK=y
845CONFIG_SND_OSSEMUL=y
846CONFIG_SND_MIXER_OSS=y
847CONFIG_SND_PCM_OSS=y
848CONFIG_SND_PCM_OSS_PLUGINS=y
849CONFIG_SND_SUPPORT_OLD_API=y
850CONFIG_SND_VERBOSE_PROCFS=y
851CONFIG_SND_VERBOSE_PRINTK=y
852CONFIG_SND_DRIVERS=y
853CONFIG_SND_USB=y
854CONFIG_SND_SOC=y
855CONFIG_SND_OMAP_SOC=y
856CONFIG_SND_OMAP_SOC_MCBSP=y
857CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=y
858CONFIG_SND_SOC_I2C_AND_SPI=y
859CONFIG_SND_SOC_TWL4030=y
860
838CONFIG_HID_SUPPORT=y 861CONFIG_HID_SUPPORT=y
839CONFIG_HID=y 862CONFIG_HID=y
840# CONFIG_HID_DEBUG is not set 863# CONFIG_HID_DEBUG is not set
@@ -1020,7 +1043,13 @@ CONFIG_MMC_BLOCK_BOUNCE=y
1020# CONFIG_MMC_SPI is not set 1043# CONFIG_MMC_SPI is not set
1021# CONFIG_MEMSTICK is not set 1044# CONFIG_MEMSTICK is not set
1022# CONFIG_ACCESSIBILITY is not set 1045# CONFIG_ACCESSIBILITY is not set
1023# CONFIG_NEW_LEDS is not set 1046CONFIG_NEW_LEDS=y
1047CONFIG_LEDS_CLASS=y
1048CONFIG_LEDS_GPIO=y
1049CONFIG_LEDS_GPIO_PLATFORM=y
1050CONFIG_LEDS_TRIGGERS=y
1051CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
1052
1024CONFIG_RTC_LIB=y 1053CONFIG_RTC_LIB=y
1025CONFIG_RTC_CLASS=y 1054CONFIG_RTC_CLASS=y
1026CONFIG_RTC_HCTOSYS=y 1055CONFIG_RTC_HCTOSYS=y
@@ -1084,9 +1113,12 @@ CONFIG_RTC_DRV_TWL4030=y
1084# on-CPU RTC drivers 1113# on-CPU RTC drivers
1085# 1114#
1086# CONFIG_DMADEVICES is not set 1115# CONFIG_DMADEVICES is not set
1087# CONFIG_REGULATOR is not set
1088# CONFIG_UIO is not set 1116# CONFIG_UIO is not set
1089 1117
1118CONFIG_REGULATOR=y
1119CONFIG_REGULATOR_FIXED_VOLTAGE=y
1120CONFIG_REGULATOR_TWL4030=y
1121
1090# 1122#
1091# File systems 1123# File systems
1092# 1124#
@@ -1407,3 +1439,10 @@ CONFIG_PLIST=y
1407CONFIG_HAS_IOMEM=y 1439CONFIG_HAS_IOMEM=y
1408CONFIG_HAS_IOPORT=y 1440CONFIG_HAS_IOPORT=y
1409CONFIG_HAS_DMA=y 1441CONFIG_HAS_DMA=y
1442
1443# added by hand for now
1444CONFIG_KEYBOARD_TWL4030=y
1445CONFIG_USB_OTG_UTILS=y
1446CONFIG_TWL4030_USB=y
1447CONFIG_MMC_OMAP_HS=y
1448
diff --git a/arch/arm/configs/omap_3430sdp_defconfig b/arch/arm/configs/omap_3430sdp_defconfig
index 8a4a7e2ba87b..5a305f015307 100644
--- a/arch/arm/configs/omap_3430sdp_defconfig
+++ b/arch/arm/configs/omap_3430sdp_defconfig
@@ -1703,7 +1703,14 @@ CONFIG_RTC_DRV_TWL4030=y
1703# on-CPU RTC drivers 1703# on-CPU RTC drivers
1704# 1704#
1705# CONFIG_DMADEVICES is not set 1705# CONFIG_DMADEVICES is not set
1706# CONFIG_REGULATOR is not set 1706CONFIG_REGULATOR=y
1707# CONFIG_REGULATOR_DEBUG is not set
1708# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
1709# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
1710# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
1711# CONFIG_REGULATOR_BQ24022 is not set
1712# CONFIG_REGULATOR_MAX1586 is not set
1713CONFIG_REGULATOR_TWL4030=y
1707# CONFIG_UIO is not set 1714# CONFIG_UIO is not set
1708# CONFIG_STAGING is not set 1715# CONFIG_STAGING is not set
1709 1716
diff --git a/arch/arm/configs/orion5x_defconfig b/arch/arm/configs/orion5x_defconfig
index 9e2385293ecb..5383cd0dff54 100644
--- a/arch/arm/configs/orion5x_defconfig
+++ b/arch/arm/configs/orion5x_defconfig
@@ -1,15 +1,13 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.30-rc4 3# Linux kernel version: 2.6.32-rc6
4# Mon May 4 14:07:25 2009 4# Sat Nov 7 20:52:21 2009
5# 5#
6CONFIG_ARM=y 6CONFIG_ARM=y
7CONFIG_SYS_SUPPORTS_APM_EMULATION=y 7CONFIG_SYS_SUPPORTS_APM_EMULATION=y
8CONFIG_GENERIC_GPIO=y 8CONFIG_GENERIC_GPIO=y
9CONFIG_GENERIC_TIME=y 9CONFIG_GENERIC_TIME=y
10CONFIG_GENERIC_CLOCKEVENTS=y 10CONFIG_GENERIC_CLOCKEVENTS=y
11CONFIG_MMU=y
12# CONFIG_NO_IOPORT is not set
13CONFIG_GENERIC_HARDIRQS=y 11CONFIG_GENERIC_HARDIRQS=y
14CONFIG_STACKTRACE_SUPPORT=y 12CONFIG_STACKTRACE_SUPPORT=y
15CONFIG_HAVE_LATENCYTOP_SUPPORT=y 13CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -18,13 +16,12 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
18CONFIG_HARDIRQS_SW_RESEND=y 16CONFIG_HARDIRQS_SW_RESEND=y
19CONFIG_GENERIC_IRQ_PROBE=y 17CONFIG_GENERIC_IRQ_PROBE=y
20CONFIG_RWSEM_GENERIC_SPINLOCK=y 18CONFIG_RWSEM_GENERIC_SPINLOCK=y
21# CONFIG_ARCH_HAS_ILOG2_U32 is not set
22# CONFIG_ARCH_HAS_ILOG2_U64 is not set
23CONFIG_GENERIC_HWEIGHT=y 19CONFIG_GENERIC_HWEIGHT=y
24CONFIG_GENERIC_CALIBRATE_DELAY=y 20CONFIG_GENERIC_CALIBRATE_DELAY=y
25CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 21CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
26CONFIG_VECTORS_BASE=0xffff0000 22CONFIG_VECTORS_BASE=0xffff0000
27CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 23CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
24CONFIG_CONSTRUCTORS=y
28 25
29# 26#
30# General setup 27# General setup
@@ -46,11 +43,12 @@ CONFIG_SYSVIPC_SYSCTL=y
46# 43#
47# RCU Subsystem 44# RCU Subsystem
48# 45#
49CONFIG_CLASSIC_RCU=y 46CONFIG_TREE_RCU=y
50# CONFIG_TREE_RCU is not set 47# CONFIG_TREE_PREEMPT_RCU is not set
51# CONFIG_PREEMPT_RCU is not set 48# CONFIG_RCU_TRACE is not set
49CONFIG_RCU_FANOUT=32
50# CONFIG_RCU_FANOUT_EXACT is not set
52# CONFIG_TREE_RCU_TRACE is not set 51# CONFIG_TREE_RCU_TRACE is not set
53# CONFIG_PREEMPT_RCU_TRACE is not set
54# CONFIG_IKCONFIG is not set 52# CONFIG_IKCONFIG is not set
55CONFIG_LOG_BUF_SHIFT=14 53CONFIG_LOG_BUF_SHIFT=14
56# CONFIG_GROUP_SCHED is not set 54# CONFIG_GROUP_SCHED is not set
@@ -69,7 +67,6 @@ CONFIG_SYSCTL_SYSCALL=y
69CONFIG_KALLSYMS=y 67CONFIG_KALLSYMS=y
70CONFIG_KALLSYMS_ALL=y 68CONFIG_KALLSYMS_ALL=y
71# CONFIG_KALLSYMS_EXTRA_PASS is not set 69# CONFIG_KALLSYMS_EXTRA_PASS is not set
72# CONFIG_STRIP_ASM_SYMS is not set
73CONFIG_HOTPLUG=y 70CONFIG_HOTPLUG=y
74CONFIG_PRINTK=y 71CONFIG_PRINTK=y
75CONFIG_BUG=y 72CONFIG_BUG=y
@@ -82,6 +79,10 @@ CONFIG_TIMERFD=y
82CONFIG_EVENTFD=y 79CONFIG_EVENTFD=y
83CONFIG_SHMEM=y 80CONFIG_SHMEM=y
84CONFIG_AIO=y 81CONFIG_AIO=y
82
83#
84# Kernel Performance Events And Counters
85#
85CONFIG_VM_EVENT_COUNTERS=y 86CONFIG_VM_EVENT_COUNTERS=y
86CONFIG_PCI_QUIRKS=y 87CONFIG_PCI_QUIRKS=y
87# CONFIG_SLUB_DEBUG is not set 88# CONFIG_SLUB_DEBUG is not set
@@ -91,13 +92,17 @@ CONFIG_SLUB=y
91# CONFIG_SLOB is not set 92# CONFIG_SLOB is not set
92CONFIG_PROFILING=y 93CONFIG_PROFILING=y
93CONFIG_TRACEPOINTS=y 94CONFIG_TRACEPOINTS=y
94# CONFIG_MARKERS is not set
95CONFIG_OPROFILE=y 95CONFIG_OPROFILE=y
96CONFIG_HAVE_OPROFILE=y 96CONFIG_HAVE_OPROFILE=y
97CONFIG_KPROBES=y 97CONFIG_KPROBES=y
98CONFIG_KRETPROBES=y 98CONFIG_KRETPROBES=y
99CONFIG_HAVE_KPROBES=y 99CONFIG_HAVE_KPROBES=y
100CONFIG_HAVE_KRETPROBES=y 100CONFIG_HAVE_KRETPROBES=y
101
102#
103# GCOV-based kernel profiling
104#
105# CONFIG_GCOV_KERNEL is not set
101# CONFIG_SLOW_WORK is not set 106# CONFIG_SLOW_WORK is not set
102CONFIG_HAVE_GENERIC_DMA_COHERENT=y 107CONFIG_HAVE_GENERIC_DMA_COHERENT=y
103CONFIG_RT_MUTEXES=y 108CONFIG_RT_MUTEXES=y
@@ -109,7 +114,7 @@ CONFIG_MODULE_UNLOAD=y
109# CONFIG_MODVERSIONS is not set 114# CONFIG_MODVERSIONS is not set
110# CONFIG_MODULE_SRCVERSION_ALL is not set 115# CONFIG_MODULE_SRCVERSION_ALL is not set
111CONFIG_BLOCK=y 116CONFIG_BLOCK=y
112# CONFIG_LBD is not set 117CONFIG_LBDAF=y
113# CONFIG_BLK_DEV_BSG is not set 118# CONFIG_BLK_DEV_BSG is not set
114# CONFIG_BLK_DEV_INTEGRITY is not set 119# CONFIG_BLK_DEV_INTEGRITY is not set
115 120
@@ -130,19 +135,22 @@ CONFIG_DEFAULT_IOSCHED="cfq"
130# 135#
131# System Type 136# System Type
132# 137#
138CONFIG_MMU=y
133# CONFIG_ARCH_AAEC2000 is not set 139# CONFIG_ARCH_AAEC2000 is not set
134# CONFIG_ARCH_INTEGRATOR is not set 140# CONFIG_ARCH_INTEGRATOR is not set
135# CONFIG_ARCH_REALVIEW is not set 141# CONFIG_ARCH_REALVIEW is not set
136# CONFIG_ARCH_VERSATILE is not set 142# CONFIG_ARCH_VERSATILE is not set
137# CONFIG_ARCH_AT91 is not set 143# CONFIG_ARCH_AT91 is not set
138# CONFIG_ARCH_CLPS711X is not set 144# CONFIG_ARCH_CLPS711X is not set
145# CONFIG_ARCH_GEMINI is not set
139# CONFIG_ARCH_EBSA110 is not set 146# CONFIG_ARCH_EBSA110 is not set
140# CONFIG_ARCH_EP93XX is not set 147# CONFIG_ARCH_EP93XX is not set
141# CONFIG_ARCH_GEMINI is not set
142# CONFIG_ARCH_FOOTBRIDGE is not set 148# CONFIG_ARCH_FOOTBRIDGE is not set
149# CONFIG_ARCH_MXC is not set
150# CONFIG_ARCH_STMP3XXX is not set
143# CONFIG_ARCH_NETX is not set 151# CONFIG_ARCH_NETX is not set
144# CONFIG_ARCH_H720X is not set 152# CONFIG_ARCH_H720X is not set
145# CONFIG_ARCH_IMX is not set 153# CONFIG_ARCH_NOMADIK is not set
146# CONFIG_ARCH_IOP13XX is not set 154# CONFIG_ARCH_IOP13XX is not set
147# CONFIG_ARCH_IOP32X is not set 155# CONFIG_ARCH_IOP32X is not set
148# CONFIG_ARCH_IOP33X is not set 156# CONFIG_ARCH_IOP33X is not set
@@ -151,25 +159,27 @@ CONFIG_DEFAULT_IOSCHED="cfq"
151# CONFIG_ARCH_IXP4XX is not set 159# CONFIG_ARCH_IXP4XX is not set
152# CONFIG_ARCH_L7200 is not set 160# CONFIG_ARCH_L7200 is not set
153# CONFIG_ARCH_KIRKWOOD is not set 161# CONFIG_ARCH_KIRKWOOD is not set
154# CONFIG_ARCH_KS8695 is not set
155# CONFIG_ARCH_NS9XXX is not set
156# CONFIG_ARCH_LOKI is not set 162# CONFIG_ARCH_LOKI is not set
157# CONFIG_ARCH_MV78XX0 is not set 163# CONFIG_ARCH_MV78XX0 is not set
158# CONFIG_ARCH_MXC is not set
159CONFIG_ARCH_ORION5X=y 164CONFIG_ARCH_ORION5X=y
165# CONFIG_ARCH_MMP is not set
166# CONFIG_ARCH_KS8695 is not set
167# CONFIG_ARCH_NS9XXX is not set
168# CONFIG_ARCH_W90X900 is not set
160# CONFIG_ARCH_PNX4008 is not set 169# CONFIG_ARCH_PNX4008 is not set
161# CONFIG_ARCH_PXA is not set 170# CONFIG_ARCH_PXA is not set
162# CONFIG_ARCH_MMP is not set 171# CONFIG_ARCH_MSM is not set
163# CONFIG_ARCH_RPC is not set 172# CONFIG_ARCH_RPC is not set
164# CONFIG_ARCH_SA1100 is not set 173# CONFIG_ARCH_SA1100 is not set
165# CONFIG_ARCH_S3C2410 is not set 174# CONFIG_ARCH_S3C2410 is not set
166# CONFIG_ARCH_S3C64XX is not set 175# CONFIG_ARCH_S3C64XX is not set
176# CONFIG_ARCH_S5PC1XX is not set
167# CONFIG_ARCH_SHARK is not set 177# CONFIG_ARCH_SHARK is not set
168# CONFIG_ARCH_LH7A40X is not set 178# CONFIG_ARCH_LH7A40X is not set
179# CONFIG_ARCH_U300 is not set
169# CONFIG_ARCH_DAVINCI is not set 180# CONFIG_ARCH_DAVINCI is not set
170# CONFIG_ARCH_OMAP is not set 181# CONFIG_ARCH_OMAP is not set
171# CONFIG_ARCH_MSM is not set 182# CONFIG_ARCH_BCMRING is not set
172# CONFIG_ARCH_W90X900 is not set
173 183
174# 184#
175# Orion Implementations 185# Orion Implementations
@@ -187,6 +197,9 @@ CONFIG_MACH_WRT350N_V2=y
187CONFIG_MACH_TS78XX=y 197CONFIG_MACH_TS78XX=y
188CONFIG_MACH_MV2120=y 198CONFIG_MACH_MV2120=y
189CONFIG_MACH_EDMINI_V2=y 199CONFIG_MACH_EDMINI_V2=y
200CONFIG_MACH_D2NET=y
201CONFIG_MACH_BIGDISK=y
202CONFIG_MACH_NET2BIG=y
190CONFIG_MACH_MSS2=y 203CONFIG_MACH_MSS2=y
191CONFIG_MACH_WNR854T=y 204CONFIG_MACH_WNR854T=y
192CONFIG_MACH_RD88F5181L_GE=y 205CONFIG_MACH_RD88F5181L_GE=y
@@ -202,7 +215,7 @@ CONFIG_CPU_FEROCEON=y
202CONFIG_CPU_FEROCEON_OLD_ID=y 215CONFIG_CPU_FEROCEON_OLD_ID=y
203CONFIG_CPU_32v5=y 216CONFIG_CPU_32v5=y
204CONFIG_CPU_ABRT_EV5T=y 217CONFIG_CPU_ABRT_EV5T=y
205CONFIG_CPU_PABRT_NOIFAR=y 218CONFIG_CPU_PABRT_LEGACY=y
206CONFIG_CPU_CACHE_VIVT=y 219CONFIG_CPU_CACHE_VIVT=y
207CONFIG_CPU_COPY_FEROCEON=y 220CONFIG_CPU_COPY_FEROCEON=y
208CONFIG_CPU_TLB_FEROCEON=y 221CONFIG_CPU_TLB_FEROCEON=y
@@ -215,7 +228,7 @@ CONFIG_CPU_CP15_MMU=y
215CONFIG_ARM_THUMB=y 228CONFIG_ARM_THUMB=y
216# CONFIG_CPU_ICACHE_DISABLE is not set 229# CONFIG_CPU_ICACHE_DISABLE is not set
217# CONFIG_CPU_DCACHE_DISABLE is not set 230# CONFIG_CPU_DCACHE_DISABLE is not set
218# CONFIG_OUTER_CACHE is not set 231CONFIG_ARM_L1_CACHE_SHIFT=5
219 232
220# 233#
221# Bus support 234# Bus support
@@ -240,11 +253,12 @@ CONFIG_VMSPLIT_3G=y
240# CONFIG_VMSPLIT_2G is not set 253# CONFIG_VMSPLIT_2G is not set
241# CONFIG_VMSPLIT_1G is not set 254# CONFIG_VMSPLIT_1G is not set
242CONFIG_PAGE_OFFSET=0xC0000000 255CONFIG_PAGE_OFFSET=0xC0000000
256# CONFIG_PREEMPT_NONE is not set
257# CONFIG_PREEMPT_VOLUNTARY is not set
243CONFIG_PREEMPT=y 258CONFIG_PREEMPT=y
244CONFIG_HZ=100 259CONFIG_HZ=100
245CONFIG_AEABI=y 260CONFIG_AEABI=y
246CONFIG_OABI_COMPAT=y 261CONFIG_OABI_COMPAT=y
247CONFIG_ARCH_FLATMEM_HAS_HOLES=y
248# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set 262# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
249# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set 263# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
250# CONFIG_HIGHMEM is not set 264# CONFIG_HIGHMEM is not set
@@ -259,12 +273,14 @@ CONFIG_SPLIT_PTLOCK_CPUS=4096
259# CONFIG_PHYS_ADDR_T_64BIT is not set 273# CONFIG_PHYS_ADDR_T_64BIT is not set
260CONFIG_ZONE_DMA_FLAG=0 274CONFIG_ZONE_DMA_FLAG=0
261CONFIG_VIRT_TO_BUS=y 275CONFIG_VIRT_TO_BUS=y
262CONFIG_UNEVICTABLE_LRU=y
263CONFIG_HAVE_MLOCK=y 276CONFIG_HAVE_MLOCK=y
264CONFIG_HAVE_MLOCKED_PAGE_BIT=y 277CONFIG_HAVE_MLOCKED_PAGE_BIT=y
278# CONFIG_KSM is not set
279CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
265CONFIG_LEDS=y 280CONFIG_LEDS=y
266CONFIG_LEDS_CPU=y 281CONFIG_LEDS_CPU=y
267CONFIG_ALIGNMENT_TRAP=y 282CONFIG_ALIGNMENT_TRAP=y
283CONFIG_UACCESS_WITH_MEMCPY=y
268 284
269# 285#
270# Boot options 286# Boot options
@@ -308,6 +324,7 @@ CONFIG_PM=y
308# CONFIG_PM_DEBUG is not set 324# CONFIG_PM_DEBUG is not set
309# CONFIG_SUSPEND is not set 325# CONFIG_SUSPEND is not set
310# CONFIG_APM_EMULATION is not set 326# CONFIG_APM_EMULATION is not set
327# CONFIG_PM_RUNTIME is not set
311CONFIG_ARCH_SUSPEND_POSSIBLE=y 328CONFIG_ARCH_SUSPEND_POSSIBLE=y
312CONFIG_NET=y 329CONFIG_NET=y
313 330
@@ -356,6 +373,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
356# CONFIG_NETFILTER is not set 373# CONFIG_NETFILTER is not set
357# CONFIG_IP_DCCP is not set 374# CONFIG_IP_DCCP is not set
358# CONFIG_IP_SCTP is not set 375# CONFIG_IP_SCTP is not set
376# CONFIG_RDS is not set
359# CONFIG_TIPC is not set 377# CONFIG_TIPC is not set
360# CONFIG_ATM is not set 378# CONFIG_ATM is not set
361# CONFIG_BRIDGE is not set 379# CONFIG_BRIDGE is not set
@@ -378,6 +396,7 @@ CONFIG_NET_DSA_MV88E6123_61_65=y
378# CONFIG_ECONET is not set 396# CONFIG_ECONET is not set
379# CONFIG_WAN_ROUTER is not set 397# CONFIG_WAN_ROUTER is not set
380# CONFIG_PHONET is not set 398# CONFIG_PHONET is not set
399# CONFIG_IEEE802154 is not set
381# CONFIG_NET_SCHED is not set 400# CONFIG_NET_SCHED is not set
382# CONFIG_DCB is not set 401# CONFIG_DCB is not set
383 402
@@ -394,11 +413,15 @@ CONFIG_NET_PKTGEN=m
394# CONFIG_AF_RXRPC is not set 413# CONFIG_AF_RXRPC is not set
395CONFIG_WIRELESS=y 414CONFIG_WIRELESS=y
396# CONFIG_CFG80211 is not set 415# CONFIG_CFG80211 is not set
416CONFIG_CFG80211_DEFAULT_PS_VALUE=0
397# CONFIG_WIRELESS_OLD_REGULATORY is not set 417# CONFIG_WIRELESS_OLD_REGULATORY is not set
398CONFIG_WIRELESS_EXT=y 418CONFIG_WIRELESS_EXT=y
399CONFIG_WIRELESS_EXT_SYSFS=y 419CONFIG_WIRELESS_EXT_SYSFS=y
400# CONFIG_LIB80211 is not set 420# CONFIG_LIB80211 is not set
401# CONFIG_MAC80211 is not set 421
422#
423# CFG80211 needs to be enabled for MAC80211
424#
402# CONFIG_WIMAX is not set 425# CONFIG_WIMAX is not set
403# CONFIG_RFKILL is not set 426# CONFIG_RFKILL is not set
404# CONFIG_NET_9P is not set 427# CONFIG_NET_9P is not set
@@ -411,6 +434,7 @@ CONFIG_WIRELESS_EXT_SYSFS=y
411# Generic Driver Options 434# Generic Driver Options
412# 435#
413CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 436CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
437# CONFIG_DEVTMPFS is not set
414CONFIG_STANDALONE=y 438CONFIG_STANDALONE=y
415CONFIG_PREVENT_FIRMWARE_BUILD=y 439CONFIG_PREVENT_FIRMWARE_BUILD=y
416CONFIG_FW_LOADER=y 440CONFIG_FW_LOADER=y
@@ -422,9 +446,9 @@ CONFIG_EXTRA_FIRMWARE=""
422# CONFIG_CONNECTOR is not set 446# CONFIG_CONNECTOR is not set
423CONFIG_MTD=y 447CONFIG_MTD=y
424# CONFIG_MTD_DEBUG is not set 448# CONFIG_MTD_DEBUG is not set
449# CONFIG_MTD_TESTS is not set
425# CONFIG_MTD_CONCAT is not set 450# CONFIG_MTD_CONCAT is not set
426CONFIG_MTD_PARTITIONS=y 451CONFIG_MTD_PARTITIONS=y
427# CONFIG_MTD_TESTS is not set
428# CONFIG_MTD_REDBOOT_PARTS is not set 452# CONFIG_MTD_REDBOOT_PARTS is not set
429CONFIG_MTD_CMDLINE_PARTS=y 453CONFIG_MTD_CMDLINE_PARTS=y
430# CONFIG_MTD_AFS_PARTS is not set 454# CONFIG_MTD_AFS_PARTS is not set
@@ -537,6 +561,7 @@ CONFIG_BLK_DEV_LOOP=y
537# CONFIG_BLK_DEV_RAM is not set 561# CONFIG_BLK_DEV_RAM is not set
538# CONFIG_CDROM_PKTCDVD is not set 562# CONFIG_CDROM_PKTCDVD is not set
539# CONFIG_ATA_OVER_ETH is not set 563# CONFIG_ATA_OVER_ETH is not set
564# CONFIG_MG_DISK is not set
540CONFIG_MISC_DEVICES=y 565CONFIG_MISC_DEVICES=y
541# CONFIG_PHANTOM is not set 566# CONFIG_PHANTOM is not set
542# CONFIG_SGI_IOC4 is not set 567# CONFIG_SGI_IOC4 is not set
@@ -552,7 +577,9 @@ CONFIG_MISC_DEVICES=y
552# 577#
553# CONFIG_EEPROM_AT24 is not set 578# CONFIG_EEPROM_AT24 is not set
554# CONFIG_EEPROM_LEGACY is not set 579# CONFIG_EEPROM_LEGACY is not set
580# CONFIG_EEPROM_MAX6875 is not set
555# CONFIG_EEPROM_93CX6 is not set 581# CONFIG_EEPROM_93CX6 is not set
582# CONFIG_CB710_CORE is not set
556CONFIG_HAVE_IDE=y 583CONFIG_HAVE_IDE=y
557# CONFIG_IDE is not set 584# CONFIG_IDE is not set
558 585
@@ -576,10 +603,6 @@ CONFIG_BLK_DEV_SR=m
576# CONFIG_BLK_DEV_SR_VENDOR is not set 603# CONFIG_BLK_DEV_SR_VENDOR is not set
577CONFIG_CHR_DEV_SG=m 604CONFIG_CHR_DEV_SG=m
578# CONFIG_CHR_DEV_SCH is not set 605# CONFIG_CHR_DEV_SCH is not set
579
580#
581# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
582#
583# CONFIG_SCSI_MULTI_LUN is not set 606# CONFIG_SCSI_MULTI_LUN is not set
584# CONFIG_SCSI_CONSTANTS is not set 607# CONFIG_SCSI_CONSTANTS is not set
585# CONFIG_SCSI_LOGGING is not set 608# CONFIG_SCSI_LOGGING is not set
@@ -596,6 +619,8 @@ CONFIG_SCSI_WAIT_SCAN=m
596# CONFIG_SCSI_SRP_ATTRS is not set 619# CONFIG_SCSI_SRP_ATTRS is not set
597CONFIG_SCSI_LOWLEVEL=y 620CONFIG_SCSI_LOWLEVEL=y
598# CONFIG_ISCSI_TCP is not set 621# CONFIG_ISCSI_TCP is not set
622# CONFIG_SCSI_BNX2_ISCSI is not set
623# CONFIG_BE2ISCSI is not set
599# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 624# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
600# CONFIG_SCSI_3W_9XXX is not set 625# CONFIG_SCSI_3W_9XXX is not set
601# CONFIG_SCSI_ACARD is not set 626# CONFIG_SCSI_ACARD is not set
@@ -604,6 +629,7 @@ CONFIG_SCSI_LOWLEVEL=y
604# CONFIG_SCSI_AIC7XXX_OLD is not set 629# CONFIG_SCSI_AIC7XXX_OLD is not set
605# CONFIG_SCSI_AIC79XX is not set 630# CONFIG_SCSI_AIC79XX is not set
606# CONFIG_SCSI_AIC94XX is not set 631# CONFIG_SCSI_AIC94XX is not set
632# CONFIG_SCSI_MVSAS is not set
607# CONFIG_SCSI_DPT_I2O is not set 633# CONFIG_SCSI_DPT_I2O is not set
608# CONFIG_SCSI_ADVANSYS is not set 634# CONFIG_SCSI_ADVANSYS is not set
609# CONFIG_SCSI_ARCMSR is not set 635# CONFIG_SCSI_ARCMSR is not set
@@ -620,7 +646,6 @@ CONFIG_SCSI_LOWLEVEL=y
620# CONFIG_SCSI_IPS is not set 646# CONFIG_SCSI_IPS is not set
621# CONFIG_SCSI_INITIO is not set 647# CONFIG_SCSI_INITIO is not set
622# CONFIG_SCSI_INIA100 is not set 648# CONFIG_SCSI_INIA100 is not set
623# CONFIG_SCSI_MVSAS is not set
624# CONFIG_SCSI_STEX is not set 649# CONFIG_SCSI_STEX is not set
625# CONFIG_SCSI_SYM53C8XX_2 is not set 650# CONFIG_SCSI_SYM53C8XX_2 is not set
626# CONFIG_SCSI_IPR is not set 651# CONFIG_SCSI_IPR is not set
@@ -632,11 +657,14 @@ CONFIG_SCSI_LOWLEVEL=y
632# CONFIG_SCSI_DC390T is not set 657# CONFIG_SCSI_DC390T is not set
633# CONFIG_SCSI_NSP32 is not set 658# CONFIG_SCSI_NSP32 is not set
634# CONFIG_SCSI_DEBUG is not set 659# CONFIG_SCSI_DEBUG is not set
660# CONFIG_SCSI_PMCRAID is not set
635# CONFIG_SCSI_SRP is not set 661# CONFIG_SCSI_SRP is not set
662# CONFIG_SCSI_BFA_FC is not set
636# CONFIG_SCSI_DH is not set 663# CONFIG_SCSI_DH is not set
637# CONFIG_SCSI_OSD_INITIATOR is not set 664# CONFIG_SCSI_OSD_INITIATOR is not set
638CONFIG_ATA=y 665CONFIG_ATA=y
639# CONFIG_ATA_NONSTANDARD is not set 666# CONFIG_ATA_NONSTANDARD is not set
667CONFIG_ATA_VERBOSE_ERROR=y
640CONFIG_SATA_PMP=y 668CONFIG_SATA_PMP=y
641# CONFIG_SATA_AHCI is not set 669# CONFIG_SATA_AHCI is not set
642# CONFIG_SATA_SIL24 is not set 670# CONFIG_SATA_SIL24 is not set
@@ -658,6 +686,7 @@ CONFIG_SATA_MV=y
658# CONFIG_PATA_ALI is not set 686# CONFIG_PATA_ALI is not set
659# CONFIG_PATA_AMD is not set 687# CONFIG_PATA_AMD is not set
660# CONFIG_PATA_ARTOP is not set 688# CONFIG_PATA_ARTOP is not set
689# CONFIG_PATA_ATP867X is not set
661# CONFIG_PATA_ATIIXP is not set 690# CONFIG_PATA_ATIIXP is not set
662# CONFIG_PATA_CMD640_PCI is not set 691# CONFIG_PATA_CMD640_PCI is not set
663# CONFIG_PATA_CMD64X is not set 692# CONFIG_PATA_CMD64X is not set
@@ -685,6 +714,7 @@ CONFIG_SATA_MV=y
685# CONFIG_PATA_OPTIDMA is not set 714# CONFIG_PATA_OPTIDMA is not set
686# CONFIG_PATA_PDC_OLD is not set 715# CONFIG_PATA_PDC_OLD is not set
687# CONFIG_PATA_RADISYS is not set 716# CONFIG_PATA_RADISYS is not set
717# CONFIG_PATA_RDC is not set
688# CONFIG_PATA_RZ1000 is not set 718# CONFIG_PATA_RZ1000 is not set
689# CONFIG_PATA_SC1200 is not set 719# CONFIG_PATA_SC1200 is not set
690# CONFIG_PATA_SERVERWORKS is not set 720# CONFIG_PATA_SERVERWORKS is not set
@@ -703,13 +733,16 @@ CONFIG_SATA_MV=y
703# 733#
704 734
705# 735#
706# Enable only one of the two stacks, unless you know what you are doing 736# You can enable one or both FireWire driver stacks.
737#
738
739#
740# See the help texts for more information.
707# 741#
708# CONFIG_FIREWIRE is not set 742# CONFIG_FIREWIRE is not set
709# CONFIG_IEEE1394 is not set 743# CONFIG_IEEE1394 is not set
710# CONFIG_I2O is not set 744# CONFIG_I2O is not set
711CONFIG_NETDEVICES=y 745CONFIG_NETDEVICES=y
712CONFIG_COMPAT_NET_DEV_OPS=y
713# CONFIG_DUMMY is not set 746# CONFIG_DUMMY is not set
714# CONFIG_BONDING is not set 747# CONFIG_BONDING is not set
715# CONFIG_MACVLAN is not set 748# CONFIG_MACVLAN is not set
@@ -777,6 +810,8 @@ CONFIG_NET_PCI=y
777# CONFIG_SMSC9420 is not set 810# CONFIG_SMSC9420 is not set
778# CONFIG_SUNDANCE is not set 811# CONFIG_SUNDANCE is not set
779# CONFIG_TLAN is not set 812# CONFIG_TLAN is not set
813# CONFIG_KS8842 is not set
814# CONFIG_KS8851_MLL is not set
780# CONFIG_VIA_RHINE is not set 815# CONFIG_VIA_RHINE is not set
781# CONFIG_SC92031 is not set 816# CONFIG_SC92031 is not set
782# CONFIG_ATL2 is not set 817# CONFIG_ATL2 is not set
@@ -798,6 +833,7 @@ CONFIG_NETDEV_1000=y
798# CONFIG_VIA_VELOCITY is not set 833# CONFIG_VIA_VELOCITY is not set
799# CONFIG_TIGON3 is not set 834# CONFIG_TIGON3 is not set
800# CONFIG_BNX2 is not set 835# CONFIG_BNX2 is not set
836# CONFIG_CNIC is not set
801CONFIG_MV643XX_ETH=y 837CONFIG_MV643XX_ETH=y
802# CONFIG_QLA3XXX is not set 838# CONFIG_QLA3XXX is not set
803# CONFIG_ATL1 is not set 839# CONFIG_ATL1 is not set
@@ -806,10 +842,7 @@ CONFIG_MV643XX_ETH=y
806# CONFIG_JME is not set 842# CONFIG_JME is not set
807# CONFIG_NETDEV_10000 is not set 843# CONFIG_NETDEV_10000 is not set
808# CONFIG_TR is not set 844# CONFIG_TR is not set
809 845CONFIG_WLAN=y
810#
811# Wireless LAN
812#
813# CONFIG_WLAN_PRE80211 is not set 846# CONFIG_WLAN_PRE80211 is not set
814# CONFIG_WLAN_80211 is not set 847# CONFIG_WLAN_80211 is not set
815 848
@@ -835,6 +868,7 @@ CONFIG_MV643XX_ETH=y
835# CONFIG_NETPOLL is not set 868# CONFIG_NETPOLL is not set
836# CONFIG_NET_POLL_CONTROLLER is not set 869# CONFIG_NET_POLL_CONTROLLER is not set
837# CONFIG_ISDN is not set 870# CONFIG_ISDN is not set
871# CONFIG_PHONE is not set
838 872
839# 873#
840# Input device support 874# Input device support
@@ -855,13 +889,19 @@ CONFIG_INPUT_EVDEV=y
855# Input Device Drivers 889# Input Device Drivers
856# 890#
857CONFIG_INPUT_KEYBOARD=y 891CONFIG_INPUT_KEYBOARD=y
892# CONFIG_KEYBOARD_ADP5588 is not set
858# CONFIG_KEYBOARD_ATKBD is not set 893# CONFIG_KEYBOARD_ATKBD is not set
859# CONFIG_KEYBOARD_SUNKBD is not set 894# CONFIG_QT2160 is not set
860# CONFIG_KEYBOARD_LKKBD is not set 895# CONFIG_KEYBOARD_LKKBD is not set
861# CONFIG_KEYBOARD_XTKBD is not set 896CONFIG_KEYBOARD_GPIO=y
897# CONFIG_KEYBOARD_MATRIX is not set
898# CONFIG_KEYBOARD_LM8323 is not set
899# CONFIG_KEYBOARD_MAX7359 is not set
862# CONFIG_KEYBOARD_NEWTON is not set 900# CONFIG_KEYBOARD_NEWTON is not set
901# CONFIG_KEYBOARD_OPENCORES is not set
863# CONFIG_KEYBOARD_STOWAWAY is not set 902# CONFIG_KEYBOARD_STOWAWAY is not set
864CONFIG_KEYBOARD_GPIO=y 903# CONFIG_KEYBOARD_SUNKBD is not set
904# CONFIG_KEYBOARD_XTKBD is not set
865# CONFIG_INPUT_MOUSE is not set 905# CONFIG_INPUT_MOUSE is not set
866# CONFIG_INPUT_JOYSTICK is not set 906# CONFIG_INPUT_JOYSTICK is not set
867# CONFIG_INPUT_TABLET is not set 907# CONFIG_INPUT_TABLET is not set
@@ -912,6 +952,7 @@ CONFIG_HW_RANDOM_TIMERIOMEM=m
912CONFIG_DEVPORT=y 952CONFIG_DEVPORT=y
913CONFIG_I2C=y 953CONFIG_I2C=y
914CONFIG_I2C_BOARDINFO=y 954CONFIG_I2C_BOARDINFO=y
955# CONFIG_I2C_COMPAT is not set
915CONFIG_I2C_CHARDEV=y 956CONFIG_I2C_CHARDEV=y
916CONFIG_I2C_HELPER_AUTO=y 957CONFIG_I2C_HELPER_AUTO=y
917 958
@@ -967,20 +1008,55 @@ CONFIG_I2C_MV64XXX=y
967# Miscellaneous I2C Chip support 1008# Miscellaneous I2C Chip support
968# 1009#
969# CONFIG_DS1682 is not set 1010# CONFIG_DS1682 is not set
970# CONFIG_SENSORS_PCF8574 is not set
971# CONFIG_PCF8575 is not set
972# CONFIG_SENSORS_PCA9539 is not set
973# CONFIG_SENSORS_MAX6875 is not set
974# CONFIG_SENSORS_TSL2550 is not set 1011# CONFIG_SENSORS_TSL2550 is not set
975# CONFIG_I2C_DEBUG_CORE is not set 1012# CONFIG_I2C_DEBUG_CORE is not set
976# CONFIG_I2C_DEBUG_ALGO is not set 1013# CONFIG_I2C_DEBUG_ALGO is not set
977# CONFIG_I2C_DEBUG_BUS is not set 1014# CONFIG_I2C_DEBUG_BUS is not set
978# CONFIG_I2C_DEBUG_CHIP is not set 1015# CONFIG_I2C_DEBUG_CHIP is not set
979# CONFIG_SPI is not set 1016# CONFIG_SPI is not set
1017
1018#
1019# PPS support
1020#
1021# CONFIG_PPS is not set
1022CONFIG_ARCH_REQUIRE_GPIOLIB=y
1023CONFIG_GPIOLIB=y
1024# CONFIG_DEBUG_GPIO is not set
1025CONFIG_GPIO_SYSFS=y
1026
1027#
1028# Memory mapped GPIO expanders:
1029#
1030
1031#
1032# I2C GPIO expanders:
1033#
1034# CONFIG_GPIO_MAX732X is not set
1035# CONFIG_GPIO_PCA953X is not set
1036# CONFIG_GPIO_PCF857X is not set
1037
1038#
1039# PCI GPIO expanders:
1040#
1041# CONFIG_GPIO_BT8XX is not set
1042# CONFIG_GPIO_LANGWELL is not set
1043
1044#
1045# SPI GPIO expanders:
1046#
1047
1048#
1049# AC97 GPIO expanders:
1050#
980# CONFIG_W1 is not set 1051# CONFIG_W1 is not set
981# CONFIG_POWER_SUPPLY is not set 1052# CONFIG_POWER_SUPPLY is not set
982CONFIG_HWMON=y 1053CONFIG_HWMON=y
983# CONFIG_HWMON_VID is not set 1054# CONFIG_HWMON_VID is not set
1055# CONFIG_HWMON_DEBUG_CHIP is not set
1056
1057#
1058# Native drivers
1059#
984# CONFIG_SENSORS_AD7414 is not set 1060# CONFIG_SENSORS_AD7414 is not set
985# CONFIG_SENSORS_AD7418 is not set 1061# CONFIG_SENSORS_AD7418 is not set
986# CONFIG_SENSORS_ADM1021 is not set 1062# CONFIG_SENSORS_ADM1021 is not set
@@ -1030,6 +1106,8 @@ CONFIG_SENSORS_LM75=y
1030# CONFIG_SENSORS_SMSC47B397 is not set 1106# CONFIG_SENSORS_SMSC47B397 is not set
1031# CONFIG_SENSORS_ADS7828 is not set 1107# CONFIG_SENSORS_ADS7828 is not set
1032# CONFIG_SENSORS_THMC50 is not set 1108# CONFIG_SENSORS_THMC50 is not set
1109# CONFIG_SENSORS_TMP401 is not set
1110# CONFIG_SENSORS_TMP421 is not set
1033# CONFIG_SENSORS_VIA686A is not set 1111# CONFIG_SENSORS_VIA686A is not set
1034# CONFIG_SENSORS_VT1211 is not set 1112# CONFIG_SENSORS_VT1211 is not set
1035# CONFIG_SENSORS_VT8231 is not set 1113# CONFIG_SENSORS_VT8231 is not set
@@ -1041,9 +1119,7 @@ CONFIG_SENSORS_LM75=y
1041# CONFIG_SENSORS_W83L786NG is not set 1119# CONFIG_SENSORS_W83L786NG is not set
1042# CONFIG_SENSORS_W83627HF is not set 1120# CONFIG_SENSORS_W83627HF is not set
1043# CONFIG_SENSORS_W83627EHF is not set 1121# CONFIG_SENSORS_W83627EHF is not set
1044# CONFIG_HWMON_DEBUG_CHIP is not set
1045# CONFIG_THERMAL is not set 1122# CONFIG_THERMAL is not set
1046# CONFIG_THERMAL_HWMON is not set
1047# CONFIG_WATCHDOG is not set 1123# CONFIG_WATCHDOG is not set
1048CONFIG_SSB_POSSIBLE=y 1124CONFIG_SSB_POSSIBLE=y
1049 1125
@@ -1057,33 +1133,26 @@ CONFIG_SSB_POSSIBLE=y
1057# 1133#
1058# CONFIG_MFD_CORE is not set 1134# CONFIG_MFD_CORE is not set
1059# CONFIG_MFD_SM501 is not set 1135# CONFIG_MFD_SM501 is not set
1136# CONFIG_MFD_ASIC3 is not set
1137# CONFIG_HTC_EGPIO is not set
1060# CONFIG_HTC_PASIC3 is not set 1138# CONFIG_HTC_PASIC3 is not set
1139# CONFIG_TPS65010 is not set
1061# CONFIG_TWL4030_CORE is not set 1140# CONFIG_TWL4030_CORE is not set
1062# CONFIG_MFD_TMIO is not set 1141# CONFIG_MFD_TMIO is not set
1142# CONFIG_MFD_TC6393XB is not set
1063# CONFIG_PMIC_DA903X is not set 1143# CONFIG_PMIC_DA903X is not set
1064# CONFIG_MFD_WM8400 is not set 1144# CONFIG_MFD_WM8400 is not set
1145# CONFIG_MFD_WM831X is not set
1065# CONFIG_MFD_WM8350_I2C is not set 1146# CONFIG_MFD_WM8350_I2C is not set
1066# CONFIG_MFD_PCF50633 is not set 1147# CONFIG_MFD_PCF50633 is not set
1067 1148# CONFIG_AB3100_CORE is not set
1068# 1149# CONFIG_REGULATOR is not set
1069# Multimedia devices 1150# CONFIG_MEDIA_SUPPORT is not set
1070#
1071
1072#
1073# Multimedia core support
1074#
1075# CONFIG_VIDEO_DEV is not set
1076# CONFIG_DVB_CORE is not set
1077# CONFIG_VIDEO_MEDIA is not set
1078
1079#
1080# Multimedia drivers
1081#
1082# CONFIG_DAB is not set
1083 1151
1084# 1152#
1085# Graphics support 1153# Graphics support
1086# 1154#
1155# CONFIG_VGA_ARB is not set
1087# CONFIG_DRM is not set 1156# CONFIG_DRM is not set
1088# CONFIG_VGASTATE is not set 1157# CONFIG_VGASTATE is not set
1089# CONFIG_VIDEO_OUTPUT_CONTROL is not set 1158# CONFIG_VIDEO_OUTPUT_CONTROL is not set
@@ -1097,7 +1166,6 @@ CONFIG_SSB_POSSIBLE=y
1097# CONFIG_SOUND is not set 1166# CONFIG_SOUND is not set
1098CONFIG_HID_SUPPORT=y 1167CONFIG_HID_SUPPORT=y
1099CONFIG_HID=y 1168CONFIG_HID=y
1100# CONFIG_HID_DEBUG is not set
1101# CONFIG_HIDRAW is not set 1169# CONFIG_HIDRAW is not set
1102 1170
1103# 1171#
@@ -1116,10 +1184,11 @@ CONFIG_USB_HID=y
1116# CONFIG_HID_CHERRY is not set 1184# CONFIG_HID_CHERRY is not set
1117# CONFIG_HID_CHICONY is not set 1185# CONFIG_HID_CHICONY is not set
1118# CONFIG_HID_CYPRESS is not set 1186# CONFIG_HID_CYPRESS is not set
1119# CONFIG_DRAGONRISE_FF is not set 1187# CONFIG_HID_DRAGONRISE is not set
1120# CONFIG_HID_EZKEY is not set 1188# CONFIG_HID_EZKEY is not set
1121# CONFIG_HID_KYE is not set 1189# CONFIG_HID_KYE is not set
1122# CONFIG_HID_GYRATION is not set 1190# CONFIG_HID_GYRATION is not set
1191# CONFIG_HID_TWINHAN is not set
1123# CONFIG_HID_KENSINGTON is not set 1192# CONFIG_HID_KENSINGTON is not set
1124# CONFIG_HID_LOGITECH is not set 1193# CONFIG_HID_LOGITECH is not set
1125# CONFIG_HID_MICROSOFT is not set 1194# CONFIG_HID_MICROSOFT is not set
@@ -1130,10 +1199,11 @@ CONFIG_USB_HID=y
1130# CONFIG_HID_SAMSUNG is not set 1199# CONFIG_HID_SAMSUNG is not set
1131# CONFIG_HID_SONY is not set 1200# CONFIG_HID_SONY is not set
1132# CONFIG_HID_SUNPLUS is not set 1201# CONFIG_HID_SUNPLUS is not set
1133# CONFIG_GREENASIA_FF is not set 1202# CONFIG_HID_GREENASIA is not set
1203# CONFIG_HID_SMARTJOYPLUS is not set
1134# CONFIG_HID_TOPSEED is not set 1204# CONFIG_HID_TOPSEED is not set
1135# CONFIG_THRUSTMASTER_FF is not set 1205# CONFIG_HID_THRUSTMASTER is not set
1136# CONFIG_ZEROPLUS_FF is not set 1206# CONFIG_HID_ZEROPLUS is not set
1137CONFIG_USB_SUPPORT=y 1207CONFIG_USB_SUPPORT=y
1138CONFIG_USB_ARCH_HAS_HCD=y 1208CONFIG_USB_ARCH_HAS_HCD=y
1139CONFIG_USB_ARCH_HAS_OHCI=y 1209CONFIG_USB_ARCH_HAS_OHCI=y
@@ -1160,18 +1230,21 @@ CONFIG_USB_DEVICE_CLASS=y
1160# USB Host Controller Drivers 1230# USB Host Controller Drivers
1161# 1231#
1162# CONFIG_USB_C67X00_HCD is not set 1232# CONFIG_USB_C67X00_HCD is not set
1233# CONFIG_USB_XHCI_HCD is not set
1163CONFIG_USB_EHCI_HCD=y 1234CONFIG_USB_EHCI_HCD=y
1164CONFIG_USB_EHCI_ROOT_HUB_TT=y 1235CONFIG_USB_EHCI_ROOT_HUB_TT=y
1165CONFIG_USB_EHCI_TT_NEWSCHED=y 1236CONFIG_USB_EHCI_TT_NEWSCHED=y
1166# CONFIG_USB_OXU210HP_HCD is not set 1237# CONFIG_USB_OXU210HP_HCD is not set
1167# CONFIG_USB_ISP116X_HCD is not set 1238# CONFIG_USB_ISP116X_HCD is not set
1168# CONFIG_USB_ISP1760_HCD is not set 1239# CONFIG_USB_ISP1760_HCD is not set
1240# CONFIG_USB_ISP1362_HCD is not set
1169# CONFIG_USB_OHCI_HCD is not set 1241# CONFIG_USB_OHCI_HCD is not set
1170# CONFIG_USB_UHCI_HCD is not set 1242# CONFIG_USB_UHCI_HCD is not set
1171# CONFIG_USB_SL811_HCD is not set 1243# CONFIG_USB_SL811_HCD is not set
1172# CONFIG_USB_R8A66597_HCD is not set 1244# CONFIG_USB_R8A66597_HCD is not set
1173# CONFIG_USB_WHCI_HCD is not set 1245# CONFIG_USB_WHCI_HCD is not set
1174# CONFIG_USB_HWA_HCD is not set 1246# CONFIG_USB_HWA_HCD is not set
1247# CONFIG_USB_MUSB_HDRC is not set
1175 1248
1176# 1249#
1177# USB Device Class drivers 1250# USB Device Class drivers
@@ -1248,7 +1321,6 @@ CONFIG_USB_STORAGE_JUMPSHOT=y
1248# CONFIG_UWB is not set 1321# CONFIG_UWB is not set
1249# CONFIG_MMC is not set 1322# CONFIG_MMC is not set
1250# CONFIG_MEMSTICK is not set 1323# CONFIG_MEMSTICK is not set
1251# CONFIG_ACCESSIBILITY is not set
1252CONFIG_NEW_LEDS=y 1324CONFIG_NEW_LEDS=y
1253CONFIG_LEDS_CLASS=y 1325CONFIG_LEDS_CLASS=y
1254 1326
@@ -1258,7 +1330,7 @@ CONFIG_LEDS_CLASS=y
1258# CONFIG_LEDS_PCA9532 is not set 1330# CONFIG_LEDS_PCA9532 is not set
1259CONFIG_LEDS_GPIO=y 1331CONFIG_LEDS_GPIO=y
1260CONFIG_LEDS_GPIO_PLATFORM=y 1332CONFIG_LEDS_GPIO_PLATFORM=y
1261# CONFIG_LEDS_LP5521 is not set 1333# CONFIG_LEDS_LP3944 is not set
1262# CONFIG_LEDS_PCA955X is not set 1334# CONFIG_LEDS_PCA955X is not set
1263# CONFIG_LEDS_BD2802 is not set 1335# CONFIG_LEDS_BD2802 is not set
1264 1336
@@ -1269,11 +1341,14 @@ CONFIG_LEDS_TRIGGERS=y
1269CONFIG_LEDS_TRIGGER_TIMER=y 1341CONFIG_LEDS_TRIGGER_TIMER=y
1270CONFIG_LEDS_TRIGGER_HEARTBEAT=y 1342CONFIG_LEDS_TRIGGER_HEARTBEAT=y
1271# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set 1343# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
1344# CONFIG_LEDS_TRIGGER_GPIO is not set
1272CONFIG_LEDS_TRIGGER_DEFAULT_ON=y 1345CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
1273 1346
1274# 1347#
1275# iptables trigger is under Netfilter config (LED target) 1348# iptables trigger is under Netfilter config (LED target)
1276# 1349#
1350# CONFIG_ACCESSIBILITY is not set
1351# CONFIG_INFINIBAND is not set
1277CONFIG_RTC_LIB=y 1352CONFIG_RTC_LIB=y
1278CONFIG_RTC_CLASS=y 1353CONFIG_RTC_CLASS=y
1279CONFIG_RTC_HCTOSYS=y 1354CONFIG_RTC_HCTOSYS=y
@@ -1306,6 +1381,7 @@ CONFIG_RTC_DRV_M41T80=y
1306CONFIG_RTC_DRV_S35390A=y 1381CONFIG_RTC_DRV_S35390A=y
1307# CONFIG_RTC_DRV_FM3130 is not set 1382# CONFIG_RTC_DRV_FM3130 is not set
1308# CONFIG_RTC_DRV_RX8581 is not set 1383# CONFIG_RTC_DRV_RX8581 is not set
1384# CONFIG_RTC_DRV_RX8025 is not set
1309 1385
1310# 1386#
1311# SPI RTC drivers 1387# SPI RTC drivers
@@ -1344,8 +1420,11 @@ CONFIG_DMA_ENGINE=y
1344# CONFIG_ASYNC_TX_DMA is not set 1420# CONFIG_ASYNC_TX_DMA is not set
1345# CONFIG_DMATEST is not set 1421# CONFIG_DMATEST is not set
1346# CONFIG_AUXDISPLAY is not set 1422# CONFIG_AUXDISPLAY is not set
1347# CONFIG_REGULATOR is not set
1348# CONFIG_UIO is not set 1423# CONFIG_UIO is not set
1424
1425#
1426# TI VLYNQ
1427#
1349# CONFIG_STAGING is not set 1428# CONFIG_STAGING is not set
1350 1429
1351# 1430#
@@ -1358,10 +1437,10 @@ CONFIG_EXT3_FS=y
1358# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 1437# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
1359# CONFIG_EXT3_FS_XATTR is not set 1438# CONFIG_EXT3_FS_XATTR is not set
1360CONFIG_EXT4_FS=m 1439CONFIG_EXT4_FS=m
1361# CONFIG_EXT4DEV_COMPAT is not set
1362CONFIG_EXT4_FS_XATTR=y 1440CONFIG_EXT4_FS_XATTR=y
1363# CONFIG_EXT4_FS_POSIX_ACL is not set 1441# CONFIG_EXT4_FS_POSIX_ACL is not set
1364# CONFIG_EXT4_FS_SECURITY is not set 1442# CONFIG_EXT4_FS_SECURITY is not set
1443# CONFIG_EXT4_DEBUG is not set
1365CONFIG_JBD=y 1444CONFIG_JBD=y
1366# CONFIG_JBD_DEBUG is not set 1445# CONFIG_JBD_DEBUG is not set
1367CONFIG_JBD2=m 1446CONFIG_JBD2=m
@@ -1370,10 +1449,13 @@ CONFIG_FS_MBCACHE=m
1370# CONFIG_REISERFS_FS is not set 1449# CONFIG_REISERFS_FS is not set
1371# CONFIG_JFS_FS is not set 1450# CONFIG_JFS_FS is not set
1372# CONFIG_FS_POSIX_ACL is not set 1451# CONFIG_FS_POSIX_ACL is not set
1373CONFIG_FILE_LOCKING=y
1374# CONFIG_XFS_FS is not set 1452# CONFIG_XFS_FS is not set
1453# CONFIG_GFS2_FS is not set
1375# CONFIG_OCFS2_FS is not set 1454# CONFIG_OCFS2_FS is not set
1376# CONFIG_BTRFS_FS is not set 1455# CONFIG_BTRFS_FS is not set
1456# CONFIG_NILFS2_FS is not set
1457CONFIG_FILE_LOCKING=y
1458CONFIG_FSNOTIFY=y
1377CONFIG_DNOTIFY=y 1459CONFIG_DNOTIFY=y
1378CONFIG_INOTIFY=y 1460CONFIG_INOTIFY=y
1379CONFIG_INOTIFY_USER=y 1461CONFIG_INOTIFY_USER=y
@@ -1446,7 +1528,6 @@ CONFIG_CRAMFS=y
1446# CONFIG_ROMFS_FS is not set 1528# CONFIG_ROMFS_FS is not set
1447# CONFIG_SYSV_FS is not set 1529# CONFIG_SYSV_FS is not set
1448# CONFIG_UFS_FS is not set 1530# CONFIG_UFS_FS is not set
1449# CONFIG_NILFS2_FS is not set
1450CONFIG_NETWORK_FILESYSTEMS=y 1531CONFIG_NETWORK_FILESYSTEMS=y
1451CONFIG_NFS_FS=y 1532CONFIG_NFS_FS=y
1452CONFIG_NFS_V3=y 1533CONFIG_NFS_V3=y
@@ -1537,6 +1618,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
1537CONFIG_ENABLE_MUST_CHECK=y 1618CONFIG_ENABLE_MUST_CHECK=y
1538CONFIG_FRAME_WARN=1024 1619CONFIG_FRAME_WARN=1024
1539CONFIG_MAGIC_SYSRQ=y 1620CONFIG_MAGIC_SYSRQ=y
1621# CONFIG_STRIP_ASM_SYMS is not set
1540# CONFIG_UNUSED_SYMBOLS is not set 1622# CONFIG_UNUSED_SYMBOLS is not set
1541CONFIG_DEBUG_FS=y 1623CONFIG_DEBUG_FS=y
1542# CONFIG_HEADERS_CHECK is not set 1624# CONFIG_HEADERS_CHECK is not set
@@ -1552,6 +1634,7 @@ CONFIG_SCHED_DEBUG=y
1552CONFIG_SCHEDSTATS=y 1634CONFIG_SCHEDSTATS=y
1553# CONFIG_TIMER_STATS is not set 1635# CONFIG_TIMER_STATS is not set
1554# CONFIG_DEBUG_OBJECTS is not set 1636# CONFIG_DEBUG_OBJECTS is not set
1637# CONFIG_DEBUG_KMEMLEAK is not set
1555CONFIG_DEBUG_PREEMPT=y 1638CONFIG_DEBUG_PREEMPT=y
1556# CONFIG_DEBUG_RT_MUTEXES is not set 1639# CONFIG_DEBUG_RT_MUTEXES is not set
1557# CONFIG_RT_MUTEX_TESTER is not set 1640# CONFIG_RT_MUTEX_TESTER is not set
@@ -1572,6 +1655,7 @@ CONFIG_DEBUG_INFO=y
1572# CONFIG_DEBUG_LIST is not set 1655# CONFIG_DEBUG_LIST is not set
1573# CONFIG_DEBUG_SG is not set 1656# CONFIG_DEBUG_SG is not set
1574# CONFIG_DEBUG_NOTIFIERS is not set 1657# CONFIG_DEBUG_NOTIFIERS is not set
1658# CONFIG_DEBUG_CREDENTIALS is not set
1575CONFIG_FRAME_POINTER=y 1659CONFIG_FRAME_POINTER=y
1576# CONFIG_BOOT_PRINTK_DELAY is not set 1660# CONFIG_BOOT_PRINTK_DELAY is not set
1577# CONFIG_RCU_TORTURE_TEST is not set 1661# CONFIG_RCU_TORTURE_TEST is not set
@@ -1579,6 +1663,7 @@ CONFIG_FRAME_POINTER=y
1579# CONFIG_KPROBES_SANITY_TEST is not set 1663# CONFIG_KPROBES_SANITY_TEST is not set
1580# CONFIG_BACKTRACE_SELF_TEST is not set 1664# CONFIG_BACKTRACE_SELF_TEST is not set
1581# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 1665# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1666# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
1582# CONFIG_LKDTM is not set 1667# CONFIG_LKDTM is not set
1583# CONFIG_FAULT_INJECTION is not set 1668# CONFIG_FAULT_INJECTION is not set
1584CONFIG_LATENCYTOP=y 1669CONFIG_LATENCYTOP=y
@@ -1587,25 +1672,12 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y
1587CONFIG_NOP_TRACER=y 1672CONFIG_NOP_TRACER=y
1588CONFIG_HAVE_FUNCTION_TRACER=y 1673CONFIG_HAVE_FUNCTION_TRACER=y
1589CONFIG_RING_BUFFER=y 1674CONFIG_RING_BUFFER=y
1675CONFIG_EVENT_TRACING=y
1676CONFIG_CONTEXT_SWITCH_TRACER=y
1677CONFIG_RING_BUFFER_ALLOW_SWAP=y
1590CONFIG_TRACING=y 1678CONFIG_TRACING=y
1591CONFIG_TRACING_SUPPORT=y 1679CONFIG_TRACING_SUPPORT=y
1592 1680# CONFIG_FTRACE is not set
1593#
1594# Tracers
1595#
1596# CONFIG_FUNCTION_TRACER is not set
1597# CONFIG_IRQSOFF_TRACER is not set
1598# CONFIG_PREEMPT_TRACER is not set
1599# CONFIG_SCHED_TRACER is not set
1600# CONFIG_CONTEXT_SWITCH_TRACER is not set
1601# CONFIG_EVENT_TRACER is not set
1602# CONFIG_BOOT_TRACER is not set
1603# CONFIG_TRACE_BRANCH_PROFILING is not set
1604# CONFIG_STACK_TRACER is not set
1605# CONFIG_KMEMTRACE is not set
1606# CONFIG_WORKQUEUE_TRACER is not set
1607# CONFIG_BLK_DEV_IO_TRACE is not set
1608# CONFIG_FTRACE_STARTUP_TEST is not set
1609# CONFIG_DYNAMIC_DEBUG is not set 1681# CONFIG_DYNAMIC_DEBUG is not set
1610# CONFIG_SAMPLES is not set 1682# CONFIG_SAMPLES is not set
1611CONFIG_HAVE_ARCH_KGDB=y 1683CONFIG_HAVE_ARCH_KGDB=y
@@ -1629,20 +1701,19 @@ CONFIG_CRYPTO=y
1629# 1701#
1630# Crypto core or helper 1702# Crypto core or helper
1631# 1703#
1632# CONFIG_CRYPTO_FIPS is not set 1704CONFIG_CRYPTO_ALGAPI=y
1633CONFIG_CRYPTO_ALGAPI=m 1705CONFIG_CRYPTO_ALGAPI2=y
1634CONFIG_CRYPTO_ALGAPI2=m 1706CONFIG_CRYPTO_AEAD2=y
1635CONFIG_CRYPTO_AEAD2=m
1636CONFIG_CRYPTO_BLKCIPHER=m 1707CONFIG_CRYPTO_BLKCIPHER=m
1637CONFIG_CRYPTO_BLKCIPHER2=m 1708CONFIG_CRYPTO_BLKCIPHER2=y
1638CONFIG_CRYPTO_HASH2=m 1709CONFIG_CRYPTO_HASH2=y
1639CONFIG_CRYPTO_RNG2=m 1710CONFIG_CRYPTO_RNG2=y
1640CONFIG_CRYPTO_PCOMP=m 1711CONFIG_CRYPTO_PCOMP=y
1641CONFIG_CRYPTO_MANAGER=m 1712CONFIG_CRYPTO_MANAGER=m
1642CONFIG_CRYPTO_MANAGER2=m 1713CONFIG_CRYPTO_MANAGER2=y
1643# CONFIG_CRYPTO_GF128MUL is not set 1714# CONFIG_CRYPTO_GF128MUL is not set
1644# CONFIG_CRYPTO_NULL is not set 1715# CONFIG_CRYPTO_NULL is not set
1645CONFIG_CRYPTO_WORKQUEUE=m 1716CONFIG_CRYPTO_WORKQUEUE=y
1646# CONFIG_CRYPTO_CRYPTD is not set 1717# CONFIG_CRYPTO_CRYPTD is not set
1647# CONFIG_CRYPTO_AUTHENC is not set 1718# CONFIG_CRYPTO_AUTHENC is not set
1648# CONFIG_CRYPTO_TEST is not set 1719# CONFIG_CRYPTO_TEST is not set
@@ -1670,11 +1741,13 @@ CONFIG_CRYPTO_PCBC=m
1670# 1741#
1671# CONFIG_CRYPTO_HMAC is not set 1742# CONFIG_CRYPTO_HMAC is not set
1672# CONFIG_CRYPTO_XCBC is not set 1743# CONFIG_CRYPTO_XCBC is not set
1744# CONFIG_CRYPTO_VMAC is not set
1673 1745
1674# 1746#
1675# Digest 1747# Digest
1676# 1748#
1677# CONFIG_CRYPTO_CRC32C is not set 1749# CONFIG_CRYPTO_CRC32C is not set
1750# CONFIG_CRYPTO_GHASH is not set
1678# CONFIG_CRYPTO_MD4 is not set 1751# CONFIG_CRYPTO_MD4 is not set
1679# CONFIG_CRYPTO_MD5 is not set 1752# CONFIG_CRYPTO_MD5 is not set
1680# CONFIG_CRYPTO_MICHAEL_MIC is not set 1753# CONFIG_CRYPTO_MICHAEL_MIC is not set
@@ -1691,7 +1764,7 @@ CONFIG_CRYPTO_PCBC=m
1691# 1764#
1692# Ciphers 1765# Ciphers
1693# 1766#
1694# CONFIG_CRYPTO_AES is not set 1767CONFIG_CRYPTO_AES=y
1695# CONFIG_CRYPTO_ANUBIS is not set 1768# CONFIG_CRYPTO_ANUBIS is not set
1696# CONFIG_CRYPTO_ARC4 is not set 1769# CONFIG_CRYPTO_ARC4 is not set
1697# CONFIG_CRYPTO_BLOWFISH is not set 1770# CONFIG_CRYPTO_BLOWFISH is not set
@@ -1719,6 +1792,7 @@ CONFIG_CRYPTO_PCBC=m
1719# 1792#
1720# CONFIG_CRYPTO_ANSI_CPRNG is not set 1793# CONFIG_CRYPTO_ANSI_CPRNG is not set
1721CONFIG_CRYPTO_HW=y 1794CONFIG_CRYPTO_HW=y
1795CONFIG_CRYPTO_DEV_MV_CESA=y
1722# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1796# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1723CONFIG_BINARY_PRINTF=y 1797CONFIG_BINARY_PRINTF=y
1724 1798
diff --git a/arch/arm/include/asm/unistd.h b/arch/arm/include/asm/unistd.h
index 7020217fc49f..4e506d09e5f9 100644
--- a/arch/arm/include/asm/unistd.h
+++ b/arch/arm/include/asm/unistd.h
@@ -403,6 +403,15 @@
403#define __ARM_NR_set_tls (__ARM_NR_BASE+5) 403#define __ARM_NR_set_tls (__ARM_NR_BASE+5)
404 404
405/* 405/*
406 * *NOTE*: This is a ghost syscall private to the kernel. Only the
407 * __kuser_cmpxchg code in entry-armv.S should be aware of its
408 * existence. Don't ever use this from user code.
409 */
410#ifdef __KERNEL__
411#define __ARM_NR_cmpxchg (__ARM_NR_BASE+0x00fff0)
412#endif
413
414/*
406 * The following syscalls are obsolete and no longer available for EABI. 415 * The following syscalls are obsolete and no longer available for EABI.
407 */ 416 */
408#if defined(__ARM_EABI__) && !defined(__KERNEL__) 417#if defined(__ARM_EABI__) && !defined(__KERNEL__)
diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
index 0022b4d57f8b..d2903e3bc861 100644
--- a/arch/arm/kernel/entry-armv.S
+++ b/arch/arm/kernel/entry-armv.S
@@ -21,6 +21,7 @@
21#include <mach/entry-macro.S> 21#include <mach/entry-macro.S>
22#include <asm/thread_notify.h> 22#include <asm/thread_notify.h>
23#include <asm/unwind.h> 23#include <asm/unwind.h>
24#include <asm/unistd.h>
24 25
25#include "entry-header.S" 26#include "entry-header.S"
26 27
@@ -908,10 +909,10 @@ __kuser_cmpxchg: @ 0xffff0fc0
908 * A special ghost syscall is used for that (see traps.c). 909 * A special ghost syscall is used for that (see traps.c).
909 */ 910 */
910 stmfd sp!, {r7, lr} 911 stmfd sp!, {r7, lr}
911 mov r7, #0xff00 @ 0xfff0 into r7 for EABI 912 ldr r7, =1f @ it's 20 bits
912 orr r7, r7, #0xf0 913 swi __ARM_NR_cmpxchg
913 swi #0x9ffff0
914 ldmfd sp!, {r7, pc} 914 ldmfd sp!, {r7, pc}
9151: .word __ARM_NR_cmpxchg
915 916
916#elif __LINUX_ARM_ARCH__ < 6 917#elif __LINUX_ARM_ARCH__ < 6
917 918
diff --git a/arch/arm/kernel/head-common.S b/arch/arm/kernel/head-common.S
index 885a7214418d..b9505aa267c0 100644
--- a/arch/arm/kernel/head-common.S
+++ b/arch/arm/kernel/head-common.S
@@ -97,7 +97,7 @@ __error_a:
97 bl printhex8 97 bl printhex8
98 adr r0, str_a2 98 adr r0, str_a2
99 bl printascii 99 bl printascii
100 adr r3, 3f 100 adr r3, 4f
101 ldmia r3, {r4, r5, r6} @ get machine desc list 101 ldmia r3, {r4, r5, r6} @ get machine desc list
102 sub r4, r3, r4 @ get offset between virt&phys 102 sub r4, r3, r4 @ get offset between virt&phys
103 add r5, r5, r4 @ convert virt addresses to 103 add r5, r5, r4 @ convert virt addresses to
diff --git a/arch/arm/kernel/smp_scu.c b/arch/arm/kernel/smp_scu.c
index d3831f616ee9..9ab4149bd983 100644
--- a/arch/arm/kernel/smp_scu.c
+++ b/arch/arm/kernel/smp_scu.c
@@ -37,6 +37,10 @@ void __init scu_enable(void __iomem *scu_base)
37 u32 scu_ctrl; 37 u32 scu_ctrl;
38 38
39 scu_ctrl = __raw_readl(scu_base + SCU_CTRL); 39 scu_ctrl = __raw_readl(scu_base + SCU_CTRL);
40 /* already enabled? */
41 if (scu_ctrl & 1)
42 return;
43
40 scu_ctrl |= 1; 44 scu_ctrl |= 1;
41 __raw_writel(scu_ctrl, scu_base + SCU_CTRL); 45 __raw_writel(scu_ctrl, scu_base + SCU_CTRL);
42 46
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
index 95718a6b50a6..3f361a783f43 100644
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
@@ -528,7 +528,7 @@ asmlinkage int arm_syscall(int no, struct pt_regs *regs)
528 * __kuser_cmpxchg code in entry-armv.S should be aware of its 528 * __kuser_cmpxchg code in entry-armv.S should be aware of its
529 * existence. Don't ever use this from user code. 529 * existence. Don't ever use this from user code.
530 */ 530 */
531 case 0xfff0: 531 case NR(cmpxchg):
532 for (;;) { 532 for (;;) {
533 extern void do_DataAbort(unsigned long addr, unsigned int fsr, 533 extern void do_DataAbort(unsigned long addr, unsigned int fsr,
534 struct pt_regs *regs); 534 struct pt_regs *regs);
@@ -573,7 +573,7 @@ asmlinkage int arm_syscall(int no, struct pt_regs *regs)
573 if not implemented, rather than raising SIGILL. This 573 if not implemented, rather than raising SIGILL. This
574 way the calling program can gracefully determine whether 574 way the calling program can gracefully determine whether
575 a feature is supported. */ 575 a feature is supported. */
576 if (no <= 0x7ff) 576 if ((no & 0xffff) <= 0x7ff)
577 return -ENOSYS; 577 return -ENOSYS;
578 break; 578 break;
579 } 579 }
diff --git a/arch/arm/mach-ep93xx/micro9.c b/arch/arm/mach-ep93xx/micro9.c
index d83b80478b09..f3757a1c5a10 100644
--- a/arch/arm/mach-ep93xx/micro9.c
+++ b/arch/arm/mach-ep93xx/micro9.c
@@ -15,6 +15,7 @@
15#include <linux/init.h> 15#include <linux/init.h>
16#include <linux/platform_device.h> 16#include <linux/platform_device.h>
17#include <linux/mtd/physmap.h> 17#include <linux/mtd/physmap.h>
18#include <linux/io.h>
18 19
19#include <mach/hardware.h> 20#include <mach/hardware.h>
20 21
diff --git a/arch/arm/mach-kirkwood/addr-map.c b/arch/arm/mach-kirkwood/addr-map.c
index 1da5d1c18ecb..2e69168fc699 100644
--- a/arch/arm/mach-kirkwood/addr-map.c
+++ b/arch/arm/mach-kirkwood/addr-map.c
@@ -105,7 +105,7 @@ void __init kirkwood_setup_cpu_mbus(void)
105 setup_cpu_win(0, KIRKWOOD_PCIE_IO_PHYS_BASE, KIRKWOOD_PCIE_IO_SIZE, 105 setup_cpu_win(0, KIRKWOOD_PCIE_IO_PHYS_BASE, KIRKWOOD_PCIE_IO_SIZE,
106 TARGET_PCIE, ATTR_PCIE_IO, KIRKWOOD_PCIE_IO_BUS_BASE); 106 TARGET_PCIE, ATTR_PCIE_IO, KIRKWOOD_PCIE_IO_BUS_BASE);
107 setup_cpu_win(1, KIRKWOOD_PCIE_MEM_PHYS_BASE, KIRKWOOD_PCIE_MEM_SIZE, 107 setup_cpu_win(1, KIRKWOOD_PCIE_MEM_PHYS_BASE, KIRKWOOD_PCIE_MEM_SIZE,
108 TARGET_PCIE, ATTR_PCIE_MEM, -1); 108 TARGET_PCIE, ATTR_PCIE_MEM, KIRKWOOD_PCIE_MEM_BUS_BASE);
109 109
110 /* 110 /*
111 * Setup window for NAND controller. 111 * Setup window for NAND controller.
diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
index 0acb61f3c10b..7177c4aa6342 100644
--- a/arch/arm/mach-kirkwood/common.c
+++ b/arch/arm/mach-kirkwood/common.c
@@ -845,7 +845,7 @@ int __init kirkwood_find_tclk(void)
845 return 166666667; 845 return 166666667;
846} 846}
847 847
848static void kirkwood_timer_init(void) 848static void __init kirkwood_timer_init(void)
849{ 849{
850 kirkwood_tclk = kirkwood_find_tclk(); 850 kirkwood_tclk = kirkwood_find_tclk();
851 orion_time_init(IRQ_KIRKWOOD_BRIDGE, kirkwood_tclk); 851 orion_time_init(IRQ_KIRKWOOD_BRIDGE, kirkwood_tclk);
diff --git a/arch/arm/mach-kirkwood/include/mach/io.h b/arch/arm/mach-kirkwood/include/mach/io.h
index a643a846d5fb..44e8be04f259 100644
--- a/arch/arm/mach-kirkwood/include/mach/io.h
+++ b/arch/arm/mach-kirkwood/include/mach/io.h
@@ -15,7 +15,7 @@
15 15
16static inline void __iomem *__io(unsigned long addr) 16static inline void __iomem *__io(unsigned long addr)
17{ 17{
18 return (void __iomem *)((addr - KIRKWOOD_PCIE_IO_PHYS_BASE) 18 return (void __iomem *)((addr - KIRKWOOD_PCIE_IO_BUS_BASE)
19 + KIRKWOOD_PCIE_IO_VIRT_BASE); 19 + KIRKWOOD_PCIE_IO_VIRT_BASE);
20} 20}
21 21
diff --git a/arch/arm/mach-kirkwood/include/mach/kirkwood.h b/arch/arm/mach-kirkwood/include/mach/kirkwood.h
index 54c132731d2d..a15cf0ee22bd 100644
--- a/arch/arm/mach-kirkwood/include/mach/kirkwood.h
+++ b/arch/arm/mach-kirkwood/include/mach/kirkwood.h
@@ -43,6 +43,7 @@
43#define KIRKWOOD_REGS_SIZE SZ_1M 43#define KIRKWOOD_REGS_SIZE SZ_1M
44 44
45#define KIRKWOOD_PCIE_MEM_PHYS_BASE 0xe0000000 45#define KIRKWOOD_PCIE_MEM_PHYS_BASE 0xe0000000
46#define KIRKWOOD_PCIE_MEM_BUS_BASE 0xe0000000
46#define KIRKWOOD_PCIE_MEM_SIZE SZ_128M 47#define KIRKWOOD_PCIE_MEM_SIZE SZ_128M
47 48
48/* 49/*
diff --git a/arch/arm/mach-kirkwood/openrd_base-setup.c b/arch/arm/mach-kirkwood/openrd_base-setup.c
index 947dfb8cd5b2..77617c722299 100644
--- a/arch/arm/mach-kirkwood/openrd_base-setup.c
+++ b/arch/arm/mach-kirkwood/openrd_base-setup.c
@@ -70,8 +70,20 @@ static void __init openrd_base_init(void)
70 kirkwood_ge00_init(&openrd_base_ge00_data); 70 kirkwood_ge00_init(&openrd_base_ge00_data);
71 kirkwood_sata_init(&openrd_base_sata_data); 71 kirkwood_sata_init(&openrd_base_sata_data);
72 kirkwood_sdio_init(&openrd_base_mvsdio_data); 72 kirkwood_sdio_init(&openrd_base_mvsdio_data);
73
74 kirkwood_i2c_init();
73} 75}
74 76
77static int __init openrd_base_pci_init(void)
78{
79 if (machine_is_openrd_base())
80 kirkwood_pcie_init();
81
82 return 0;
83 }
84subsys_initcall(openrd_base_pci_init);
85
86
75MACHINE_START(OPENRD_BASE, "Marvell OpenRD Base Board") 87MACHINE_START(OPENRD_BASE, "Marvell OpenRD Base Board")
76 /* Maintainer: Dhaval Vasa <dhaval.vasa@einfochips.com> */ 88 /* Maintainer: Dhaval Vasa <dhaval.vasa@einfochips.com> */
77 .phys_io = KIRKWOOD_REGS_PHYS_BASE, 89 .phys_io = KIRKWOOD_REGS_PHYS_BASE,
diff --git a/arch/arm/mach-kirkwood/pcie.c b/arch/arm/mach-kirkwood/pcie.c
index d90b9aae308d..a604b2a701aa 100644
--- a/arch/arm/mach-kirkwood/pcie.c
+++ b/arch/arm/mach-kirkwood/pcie.c
@@ -93,7 +93,7 @@ static struct pci_ops pcie_ops = {
93}; 93};
94 94
95 95
96static int kirkwood_pcie_setup(int nr, struct pci_sys_data *sys) 96static int __init kirkwood_pcie_setup(int nr, struct pci_sys_data *sys)
97{ 97{
98 struct resource *res; 98 struct resource *res;
99 extern unsigned int kirkwood_clk_ctrl; 99 extern unsigned int kirkwood_clk_ctrl;
@@ -115,7 +115,7 @@ static int kirkwood_pcie_setup(int nr, struct pci_sys_data *sys)
115 */ 115 */
116 res[0].name = "PCIe I/O Space"; 116 res[0].name = "PCIe I/O Space";
117 res[0].flags = IORESOURCE_IO; 117 res[0].flags = IORESOURCE_IO;
118 res[0].start = KIRKWOOD_PCIE_IO_PHYS_BASE; 118 res[0].start = KIRKWOOD_PCIE_IO_BUS_BASE;
119 res[0].end = res[0].start + KIRKWOOD_PCIE_IO_SIZE - 1; 119 res[0].end = res[0].start + KIRKWOOD_PCIE_IO_SIZE - 1;
120 if (request_resource(&ioport_resource, &res[0])) 120 if (request_resource(&ioport_resource, &res[0]))
121 panic("Request PCIe IO resource failed\n"); 121 panic("Request PCIe IO resource failed\n");
@@ -126,7 +126,7 @@ static int kirkwood_pcie_setup(int nr, struct pci_sys_data *sys)
126 */ 126 */
127 res[1].name = "PCIe Memory Space"; 127 res[1].name = "PCIe Memory Space";
128 res[1].flags = IORESOURCE_MEM; 128 res[1].flags = IORESOURCE_MEM;
129 res[1].start = KIRKWOOD_PCIE_MEM_PHYS_BASE; 129 res[1].start = KIRKWOOD_PCIE_MEM_BUS_BASE;
130 res[1].end = res[1].start + KIRKWOOD_PCIE_MEM_SIZE - 1; 130 res[1].end = res[1].start + KIRKWOOD_PCIE_MEM_SIZE - 1;
131 if (request_resource(&iomem_resource, &res[1])) 131 if (request_resource(&iomem_resource, &res[1]))
132 panic("Request PCIe Memory resource failed\n"); 132 panic("Request PCIe Memory resource failed\n");
diff --git a/arch/arm/mach-ks8695/include/mach/regs-switch.h b/arch/arm/mach-ks8695/include/mach/regs-switch.h
index 56d12e8de895..97e8acb1cf6c 100644
--- a/arch/arm/mach-ks8695/include/mach/regs-switch.h
+++ b/arch/arm/mach-ks8695/include/mach/regs-switch.h
@@ -25,7 +25,7 @@
25#define KS8695_SEC1 (0x04) /* Switch Engine Control 1 */ 25#define KS8695_SEC1 (0x04) /* Switch Engine Control 1 */
26#define KS8695_SEC2 (0x08) /* Switch Engine Control 2 */ 26#define KS8695_SEC2 (0x08) /* Switch Engine Control 2 */
27 27
28#define KS8695_P(x)_C(z) (0xc0 + (((x)-1)*3 + ((z)-1))*4) /* Port Configuration Registers */ 28#define KS8695_SEPXCZ(x,z) (0x0c + (((x)-1)*3 + ((z)-1))*4) /* Port Configuration Registers */
29 29
30#define KS8695_SEP12AN (0x48) /* Port 1 & 2 Auto-Negotiation */ 30#define KS8695_SEP12AN (0x48) /* Port 1 & 2 Auto-Negotiation */
31#define KS8695_SEP34AN (0x4c) /* Port 3 & 4 Auto-Negotiation */ 31#define KS8695_SEP34AN (0x4c) /* Port 3 & 4 Auto-Negotiation */
diff --git a/arch/arm/mach-mv78xx0/common.c b/arch/arm/mach-mv78xx0/common.c
index 1b22e4af8791..08465eb6a2c2 100644
--- a/arch/arm/mach-mv78xx0/common.c
+++ b/arch/arm/mach-mv78xx0/common.c
@@ -845,6 +845,8 @@ static char * __init mv78xx0_id(void)
845 } else if (dev == MV78100_DEV_ID) { 845 } else if (dev == MV78100_DEV_ID) {
846 if (rev == MV78100_REV_A0) 846 if (rev == MV78100_REV_A0)
847 return "MV78100-A0"; 847 return "MV78100-A0";
848 else if (rev == MV78100_REV_A1)
849 return "MV78100-A1";
848 else 850 else
849 return "MV78100-Rev-Unsupported"; 851 return "MV78100-Rev-Unsupported";
850 } else if (dev == MV78200_DEV_ID) { 852 } else if (dev == MV78200_DEV_ID) {
diff --git a/arch/arm/mach-mv78xx0/include/mach/mv78xx0.h b/arch/arm/mach-mv78xx0/include/mach/mv78xx0.h
index d715b92b0908..788bdace1304 100644
--- a/arch/arm/mach-mv78xx0/include/mach/mv78xx0.h
+++ b/arch/arm/mach-mv78xx0/include/mach/mv78xx0.h
@@ -112,6 +112,7 @@
112 112
113#define MV78100_DEV_ID 0x7810 113#define MV78100_DEV_ID 0x7810
114#define MV78100_REV_A0 1 114#define MV78100_REV_A0 1
115#define MV78100_REV_A1 2
115 116
116#define MV78200_DEV_ID 0x7820 117#define MV78200_DEV_ID 0x7820
117#define MV78200_REV_A0 1 118#define MV78200_REV_A0 1
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
index 70df6b4dbcd4..08b0816afa61 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -162,7 +162,7 @@ static int beagle_twl_gpio_setup(struct device *dev,
162 162
163 /* TWL4030_GPIO_MAX + 0 == ledA, EHCI nEN_USB_PWR (out, active low) */ 163 /* TWL4030_GPIO_MAX + 0 == ledA, EHCI nEN_USB_PWR (out, active low) */
164 gpio_request(gpio + TWL4030_GPIO_MAX, "nEN_USB_PWR"); 164 gpio_request(gpio + TWL4030_GPIO_MAX, "nEN_USB_PWR");
165 gpio_direction_output(gpio + TWL4030_GPIO_MAX, 1); 165 gpio_direction_output(gpio + TWL4030_GPIO_MAX, 0);
166 166
167 /* TWL4030_GPIO_MAX + 1 == ledB, PMU_STAT (out, active low LED) */ 167 /* TWL4030_GPIO_MAX + 1 == ledB, PMU_STAT (out, active low LED) */
168 gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1; 168 gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1;
diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c
index 5326e0d61597..7519edb69155 100644
--- a/arch/arm/mach-omap2/board-omap3pandora.c
+++ b/arch/arm/mach-omap2/board-omap3pandora.c
@@ -134,50 +134,50 @@ static void __init pandora_keys_gpio_init(void)
134} 134}
135 135
136static int board_keymap[] = { 136static int board_keymap[] = {
137 /* col, row, code */ 137 /* row, col, code */
138 KEY(0, 0, KEY_9), 138 KEY(0, 0, KEY_9),
139 KEY(0, 1, KEY_0), 139 KEY(0, 1, KEY_8),
140 KEY(0, 2, KEY_BACKSPACE), 140 KEY(0, 2, KEY_I),
141 KEY(0, 3, KEY_O), 141 KEY(0, 3, KEY_J),
142 KEY(0, 4, KEY_P), 142 KEY(0, 4, KEY_N),
143 KEY(0, 5, KEY_K), 143 KEY(0, 5, KEY_M),
144 KEY(0, 6, KEY_L), 144 KEY(1, 0, KEY_0),
145 KEY(0, 7, KEY_ENTER),
146 KEY(1, 0, KEY_8),
147 KEY(1, 1, KEY_7), 145 KEY(1, 1, KEY_7),
148 KEY(1, 2, KEY_6), 146 KEY(1, 2, KEY_U),
149 KEY(1, 3, KEY_5), 147 KEY(1, 3, KEY_H),
150 KEY(1, 4, KEY_4), 148 KEY(1, 4, KEY_B),
151 KEY(1, 5, KEY_3), 149 KEY(1, 5, KEY_SPACE),
152 KEY(1, 6, KEY_2), 150 KEY(2, 0, KEY_BACKSPACE),
153 KEY(1, 7, KEY_1), 151 KEY(2, 1, KEY_6),
154 KEY(2, 0, KEY_I),
155 KEY(2, 1, KEY_U),
156 KEY(2, 2, KEY_Y), 152 KEY(2, 2, KEY_Y),
157 KEY(2, 3, KEY_T), 153 KEY(2, 3, KEY_G),
158 KEY(2, 4, KEY_R), 154 KEY(2, 4, KEY_V),
159 KEY(2, 5, KEY_E), 155 KEY(2, 5, KEY_FN),
160 KEY(2, 6, KEY_W), 156 KEY(3, 0, KEY_O),
161 KEY(2, 7, KEY_Q), 157 KEY(3, 1, KEY_5),
162 KEY(3, 0, KEY_J), 158 KEY(3, 2, KEY_T),
163 KEY(3, 1, KEY_H),
164 KEY(3, 2, KEY_G),
165 KEY(3, 3, KEY_F), 159 KEY(3, 3, KEY_F),
166 KEY(3, 4, KEY_D), 160 KEY(3, 4, KEY_C),
167 KEY(3, 5, KEY_S), 161 KEY(4, 0, KEY_P),
168 KEY(3, 6, KEY_A), 162 KEY(4, 1, KEY_4),
169 KEY(3, 7, KEY_LEFTSHIFT), 163 KEY(4, 2, KEY_R),
170 KEY(4, 0, KEY_N), 164 KEY(4, 3, KEY_D),
171 KEY(4, 1, KEY_B),
172 KEY(4, 2, KEY_V),
173 KEY(4, 3, KEY_C),
174 KEY(4, 4, KEY_X), 165 KEY(4, 4, KEY_X),
175 KEY(4, 5, KEY_Z), 166 KEY(5, 0, KEY_K),
176 KEY(4, 6, KEY_DOT), 167 KEY(5, 1, KEY_3),
177 KEY(4, 7, KEY_COMMA), 168 KEY(5, 2, KEY_E),
178 KEY(5, 0, KEY_M), 169 KEY(5, 3, KEY_S),
179 KEY(5, 1, KEY_SPACE), 170 KEY(5, 4, KEY_Z),
180 KEY(5, 2, KEY_FN), 171 KEY(6, 0, KEY_L),
172 KEY(6, 1, KEY_2),
173 KEY(6, 2, KEY_W),
174 KEY(6, 3, KEY_A),
175 KEY(6, 4, KEY_DOT),
176 KEY(7, 0, KEY_ENTER),
177 KEY(7, 1, KEY_1),
178 KEY(7, 2, KEY_Q),
179 KEY(7, 3, KEY_LEFTSHIFT),
180 KEY(7, 4, KEY_COMMA),
181}; 181};
182 182
183static struct matrix_keymap_data board_map_data = { 183static struct matrix_keymap_data board_map_data = {
diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c
index 15876828db23..f8657568b1ba 100644
--- a/arch/arm/mach-omap2/gpmc.c
+++ b/arch/arm/mach-omap2/gpmc.c
@@ -366,7 +366,7 @@ int gpmc_cs_request(int cs, unsigned long size, unsigned long *base)
366 if (r < 0) 366 if (r < 0)
367 goto out; 367 goto out;
368 368
369 gpmc_cs_enable_mem(cs, res->start, res->end - res->start + 1); 369 gpmc_cs_enable_mem(cs, res->start, resource_size(res));
370 *base = res->start; 370 *base = res->start;
371 gpmc_cs_set_reserved(cs, 1); 371 gpmc_cs_set_reserved(cs, 1);
372out: 372out:
diff --git a/arch/arm/mach-omap2/mailbox.c b/arch/arm/mach-omap2/mailbox.c
index c035ad3426d0..ef57b38a56a4 100644
--- a/arch/arm/mach-omap2/mailbox.c
+++ b/arch/arm/mach-omap2/mailbox.c
@@ -300,7 +300,7 @@ static int __devinit omap2_mbox_probe(struct platform_device *pdev)
300 dev_err(&pdev->dev, "invalid mem resource\n"); 300 dev_err(&pdev->dev, "invalid mem resource\n");
301 return -ENODEV; 301 return -ENODEV;
302 } 302 }
303 mbox_base = ioremap(res->start, res->end - res->start); 303 mbox_base = ioremap(res->start, resource_size(res));
304 if (!mbox_base) 304 if (!mbox_base)
305 return -ENOMEM; 305 return -ENOMEM;
306 306
diff --git a/arch/arm/mach-pxa/irq.c b/arch/arm/mach-pxa/irq.c
index d694ce289668..6112af431fa4 100644
--- a/arch/arm/mach-pxa/irq.c
+++ b/arch/arm/mach-pxa/irq.c
@@ -25,6 +25,8 @@
25 25
26#include "generic.h" 26#include "generic.h"
27 27
28#define MAX_INTERNAL_IRQS 128
29
28#define IRQ_BIT(n) (((n) - PXA_IRQ(0)) & 0x1f) 30#define IRQ_BIT(n) (((n) - PXA_IRQ(0)) & 0x1f)
29#define _ICMR(n) (*((((n) - PXA_IRQ(0)) & ~0x1f) ? &ICMR2 : &ICMR)) 31#define _ICMR(n) (*((((n) - PXA_IRQ(0)) & ~0x1f) ? &ICMR2 : &ICMR))
30#define _ICLR(n) (*((((n) - PXA_IRQ(0)) & ~0x1f) ? &ICLR2 : &ICLR)) 32#define _ICLR(n) (*((((n) - PXA_IRQ(0)) & ~0x1f) ? &ICLR2 : &ICLR))
@@ -122,6 +124,8 @@ void __init pxa_init_irq(int irq_nr, set_wake_t fn)
122{ 124{
123 int irq, i; 125 int irq, i;
124 126
127 BUG_ON(irq_nr > MAX_INTERNAL_IRQS);
128
125 pxa_internal_irq_nr = irq_nr; 129 pxa_internal_irq_nr = irq_nr;
126 130
127 for (irq = PXA_IRQ(0); irq < PXA_IRQ(irq_nr); irq += 32) { 131 for (irq = PXA_IRQ(0); irq < PXA_IRQ(irq_nr); irq += 32) {
@@ -149,7 +153,8 @@ void __init pxa_init_irq(int irq_nr, set_wake_t fn)
149} 153}
150 154
151#ifdef CONFIG_PM 155#ifdef CONFIG_PM
152static unsigned long saved_icmr[2]; 156static unsigned long saved_icmr[MAX_INTERNAL_IRQS/32];
157static unsigned long saved_ipr[MAX_INTERNAL_IRQS];
153 158
154static int pxa_irq_suspend(struct sys_device *dev, pm_message_t state) 159static int pxa_irq_suspend(struct sys_device *dev, pm_message_t state)
155{ 160{
@@ -159,6 +164,8 @@ static int pxa_irq_suspend(struct sys_device *dev, pm_message_t state)
159 saved_icmr[i] = _ICMR(irq); 164 saved_icmr[i] = _ICMR(irq);
160 _ICMR(irq) = 0; 165 _ICMR(irq) = 0;
161 } 166 }
167 for (i = 0; i < pxa_internal_irq_nr; i++)
168 saved_ipr[i] = IPR(i);
162 169
163 return 0; 170 return 0;
164} 171}
@@ -171,6 +178,8 @@ static int pxa_irq_resume(struct sys_device *dev)
171 _ICMR(irq) = saved_icmr[i]; 178 _ICMR(irq) = saved_icmr[i];
172 _ICLR(irq) = 0; 179 _ICLR(irq) = 0;
173 } 180 }
181 for (i = 0; i < pxa_internal_irq_nr; i++)
182 IPR(i) = saved_ipr[i];
174 183
175 ICCR = 1; 184 ICCR = 1;
176 return 0; 185 return 0;
diff --git a/arch/arm/mach-pxa/palmtc.c b/arch/arm/mach-pxa/palmtc.c
index bb2cc0dd44ec..0b92291a58f6 100644
--- a/arch/arm/mach-pxa/palmtc.c
+++ b/arch/arm/mach-pxa/palmtc.c
@@ -292,10 +292,10 @@ const static unsigned int palmtc_keypad_col_gpios[] = {
292 292
293static struct matrix_keypad_platform_data palmtc_keypad_platform_data = { 293static struct matrix_keypad_platform_data palmtc_keypad_platform_data = {
294 .keymap_data = &palmtc_keymap_data, 294 .keymap_data = &palmtc_keymap_data,
295 .col_gpios = palmtc_keypad_row_gpios, 295 .row_gpios = palmtc_keypad_row_gpios,
296 .num_col_gpios = 12, 296 .num_row_gpios = ARRAY_SIZE(palmtc_keypad_row_gpios),
297 .row_gpios = palmtc_keypad_col_gpios, 297 .col_gpios = palmtc_keypad_col_gpios,
298 .num_row_gpios = 4, 298 .num_col_gpios = ARRAY_SIZE(palmtc_keypad_col_gpios),
299 .active_low = 1, 299 .active_low = 1,
300 300
301 .debounce_ms = 20, 301 .debounce_ms = 20,
diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c
index 82ff5733e4dc..3da45d051743 100644
--- a/arch/arm/mach-pxa/spitz.c
+++ b/arch/arm/mach-pxa/spitz.c
@@ -779,11 +779,34 @@ static void __init common_init(void)
779 pxa_set_i2c_info(NULL); 779 pxa_set_i2c_info(NULL);
780} 780}
781 781
782#if defined(CONFIG_MACH_AKITA) || defined(CONFIG_MACH_BORZOI)
783static struct nand_bbt_descr sharpsl_akita_bbt = {
784 .options = 0,
785 .offs = 4,
786 .len = 1,
787 .pattern = scan_ff_pattern
788};
789
790static struct nand_ecclayout akita_oobinfo = {
791 .eccbytes = 24,
792 .eccpos = {
793 0x5, 0x1, 0x2, 0x3, 0x6, 0x7, 0x15, 0x11,
794 0x12, 0x13, 0x16, 0x17, 0x25, 0x21, 0x22, 0x23,
795 0x26, 0x27, 0x35, 0x31, 0x32, 0x33, 0x36, 0x37},
796 .oobfree = {{0x08, 0x09}}
797};
798#endif
799
782#if defined(CONFIG_MACH_SPITZ) || defined(CONFIG_MACH_BORZOI) 800#if defined(CONFIG_MACH_SPITZ) || defined(CONFIG_MACH_BORZOI)
783static void __init spitz_init(void) 801static void __init spitz_init(void)
784{ 802{
785 spitz_ficp_platform_data.gpio_pwdown = SPITZ_GPIO_IR_ON; 803 spitz_ficp_platform_data.gpio_pwdown = SPITZ_GPIO_IR_ON;
786 804
805 if (machine_is_borzoi()) {
806 sharpsl_nand_platform_data.badblock_pattern = &sharpsl_akita_bbt;
807 sharpsl_nand_platform_data.ecc_layout = &akita_oobinfo;
808 }
809
787 platform_scoop_config = &spitz_pcmcia_config; 810 platform_scoop_config = &spitz_pcmcia_config;
788 811
789 common_init(); 812 common_init();
@@ -808,22 +831,6 @@ static struct i2c_board_info akita_i2c_board_info[] = {
808 }, 831 },
809}; 832};
810 833
811static struct nand_bbt_descr sharpsl_akita_bbt = {
812 .options = 0,
813 .offs = 4,
814 .len = 1,
815 .pattern = scan_ff_pattern
816};
817
818static struct nand_ecclayout akita_oobinfo = {
819 .eccbytes = 24,
820 .eccpos = {
821 0x5, 0x1, 0x2, 0x3, 0x6, 0x7, 0x15, 0x11,
822 0x12, 0x13, 0x16, 0x17, 0x25, 0x21, 0x22, 0x23,
823 0x26, 0x27, 0x35, 0x31, 0x32, 0x33, 0x36, 0x37},
824 .oobfree = {{0x08, 0x09}}
825};
826
827static void __init akita_init(void) 834static void __init akita_init(void)
828{ 835{
829 spitz_ficp_platform_data.gpio_pwdown = AKITA_GPIO_IR_ON; 836 spitz_ficp_platform_data.gpio_pwdown = AKITA_GPIO_IR_ON;
diff --git a/arch/arm/mach-realview/Kconfig b/arch/arm/mach-realview/Kconfig
index dfc9b0bc6eb2..c48e1f2c3349 100644
--- a/arch/arm/mach-realview/Kconfig
+++ b/arch/arm/mach-realview/Kconfig
@@ -70,6 +70,8 @@ config MACH_REALVIEW_PBX
70 bool "Support RealView/PBX platform" 70 bool "Support RealView/PBX platform"
71 select ARM_GIC 71 select ARM_GIC
72 select HAVE_PATA_PLATFORM 72 select HAVE_PATA_PLATFORM
73 select ARCH_SPARSEMEM_ENABLE if CPU_V7 && !HIGH_PHYS_OFFSET
74 select ZONE_DMA if SPARSEMEM
73 help 75 help
74 Include support for the ARM(R) RealView PBX platform. 76 Include support for the ARM(R) RealView PBX platform.
75 77
@@ -82,6 +84,7 @@ config REALVIEW_HIGH_PHYS_OFFSET
82 0x70000000, 256MB of which being mirrored at 0x00000000. If 84 0x70000000, 256MB of which being mirrored at 0x00000000. If
83 the board supports 512MB of RAM, this option allows the 85 the board supports 512MB of RAM, this option allows the
84 memory to be accessed contiguously at the high physical 86 memory to be accessed contiguously at the high physical
85 offset. 87 offset. On the PBX board, disabling this option allows 1GB of
88 RAM to be used with SPARSEMEM.
86 89
87endmenu 90endmenu
diff --git a/arch/arm/mach-realview/core.c b/arch/arm/mach-realview/core.c
index a2083b60e3fb..9f293438e020 100644
--- a/arch/arm/mach-realview/core.c
+++ b/arch/arm/mach-realview/core.c
@@ -59,6 +59,25 @@
59/* used by entry-macro.S and platsmp.c */ 59/* used by entry-macro.S and platsmp.c */
60void __iomem *gic_cpu_base_addr; 60void __iomem *gic_cpu_base_addr;
61 61
62#ifdef CONFIG_ZONE_DMA
63/*
64 * Adjust the zones if there are restrictions for DMA access.
65 */
66void __init realview_adjust_zones(int node, unsigned long *size,
67 unsigned long *hole)
68{
69 unsigned long dma_size = SZ_256M >> PAGE_SHIFT;
70
71 if (!machine_is_realview_pbx() || node || (size[0] <= dma_size))
72 return;
73
74 size[ZONE_NORMAL] = size[0] - dma_size;
75 size[ZONE_DMA] = dma_size;
76 hole[ZONE_NORMAL] = hole[0];
77 hole[ZONE_DMA] = 0;
78}
79#endif
80
62/* 81/*
63 * This is the RealView sched_clock implementation. This has 82 * This is the RealView sched_clock implementation. This has
64 * a resolution of 41.7ns, and a maximum value of about 179s. 83 * a resolution of 41.7ns, and a maximum value of about 179s.
@@ -543,7 +562,7 @@ static int realview_clcd_setup(struct clcd_fb *fb)
543 fb->panel = realview_clcd_panel(); 562 fb->panel = realview_clcd_panel();
544 563
545 fb->fb.screen_base = dma_alloc_writecombine(&fb->dev->dev, framesize, 564 fb->fb.screen_base = dma_alloc_writecombine(&fb->dev->dev, framesize,
546 &dma, GFP_KERNEL); 565 &dma, GFP_KERNEL | GFP_DMA);
547 if (!fb->fb.screen_base) { 566 if (!fb->fb.screen_base) {
548 printk(KERN_ERR "CLCD: unable to map framebuffer\n"); 567 printk(KERN_ERR "CLCD: unable to map framebuffer\n");
549 return -ENOMEM; 568 return -ENOMEM;
@@ -788,3 +807,24 @@ void __init realview_timer_init(unsigned int timer_irq)
788 realview_clocksource_init(); 807 realview_clocksource_init();
789 realview_clockevents_init(timer_irq); 808 realview_clockevents_init(timer_irq);
790} 809}
810
811/*
812 * Setup the memory banks.
813 */
814void realview_fixup(struct machine_desc *mdesc, struct tag *tags, char **from,
815 struct meminfo *meminfo)
816{
817 /*
818 * Most RealView platforms have 512MB contiguous RAM at 0x70000000.
819 * Half of this is mirrored at 0.
820 */
821#ifdef CONFIG_REALVIEW_HIGH_PHYS_OFFSET
822 meminfo->bank[0].start = 0x70000000;
823 meminfo->bank[0].size = SZ_512M;
824 meminfo->nr_banks = 1;
825#else
826 meminfo->bank[0].start = 0;
827 meminfo->bank[0].size = SZ_256M;
828 meminfo->nr_banks = 1;
829#endif
830}
diff --git a/arch/arm/mach-realview/core.h b/arch/arm/mach-realview/core.h
index 699671fa6e0b..781bca68a9fa 100644
--- a/arch/arm/mach-realview/core.h
+++ b/arch/arm/mach-realview/core.h
@@ -25,6 +25,7 @@
25#include <linux/amba/bus.h> 25#include <linux/amba/bus.h>
26#include <linux/io.h> 26#include <linux/io.h>
27 27
28#include <asm/setup.h>
28#include <asm/leds.h> 29#include <asm/leds.h>
29 30
30#define AMBA_DEVICE(name,busid,base,plat) \ 31#define AMBA_DEVICE(name,busid,base,plat) \
@@ -44,6 +45,8 @@ static struct amba_device name##_device = { \
44 /* .dma = base##_DMA,*/ \ 45 /* .dma = base##_DMA,*/ \
45} 46}
46 47
48struct machine_desc;
49
47extern struct platform_device realview_flash_device; 50extern struct platform_device realview_flash_device;
48extern struct platform_device realview_cf_device; 51extern struct platform_device realview_cf_device;
49extern struct platform_device realview_i2c_device; 52extern struct platform_device realview_i2c_device;
@@ -61,5 +64,8 @@ extern void realview_timer_init(unsigned int timer_irq);
61extern int realview_flash_register(struct resource *res, u32 num); 64extern int realview_flash_register(struct resource *res, u32 num);
62extern int realview_eth_register(const char *name, struct resource *res); 65extern int realview_eth_register(const char *name, struct resource *res);
63extern int realview_usb_register(struct resource *res); 66extern int realview_usb_register(struct resource *res);
67extern void realview_fixup(struct machine_desc *mdesc, struct tag *tags,
68 char **from, struct meminfo *meminfo);
64extern void (*realview_reset)(char); 69extern void (*realview_reset)(char);
70
65#endif 71#endif
diff --git a/arch/arm/mach-realview/include/mach/memory.h b/arch/arm/mach-realview/include/mach/memory.h
index 293c30025e7e..2417bbcf97fd 100644
--- a/arch/arm/mach-realview/include/mach/memory.h
+++ b/arch/arm/mach-realview/include/mach/memory.h
@@ -29,4 +29,53 @@
29#define PHYS_OFFSET UL(0x00000000) 29#define PHYS_OFFSET UL(0x00000000)
30#endif 30#endif
31 31
32#if !defined(__ASSEMBLY__) && defined(CONFIG_ZONE_DMA)
33extern void realview_adjust_zones(int node, unsigned long *size,
34 unsigned long *hole);
35#define arch_adjust_zones(node, size, hole) \
36 realview_adjust_zones(node, size, hole)
37
38#define ISA_DMA_THRESHOLD (PHYS_OFFSET + SZ_256M - 1)
39#define MAX_DMA_ADDRESS (PAGE_OFFSET + SZ_256M)
40#endif
41
42#ifdef CONFIG_SPARSEMEM
43
44/*
45 * Sparsemem definitions for RealView PBX.
46 *
47 * The RealView PBX board has another block of 512MB of RAM at 0x20000000,
48 * however only the block at 0x70000000 (or the 256MB mirror at 0x00000000)
49 * may be used for DMA.
50 *
51 * The macros below define a section size of 256MB and a non-linear virtual to
52 * physical mapping:
53 *
54 * 256MB @ 0x00000000 -> PAGE_OFFSET
55 * 512MB @ 0x20000000 -> PAGE_OFFSET + 0x10000000
56 * 256MB @ 0x80000000 -> PAGE_OFFSET + 0x30000000
57 */
58#ifdef CONFIG_REALVIEW_HIGH_PHYS_OFFSET
59#error "SPARSEMEM not available with REALVIEW_HIGH_PHYS_OFFSET"
60#endif
61
62#define MAX_PHYSMEM_BITS 32
63#define SECTION_SIZE_BITS 28
64
65/* bank page offsets */
66#define PAGE_OFFSET1 (PAGE_OFFSET + 0x10000000)
67#define PAGE_OFFSET2 (PAGE_OFFSET + 0x30000000)
68
69#define __phys_to_virt(phys) \
70 ((phys) >= 0x80000000 ? (phys) - 0x80000000 + PAGE_OFFSET2 : \
71 (phys) >= 0x20000000 ? (phys) - 0x20000000 + PAGE_OFFSET1 : \
72 (phys) + PAGE_OFFSET)
73
74#define __virt_to_phys(virt) \
75 ((virt) >= PAGE_OFFSET2 ? (virt) - PAGE_OFFSET2 + 0x80000000 : \
76 (virt) >= PAGE_OFFSET1 ? (virt) - PAGE_OFFSET1 + 0x20000000 : \
77 (virt) - PAGE_OFFSET)
78
79#endif /* CONFIG_SPARSEMEM */
80
32#endif 81#endif
diff --git a/arch/arm/mach-realview/platsmp.c b/arch/arm/mach-realview/platsmp.c
index a88458b4799d..009265818d55 100644
--- a/arch/arm/mach-realview/platsmp.c
+++ b/arch/arm/mach-realview/platsmp.c
@@ -146,11 +146,8 @@ static void __init poke_milo(void)
146 * register. The BootMonitor waits for this register to become 146 * register. The BootMonitor waits for this register to become
147 * non-zero. 147 * non-zero.
148 */ 148 */
149#define REALVIEW_SYS_FLAGSS_OFFSET 0x30
150#define REALVIEW_SYS_FLAGSC_OFFSET 0x34
151 __raw_writel(BSYM(virt_to_phys(realview_secondary_startup)), 149 __raw_writel(BSYM(virt_to_phys(realview_secondary_startup)),
152 __io_address(REALVIEW_SYS_BASE) + 150 __io_address(REALVIEW_SYS_FLAGSSET));
153 REALVIEW_SYS_FLAGSS_OFFSET);
154 151
155 mb(); 152 mb();
156} 153}
diff --git a/arch/arm/mach-realview/realview_eb.c b/arch/arm/mach-realview/realview_eb.c
index 1d65e64ae571..917f8ca3abff 100644
--- a/arch/arm/mach-realview/realview_eb.c
+++ b/arch/arm/mach-realview/realview_eb.c
@@ -415,6 +415,7 @@ MACHINE_START(REALVIEW_EB, "ARM-RealView EB")
415 .phys_io = REALVIEW_EB_UART0_BASE, 415 .phys_io = REALVIEW_EB_UART0_BASE,
416 .io_pg_offst = (IO_ADDRESS(REALVIEW_EB_UART0_BASE) >> 18) & 0xfffc, 416 .io_pg_offst = (IO_ADDRESS(REALVIEW_EB_UART0_BASE) >> 18) & 0xfffc,
417 .boot_params = PHYS_OFFSET + 0x00000100, 417 .boot_params = PHYS_OFFSET + 0x00000100,
418 .fixup = realview_fixup,
418 .map_io = realview_eb_map_io, 419 .map_io = realview_eb_map_io,
419 .init_irq = gic_init_irq, 420 .init_irq = gic_init_irq,
420 .timer = &realview_eb_timer, 421 .timer = &realview_eb_timer,
diff --git a/arch/arm/mach-realview/realview_pb1176.c b/arch/arm/mach-realview/realview_pb1176.c
index a6ba147692c1..7fb726d5f8b9 100644
--- a/arch/arm/mach-realview/realview_pb1176.c
+++ b/arch/arm/mach-realview/realview_pb1176.c
@@ -300,6 +300,18 @@ static void realview_pb1176_reset(char mode)
300 __raw_writel(REALVIEW_PB1176_SYS_LOCKVAL_RSTCTL, hdr_ctrl); 300 __raw_writel(REALVIEW_PB1176_SYS_LOCKVAL_RSTCTL, hdr_ctrl);
301} 301}
302 302
303static void realview_pb1176_fixup(struct machine_desc *mdesc,
304 struct tag *tags, char **from,
305 struct meminfo *meminfo)
306{
307 /*
308 * RealView PB1176 only has 128MB of RAM mapped at 0.
309 */
310 meminfo->bank[0].start = 0;
311 meminfo->bank[0].size = SZ_128M;
312 meminfo->nr_banks = 1;
313}
314
303static void __init realview_pb1176_init(void) 315static void __init realview_pb1176_init(void)
304{ 316{
305 int i; 317 int i;
@@ -331,6 +343,7 @@ MACHINE_START(REALVIEW_PB1176, "ARM-RealView PB1176")
331 .phys_io = REALVIEW_PB1176_UART0_BASE, 343 .phys_io = REALVIEW_PB1176_UART0_BASE,
332 .io_pg_offst = (IO_ADDRESS(REALVIEW_PB1176_UART0_BASE) >> 18) & 0xfffc, 344 .io_pg_offst = (IO_ADDRESS(REALVIEW_PB1176_UART0_BASE) >> 18) & 0xfffc,
333 .boot_params = PHYS_OFFSET + 0x00000100, 345 .boot_params = PHYS_OFFSET + 0x00000100,
346 .fixup = realview_pb1176_fixup,
334 .map_io = realview_pb1176_map_io, 347 .map_io = realview_pb1176_map_io,
335 .init_irq = gic_init_irq, 348 .init_irq = gic_init_irq,
336 .timer = &realview_pb1176_timer, 349 .timer = &realview_pb1176_timer,
diff --git a/arch/arm/mach-realview/realview_pb11mp.c b/arch/arm/mach-realview/realview_pb11mp.c
index 070d284ce96e..9bbbfc05f225 100644
--- a/arch/arm/mach-realview/realview_pb11mp.c
+++ b/arch/arm/mach-realview/realview_pb11mp.c
@@ -347,6 +347,7 @@ MACHINE_START(REALVIEW_PB11MP, "ARM-RealView PB11MPCore")
347 .phys_io = REALVIEW_PB11MP_UART0_BASE, 347 .phys_io = REALVIEW_PB11MP_UART0_BASE,
348 .io_pg_offst = (IO_ADDRESS(REALVIEW_PB11MP_UART0_BASE) >> 18) & 0xfffc, 348 .io_pg_offst = (IO_ADDRESS(REALVIEW_PB11MP_UART0_BASE) >> 18) & 0xfffc,
349 .boot_params = PHYS_OFFSET + 0x00000100, 349 .boot_params = PHYS_OFFSET + 0x00000100,
350 .fixup = realview_fixup,
350 .map_io = realview_pb11mp_map_io, 351 .map_io = realview_pb11mp_map_io,
351 .init_irq = gic_init_irq, 352 .init_irq = gic_init_irq,
352 .timer = &realview_pb11mp_timer, 353 .timer = &realview_pb11mp_timer,
diff --git a/arch/arm/mach-realview/realview_pba8.c b/arch/arm/mach-realview/realview_pba8.c
index 941beb2b9709..fe861e96c566 100644
--- a/arch/arm/mach-realview/realview_pba8.c
+++ b/arch/arm/mach-realview/realview_pba8.c
@@ -298,6 +298,7 @@ MACHINE_START(REALVIEW_PBA8, "ARM-RealView PB-A8")
298 .phys_io = REALVIEW_PBA8_UART0_BASE, 298 .phys_io = REALVIEW_PBA8_UART0_BASE,
299 .io_pg_offst = (IO_ADDRESS(REALVIEW_PBA8_UART0_BASE) >> 18) & 0xfffc, 299 .io_pg_offst = (IO_ADDRESS(REALVIEW_PBA8_UART0_BASE) >> 18) & 0xfffc,
300 .boot_params = PHYS_OFFSET + 0x00000100, 300 .boot_params = PHYS_OFFSET + 0x00000100,
301 .fixup = realview_fixup,
301 .map_io = realview_pba8_map_io, 302 .map_io = realview_pba8_map_io,
302 .init_irq = gic_init_irq, 303 .init_irq = gic_init_irq,
303 .timer = &realview_pba8_timer, 304 .timer = &realview_pba8_timer,
diff --git a/arch/arm/mach-realview/realview_pbx.c b/arch/arm/mach-realview/realview_pbx.c
index 7e4bc6cdca52..ec39488e2b42 100644
--- a/arch/arm/mach-realview/realview_pbx.c
+++ b/arch/arm/mach-realview/realview_pbx.c
@@ -304,6 +304,26 @@ static struct sys_timer realview_pbx_timer = {
304 .init = realview_pbx_timer_init, 304 .init = realview_pbx_timer_init,
305}; 305};
306 306
307static void realview_pbx_fixup(struct machine_desc *mdesc, struct tag *tags,
308 char **from, struct meminfo *meminfo)
309{
310#ifdef CONFIG_SPARSEMEM
311 /*
312 * Memory configuration with SPARSEMEM enabled on RealView PBX (see
313 * asm/mach/memory.h for more information).
314 */
315 meminfo->bank[0].start = 0;
316 meminfo->bank[0].size = SZ_256M;
317 meminfo->bank[1].start = 0x20000000;
318 meminfo->bank[1].size = SZ_512M;
319 meminfo->bank[2].start = 0x80000000;
320 meminfo->bank[2].size = SZ_256M;
321 meminfo->nr_banks = 3;
322#else
323 realview_fixup(mdesc, tags, from, meminfo);
324#endif
325}
326
307static void __init realview_pbx_init(void) 327static void __init realview_pbx_init(void)
308{ 328{
309 int i; 329 int i;
@@ -345,6 +365,7 @@ MACHINE_START(REALVIEW_PBX, "ARM-RealView PBX")
345 .phys_io = REALVIEW_PBX_UART0_BASE, 365 .phys_io = REALVIEW_PBX_UART0_BASE,
346 .io_pg_offst = (IO_ADDRESS(REALVIEW_PBX_UART0_BASE) >> 18) & 0xfffc, 366 .io_pg_offst = (IO_ADDRESS(REALVIEW_PBX_UART0_BASE) >> 18) & 0xfffc,
347 .boot_params = PHYS_OFFSET + 0x00000100, 367 .boot_params = PHYS_OFFSET + 0x00000100,
368 .fixup = realview_pbx_fixup,
348 .map_io = realview_pbx_map_io, 369 .map_io = realview_pbx_map_io,
349 .init_irq = gic_init_irq, 370 .init_irq = gic_init_irq,
350 .timer = &realview_pbx_timer, 371 .timer = &realview_pbx_timer,
diff --git a/arch/arm/mach-s3c6400/include/mach/dma.h b/arch/arm/mach-s3c6400/include/mach/dma.h
index 004edab23954..6723860748be 100644
--- a/arch/arm/mach-s3c6400/include/mach/dma.h
+++ b/arch/arm/mach-s3c6400/include/mach/dma.h
@@ -58,21 +58,13 @@ enum dma_ch {
58 DMACH_MAX /* the end */ 58 DMACH_MAX /* the end */
59}; 59};
60 60
61static __inline__ int s3c_dma_has_circular(void) 61static __inline__ bool s3c_dma_has_circular(void)
62{ 62{
63 /* we will be supporting ciruclar buffers as soon as we have DMA 63 return true;
64 * engine support.
65 */
66 return 1;
67} 64}
68 65
69#define S3C2410_DMAF_CIRCULAR (1 << 0) 66#define S3C2410_DMAF_CIRCULAR (1 << 0)
70 67
71static inline bool s3c_dma_has_circular(void)
72{
73 return false;
74}
75
76#include <plat/dma.h> 68#include <plat/dma.h>
77 69
78#endif /* __ASM_ARCH_IRQ_H */ 70#endif /* __ASM_ARCH_IRQ_H */
diff --git a/arch/arm/mach-s3c6410/Kconfig b/arch/arm/mach-s3c6410/Kconfig
index 53fc3ff657f7..72d4b11b2077 100644
--- a/arch/arm/mach-s3c6410/Kconfig
+++ b/arch/arm/mach-s3c6410/Kconfig
@@ -77,6 +77,7 @@ config SMDK6410_WM1190_EV1
77 depends on MACH_SMDK6410 77 depends on MACH_SMDK6410
78 select REGULATOR 78 select REGULATOR
79 select REGULATOR_WM8350 79 select REGULATOR_WM8350
80 select S3C24XX_GPIO_EXTRA64
80 select MFD_WM8350_I2C 81 select MFD_WM8350_I2C
81 select MFD_WM8350_CONFIG_MODE_0 82 select MFD_WM8350_CONFIG_MODE_0
82 select MFD_WM8350_CONFIG_MODE_3 83 select MFD_WM8350_CONFIG_MODE_3
diff --git a/arch/arm/mach-s3c6410/mach-smdk6410.c b/arch/arm/mach-s3c6410/mach-smdk6410.c
index ea51dbe76e3e..9f1a21462620 100644
--- a/arch/arm/mach-s3c6410/mach-smdk6410.c
+++ b/arch/arm/mach-s3c6410/mach-smdk6410.c
@@ -320,6 +320,9 @@ static int __init smdk6410_wm8350_init(struct wm8350 *wm8350)
320{ 320{
321 int i; 321 int i;
322 322
323 /* Configure the IRQ line */
324 s3c_gpio_setpull(S3C64XX_GPN(12), S3C_GPIO_PULL_UP);
325
323 /* Instantiate the regulators */ 326 /* Instantiate the regulators */
324 for (i = 0; i < ARRAY_SIZE(wm1190_regulators); i++) 327 for (i = 0; i < ARRAY_SIZE(wm1190_regulators); i++)
325 wm8350_register_regulator(wm8350, 328 wm8350_register_regulator(wm8350,
diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S
index eeeed01ee44a..3a285218fd15 100644
--- a/arch/arm/mm/proc-v7.S
+++ b/arch/arm/mm/proc-v7.S
@@ -186,9 +186,10 @@ cpu_v7_name:
186 */ 186 */
187__v7_setup: 187__v7_setup:
188#ifdef CONFIG_SMP 188#ifdef CONFIG_SMP
189 mrc p15, 0, r0, c1, c0, 1 @ Enable SMP/nAMP mode and 189 mrc p15, 0, r0, c1, c0, 1
190 orr r0, r0, #(1 << 6) | (1 << 0) @ TLB ops broadcasting 190 tst r0, #(1 << 6) @ SMP/nAMP mode enabled?
191 mcr p15, 0, r0, c1, c0, 1 191 orreq r0, r0, #(1 << 6) | (1 << 0) @ Enable SMP/nAMP mode and
192 mcreq p15, 0, r0, c1, c0, 1 @ TLB ops broadcasting
192#endif 193#endif
193 adr r12, __v7_setup_stack @ the local stack 194 adr r12, __v7_setup_stack @ the local stack
194 stmia r12, {r0-r5, r7, r9, r11, lr} 195 stmia r12, {r0-r5, r7, r9, r11, lr}
diff --git a/arch/arm/plat-omap/cpu-omap.c b/arch/arm/plat-omap/cpu-omap.c
index 1868c0d8f9b5..341235c278ac 100644
--- a/arch/arm/plat-omap/cpu-omap.c
+++ b/arch/arm/plat-omap/cpu-omap.c
@@ -127,7 +127,7 @@ static int __init omap_cpu_init(struct cpufreq_policy *policy)
127 } 127 }
128 128
129 /* FIXME: what's the actual transition time? */ 129 /* FIXME: what's the actual transition time? */
130 policy->cpuinfo.transition_latency = 10 * 1000 * 1000; 130 policy->cpuinfo.transition_latency = 300 * 1000;
131 131
132 return 0; 132 return 0;
133} 133}
diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c
index b53125f41293..68eaae324b6a 100644
--- a/arch/arm/plat-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
@@ -691,13 +691,16 @@ static inline void disable_lnk(int lch)
691static inline void omap2_enable_irq_lch(int lch) 691static inline void omap2_enable_irq_lch(int lch)
692{ 692{
693 u32 val; 693 u32 val;
694 unsigned long flags;
694 695
695 if (!cpu_class_is_omap2()) 696 if (!cpu_class_is_omap2())
696 return; 697 return;
697 698
699 spin_lock_irqsave(&dma_chan_lock, flags);
698 val = dma_read(IRQENABLE_L0); 700 val = dma_read(IRQENABLE_L0);
699 val |= 1 << lch; 701 val |= 1 << lch;
700 dma_write(val, IRQENABLE_L0); 702 dma_write(val, IRQENABLE_L0);
703 spin_unlock_irqrestore(&dma_chan_lock, flags);
701} 704}
702 705
703int omap_request_dma(int dev_id, const char *dev_name, 706int omap_request_dma(int dev_id, const char *dev_name,
@@ -799,10 +802,13 @@ void omap_free_dma(int lch)
799 802
800 if (cpu_class_is_omap2()) { 803 if (cpu_class_is_omap2()) {
801 u32 val; 804 u32 val;
805
806 spin_lock_irqsave(&dma_chan_lock, flags);
802 /* Disable interrupts */ 807 /* Disable interrupts */
803 val = dma_read(IRQENABLE_L0); 808 val = dma_read(IRQENABLE_L0);
804 val &= ~(1 << lch); 809 val &= ~(1 << lch);
805 dma_write(val, IRQENABLE_L0); 810 dma_write(val, IRQENABLE_L0);
811 spin_unlock_irqrestore(&dma_chan_lock, flags);
806 812
807 /* Clear the CSR register and IRQ status register */ 813 /* Clear the CSR register and IRQ status register */
808 dma_write(OMAP2_DMA_CSR_CLEAR_MASK, CSR(lch)); 814 dma_write(OMAP2_DMA_CSR_CLEAR_MASK, CSR(lch));
@@ -1108,6 +1114,14 @@ int omap_dma_running(void)
1108{ 1114{
1109 int lch; 1115 int lch;
1110 1116
1117 /*
1118 * On OMAP1510, internal LCD controller will start the transfer
1119 * when it gets enabled, so assume DMA running if LCD enabled.
1120 */
1121 if (cpu_is_omap1510())
1122 if (omap_readw(0xfffec000 + 0x00) & (1 << 0))
1123 return 1;
1124
1111 /* Check if LCD DMA is running */ 1125 /* Check if LCD DMA is running */
1112 if (cpu_is_omap16xx()) 1126 if (cpu_is_omap16xx())
1113 if (omap_readw(OMAP1610_DMA_LCD_CCR) & OMAP_DMA_CCR_EN) 1127 if (omap_readw(OMAP1610_DMA_LCD_CCR) & OMAP_DMA_CCR_EN)
diff --git a/arch/arm/plat-s3c64xx/dma.c b/arch/arm/plat-s3c64xx/dma.c
index 266a10745a85..d554b936fcfb 100644
--- a/arch/arm/plat-s3c64xx/dma.c
+++ b/arch/arm/plat-s3c64xx/dma.c
@@ -151,8 +151,6 @@ static void s3c64xx_dma_fill_lli(struct s3c2410_dma_chan *chan,
151 src = chan->dev_addr; 151 src = chan->dev_addr;
152 dst = data; 152 dst = data;
153 control0 = PL080_CONTROL_SRC_AHB2; 153 control0 = PL080_CONTROL_SRC_AHB2;
154 control0 |= (u32)chan->hw_width << PL080_CONTROL_SWIDTH_SHIFT;
155 control0 |= 2 << PL080_CONTROL_DWIDTH_SHIFT;
156 control0 |= PL080_CONTROL_DST_INCR; 154 control0 |= PL080_CONTROL_DST_INCR;
157 break; 155 break;
158 156
@@ -160,8 +158,6 @@ static void s3c64xx_dma_fill_lli(struct s3c2410_dma_chan *chan,
160 src = data; 158 src = data;
161 dst = chan->dev_addr; 159 dst = chan->dev_addr;
162 control0 = PL080_CONTROL_DST_AHB2; 160 control0 = PL080_CONTROL_DST_AHB2;
163 control0 |= (u32)chan->hw_width << PL080_CONTROL_DWIDTH_SHIFT;
164 control0 |= 2 << PL080_CONTROL_SWIDTH_SHIFT;
165 control0 |= PL080_CONTROL_SRC_INCR; 161 control0 |= PL080_CONTROL_SRC_INCR;
166 break; 162 break;
167 default: 163 default:
@@ -173,6 +169,8 @@ static void s3c64xx_dma_fill_lli(struct s3c2410_dma_chan *chan,
173 control1 = size >> chan->hw_width; /* size in no of xfers */ 169 control1 = size >> chan->hw_width; /* size in no of xfers */
174 control0 |= PL080_CONTROL_PROT_SYS; /* always in priv. mode */ 170 control0 |= PL080_CONTROL_PROT_SYS; /* always in priv. mode */
175 control0 |= PL080_CONTROL_TC_IRQ_EN; /* always fire IRQ */ 171 control0 |= PL080_CONTROL_TC_IRQ_EN; /* always fire IRQ */
172 control0 |= (u32)chan->hw_width << PL080_CONTROL_DWIDTH_SHIFT;
173 control0 |= (u32)chan->hw_width << PL080_CONTROL_SWIDTH_SHIFT;
176 174
177 lli->src_addr = src; 175 lli->src_addr = src;
178 lli->dst_addr = dst; 176 lli->dst_addr = dst;
@@ -339,6 +337,7 @@ int s3c2410_dma_enqueue(unsigned int channel, void *id,
339 struct s3c64xx_dma_buff *next; 337 struct s3c64xx_dma_buff *next;
340 struct s3c64xx_dma_buff *buff; 338 struct s3c64xx_dma_buff *buff;
341 struct pl080s_lli *lli; 339 struct pl080s_lli *lli;
340 unsigned long flags;
342 int ret; 341 int ret;
343 342
344 WARN_ON(!chan); 343 WARN_ON(!chan);
@@ -366,6 +365,8 @@ int s3c2410_dma_enqueue(unsigned int channel, void *id,
366 365
367 s3c64xx_dma_fill_lli(chan, lli, data, size); 366 s3c64xx_dma_fill_lli(chan, lli, data, size);
368 367
368 local_irq_save(flags);
369
369 if ((next = chan->next) != NULL) { 370 if ((next = chan->next) != NULL) {
370 struct s3c64xx_dma_buff *end = chan->end; 371 struct s3c64xx_dma_buff *end = chan->end;
371 struct pl080s_lli *endlli = end->lli; 372 struct pl080s_lli *endlli = end->lli;
@@ -397,6 +398,8 @@ int s3c2410_dma_enqueue(unsigned int channel, void *id,
397 s3c64xx_lli_to_regs(chan, lli); 398 s3c64xx_lli_to_regs(chan, lli);
398 } 399 }
399 400
401 local_irq_restore(flags);
402
400 show_lli(lli); 403 show_lli(lli);
401 404
402 dbg_showchan(chan); 405 dbg_showchan(chan);
@@ -560,26 +563,11 @@ int s3c2410_dma_free(unsigned int channel, struct s3c2410_dma_client *client)
560 563
561EXPORT_SYMBOL(s3c2410_dma_free); 564EXPORT_SYMBOL(s3c2410_dma_free);
562 565
563
564static void s3c64xx_dma_tcirq(struct s3c64xx_dmac *dmac, int offs)
565{
566 struct s3c2410_dma_chan *chan = dmac->channels + offs;
567
568 /* note, we currently do not bother to work out which buffer
569 * or buffers have been completed since the last tc-irq. */
570
571 if (chan->callback_fn)
572 (chan->callback_fn)(chan, chan->curr->pw, 0, S3C2410_RES_OK);
573}
574
575static void s3c64xx_dma_errirq(struct s3c64xx_dmac *dmac, int offs)
576{
577 printk(KERN_DEBUG "%s: offs %d\n", __func__, offs);
578}
579
580static irqreturn_t s3c64xx_dma_irq(int irq, void *pw) 566static irqreturn_t s3c64xx_dma_irq(int irq, void *pw)
581{ 567{
582 struct s3c64xx_dmac *dmac = pw; 568 struct s3c64xx_dmac *dmac = pw;
569 struct s3c2410_dma_chan *chan;
570 enum s3c2410_dma_buffresult res;
583 u32 tcstat, errstat; 571 u32 tcstat, errstat;
584 u32 bit; 572 u32 bit;
585 int offs; 573 int offs;
@@ -588,14 +576,54 @@ static irqreturn_t s3c64xx_dma_irq(int irq, void *pw)
588 errstat = readl(dmac->regs + PL080_ERR_STATUS); 576 errstat = readl(dmac->regs + PL080_ERR_STATUS);
589 577
590 for (offs = 0, bit = 1; offs < 8; offs++, bit <<= 1) { 578 for (offs = 0, bit = 1; offs < 8; offs++, bit <<= 1) {
579 struct s3c64xx_dma_buff *buff;
580
581 if (!(errstat & bit) && !(tcstat & bit))
582 continue;
583
584 chan = dmac->channels + offs;
585 res = S3C2410_RES_ERR;
586
591 if (tcstat & bit) { 587 if (tcstat & bit) {
592 writel(bit, dmac->regs + PL080_TC_CLEAR); 588 writel(bit, dmac->regs + PL080_TC_CLEAR);
593 s3c64xx_dma_tcirq(dmac, offs); 589 res = S3C2410_RES_OK;
594 } 590 }
595 591
596 if (errstat & bit) { 592 if (errstat & bit)
597 s3c64xx_dma_errirq(dmac, offs);
598 writel(bit, dmac->regs + PL080_ERR_CLEAR); 593 writel(bit, dmac->regs + PL080_ERR_CLEAR);
594
595 /* 'next' points to the buffer that is next to the
596 * currently active buffer.
597 * For CIRCULAR queues, 'next' will be same as 'curr'
598 * when 'end' is the active buffer.
599 */
600 buff = chan->curr;
601 while (buff && buff != chan->next
602 && buff->next != chan->next)
603 buff = buff->next;
604
605 if (!buff)
606 BUG();
607
608 if (buff == chan->next)
609 buff = chan->end;
610
611 s3c64xx_dma_bufffdone(chan, buff, res);
612
613 /* Free the node and update curr, if non-circular queue */
614 if (!(chan->flags & S3C2410_DMAF_CIRCULAR)) {
615 chan->curr = buff->next;
616 s3c64xx_dma_freebuff(buff);
617 }
618
619 /* Update 'next' */
620 buff = chan->next;
621 if (chan->next == chan->end) {
622 chan->next = chan->curr;
623 if (!(chan->flags & S3C2410_DMAF_CIRCULAR))
624 chan->end = NULL;
625 } else {
626 chan->next = buff->next;
599 } 627 }
600 } 628 }
601 629
diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig
index c41234f1b825..3a9319f93e89 100644
--- a/arch/m32r/Kconfig
+++ b/arch/m32r/Kconfig
@@ -11,6 +11,9 @@ config M32R
11 select HAVE_IDE 11 select HAVE_IDE
12 select HAVE_OPROFILE 12 select HAVE_OPROFILE
13 select INIT_ALL_POSSIBLE 13 select INIT_ALL_POSSIBLE
14 select HAVE_KERNEL_GZIP
15 select HAVE_KERNEL_BZIP2
16 select HAVE_KERNEL_LZMA
14 17
15config SBUS 18config SBUS
16 bool 19 bool
diff --git a/arch/m32r/boot/compressed/Makefile b/arch/m32r/boot/compressed/Makefile
index 560484ae35ec..177716b1d613 100644
--- a/arch/m32r/boot/compressed/Makefile
+++ b/arch/m32r/boot/compressed/Makefile
@@ -1,11 +1,11 @@
1# 1#
2# linux/arch/sh/boot/compressed/Makefile 2# linux/arch/m32r/boot/compressed/Makefile
3# 3#
4# create a compressed vmlinux image from the original vmlinux 4# create a compressed vmlinux image from the original vmlinux
5# 5#
6 6
7targets := vmlinux vmlinux.bin vmlinux.bin.gz head.o misc.o \ 7targets := vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 \
8 piggy.o vmlinux.lds 8 vmlinux.bin.lzma head.o misc.o piggy.o vmlinux.lds
9 9
10OBJECTS = $(obj)/head.o $(obj)/misc.o 10OBJECTS = $(obj)/head.o $(obj)/misc.o
11 11
@@ -27,6 +27,12 @@ $(obj)/vmlinux.bin: vmlinux FORCE
27$(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin FORCE 27$(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin FORCE
28 $(call if_changed,gzip) 28 $(call if_changed,gzip)
29 29
30$(obj)/vmlinux.bin.bz2: $(obj)/vmlinux.bin FORCE
31 $(call if_changed,bzip2)
32
33$(obj)/vmlinux.bin.lzma: $(obj)/vmlinux.bin FORCE
34 $(call if_changed,lzma)
35
30CFLAGS_misc.o += -fpic 36CFLAGS_misc.o += -fpic
31 37
32ifdef CONFIG_MMU 38ifdef CONFIG_MMU
@@ -37,5 +43,9 @@ endif
37 43
38OBJCOPYFLAGS += -R .empty_zero_page 44OBJCOPYFLAGS += -R .empty_zero_page
39 45
40$(obj)/piggy.o: $(obj)/vmlinux.scr $(obj)/vmlinux.bin.gz FORCE 46suffix_$(CONFIG_KERNEL_GZIP) = gz
47suffix_$(CONFIG_KERNEL_BZIP2) = bz2
48suffix_$(CONFIG_KERNEL_LZMA) = lzma
49
50$(obj)/piggy.o: $(obj)/vmlinux.scr $(obj)/vmlinux.bin.$(suffix-y) FORCE
41 $(call if_changed,ld) 51 $(call if_changed,ld)
diff --git a/arch/m32r/boot/compressed/misc.c b/arch/m32r/boot/compressed/misc.c
index d394292498c0..370d60881977 100644
--- a/arch/m32r/boot/compressed/misc.c
+++ b/arch/m32r/boot/compressed/misc.c
@@ -9,140 +9,49 @@
9 * Adapted for SH by Stuart Menefy, Aug 1999 9 * Adapted for SH by Stuart Menefy, Aug 1999
10 * 10 *
11 * 2003-02-12: Support M32R by Takeo Takahashi 11 * 2003-02-12: Support M32R by Takeo Takahashi
12 * This is based on arch/sh/boot/compressed/misc.c.
13 */ 12 */
14 13
15#include <linux/string.h>
16
17/* 14/*
18 * gzip declarations 15 * gzip declarations
19 */ 16 */
20
21#define OF(args) args
22#define STATIC static 17#define STATIC static
23 18
24#undef memset 19#undef memset
25#undef memcpy 20#undef memcpy
26#define memzero(s, n) memset ((s), 0, (n)) 21#define memzero(s, n) memset ((s), 0, (n))
27 22
28typedef unsigned char uch;
29typedef unsigned short ush;
30typedef unsigned long ulg;
31
32#define WSIZE 0x8000 /* Window size must be at least 32k, */
33 /* and a power of two */
34
35static uch *inbuf; /* input buffer */
36static uch window[WSIZE]; /* Sliding window buffer */
37
38static unsigned insize = 0; /* valid bytes in inbuf */
39static unsigned inptr = 0; /* index of next byte to be processed in inbuf */
40static unsigned outcnt = 0; /* bytes in output buffer */
41
42/* gzip flag byte */
43#define ASCII_FLAG 0x01 /* bit 0 set: file probably ASCII text */
44#define CONTINUATION 0x02 /* bit 1 set: continuation of multi-part gzip file */
45#define EXTRA_FIELD 0x04 /* bit 2 set: extra field present */
46#define ORIG_NAME 0x08 /* bit 3 set: original file name present */
47#define COMMENT 0x10 /* bit 4 set: file comment present */
48#define ENCRYPTED 0x20 /* bit 5 set: file is encrypted */
49#define RESERVED 0xC0 /* bit 6,7: reserved */
50
51#define get_byte() (inptr < insize ? inbuf[inptr++] : fill_inbuf())
52
53/* Diagnostic functions */
54#ifdef DEBUG
55# define Assert(cond,msg) {if(!(cond)) error(msg);}
56# define Trace(x) fprintf x
57# define Tracev(x) {if (verbose) fprintf x ;}
58# define Tracevv(x) {if (verbose>1) fprintf x ;}
59# define Tracec(c,x) {if (verbose && (c)) fprintf x ;}
60# define Tracecv(c,x) {if (verbose>1 && (c)) fprintf x ;}
61#else
62# define Assert(cond,msg)
63# define Trace(x)
64# define Tracev(x)
65# define Tracevv(x)
66# define Tracec(c,x)
67# define Tracecv(c,x)
68#endif
69
70static int fill_inbuf(void);
71static void flush_window(void);
72static void error(char *m); 23static void error(char *m);
73 24
74static unsigned char *input_data;
75static int input_len;
76
77static long bytes_out = 0;
78static uch *output_data;
79static unsigned long output_ptr = 0;
80
81#include "m32r_sio.c" 25#include "m32r_sio.c"
82 26
83static unsigned long free_mem_ptr; 27static unsigned long free_mem_ptr;
84static unsigned long free_mem_end_ptr; 28static unsigned long free_mem_end_ptr;
85 29
86#define HEAP_SIZE 0x10000 30#ifdef CONFIG_KERNEL_BZIP2
87 31static void *memset(void *s, int c, size_t n)
88#include "../../../../lib/inflate.c"
89
90void* memset(void* s, int c, size_t n)
91{ 32{
92 int i; 33 char *ss = s;
93 char *ss = (char*)s;
94 34
95 for (i=0;i<n;i++) ss[i] = c; 35 while (n--)
36 *ss++ = c;
96 return s; 37 return s;
97} 38}
39#endif
98 40
99void* memcpy(void* __dest, __const void* __src, 41#ifdef CONFIG_KERNEL_GZIP
100 size_t __n) 42#define BOOT_HEAP_SIZE 0x10000
101{ 43#include "../../../../lib/decompress_inflate.c"
102 int i; 44#endif
103 char *d = (char *)__dest, *s = (char *)__src;
104
105 for (i=0;i<__n;i++) d[i] = s[i];
106 return __dest;
107}
108
109/* ===========================================================================
110 * Fill the input buffer. This is called only when the buffer is empty
111 * and at least one byte is really needed.
112 */
113static int fill_inbuf(void)
114{
115 if (insize != 0) {
116 error("ran out of input data");
117 }
118
119 inbuf = input_data;
120 insize = input_len;
121 inptr = 1;
122 return inbuf[0];
123}
124 45
125/* =========================================================================== 46#ifdef CONFIG_KERNEL_BZIP2
126 * Write the output window window[0..outcnt-1] and update crc and bytes_out. 47#define BOOT_HEAP_SIZE 0x400000
127 * (Used for the decompressed data only.) 48#include "../../../../lib/decompress_bunzip2.c"
128 */ 49#endif
129static void flush_window(void)
130{
131 ulg c = crc; /* temporary variable */
132 unsigned n;
133 uch *in, *out, ch;
134 50
135 in = window; 51#ifdef CONFIG_KERNEL_LZMA
136 out = &output_data[output_ptr]; 52#define BOOT_HEAP_SIZE 0x10000
137 for (n = 0; n < outcnt; n++) { 53#include "../../../../lib/decompress_unlzma.c"
138 ch = *out++ = *in++; 54#endif
139 c = crc_32_tab[((int)c ^ ch) & 0xff] ^ (c >> 8);
140 }
141 crc = c;
142 bytes_out += (ulg)outcnt;
143 output_ptr += (ulg)outcnt;
144 outcnt = 0;
145}
146 55
147static void error(char *x) 56static void error(char *x)
148{ 57{
@@ -153,20 +62,20 @@ static void error(char *x)
153 while(1); /* Halt */ 62 while(1); /* Halt */
154} 63}
155 64
156/* return decompressed size */
157void 65void
158decompress_kernel(int mmu_on, unsigned char *zimage_data, 66decompress_kernel(int mmu_on, unsigned char *zimage_data,
159 unsigned int zimage_len, unsigned long heap) 67 unsigned int zimage_len, unsigned long heap)
160{ 68{
69 unsigned char *input_data = zimage_data;
70 int input_len = zimage_len;
71 unsigned char *output_data;
72
161 output_data = (unsigned char *)CONFIG_MEMORY_START + 0x2000 73 output_data = (unsigned char *)CONFIG_MEMORY_START + 0x2000
162 + (mmu_on ? 0x80000000 : 0); 74 + (mmu_on ? 0x80000000 : 0);
163 free_mem_ptr = heap; 75 free_mem_ptr = heap;
164 free_mem_end_ptr = free_mem_ptr + HEAP_SIZE; 76 free_mem_end_ptr = free_mem_ptr + BOOT_HEAP_SIZE;
165 input_data = zimage_data;
166 input_len = zimage_len;
167 77
168 makecrc(); 78 puts("\nDecompressing Linux... ");
169 puts("Uncompressing Linux... "); 79 decompress(input_data, input_len, NULL, NULL, output_data, NULL, error);
170 gunzip(); 80 puts("done.\nBooting the kernel.\n");
171 puts("Ok, booting the kernel.\n");
172} 81}
diff --git a/arch/m32r/kernel/smp.c b/arch/m32r/kernel/smp.c
index 8a88f1f0a3e2..31cef20b2996 100644
--- a/arch/m32r/kernel/smp.c
+++ b/arch/m32r/kernel/smp.c
@@ -806,7 +806,7 @@ unsigned long send_IPI_mask_phys(cpumask_t physid_mask, int ipi_num,
806 806
807 if (mask & ~physids_coerce(phys_cpu_present_map)) 807 if (mask & ~physids_coerce(phys_cpu_present_map))
808 BUG(); 808 BUG();
809 if (ipi_num >= NR_IPIS) 809 if (ipi_num >= NR_IPIS || ipi_num < 0)
810 BUG(); 810 BUG();
811 811
812 mask <<= IPI_SHIFT; 812 mask <<= IPI_SHIFT;
diff --git a/arch/m32r/kernel/time.c b/arch/m32r/kernel/time.c
index e7fee0f198d5..9cedcef11575 100644
--- a/arch/m32r/kernel/time.c
+++ b/arch/m32r/kernel/time.c
@@ -75,7 +75,7 @@ u32 arch_gettimeoffset(void)
75 count = 0; 75 count = 0;
76 76
77 count = (latch - count) * TICK_SIZE; 77 count = (latch - count) * TICK_SIZE;
78 elapsed_time = (count + latch / 2) / latch; 78 elapsed_time = DIV_ROUND_CLOSEST(count, latch);
79 /* NOTE: LATCH is equal to the "interval" value (= reload count). */ 79 /* NOTE: LATCH is equal to the "interval" value (= reload count). */
80 80
81#else /* CONFIG_SMP */ 81#else /* CONFIG_SMP */
@@ -93,7 +93,7 @@ u32 arch_gettimeoffset(void)
93 p_count = count; 93 p_count = count;
94 94
95 count = (latch - count) * TICK_SIZE; 95 count = (latch - count) * TICK_SIZE;
96 elapsed_time = (count + latch / 2) / latch; 96 elapsed_time = DIV_ROUND_CLOSEST(count, latch);
97 /* NOTE: LATCH is equal to the "interval" value (= reload count). */ 97 /* NOTE: LATCH is equal to the "interval" value (= reload count). */
98#endif /* CONFIG_SMP */ 98#endif /* CONFIG_SMP */
99#elif defined(CONFIG_CHIP_M32310) 99#elif defined(CONFIG_CHIP_M32310)
@@ -211,7 +211,7 @@ void __init time_init(void)
211 211
212 bus_clock = boot_cpu_data.bus_clock; 212 bus_clock = boot_cpu_data.bus_clock;
213 divide = boot_cpu_data.timer_divide; 213 divide = boot_cpu_data.timer_divide;
214 latch = (bus_clock/divide + HZ / 2) / HZ; 214 latch = DIV_ROUND_CLOSEST(bus_clock/divide, HZ);
215 215
216 printk("Timer start : latch = %ld\n", latch); 216 printk("Timer start : latch = %ld\n", latch);
217 217
diff --git a/arch/m32r/kernel/vmlinux.lds.S b/arch/m32r/kernel/vmlinux.lds.S
index 8ceb6181d805..7da94eaa082b 100644
--- a/arch/m32r/kernel/vmlinux.lds.S
+++ b/arch/m32r/kernel/vmlinux.lds.S
@@ -42,6 +42,8 @@ SECTIONS
42 _etext = .; /* End of text section */ 42 _etext = .; /* End of text section */
43 43
44 EXCEPTION_TABLE(16) 44 EXCEPTION_TABLE(16)
45 NOTES
46
45 RODATA 47 RODATA
46 RW_DATA_SECTION(32, PAGE_SIZE, THREAD_SIZE) 48 RW_DATA_SECTION(32, PAGE_SIZE, THREAD_SIZE)
47 _edata = .; /* End of data section */ 49 _edata = .; /* End of data section */
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 10a0a5488a44..2ba14e77296c 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -414,6 +414,10 @@ config ARCH_SPARSEMEM_DEFAULT
414config ARCH_POPULATES_NODE_MAP 414config ARCH_POPULATES_NODE_MAP
415 def_bool y 415 def_bool y
416 416
417config SYS_SUPPORTS_HUGETLBFS
418 def_bool y
419 depends on PPC_BOOK3S_64
420
417source "mm/Kconfig" 421source "mm/Kconfig"
418 422
419config ARCH_MEMORY_PROBE 423config ARCH_MEMORY_PROBE
diff --git a/arch/powerpc/boot/dts/mpc8377_wlan.dts b/arch/powerpc/boot/dts/mpc8377_wlan.dts
index 9a603695723b..9ea783056969 100644
--- a/arch/powerpc/boot/dts/mpc8377_wlan.dts
+++ b/arch/powerpc/boot/dts/mpc8377_wlan.dts
@@ -67,7 +67,7 @@
67 device-width = <1>; 67 device-width = <1>;
68 68
69 partition@0 { 69 partition@0 {
70 reg = <0 0x8000>; 70 reg = <0 0x80000>;
71 label = "u-boot"; 71 label = "u-boot";
72 read-only; 72 read-only;
73 }; 73 };
diff --git a/arch/powerpc/boot/dts/mpc8569mds.dts b/arch/powerpc/boot/dts/mpc8569mds.dts
index 06332d61830a..1e3ec8f059bf 100644
--- a/arch/powerpc/boot/dts/mpc8569mds.dts
+++ b/arch/powerpc/boot/dts/mpc8569mds.dts
@@ -487,8 +487,8 @@
487 &qe_pio_f 5 0 /* USBTN */ 487 &qe_pio_f 5 0 /* USBTN */
488 &qe_pio_f 6 0 /* USBRP */ 488 &qe_pio_f 6 0 /* USBRP */
489 &qe_pio_f 8 0 /* USBRN */ 489 &qe_pio_f 8 0 /* USBRN */
490 &bcsr17 6 0 /* SPEED */ 490 &bcsr17 1 0 /* SPEED */
491 &bcsr17 5 1>; /* POWER */ 491 &bcsr17 2 0>; /* POWER */
492 }; 492 };
493 493
494 enet0: ucc@2000 { 494 enet0: ucc@2000 {
diff --git a/arch/powerpc/boot/dts/sbc8548.dts b/arch/powerpc/boot/dts/sbc8548.dts
index 9eefe00ed253..94a332251710 100644
--- a/arch/powerpc/boot/dts/sbc8548.dts
+++ b/arch/powerpc/boot/dts/sbc8548.dts
@@ -26,8 +26,7 @@
26 serial0 = &serial0; 26 serial0 = &serial0;
27 serial1 = &serial1; 27 serial1 = &serial1;
28 pci0 = &pci0; 28 pci0 = &pci0;
29 /* pci1 doesn't have a corresponding physical connector */ 29 pci1 = &pci1;
30 pci2 = &pci2;
31 }; 30 };
32 31
33 cpus { 32 cpus {
@@ -381,7 +380,7 @@
381 bus-range = <0 0>; 380 bus-range = <0 0>;
382 ranges = <0x02000000 0x0 0x80000000 0x80000000 0x0 0x10000000 381 ranges = <0x02000000 0x0 0x80000000 0x80000000 0x0 0x10000000
383 0x01000000 0x0 0x00000000 0xe2000000 0x0 0x00800000>; 382 0x01000000 0x0 0x00000000 0xe2000000 0x0 0x00800000>;
384 clock-frequency = <66666666>; 383 clock-frequency = <66000000>;
385 #interrupt-cells = <1>; 384 #interrupt-cells = <1>;
386 #size-cells = <2>; 385 #size-cells = <2>;
387 #address-cells = <3>; 386 #address-cells = <3>;
@@ -390,7 +389,7 @@
390 device_type = "pci"; 389 device_type = "pci";
391 }; 390 };
392 391
393 pci2: pcie@e000a000 { 392 pci1: pcie@e000a000 {
394 interrupt-map-mask = <0xf800 0x0 0x0 0x7>; 393 interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
395 interrupt-map = < 394 interrupt-map = <
396 395
@@ -403,9 +402,9 @@
403 interrupt-parent = <&mpic>; 402 interrupt-parent = <&mpic>;
404 interrupts = <0x1a 0x2>; 403 interrupts = <0x1a 0x2>;
405 bus-range = <0x0 0xff>; 404 bus-range = <0x0 0xff>;
406 ranges = <0x02000000 0x0 0xa0000000 0xa0000000 0x0 0x20000000 405 ranges = <0x02000000 0x0 0xa0000000 0xa0000000 0x0 0x10000000
407 0x01000000 0x0 0x00000000 0xe3000000 0x0 0x08000000>; 406 0x01000000 0x0 0x00000000 0xe2800000 0x0 0x08000000>;
408 clock-frequency = <33333333>; 407 clock-frequency = <33000000>;
409 #interrupt-cells = <1>; 408 #interrupt-cells = <1>;
410 #size-cells = <2>; 409 #size-cells = <2>;
411 #address-cells = <3>; 410 #address-cells = <3>;
@@ -419,11 +418,11 @@
419 device_type = "pci"; 418 device_type = "pci";
420 ranges = <0x02000000 0x0 0xa0000000 419 ranges = <0x02000000 0x0 0xa0000000
421 0x02000000 0x0 0xa0000000 420 0x02000000 0x0 0xa0000000
422 0x0 0x20000000 421 0x0 0x10000000
423 422
424 0x01000000 0x0 0x00000000 423 0x01000000 0x0 0x00000000
425 0x01000000 0x0 0x00000000 424 0x01000000 0x0 0x00000000
426 0x0 0x08000000>; 425 0x0 0x00800000>;
427 }; 426 };
428 }; 427 };
429}; 428};
diff --git a/arch/powerpc/configs/83xx/asp8347_defconfig b/arch/powerpc/configs/83xx/asp8347_defconfig
index a2df0635b6de..466f09ac3153 100644
--- a/arch/powerpc/configs/83xx/asp8347_defconfig
+++ b/arch/powerpc/configs/83xx/asp8347_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.31-rc4 3# Linux kernel version: 2.6.32-rc5
4# Wed Jul 29 23:32:02 2009 4# Thu Nov 5 08:20:20 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -35,6 +35,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
35CONFIG_GENERIC_HARDIRQS=y 35CONFIG_GENERIC_HARDIRQS=y
36CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 36CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
38CONFIG_IRQ_PER_CPU=y 39CONFIG_IRQ_PER_CPU=y
39CONFIG_STACKTRACE_SUPPORT=y 40CONFIG_STACKTRACE_SUPPORT=y
40CONFIG_HAVE_LATENCYTOP_SUPPORT=y 41CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -85,11 +86,12 @@ CONFIG_SYSVIPC_SYSCTL=y
85# 86#
86# RCU Subsystem 87# RCU Subsystem
87# 88#
88CONFIG_CLASSIC_RCU=y 89CONFIG_TREE_RCU=y
89# CONFIG_TREE_RCU is not set 90# CONFIG_TREE_PREEMPT_RCU is not set
90# CONFIG_PREEMPT_RCU is not set 91# CONFIG_RCU_TRACE is not set
92CONFIG_RCU_FANOUT=32
93# CONFIG_RCU_FANOUT_EXACT is not set
91# CONFIG_TREE_RCU_TRACE is not set 94# CONFIG_TREE_RCU_TRACE is not set
92# CONFIG_PREEMPT_RCU_TRACE is not set
93# CONFIG_IKCONFIG is not set 95# CONFIG_IKCONFIG is not set
94CONFIG_LOG_BUF_SHIFT=14 96CONFIG_LOG_BUF_SHIFT=14
95CONFIG_GROUP_SCHED=y 97CONFIG_GROUP_SCHED=y
@@ -125,28 +127,29 @@ CONFIG_TIMERFD=y
125CONFIG_EVENTFD=y 127CONFIG_EVENTFD=y
126CONFIG_SHMEM=y 128CONFIG_SHMEM=y
127CONFIG_AIO=y 129CONFIG_AIO=y
128CONFIG_HAVE_PERF_COUNTERS=y 130CONFIG_HAVE_PERF_EVENTS=y
129 131
130# 132#
131# Performance Counters 133# Kernel Performance Events And Counters
132# 134#
135# CONFIG_PERF_EVENTS is not set
133# CONFIG_PERF_COUNTERS is not set 136# CONFIG_PERF_COUNTERS is not set
134CONFIG_VM_EVENT_COUNTERS=y 137CONFIG_VM_EVENT_COUNTERS=y
135CONFIG_PCI_QUIRKS=y 138CONFIG_PCI_QUIRKS=y
136CONFIG_SLUB_DEBUG=y 139CONFIG_SLUB_DEBUG=y
137# CONFIG_STRIP_ASM_SYMS is not set
138CONFIG_COMPAT_BRK=y 140CONFIG_COMPAT_BRK=y
139# CONFIG_SLAB is not set 141# CONFIG_SLAB is not set
140CONFIG_SLUB=y 142CONFIG_SLUB=y
141# CONFIG_SLOB is not set 143# CONFIG_SLOB is not set
142# CONFIG_PROFILING is not set 144# CONFIG_PROFILING is not set
143# CONFIG_MARKERS is not set
144CONFIG_HAVE_OPROFILE=y 145CONFIG_HAVE_OPROFILE=y
145CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 146CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
146CONFIG_HAVE_IOREMAP_PROT=y 147CONFIG_HAVE_IOREMAP_PROT=y
147CONFIG_HAVE_KPROBES=y 148CONFIG_HAVE_KPROBES=y
148CONFIG_HAVE_KRETPROBES=y 149CONFIG_HAVE_KRETPROBES=y
149CONFIG_HAVE_ARCH_TRACEHOOK=y 150CONFIG_HAVE_ARCH_TRACEHOOK=y
151CONFIG_HAVE_DMA_ATTRS=y
152CONFIG_HAVE_DMA_API_DEBUG=y
150 153
151# 154#
152# GCOV-based kernel profiling 155# GCOV-based kernel profiling
@@ -257,6 +260,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
257CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 260CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
258# CONFIG_KEXEC is not set 261# CONFIG_KEXEC is not set
259# CONFIG_CRASH_DUMP is not set 262# CONFIG_CRASH_DUMP is not set
263CONFIG_MAX_ACTIVE_REGIONS=32
260CONFIG_ARCH_FLATMEM_ENABLE=y 264CONFIG_ARCH_FLATMEM_ENABLE=y
261CONFIG_ARCH_POPULATES_NODE_MAP=y 265CONFIG_ARCH_POPULATES_NODE_MAP=y
262CONFIG_SELECT_MEMORY_MODEL=y 266CONFIG_SELECT_MEMORY_MODEL=y
@@ -274,6 +278,7 @@ CONFIG_BOUNCE=y
274CONFIG_VIRT_TO_BUS=y 278CONFIG_VIRT_TO_BUS=y
275CONFIG_HAVE_MLOCK=y 279CONFIG_HAVE_MLOCK=y
276CONFIG_HAVE_MLOCKED_PAGE_BIT=y 280CONFIG_HAVE_MLOCKED_PAGE_BIT=y
281# CONFIG_KSM is not set
277CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 282CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
278CONFIG_PPC_4K_PAGES=y 283CONFIG_PPC_4K_PAGES=y
279# CONFIG_PPC_16K_PAGES is not set 284# CONFIG_PPC_16K_PAGES is not set
@@ -369,6 +374,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
369# CONFIG_NETFILTER is not set 374# CONFIG_NETFILTER is not set
370# CONFIG_IP_DCCP is not set 375# CONFIG_IP_DCCP is not set
371# CONFIG_IP_SCTP is not set 376# CONFIG_IP_SCTP is not set
377# CONFIG_RDS is not set
372# CONFIG_TIPC is not set 378# CONFIG_TIPC is not set
373# CONFIG_ATM is not set 379# CONFIG_ATM is not set
374# CONFIG_BRIDGE is not set 380# CONFIG_BRIDGE is not set
@@ -398,6 +404,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
398# CONFIG_AF_RXRPC is not set 404# CONFIG_AF_RXRPC is not set
399CONFIG_WIRELESS=y 405CONFIG_WIRELESS=y
400# CONFIG_CFG80211 is not set 406# CONFIG_CFG80211 is not set
407CONFIG_CFG80211_DEFAULT_PS_VALUE=0
401CONFIG_WIRELESS_OLD_REGULATORY=y 408CONFIG_WIRELESS_OLD_REGULATORY=y
402# CONFIG_WIRELESS_EXT is not set 409# CONFIG_WIRELESS_EXT is not set
403# CONFIG_LIB80211 is not set 410# CONFIG_LIB80211 is not set
@@ -405,7 +412,6 @@ CONFIG_WIRELESS_OLD_REGULATORY=y
405# 412#
406# CFG80211 needs to be enabled for MAC80211 413# CFG80211 needs to be enabled for MAC80211
407# 414#
408CONFIG_MAC80211_DEFAULT_PS_VALUE=0
409# CONFIG_WIMAX is not set 415# CONFIG_WIMAX is not set
410# CONFIG_RFKILL is not set 416# CONFIG_RFKILL is not set
411# CONFIG_NET_9P is not set 417# CONFIG_NET_9P is not set
@@ -418,6 +424,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
418# Generic Driver Options 424# Generic Driver Options
419# 425#
420CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 426CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
427# CONFIG_DEVTMPFS is not set
421CONFIG_STANDALONE=y 428CONFIG_STANDALONE=y
422CONFIG_PREVENT_FIRMWARE_BUILD=y 429CONFIG_PREVENT_FIRMWARE_BUILD=y
423# CONFIG_FW_LOADER is not set 430# CONFIG_FW_LOADER is not set
@@ -425,9 +432,9 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
425# CONFIG_CONNECTOR is not set 432# CONFIG_CONNECTOR is not set
426CONFIG_MTD=y 433CONFIG_MTD=y
427# CONFIG_MTD_DEBUG is not set 434# CONFIG_MTD_DEBUG is not set
435# CONFIG_MTD_TESTS is not set
428# CONFIG_MTD_CONCAT is not set 436# CONFIG_MTD_CONCAT is not set
429CONFIG_MTD_PARTITIONS=y 437CONFIG_MTD_PARTITIONS=y
430# CONFIG_MTD_TESTS is not set
431CONFIG_MTD_REDBOOT_PARTS=y 438CONFIG_MTD_REDBOOT_PARTS=y
432CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 439CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
433CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y 440CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y
@@ -628,7 +635,9 @@ CONFIG_MII=y
628# CONFIG_NET_PCI is not set 635# CONFIG_NET_PCI is not set
629# CONFIG_B44 is not set 636# CONFIG_B44 is not set
630# CONFIG_KS8842 is not set 637# CONFIG_KS8842 is not set
638# CONFIG_KS8851_MLL is not set
631# CONFIG_ATL2 is not set 639# CONFIG_ATL2 is not set
640# CONFIG_XILINX_EMACLITE is not set
632CONFIG_NETDEV_1000=y 641CONFIG_NETDEV_1000=y
633# CONFIG_ACENIC is not set 642# CONFIG_ACENIC is not set
634# CONFIG_DL2K is not set 643# CONFIG_DL2K is not set
@@ -658,10 +667,7 @@ CONFIG_GIANFAR=y
658# CONFIG_JME is not set 667# CONFIG_JME is not set
659# CONFIG_NETDEV_10000 is not set 668# CONFIG_NETDEV_10000 is not set
660# CONFIG_TR is not set 669# CONFIG_TR is not set
661 670CONFIG_WLAN=y
662#
663# Wireless LAN
664#
665# CONFIG_WLAN_PRE80211 is not set 671# CONFIG_WLAN_PRE80211 is not set
666# CONFIG_WLAN_80211 is not set 672# CONFIG_WLAN_80211 is not set
667 673
@@ -760,6 +766,7 @@ CONFIG_LEGACY_PTY_COUNT=256
760CONFIG_DEVPORT=y 766CONFIG_DEVPORT=y
761CONFIG_I2C=y 767CONFIG_I2C=y
762CONFIG_I2C_BOARDINFO=y 768CONFIG_I2C_BOARDINFO=y
769CONFIG_I2C_COMPAT=y
763CONFIG_I2C_CHARDEV=y 770CONFIG_I2C_CHARDEV=y
764CONFIG_I2C_HELPER_AUTO=y 771CONFIG_I2C_HELPER_AUTO=y
765 772
@@ -814,9 +821,6 @@ CONFIG_I2C_MPC=y
814# Miscellaneous I2C Chip support 821# Miscellaneous I2C Chip support
815# 822#
816# CONFIG_DS1682 is not set 823# CONFIG_DS1682 is not set
817# CONFIG_SENSORS_PCF8574 is not set
818# CONFIG_PCF8575 is not set
819# CONFIG_SENSORS_PCA9539 is not set
820# CONFIG_SENSORS_TSL2550 is not set 824# CONFIG_SENSORS_TSL2550 is not set
821# CONFIG_I2C_DEBUG_CORE is not set 825# CONFIG_I2C_DEBUG_CORE is not set
822# CONFIG_I2C_DEBUG_ALGO is not set 826# CONFIG_I2C_DEBUG_ALGO is not set
@@ -834,6 +838,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
834# CONFIG_POWER_SUPPLY is not set 838# CONFIG_POWER_SUPPLY is not set
835CONFIG_HWMON=y 839CONFIG_HWMON=y
836# CONFIG_HWMON_VID is not set 840# CONFIG_HWMON_VID is not set
841# CONFIG_HWMON_DEBUG_CHIP is not set
842
843#
844# Native drivers
845#
837# CONFIG_SENSORS_AD7414 is not set 846# CONFIG_SENSORS_AD7414 is not set
838# CONFIG_SENSORS_AD7418 is not set 847# CONFIG_SENSORS_AD7418 is not set
839# CONFIG_SENSORS_ADM1021 is not set 848# CONFIG_SENSORS_ADM1021 is not set
@@ -883,6 +892,7 @@ CONFIG_HWMON=y
883# CONFIG_SENSORS_ADS7828 is not set 892# CONFIG_SENSORS_ADS7828 is not set
884# CONFIG_SENSORS_THMC50 is not set 893# CONFIG_SENSORS_THMC50 is not set
885# CONFIG_SENSORS_TMP401 is not set 894# CONFIG_SENSORS_TMP401 is not set
895# CONFIG_SENSORS_TMP421 is not set
886# CONFIG_SENSORS_VIA686A is not set 896# CONFIG_SENSORS_VIA686A is not set
887# CONFIG_SENSORS_VT1211 is not set 897# CONFIG_SENSORS_VT1211 is not set
888# CONFIG_SENSORS_VT8231 is not set 898# CONFIG_SENSORS_VT8231 is not set
@@ -894,7 +904,6 @@ CONFIG_HWMON=y
894# CONFIG_SENSORS_W83L786NG is not set 904# CONFIG_SENSORS_W83L786NG is not set
895# CONFIG_SENSORS_W83627HF is not set 905# CONFIG_SENSORS_W83627HF is not set
896# CONFIG_SENSORS_W83627EHF is not set 906# CONFIG_SENSORS_W83627EHF is not set
897# CONFIG_HWMON_DEBUG_CHIP is not set
898CONFIG_THERMAL=y 907CONFIG_THERMAL=y
899# CONFIG_THERMAL_HWMON is not set 908# CONFIG_THERMAL_HWMON is not set
900CONFIG_WATCHDOG=y 909CONFIG_WATCHDOG=y
@@ -934,6 +943,7 @@ CONFIG_SSB_POSSIBLE=y
934# CONFIG_MFD_TMIO is not set 943# CONFIG_MFD_TMIO is not set
935# CONFIG_PMIC_DA903X is not set 944# CONFIG_PMIC_DA903X is not set
936# CONFIG_MFD_WM8400 is not set 945# CONFIG_MFD_WM8400 is not set
946# CONFIG_MFD_WM831X is not set
937# CONFIG_MFD_WM8350_I2C is not set 947# CONFIG_MFD_WM8350_I2C is not set
938# CONFIG_MFD_PCF50633 is not set 948# CONFIG_MFD_PCF50633 is not set
939# CONFIG_AB3100_CORE is not set 949# CONFIG_AB3100_CORE is not set
@@ -944,6 +954,7 @@ CONFIG_SSB_POSSIBLE=y
944# Graphics support 954# Graphics support
945# 955#
946# CONFIG_AGP is not set 956# CONFIG_AGP is not set
957CONFIG_VGA_ARB=y
947# CONFIG_DRM is not set 958# CONFIG_DRM is not set
948# CONFIG_VGASTATE is not set 959# CONFIG_VGASTATE is not set
949CONFIG_VIDEO_OUTPUT_CONTROL=m 960CONFIG_VIDEO_OUTPUT_CONTROL=m
@@ -990,6 +1001,7 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y
990# CONFIG_USB_OXU210HP_HCD is not set 1001# CONFIG_USB_OXU210HP_HCD is not set
991# CONFIG_USB_ISP116X_HCD is not set 1002# CONFIG_USB_ISP116X_HCD is not set
992# CONFIG_USB_ISP1760_HCD is not set 1003# CONFIG_USB_ISP1760_HCD is not set
1004# CONFIG_USB_ISP1362_HCD is not set
993# CONFIG_USB_OHCI_HCD is not set 1005# CONFIG_USB_OHCI_HCD is not set
994# CONFIG_USB_UHCI_HCD is not set 1006# CONFIG_USB_UHCI_HCD is not set
995# CONFIG_USB_SL811_HCD is not set 1007# CONFIG_USB_SL811_HCD is not set
@@ -1045,6 +1057,7 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y
1045# CONFIG_USB_LD is not set 1057# CONFIG_USB_LD is not set
1046# CONFIG_USB_TRANCEVIBRATOR is not set 1058# CONFIG_USB_TRANCEVIBRATOR is not set
1047# CONFIG_USB_IOWARRIOR is not set 1059# CONFIG_USB_IOWARRIOR is not set
1060# CONFIG_USB_TEST is not set
1048# CONFIG_USB_ISIGHTFW is not set 1061# CONFIG_USB_ISIGHTFW is not set
1049# CONFIG_USB_VST is not set 1062# CONFIG_USB_VST is not set
1050# CONFIG_USB_GADGET is not set 1063# CONFIG_USB_GADGET is not set
@@ -1146,6 +1159,7 @@ CONFIG_FS_MBCACHE=y
1146# CONFIG_GFS2_FS is not set 1159# CONFIG_GFS2_FS is not set
1147# CONFIG_OCFS2_FS is not set 1160# CONFIG_OCFS2_FS is not set
1148# CONFIG_BTRFS_FS is not set 1161# CONFIG_BTRFS_FS is not set
1162# CONFIG_NILFS2_FS is not set
1149CONFIG_FILE_LOCKING=y 1163CONFIG_FILE_LOCKING=y
1150CONFIG_FSNOTIFY=y 1164CONFIG_FSNOTIFY=y
1151CONFIG_DNOTIFY=y 1165CONFIG_DNOTIFY=y
@@ -1215,7 +1229,6 @@ CONFIG_JFFS2_RTIME=y
1215# CONFIG_ROMFS_FS is not set 1229# CONFIG_ROMFS_FS is not set
1216# CONFIG_SYSV_FS is not set 1230# CONFIG_SYSV_FS is not set
1217# CONFIG_UFS_FS is not set 1231# CONFIG_UFS_FS is not set
1218# CONFIG_NILFS2_FS is not set
1219CONFIG_NETWORK_FILESYSTEMS=y 1232CONFIG_NETWORK_FILESYSTEMS=y
1220CONFIG_NFS_FS=y 1233CONFIG_NFS_FS=y
1221CONFIG_NFS_V3=y 1234CONFIG_NFS_V3=y
@@ -1327,6 +1340,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
1327CONFIG_ENABLE_MUST_CHECK=y 1340CONFIG_ENABLE_MUST_CHECK=y
1328CONFIG_FRAME_WARN=1024 1341CONFIG_FRAME_WARN=1024
1329# CONFIG_MAGIC_SYSRQ is not set 1342# CONFIG_MAGIC_SYSRQ is not set
1343# CONFIG_STRIP_ASM_SYMS is not set
1330# CONFIG_UNUSED_SYMBOLS is not set 1344# CONFIG_UNUSED_SYMBOLS is not set
1331# CONFIG_DEBUG_FS is not set 1345# CONFIG_DEBUG_FS is not set
1332# CONFIG_HEADERS_CHECK is not set 1346# CONFIG_HEADERS_CHECK is not set
@@ -1344,6 +1358,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
1344CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1358CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1345CONFIG_TRACING_SUPPORT=y 1359CONFIG_TRACING_SUPPORT=y
1346# CONFIG_FTRACE is not set 1360# CONFIG_FTRACE is not set
1361# CONFIG_DMA_API_DEBUG is not set
1347# CONFIG_SAMPLES is not set 1362# CONFIG_SAMPLES is not set
1348CONFIG_HAVE_ARCH_KGDB=y 1363CONFIG_HAVE_ARCH_KGDB=y
1349# CONFIG_PPC_DISABLE_WERROR is not set 1364# CONFIG_PPC_DISABLE_WERROR is not set
@@ -1365,7 +1380,6 @@ CONFIG_CRYPTO=y
1365# 1380#
1366# Crypto core or helper 1381# Crypto core or helper
1367# 1382#
1368# CONFIG_CRYPTO_FIPS is not set
1369CONFIG_CRYPTO_ALGAPI=y 1383CONFIG_CRYPTO_ALGAPI=y
1370CONFIG_CRYPTO_ALGAPI2=y 1384CONFIG_CRYPTO_ALGAPI2=y
1371CONFIG_CRYPTO_AEAD2=y 1385CONFIG_CRYPTO_AEAD2=y
@@ -1407,11 +1421,13 @@ CONFIG_CRYPTO_PCBC=m
1407# 1421#
1408# CONFIG_CRYPTO_HMAC is not set 1422# CONFIG_CRYPTO_HMAC is not set
1409# CONFIG_CRYPTO_XCBC is not set 1423# CONFIG_CRYPTO_XCBC is not set
1424# CONFIG_CRYPTO_VMAC is not set
1410 1425
1411# 1426#
1412# Digest 1427# Digest
1413# 1428#
1414# CONFIG_CRYPTO_CRC32C is not set 1429# CONFIG_CRYPTO_CRC32C is not set
1430# CONFIG_CRYPTO_GHASH is not set
1415# CONFIG_CRYPTO_MD4 is not set 1431# CONFIG_CRYPTO_MD4 is not set
1416CONFIG_CRYPTO_MD5=y 1432CONFIG_CRYPTO_MD5=y
1417# CONFIG_CRYPTO_MICHAEL_MIC is not set 1433# CONFIG_CRYPTO_MICHAEL_MIC is not set
diff --git a/arch/powerpc/configs/83xx/kmeter1_defconfig b/arch/powerpc/configs/83xx/kmeter1_defconfig
index 93ebd443a18f..6694fb73cd99 100644
--- a/arch/powerpc/configs/83xx/kmeter1_defconfig
+++ b/arch/powerpc/configs/83xx/kmeter1_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.31-rc4 3# Linux kernel version: 2.6.32-rc5
4# Wed Jul 29 23:32:03 2009 4# Thu Nov 5 08:20:21 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -35,6 +35,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
35CONFIG_GENERIC_HARDIRQS=y 35CONFIG_GENERIC_HARDIRQS=y
36CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 36CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
38CONFIG_IRQ_PER_CPU=y 39CONFIG_IRQ_PER_CPU=y
39CONFIG_STACKTRACE_SUPPORT=y 40CONFIG_STACKTRACE_SUPPORT=y
40CONFIG_HAVE_LATENCYTOP_SUPPORT=y 41CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -86,11 +87,12 @@ CONFIG_POSIX_MQUEUE_SYSCTL=y
86# 87#
87# RCU Subsystem 88# RCU Subsystem
88# 89#
89CONFIG_CLASSIC_RCU=y 90CONFIG_TREE_RCU=y
90# CONFIG_TREE_RCU is not set 91# CONFIG_TREE_PREEMPT_RCU is not set
91# CONFIG_PREEMPT_RCU is not set 92# CONFIG_RCU_TRACE is not set
93CONFIG_RCU_FANOUT=32
94# CONFIG_RCU_FANOUT_EXACT is not set
92# CONFIG_TREE_RCU_TRACE is not set 95# CONFIG_TREE_RCU_TRACE is not set
93# CONFIG_PREEMPT_RCU_TRACE is not set
94# CONFIG_IKCONFIG is not set 96# CONFIG_IKCONFIG is not set
95CONFIG_LOG_BUF_SHIFT=14 97CONFIG_LOG_BUF_SHIFT=14
96# CONFIG_GROUP_SCHED is not set 98# CONFIG_GROUP_SCHED is not set
@@ -119,20 +121,19 @@ CONFIG_TIMERFD=y
119CONFIG_EVENTFD=y 121CONFIG_EVENTFD=y
120CONFIG_SHMEM=y 122CONFIG_SHMEM=y
121CONFIG_AIO=y 123CONFIG_AIO=y
122CONFIG_HAVE_PERF_COUNTERS=y 124CONFIG_HAVE_PERF_EVENTS=y
123 125
124# 126#
125# Performance Counters 127# Kernel Performance Events And Counters
126# 128#
129# CONFIG_PERF_EVENTS is not set
127# CONFIG_PERF_COUNTERS is not set 130# CONFIG_PERF_COUNTERS is not set
128CONFIG_VM_EVENT_COUNTERS=y 131CONFIG_VM_EVENT_COUNTERS=y
129# CONFIG_STRIP_ASM_SYMS is not set
130CONFIG_COMPAT_BRK=y 132CONFIG_COMPAT_BRK=y
131CONFIG_SLAB=y 133CONFIG_SLAB=y
132# CONFIG_SLUB is not set 134# CONFIG_SLUB is not set
133# CONFIG_SLOB is not set 135# CONFIG_SLOB is not set
134# CONFIG_PROFILING is not set 136# CONFIG_PROFILING is not set
135# CONFIG_MARKERS is not set
136CONFIG_HAVE_OPROFILE=y 137CONFIG_HAVE_OPROFILE=y
137# CONFIG_KPROBES is not set 138# CONFIG_KPROBES is not set
138CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 139CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -140,6 +141,8 @@ CONFIG_HAVE_IOREMAP_PROT=y
140CONFIG_HAVE_KPROBES=y 141CONFIG_HAVE_KPROBES=y
141CONFIG_HAVE_KRETPROBES=y 142CONFIG_HAVE_KRETPROBES=y
142CONFIG_HAVE_ARCH_TRACEHOOK=y 143CONFIG_HAVE_ARCH_TRACEHOOK=y
144CONFIG_HAVE_DMA_ATTRS=y
145CONFIG_HAVE_DMA_API_DEBUG=y
143 146
144# 147#
145# GCOV-based kernel profiling 148# GCOV-based kernel profiling
@@ -250,6 +253,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
250CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 253CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
251# CONFIG_KEXEC is not set 254# CONFIG_KEXEC is not set
252# CONFIG_CRASH_DUMP is not set 255# CONFIG_CRASH_DUMP is not set
256CONFIG_MAX_ACTIVE_REGIONS=32
253CONFIG_ARCH_FLATMEM_ENABLE=y 257CONFIG_ARCH_FLATMEM_ENABLE=y
254CONFIG_ARCH_POPULATES_NODE_MAP=y 258CONFIG_ARCH_POPULATES_NODE_MAP=y
255CONFIG_SELECT_MEMORY_MODEL=y 259CONFIG_SELECT_MEMORY_MODEL=y
@@ -267,6 +271,7 @@ CONFIG_BOUNCE=y
267CONFIG_VIRT_TO_BUS=y 271CONFIG_VIRT_TO_BUS=y
268CONFIG_HAVE_MLOCK=y 272CONFIG_HAVE_MLOCK=y
269CONFIG_HAVE_MLOCKED_PAGE_BIT=y 273CONFIG_HAVE_MLOCKED_PAGE_BIT=y
274# CONFIG_KSM is not set
270CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 275CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
271CONFIG_PPC_4K_PAGES=y 276CONFIG_PPC_4K_PAGES=y
272# CONFIG_PPC_16K_PAGES is not set 277# CONFIG_PPC_16K_PAGES is not set
@@ -348,6 +353,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
348# CONFIG_NETFILTER is not set 353# CONFIG_NETFILTER is not set
349# CONFIG_IP_DCCP is not set 354# CONFIG_IP_DCCP is not set
350# CONFIG_IP_SCTP is not set 355# CONFIG_IP_SCTP is not set
356# CONFIG_RDS is not set
351# CONFIG_TIPC is not set 357# CONFIG_TIPC is not set
352# CONFIG_ATM is not set 358# CONFIG_ATM is not set
353CONFIG_STP=m 359CONFIG_STP=m
@@ -396,9 +402,9 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
396# CONFIG_CONNECTOR is not set 402# CONFIG_CONNECTOR is not set
397CONFIG_MTD=y 403CONFIG_MTD=y
398# CONFIG_MTD_DEBUG is not set 404# CONFIG_MTD_DEBUG is not set
405# CONFIG_MTD_TESTS is not set
399CONFIG_MTD_CONCAT=y 406CONFIG_MTD_CONCAT=y
400CONFIG_MTD_PARTITIONS=y 407CONFIG_MTD_PARTITIONS=y
401# CONFIG_MTD_TESTS is not set
402# CONFIG_MTD_REDBOOT_PARTS is not set 408# CONFIG_MTD_REDBOOT_PARTS is not set
403CONFIG_MTD_CMDLINE_PARTS=y 409CONFIG_MTD_CMDLINE_PARTS=y
404CONFIG_MTD_OF_PARTS=y 410CONFIG_MTD_OF_PARTS=y
@@ -565,18 +571,16 @@ CONFIG_MII=y
565# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set 571# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
566# CONFIG_B44 is not set 572# CONFIG_B44 is not set
567# CONFIG_KS8842 is not set 573# CONFIG_KS8842 is not set
574# CONFIG_KS8851_MLL is not set
575# CONFIG_XILINX_EMACLITE is not set
568CONFIG_NETDEV_1000=y 576CONFIG_NETDEV_1000=y
569CONFIG_FSL_PQ_MDIO=y 577CONFIG_FSL_PQ_MDIO=y
570# CONFIG_GIANFAR is not set 578# CONFIG_GIANFAR is not set
571CONFIG_UCC_GETH=y 579CONFIG_UCC_GETH=y
572# CONFIG_UGETH_MAGIC_PACKET is not set
573# CONFIG_UGETH_TX_ON_DEMAND is not set 580# CONFIG_UGETH_TX_ON_DEMAND is not set
574# CONFIG_MV643XX_ETH is not set 581# CONFIG_MV643XX_ETH is not set
575# CONFIG_NETDEV_10000 is not set 582# CONFIG_NETDEV_10000 is not set
576 583CONFIG_WLAN=y
577#
578# Wireless LAN
579#
580# CONFIG_WLAN_PRE80211 is not set 584# CONFIG_WLAN_PRE80211 is not set
581# CONFIG_WLAN_80211 is not set 585# CONFIG_WLAN_80211 is not set
582 586
@@ -663,6 +667,7 @@ CONFIG_HW_RANDOM=y
663# CONFIG_TCG_TPM is not set 667# CONFIG_TCG_TPM is not set
664CONFIG_I2C=y 668CONFIG_I2C=y
665CONFIG_I2C_BOARDINFO=y 669CONFIG_I2C_BOARDINFO=y
670CONFIG_I2C_COMPAT=y
666CONFIG_I2C_CHARDEV=y 671CONFIG_I2C_CHARDEV=y
667CONFIG_I2C_HELPER_AUTO=y 672CONFIG_I2C_HELPER_AUTO=y
668 673
@@ -693,9 +698,6 @@ CONFIG_I2C_MPC=y
693# Miscellaneous I2C Chip support 698# Miscellaneous I2C Chip support
694# 699#
695# CONFIG_DS1682 is not set 700# CONFIG_DS1682 is not set
696# CONFIG_SENSORS_PCF8574 is not set
697# CONFIG_PCF8575 is not set
698# CONFIG_SENSORS_PCA9539 is not set
699# CONFIG_SENSORS_TSL2550 is not set 701# CONFIG_SENSORS_TSL2550 is not set
700# CONFIG_I2C_DEBUG_CORE is not set 702# CONFIG_I2C_DEBUG_CORE is not set
701# CONFIG_I2C_DEBUG_ALGO is not set 703# CONFIG_I2C_DEBUG_ALGO is not set
@@ -713,7 +715,6 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
713# CONFIG_POWER_SUPPLY is not set 715# CONFIG_POWER_SUPPLY is not set
714# CONFIG_HWMON is not set 716# CONFIG_HWMON is not set
715# CONFIG_THERMAL is not set 717# CONFIG_THERMAL is not set
716# CONFIG_THERMAL_HWMON is not set
717# CONFIG_WATCHDOG is not set 718# CONFIG_WATCHDOG is not set
718CONFIG_SSB_POSSIBLE=y 719CONFIG_SSB_POSSIBLE=y
719 720
@@ -732,6 +733,7 @@ CONFIG_SSB_POSSIBLE=y
732# CONFIG_MFD_TMIO is not set 733# CONFIG_MFD_TMIO is not set
733# CONFIG_PMIC_DA903X is not set 734# CONFIG_PMIC_DA903X is not set
734# CONFIG_MFD_WM8400 is not set 735# CONFIG_MFD_WM8400 is not set
736# CONFIG_MFD_WM831X is not set
735# CONFIG_MFD_WM8350_I2C is not set 737# CONFIG_MFD_WM8350_I2C is not set
736# CONFIG_MFD_PCF50633 is not set 738# CONFIG_MFD_PCF50633 is not set
737# CONFIG_AB3100_CORE is not set 739# CONFIG_AB3100_CORE is not set
@@ -784,6 +786,7 @@ CONFIG_UIO=y
784# CONFIG_GFS2_FS is not set 786# CONFIG_GFS2_FS is not set
785# CONFIG_OCFS2_FS is not set 787# CONFIG_OCFS2_FS is not set
786# CONFIG_BTRFS_FS is not set 788# CONFIG_BTRFS_FS is not set
789# CONFIG_NILFS2_FS is not set
787CONFIG_FILE_LOCKING=y 790CONFIG_FILE_LOCKING=y
788CONFIG_FSNOTIFY=y 791CONFIG_FSNOTIFY=y
789# CONFIG_DNOTIFY is not set 792# CONFIG_DNOTIFY is not set
@@ -854,7 +857,6 @@ CONFIG_JFFS2_RTIME=y
854# CONFIG_ROMFS_FS is not set 857# CONFIG_ROMFS_FS is not set
855# CONFIG_SYSV_FS is not set 858# CONFIG_SYSV_FS is not set
856# CONFIG_UFS_FS is not set 859# CONFIG_UFS_FS is not set
857# CONFIG_NILFS2_FS is not set
858CONFIG_NETWORK_FILESYSTEMS=y 860CONFIG_NETWORK_FILESYSTEMS=y
859CONFIG_NFS_FS=y 861CONFIG_NFS_FS=y
860CONFIG_NFS_V3=y 862CONFIG_NFS_V3=y
@@ -926,6 +928,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
926CONFIG_ENABLE_MUST_CHECK=y 928CONFIG_ENABLE_MUST_CHECK=y
927CONFIG_FRAME_WARN=1024 929CONFIG_FRAME_WARN=1024
928# CONFIG_MAGIC_SYSRQ is not set 930# CONFIG_MAGIC_SYSRQ is not set
931# CONFIG_STRIP_ASM_SYMS is not set
929# CONFIG_UNUSED_SYMBOLS is not set 932# CONFIG_UNUSED_SYMBOLS is not set
930CONFIG_DEBUG_FS=y 933CONFIG_DEBUG_FS=y
931# CONFIG_HEADERS_CHECK is not set 934# CONFIG_HEADERS_CHECK is not set
@@ -942,6 +945,7 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
942CONFIG_TRACING_SUPPORT=y 945CONFIG_TRACING_SUPPORT=y
943# CONFIG_FTRACE is not set 946# CONFIG_FTRACE is not set
944# CONFIG_DYNAMIC_DEBUG is not set 947# CONFIG_DYNAMIC_DEBUG is not set
948# CONFIG_DMA_API_DEBUG is not set
945# CONFIG_SAMPLES is not set 949# CONFIG_SAMPLES is not set
946CONFIG_HAVE_ARCH_KGDB=y 950CONFIG_HAVE_ARCH_KGDB=y
947# CONFIG_PPC_DISABLE_WERROR is not set 951# CONFIG_PPC_DISABLE_WERROR is not set
diff --git a/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig b/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig
index ff33a7db2eab..86df19f041a4 100644
--- a/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig
+++ b/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.31-rc4 3# Linux kernel version: 2.6.32-rc5
4# Wed Jul 29 23:32:04 2009 4# Thu Nov 5 08:20:22 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -35,6 +35,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
35CONFIG_GENERIC_HARDIRQS=y 35CONFIG_GENERIC_HARDIRQS=y
36CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 36CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
38CONFIG_IRQ_PER_CPU=y 39CONFIG_IRQ_PER_CPU=y
39CONFIG_STACKTRACE_SUPPORT=y 40CONFIG_STACKTRACE_SUPPORT=y
40CONFIG_HAVE_LATENCYTOP_SUPPORT=y 41CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -84,11 +85,12 @@ CONFIG_SYSVIPC_SYSCTL=y
84# 85#
85# RCU Subsystem 86# RCU Subsystem
86# 87#
87CONFIG_CLASSIC_RCU=y 88CONFIG_TREE_RCU=y
88# CONFIG_TREE_RCU is not set 89# CONFIG_TREE_PREEMPT_RCU is not set
89# CONFIG_PREEMPT_RCU is not set 90# CONFIG_RCU_TRACE is not set
91CONFIG_RCU_FANOUT=32
92# CONFIG_RCU_FANOUT_EXACT is not set
90# CONFIG_TREE_RCU_TRACE is not set 93# CONFIG_TREE_RCU_TRACE is not set
91# CONFIG_PREEMPT_RCU_TRACE is not set
92# CONFIG_IKCONFIG is not set 94# CONFIG_IKCONFIG is not set
93CONFIG_LOG_BUF_SHIFT=14 95CONFIG_LOG_BUF_SHIFT=14
94CONFIG_GROUP_SCHED=y 96CONFIG_GROUP_SCHED=y
@@ -124,28 +126,29 @@ CONFIG_TIMERFD=y
124CONFIG_EVENTFD=y 126CONFIG_EVENTFD=y
125CONFIG_SHMEM=y 127CONFIG_SHMEM=y
126CONFIG_AIO=y 128CONFIG_AIO=y
127CONFIG_HAVE_PERF_COUNTERS=y 129CONFIG_HAVE_PERF_EVENTS=y
128 130
129# 131#
130# Performance Counters 132# Kernel Performance Events And Counters
131# 133#
134# CONFIG_PERF_EVENTS is not set
132# CONFIG_PERF_COUNTERS is not set 135# CONFIG_PERF_COUNTERS is not set
133CONFIG_VM_EVENT_COUNTERS=y 136CONFIG_VM_EVENT_COUNTERS=y
134CONFIG_PCI_QUIRKS=y 137CONFIG_PCI_QUIRKS=y
135CONFIG_SLUB_DEBUG=y 138CONFIG_SLUB_DEBUG=y
136# CONFIG_STRIP_ASM_SYMS is not set
137CONFIG_COMPAT_BRK=y 139CONFIG_COMPAT_BRK=y
138# CONFIG_SLAB is not set 140# CONFIG_SLAB is not set
139CONFIG_SLUB=y 141CONFIG_SLUB=y
140# CONFIG_SLOB is not set 142# CONFIG_SLOB is not set
141# CONFIG_PROFILING is not set 143# CONFIG_PROFILING is not set
142# CONFIG_MARKERS is not set
143CONFIG_HAVE_OPROFILE=y 144CONFIG_HAVE_OPROFILE=y
144CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 145CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
145CONFIG_HAVE_IOREMAP_PROT=y 146CONFIG_HAVE_IOREMAP_PROT=y
146CONFIG_HAVE_KPROBES=y 147CONFIG_HAVE_KPROBES=y
147CONFIG_HAVE_KRETPROBES=y 148CONFIG_HAVE_KRETPROBES=y
148CONFIG_HAVE_ARCH_TRACEHOOK=y 149CONFIG_HAVE_ARCH_TRACEHOOK=y
150CONFIG_HAVE_DMA_ATTRS=y
151CONFIG_HAVE_DMA_API_DEBUG=y
149 152
150# 153#
151# GCOV-based kernel profiling 154# GCOV-based kernel profiling
@@ -256,6 +259,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
256CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 259CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
257# CONFIG_KEXEC is not set 260# CONFIG_KEXEC is not set
258# CONFIG_CRASH_DUMP is not set 261# CONFIG_CRASH_DUMP is not set
262CONFIG_MAX_ACTIVE_REGIONS=32
259CONFIG_ARCH_FLATMEM_ENABLE=y 263CONFIG_ARCH_FLATMEM_ENABLE=y
260CONFIG_ARCH_POPULATES_NODE_MAP=y 264CONFIG_ARCH_POPULATES_NODE_MAP=y
261CONFIG_SELECT_MEMORY_MODEL=y 265CONFIG_SELECT_MEMORY_MODEL=y
@@ -273,6 +277,7 @@ CONFIG_BOUNCE=y
273CONFIG_VIRT_TO_BUS=y 277CONFIG_VIRT_TO_BUS=y
274CONFIG_HAVE_MLOCK=y 278CONFIG_HAVE_MLOCK=y
275CONFIG_HAVE_MLOCKED_PAGE_BIT=y 279CONFIG_HAVE_MLOCKED_PAGE_BIT=y
280# CONFIG_KSM is not set
276CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 281CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
277CONFIG_PPC_4K_PAGES=y 282CONFIG_PPC_4K_PAGES=y
278# CONFIG_PPC_16K_PAGES is not set 283# CONFIG_PPC_16K_PAGES is not set
@@ -369,6 +374,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
369# CONFIG_NETFILTER is not set 374# CONFIG_NETFILTER is not set
370# CONFIG_IP_DCCP is not set 375# CONFIG_IP_DCCP is not set
371# CONFIG_IP_SCTP is not set 376# CONFIG_IP_SCTP is not set
377# CONFIG_RDS is not set
372# CONFIG_TIPC is not set 378# CONFIG_TIPC is not set
373# CONFIG_ATM is not set 379# CONFIG_ATM is not set
374# CONFIG_BRIDGE is not set 380# CONFIG_BRIDGE is not set
@@ -398,6 +404,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
398# CONFIG_AF_RXRPC is not set 404# CONFIG_AF_RXRPC is not set
399CONFIG_WIRELESS=y 405CONFIG_WIRELESS=y
400# CONFIG_CFG80211 is not set 406# CONFIG_CFG80211 is not set
407CONFIG_CFG80211_DEFAULT_PS_VALUE=0
401CONFIG_WIRELESS_OLD_REGULATORY=y 408CONFIG_WIRELESS_OLD_REGULATORY=y
402# CONFIG_WIRELESS_EXT is not set 409# CONFIG_WIRELESS_EXT is not set
403# CONFIG_LIB80211 is not set 410# CONFIG_LIB80211 is not set
@@ -405,7 +412,6 @@ CONFIG_WIRELESS_OLD_REGULATORY=y
405# 412#
406# CFG80211 needs to be enabled for MAC80211 413# CFG80211 needs to be enabled for MAC80211
407# 414#
408CONFIG_MAC80211_DEFAULT_PS_VALUE=0
409# CONFIG_WIMAX is not set 415# CONFIG_WIMAX is not set
410# CONFIG_RFKILL is not set 416# CONFIG_RFKILL is not set
411# CONFIG_NET_9P is not set 417# CONFIG_NET_9P is not set
@@ -418,6 +424,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
418# Generic Driver Options 424# Generic Driver Options
419# 425#
420CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 426CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
427# CONFIG_DEVTMPFS is not set
421CONFIG_STANDALONE=y 428CONFIG_STANDALONE=y
422CONFIG_PREVENT_FIRMWARE_BUILD=y 429CONFIG_PREVENT_FIRMWARE_BUILD=y
423# CONFIG_FW_LOADER is not set 430# CONFIG_FW_LOADER is not set
@@ -427,9 +434,9 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
427# CONFIG_CONNECTOR is not set 434# CONFIG_CONNECTOR is not set
428CONFIG_MTD=y 435CONFIG_MTD=y
429# CONFIG_MTD_DEBUG is not set 436# CONFIG_MTD_DEBUG is not set
437# CONFIG_MTD_TESTS is not set
430# CONFIG_MTD_CONCAT is not set 438# CONFIG_MTD_CONCAT is not set
431CONFIG_MTD_PARTITIONS=y 439CONFIG_MTD_PARTITIONS=y
432# CONFIG_MTD_TESTS is not set
433# CONFIG_MTD_REDBOOT_PARTS is not set 440# CONFIG_MTD_REDBOOT_PARTS is not set
434# CONFIG_MTD_CMDLINE_PARTS is not set 441# CONFIG_MTD_CMDLINE_PARTS is not set
435CONFIG_MTD_OF_PARTS=y 442CONFIG_MTD_OF_PARTS=y
@@ -488,6 +495,7 @@ CONFIG_MTD_PHYSMAP_OF=y
488# CONFIG_MTD_PMC551 is not set 495# CONFIG_MTD_PMC551 is not set
489# CONFIG_MTD_DATAFLASH is not set 496# CONFIG_MTD_DATAFLASH is not set
490# CONFIG_MTD_M25P80 is not set 497# CONFIG_MTD_M25P80 is not set
498# CONFIG_MTD_SST25L is not set
491# CONFIG_MTD_SLRAM is not set 499# CONFIG_MTD_SLRAM is not set
492# CONFIG_MTD_PHRAM is not set 500# CONFIG_MTD_PHRAM is not set
493# CONFIG_MTD_MTDRAM is not set 501# CONFIG_MTD_MTDRAM is not set
@@ -605,6 +613,7 @@ CONFIG_SCSI_LOWLEVEL=y
605# CONFIG_ISCSI_TCP is not set 613# CONFIG_ISCSI_TCP is not set
606# CONFIG_SCSI_CXGB3_ISCSI is not set 614# CONFIG_SCSI_CXGB3_ISCSI is not set
607# CONFIG_SCSI_BNX2_ISCSI is not set 615# CONFIG_SCSI_BNX2_ISCSI is not set
616# CONFIG_BE2ISCSI is not set
608# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 617# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
609# CONFIG_SCSI_3W_9XXX is not set 618# CONFIG_SCSI_3W_9XXX is not set
610# CONFIG_SCSI_ACARD is not set 619# CONFIG_SCSI_ACARD is not set
@@ -643,7 +652,9 @@ CONFIG_SCSI_LOWLEVEL=y
643# CONFIG_SCSI_DC390T is not set 652# CONFIG_SCSI_DC390T is not set
644# CONFIG_SCSI_NSP32 is not set 653# CONFIG_SCSI_NSP32 is not set
645# CONFIG_SCSI_DEBUG is not set 654# CONFIG_SCSI_DEBUG is not set
655# CONFIG_SCSI_PMCRAID is not set
646# CONFIG_SCSI_SRP is not set 656# CONFIG_SCSI_SRP is not set
657# CONFIG_SCSI_BFA_FC is not set
647# CONFIG_SCSI_DH is not set 658# CONFIG_SCSI_DH is not set
648# CONFIG_SCSI_OSD_INITIATOR is not set 659# CONFIG_SCSI_OSD_INITIATOR is not set
649# CONFIG_ATA is not set 660# CONFIG_ATA is not set
@@ -741,9 +752,11 @@ CONFIG_E100=y
741# CONFIG_TLAN is not set 752# CONFIG_TLAN is not set
742# CONFIG_KS8842 is not set 753# CONFIG_KS8842 is not set
743# CONFIG_KS8851 is not set 754# CONFIG_KS8851 is not set
755# CONFIG_KS8851_MLL is not set
744# CONFIG_VIA_RHINE is not set 756# CONFIG_VIA_RHINE is not set
745# CONFIG_SC92031 is not set 757# CONFIG_SC92031 is not set
746# CONFIG_ATL2 is not set 758# CONFIG_ATL2 is not set
759# CONFIG_XILINX_EMACLITE is not set
747CONFIG_NETDEV_1000=y 760CONFIG_NETDEV_1000=y
748# CONFIG_ACENIC is not set 761# CONFIG_ACENIC is not set
749# CONFIG_DL2K is not set 762# CONFIG_DL2K is not set
@@ -791,10 +804,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
791# CONFIG_SFC is not set 804# CONFIG_SFC is not set
792# CONFIG_BE2NET is not set 805# CONFIG_BE2NET is not set
793# CONFIG_TR is not set 806# CONFIG_TR is not set
794 807CONFIG_WLAN=y
795#
796# Wireless LAN
797#
798# CONFIG_WLAN_PRE80211 is not set 808# CONFIG_WLAN_PRE80211 is not set
799# CONFIG_WLAN_80211 is not set 809# CONFIG_WLAN_80211 is not set
800 810
@@ -896,6 +906,7 @@ CONFIG_HW_RANDOM=y
896CONFIG_DEVPORT=y 906CONFIG_DEVPORT=y
897CONFIG_I2C=y 907CONFIG_I2C=y
898CONFIG_I2C_BOARDINFO=y 908CONFIG_I2C_BOARDINFO=y
909CONFIG_I2C_COMPAT=y
899CONFIG_I2C_CHARDEV=y 910CONFIG_I2C_CHARDEV=y
900CONFIG_I2C_HELPER_AUTO=y 911CONFIG_I2C_HELPER_AUTO=y
901 912
@@ -950,9 +961,6 @@ CONFIG_I2C_MPC=y
950# Miscellaneous I2C Chip support 961# Miscellaneous I2C Chip support
951# 962#
952# CONFIG_DS1682 is not set 963# CONFIG_DS1682 is not set
953# CONFIG_SENSORS_PCF8574 is not set
954# CONFIG_PCF8575 is not set
955# CONFIG_SENSORS_PCA9539 is not set
956# CONFIG_SENSORS_TSL2550 is not set 964# CONFIG_SENSORS_TSL2550 is not set
957# CONFIG_I2C_DEBUG_CORE is not set 965# CONFIG_I2C_DEBUG_CORE is not set
958# CONFIG_I2C_DEBUG_ALGO is not set 966# CONFIG_I2C_DEBUG_ALGO is not set
@@ -984,6 +992,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
984# CONFIG_POWER_SUPPLY is not set 992# CONFIG_POWER_SUPPLY is not set
985CONFIG_HWMON=y 993CONFIG_HWMON=y
986# CONFIG_HWMON_VID is not set 994# CONFIG_HWMON_VID is not set
995# CONFIG_HWMON_DEBUG_CHIP is not set
996
997#
998# Native drivers
999#
987# CONFIG_SENSORS_AD7414 is not set 1000# CONFIG_SENSORS_AD7414 is not set
988# CONFIG_SENSORS_AD7418 is not set 1001# CONFIG_SENSORS_AD7418 is not set
989# CONFIG_SENSORS_ADCXX is not set 1002# CONFIG_SENSORS_ADCXX is not set
@@ -1036,6 +1049,7 @@ CONFIG_HWMON=y
1036# CONFIG_SENSORS_ADS7828 is not set 1049# CONFIG_SENSORS_ADS7828 is not set
1037# CONFIG_SENSORS_THMC50 is not set 1050# CONFIG_SENSORS_THMC50 is not set
1038# CONFIG_SENSORS_TMP401 is not set 1051# CONFIG_SENSORS_TMP401 is not set
1052# CONFIG_SENSORS_TMP421 is not set
1039# CONFIG_SENSORS_VIA686A is not set 1053# CONFIG_SENSORS_VIA686A is not set
1040# CONFIG_SENSORS_VT1211 is not set 1054# CONFIG_SENSORS_VT1211 is not set
1041# CONFIG_SENSORS_VT8231 is not set 1055# CONFIG_SENSORS_VT8231 is not set
@@ -1048,9 +1062,7 @@ CONFIG_HWMON=y
1048# CONFIG_SENSORS_W83627HF is not set 1062# CONFIG_SENSORS_W83627HF is not set
1049# CONFIG_SENSORS_W83627EHF is not set 1063# CONFIG_SENSORS_W83627EHF is not set
1050# CONFIG_SENSORS_LIS3_SPI is not set 1064# CONFIG_SENSORS_LIS3_SPI is not set
1051# CONFIG_HWMON_DEBUG_CHIP is not set
1052# CONFIG_THERMAL is not set 1065# CONFIG_THERMAL is not set
1053# CONFIG_THERMAL_HWMON is not set
1054CONFIG_WATCHDOG=y 1066CONFIG_WATCHDOG=y
1055# CONFIG_WATCHDOG_NOWAYOUT is not set 1067# CONFIG_WATCHDOG_NOWAYOUT is not set
1056 1068
@@ -1088,8 +1100,10 @@ CONFIG_SSB_POSSIBLE=y
1088# CONFIG_MFD_TMIO is not set 1100# CONFIG_MFD_TMIO is not set
1089# CONFIG_PMIC_DA903X is not set 1101# CONFIG_PMIC_DA903X is not set
1090# CONFIG_MFD_WM8400 is not set 1102# CONFIG_MFD_WM8400 is not set
1103# CONFIG_MFD_WM831X is not set
1091# CONFIG_MFD_WM8350_I2C is not set 1104# CONFIG_MFD_WM8350_I2C is not set
1092# CONFIG_MFD_PCF50633 is not set 1105# CONFIG_MFD_PCF50633 is not set
1106# CONFIG_MFD_MC13783 is not set
1093# CONFIG_AB3100_CORE is not set 1107# CONFIG_AB3100_CORE is not set
1094# CONFIG_EZX_PCAP is not set 1108# CONFIG_EZX_PCAP is not set
1095# CONFIG_REGULATOR is not set 1109# CONFIG_REGULATOR is not set
@@ -1099,6 +1113,7 @@ CONFIG_SSB_POSSIBLE=y
1099# Graphics support 1113# Graphics support
1100# 1114#
1101# CONFIG_AGP is not set 1115# CONFIG_AGP is not set
1116CONFIG_VGA_ARB=y
1102# CONFIG_DRM is not set 1117# CONFIG_DRM is not set
1103# CONFIG_VGASTATE is not set 1118# CONFIG_VGASTATE is not set
1104CONFIG_VIDEO_OUTPUT_CONTROL=m 1119CONFIG_VIDEO_OUTPUT_CONTROL=m
@@ -1112,7 +1127,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m
1112# CONFIG_SOUND is not set 1127# CONFIG_SOUND is not set
1113CONFIG_HID_SUPPORT=y 1128CONFIG_HID_SUPPORT=y
1114CONFIG_HID=y 1129CONFIG_HID=y
1115# CONFIG_HID_DEBUG is not set
1116# CONFIG_HIDRAW is not set 1130# CONFIG_HIDRAW is not set
1117 1131
1118# 1132#
@@ -1164,6 +1178,7 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y
1164# CONFIG_USB_OXU210HP_HCD is not set 1178# CONFIG_USB_OXU210HP_HCD is not set
1165# CONFIG_USB_ISP116X_HCD is not set 1179# CONFIG_USB_ISP116X_HCD is not set
1166# CONFIG_USB_ISP1760_HCD is not set 1180# CONFIG_USB_ISP1760_HCD is not set
1181# CONFIG_USB_ISP1362_HCD is not set
1167CONFIG_USB_OHCI_HCD=y 1182CONFIG_USB_OHCI_HCD=y
1168CONFIG_USB_OHCI_HCD_PPC_OF_BE=y 1183CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
1169# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set 1184# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set
@@ -1255,6 +1270,7 @@ CONFIG_USB_GADGET_SELECTED=y
1255# CONFIG_USB_GADGET_LH7A40X is not set 1270# CONFIG_USB_GADGET_LH7A40X is not set
1256# CONFIG_USB_GADGET_OMAP is not set 1271# CONFIG_USB_GADGET_OMAP is not set
1257# CONFIG_USB_GADGET_PXA25X is not set 1272# CONFIG_USB_GADGET_PXA25X is not set
1273# CONFIG_USB_GADGET_R8A66597 is not set
1258# CONFIG_USB_GADGET_PXA27X is not set 1274# CONFIG_USB_GADGET_PXA27X is not set
1259# CONFIG_USB_GADGET_S3C_HSOTG is not set 1275# CONFIG_USB_GADGET_S3C_HSOTG is not set
1260# CONFIG_USB_GADGET_IMX is not set 1276# CONFIG_USB_GADGET_IMX is not set
@@ -1273,6 +1289,7 @@ CONFIG_USB_GADGET_DUALSPEED=y
1273# CONFIG_USB_AUDIO is not set 1289# CONFIG_USB_AUDIO is not set
1274CONFIG_USB_ETH=y 1290CONFIG_USB_ETH=y
1275CONFIG_USB_ETH_RNDIS=y 1291CONFIG_USB_ETH_RNDIS=y
1292# CONFIG_USB_ETH_EEM is not set
1276# CONFIG_USB_GADGETFS is not set 1293# CONFIG_USB_GADGETFS is not set
1277# CONFIG_USB_FILE_STORAGE is not set 1294# CONFIG_USB_FILE_STORAGE is not set
1278# CONFIG_USB_G_SERIAL is not set 1295# CONFIG_USB_G_SERIAL is not set
@@ -1334,6 +1351,7 @@ CONFIG_RTC_DRV_DS1307=y
1334# CONFIG_RTC_DRV_R9701 is not set 1351# CONFIG_RTC_DRV_R9701 is not set
1335# CONFIG_RTC_DRV_RS5C348 is not set 1352# CONFIG_RTC_DRV_RS5C348 is not set
1336# CONFIG_RTC_DRV_DS3234 is not set 1353# CONFIG_RTC_DRV_DS3234 is not set
1354# CONFIG_RTC_DRV_PCF2123 is not set
1337 1355
1338# 1356#
1339# Platform RTC drivers 1357# Platform RTC drivers
@@ -1384,6 +1402,7 @@ CONFIG_FS_MBCACHE=y
1384# CONFIG_GFS2_FS is not set 1402# CONFIG_GFS2_FS is not set
1385# CONFIG_OCFS2_FS is not set 1403# CONFIG_OCFS2_FS is not set
1386# CONFIG_BTRFS_FS is not set 1404# CONFIG_BTRFS_FS is not set
1405# CONFIG_NILFS2_FS is not set
1387CONFIG_FILE_LOCKING=y 1406CONFIG_FILE_LOCKING=y
1388CONFIG_FSNOTIFY=y 1407CONFIG_FSNOTIFY=y
1389CONFIG_DNOTIFY=y 1408CONFIG_DNOTIFY=y
@@ -1453,7 +1472,6 @@ CONFIG_JFFS2_RTIME=y
1453# CONFIG_ROMFS_FS is not set 1472# CONFIG_ROMFS_FS is not set
1454# CONFIG_SYSV_FS is not set 1473# CONFIG_SYSV_FS is not set
1455# CONFIG_UFS_FS is not set 1474# CONFIG_UFS_FS is not set
1456# CONFIG_NILFS2_FS is not set
1457CONFIG_NETWORK_FILESYSTEMS=y 1475CONFIG_NETWORK_FILESYSTEMS=y
1458CONFIG_NFS_FS=y 1476CONFIG_NFS_FS=y
1459CONFIG_NFS_V3=y 1477CONFIG_NFS_V3=y
@@ -1569,6 +1587,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
1569CONFIG_ENABLE_MUST_CHECK=y 1587CONFIG_ENABLE_MUST_CHECK=y
1570CONFIG_FRAME_WARN=1024 1588CONFIG_FRAME_WARN=1024
1571# CONFIG_MAGIC_SYSRQ is not set 1589# CONFIG_MAGIC_SYSRQ is not set
1590# CONFIG_STRIP_ASM_SYMS is not set
1572# CONFIG_UNUSED_SYMBOLS is not set 1591# CONFIG_UNUSED_SYMBOLS is not set
1573# CONFIG_DEBUG_FS is not set 1592# CONFIG_DEBUG_FS is not set
1574# CONFIG_HEADERS_CHECK is not set 1593# CONFIG_HEADERS_CHECK is not set
@@ -1586,6 +1605,7 @@ CONFIG_SCHED_DEBUG=y
1586# CONFIG_DEBUG_OBJECTS is not set 1605# CONFIG_DEBUG_OBJECTS is not set
1587# CONFIG_SLUB_DEBUG_ON is not set 1606# CONFIG_SLUB_DEBUG_ON is not set
1588# CONFIG_SLUB_STATS is not set 1607# CONFIG_SLUB_STATS is not set
1608# CONFIG_DEBUG_KMEMLEAK is not set
1589# CONFIG_DEBUG_RT_MUTEXES is not set 1609# CONFIG_DEBUG_RT_MUTEXES is not set
1590# CONFIG_RT_MUTEX_TESTER is not set 1610# CONFIG_RT_MUTEX_TESTER is not set
1591# CONFIG_DEBUG_SPINLOCK is not set 1611# CONFIG_DEBUG_SPINLOCK is not set
@@ -1604,10 +1624,12 @@ CONFIG_SCHED_DEBUG=y
1604# CONFIG_DEBUG_LIST is not set 1624# CONFIG_DEBUG_LIST is not set
1605# CONFIG_DEBUG_SG is not set 1625# CONFIG_DEBUG_SG is not set
1606# CONFIG_DEBUG_NOTIFIERS is not set 1626# CONFIG_DEBUG_NOTIFIERS is not set
1627# CONFIG_DEBUG_CREDENTIALS is not set
1607# CONFIG_RCU_TORTURE_TEST is not set 1628# CONFIG_RCU_TORTURE_TEST is not set
1608# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1629# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1609# CONFIG_BACKTRACE_SELF_TEST is not set 1630# CONFIG_BACKTRACE_SELF_TEST is not set
1610# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 1631# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1632# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
1611# CONFIG_FAULT_INJECTION is not set 1633# CONFIG_FAULT_INJECTION is not set
1612# CONFIG_LATENCYTOP is not set 1634# CONFIG_LATENCYTOP is not set
1613CONFIG_SYSCTL_SYSCALL_CHECK=y 1635CONFIG_SYSCTL_SYSCALL_CHECK=y
@@ -1630,10 +1652,10 @@ CONFIG_BRANCH_PROFILE_NONE=y
1630# CONFIG_KMEMTRACE is not set 1652# CONFIG_KMEMTRACE is not set
1631# CONFIG_WORKQUEUE_TRACER is not set 1653# CONFIG_WORKQUEUE_TRACER is not set
1632# CONFIG_BLK_DEV_IO_TRACE is not set 1654# CONFIG_BLK_DEV_IO_TRACE is not set
1655# CONFIG_DMA_API_DEBUG is not set
1633# CONFIG_SAMPLES is not set 1656# CONFIG_SAMPLES is not set
1634CONFIG_HAVE_ARCH_KGDB=y 1657CONFIG_HAVE_ARCH_KGDB=y
1635# CONFIG_KGDB is not set 1658# CONFIG_KGDB is not set
1636# CONFIG_KMEMCHECK is not set
1637# CONFIG_PPC_DISABLE_WERROR is not set 1659# CONFIG_PPC_DISABLE_WERROR is not set
1638CONFIG_PPC_WERROR=y 1660CONFIG_PPC_WERROR=y
1639CONFIG_PRINT_STACK_DEPTH=64 1661CONFIG_PRINT_STACK_DEPTH=64
@@ -1660,7 +1682,6 @@ CONFIG_CRYPTO=y
1660# 1682#
1661# Crypto core or helper 1683# Crypto core or helper
1662# 1684#
1663# CONFIG_CRYPTO_FIPS is not set
1664CONFIG_CRYPTO_ALGAPI=y 1685CONFIG_CRYPTO_ALGAPI=y
1665CONFIG_CRYPTO_ALGAPI2=y 1686CONFIG_CRYPTO_ALGAPI2=y
1666CONFIG_CRYPTO_AEAD2=y 1687CONFIG_CRYPTO_AEAD2=y
@@ -1702,11 +1723,13 @@ CONFIG_CRYPTO_PCBC=m
1702# 1723#
1703# CONFIG_CRYPTO_HMAC is not set 1724# CONFIG_CRYPTO_HMAC is not set
1704# CONFIG_CRYPTO_XCBC is not set 1725# CONFIG_CRYPTO_XCBC is not set
1726# CONFIG_CRYPTO_VMAC is not set
1705 1727
1706# 1728#
1707# Digest 1729# Digest
1708# 1730#
1709# CONFIG_CRYPTO_CRC32C is not set 1731# CONFIG_CRYPTO_CRC32C is not set
1732# CONFIG_CRYPTO_GHASH is not set
1710# CONFIG_CRYPTO_MD4 is not set 1733# CONFIG_CRYPTO_MD4 is not set
1711CONFIG_CRYPTO_MD5=y 1734CONFIG_CRYPTO_MD5=y
1712# CONFIG_CRYPTO_MICHAEL_MIC is not set 1735# CONFIG_CRYPTO_MICHAEL_MIC is not set
diff --git a/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig b/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig
index 76237d466702..7bf71d577033 100644
--- a/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig
+++ b/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.31-rc4 3# Linux kernel version: 2.6.32-rc5
4# Wed Jul 29 23:32:05 2009 4# Thu Nov 5 08:20:23 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -35,6 +35,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
35CONFIG_GENERIC_HARDIRQS=y 35CONFIG_GENERIC_HARDIRQS=y
36CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 36CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
38CONFIG_IRQ_PER_CPU=y 39CONFIG_IRQ_PER_CPU=y
39CONFIG_STACKTRACE_SUPPORT=y 40CONFIG_STACKTRACE_SUPPORT=y
40CONFIG_HAVE_LATENCYTOP_SUPPORT=y 41CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -84,11 +85,12 @@ CONFIG_SYSVIPC_SYSCTL=y
84# 85#
85# RCU Subsystem 86# RCU Subsystem
86# 87#
87CONFIG_CLASSIC_RCU=y 88CONFIG_TREE_RCU=y
88# CONFIG_TREE_RCU is not set 89# CONFIG_TREE_PREEMPT_RCU is not set
89# CONFIG_PREEMPT_RCU is not set 90# CONFIG_RCU_TRACE is not set
91CONFIG_RCU_FANOUT=32
92# CONFIG_RCU_FANOUT_EXACT is not set
90# CONFIG_TREE_RCU_TRACE is not set 93# CONFIG_TREE_RCU_TRACE is not set
91# CONFIG_PREEMPT_RCU_TRACE is not set
92# CONFIG_IKCONFIG is not set 94# CONFIG_IKCONFIG is not set
93CONFIG_LOG_BUF_SHIFT=14 95CONFIG_LOG_BUF_SHIFT=14
94CONFIG_GROUP_SCHED=y 96CONFIG_GROUP_SCHED=y
@@ -124,28 +126,29 @@ CONFIG_TIMERFD=y
124CONFIG_EVENTFD=y 126CONFIG_EVENTFD=y
125CONFIG_SHMEM=y 127CONFIG_SHMEM=y
126CONFIG_AIO=y 128CONFIG_AIO=y
127CONFIG_HAVE_PERF_COUNTERS=y 129CONFIG_HAVE_PERF_EVENTS=y
128 130
129# 131#
130# Performance Counters 132# Kernel Performance Events And Counters
131# 133#
134# CONFIG_PERF_EVENTS is not set
132# CONFIG_PERF_COUNTERS is not set 135# CONFIG_PERF_COUNTERS is not set
133CONFIG_VM_EVENT_COUNTERS=y 136CONFIG_VM_EVENT_COUNTERS=y
134CONFIG_PCI_QUIRKS=y 137CONFIG_PCI_QUIRKS=y
135CONFIG_SLUB_DEBUG=y 138CONFIG_SLUB_DEBUG=y
136# CONFIG_STRIP_ASM_SYMS is not set
137CONFIG_COMPAT_BRK=y 139CONFIG_COMPAT_BRK=y
138# CONFIG_SLAB is not set 140# CONFIG_SLAB is not set
139CONFIG_SLUB=y 141CONFIG_SLUB=y
140# CONFIG_SLOB is not set 142# CONFIG_SLOB is not set
141# CONFIG_PROFILING is not set 143# CONFIG_PROFILING is not set
142# CONFIG_MARKERS is not set
143CONFIG_HAVE_OPROFILE=y 144CONFIG_HAVE_OPROFILE=y
144CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 145CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
145CONFIG_HAVE_IOREMAP_PROT=y 146CONFIG_HAVE_IOREMAP_PROT=y
146CONFIG_HAVE_KPROBES=y 147CONFIG_HAVE_KPROBES=y
147CONFIG_HAVE_KRETPROBES=y 148CONFIG_HAVE_KRETPROBES=y
148CONFIG_HAVE_ARCH_TRACEHOOK=y 149CONFIG_HAVE_ARCH_TRACEHOOK=y
150CONFIG_HAVE_DMA_ATTRS=y
151CONFIG_HAVE_DMA_API_DEBUG=y
149 152
150# 153#
151# GCOV-based kernel profiling 154# GCOV-based kernel profiling
@@ -256,6 +259,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
256CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 259CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
257# CONFIG_KEXEC is not set 260# CONFIG_KEXEC is not set
258# CONFIG_CRASH_DUMP is not set 261# CONFIG_CRASH_DUMP is not set
262CONFIG_MAX_ACTIVE_REGIONS=32
259CONFIG_ARCH_FLATMEM_ENABLE=y 263CONFIG_ARCH_FLATMEM_ENABLE=y
260CONFIG_ARCH_POPULATES_NODE_MAP=y 264CONFIG_ARCH_POPULATES_NODE_MAP=y
261CONFIG_SELECT_MEMORY_MODEL=y 265CONFIG_SELECT_MEMORY_MODEL=y
@@ -273,6 +277,7 @@ CONFIG_BOUNCE=y
273CONFIG_VIRT_TO_BUS=y 277CONFIG_VIRT_TO_BUS=y
274CONFIG_HAVE_MLOCK=y 278CONFIG_HAVE_MLOCK=y
275CONFIG_HAVE_MLOCKED_PAGE_BIT=y 279CONFIG_HAVE_MLOCKED_PAGE_BIT=y
280# CONFIG_KSM is not set
276CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 281CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
277CONFIG_PPC_4K_PAGES=y 282CONFIG_PPC_4K_PAGES=y
278# CONFIG_PPC_16K_PAGES is not set 283# CONFIG_PPC_16K_PAGES is not set
@@ -369,6 +374,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
369# CONFIG_NETFILTER is not set 374# CONFIG_NETFILTER is not set
370# CONFIG_IP_DCCP is not set 375# CONFIG_IP_DCCP is not set
371# CONFIG_IP_SCTP is not set 376# CONFIG_IP_SCTP is not set
377# CONFIG_RDS is not set
372# CONFIG_TIPC is not set 378# CONFIG_TIPC is not set
373# CONFIG_ATM is not set 379# CONFIG_ATM is not set
374# CONFIG_BRIDGE is not set 380# CONFIG_BRIDGE is not set
@@ -398,6 +404,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
398# CONFIG_AF_RXRPC is not set 404# CONFIG_AF_RXRPC is not set
399CONFIG_WIRELESS=y 405CONFIG_WIRELESS=y
400# CONFIG_CFG80211 is not set 406# CONFIG_CFG80211 is not set
407CONFIG_CFG80211_DEFAULT_PS_VALUE=0
401CONFIG_WIRELESS_OLD_REGULATORY=y 408CONFIG_WIRELESS_OLD_REGULATORY=y
402# CONFIG_WIRELESS_EXT is not set 409# CONFIG_WIRELESS_EXT is not set
403# CONFIG_LIB80211 is not set 410# CONFIG_LIB80211 is not set
@@ -405,7 +412,6 @@ CONFIG_WIRELESS_OLD_REGULATORY=y
405# 412#
406# CFG80211 needs to be enabled for MAC80211 413# CFG80211 needs to be enabled for MAC80211
407# 414#
408CONFIG_MAC80211_DEFAULT_PS_VALUE=0
409# CONFIG_WIMAX is not set 415# CONFIG_WIMAX is not set
410# CONFIG_RFKILL is not set 416# CONFIG_RFKILL is not set
411# CONFIG_NET_9P is not set 417# CONFIG_NET_9P is not set
@@ -418,6 +424,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
418# Generic Driver Options 424# Generic Driver Options
419# 425#
420CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 426CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
427# CONFIG_DEVTMPFS is not set
421CONFIG_STANDALONE=y 428CONFIG_STANDALONE=y
422CONFIG_PREVENT_FIRMWARE_BUILD=y 429CONFIG_PREVENT_FIRMWARE_BUILD=y
423# CONFIG_FW_LOADER is not set 430# CONFIG_FW_LOADER is not set
@@ -427,9 +434,9 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
427# CONFIG_CONNECTOR is not set 434# CONFIG_CONNECTOR is not set
428CONFIG_MTD=y 435CONFIG_MTD=y
429# CONFIG_MTD_DEBUG is not set 436# CONFIG_MTD_DEBUG is not set
437# CONFIG_MTD_TESTS is not set
430# CONFIG_MTD_CONCAT is not set 438# CONFIG_MTD_CONCAT is not set
431CONFIG_MTD_PARTITIONS=y 439CONFIG_MTD_PARTITIONS=y
432# CONFIG_MTD_TESTS is not set
433# CONFIG_MTD_REDBOOT_PARTS is not set 440# CONFIG_MTD_REDBOOT_PARTS is not set
434# CONFIG_MTD_CMDLINE_PARTS is not set 441# CONFIG_MTD_CMDLINE_PARTS is not set
435# CONFIG_MTD_OF_PARTS is not set 442# CONFIG_MTD_OF_PARTS is not set
@@ -488,6 +495,7 @@ CONFIG_MTD_PHYSMAP_OF=y
488# CONFIG_MTD_PMC551 is not set 495# CONFIG_MTD_PMC551 is not set
489# CONFIG_MTD_DATAFLASH is not set 496# CONFIG_MTD_DATAFLASH is not set
490# CONFIG_MTD_M25P80 is not set 497# CONFIG_MTD_M25P80 is not set
498# CONFIG_MTD_SST25L is not set
491# CONFIG_MTD_SLRAM is not set 499# CONFIG_MTD_SLRAM is not set
492# CONFIG_MTD_PHRAM is not set 500# CONFIG_MTD_PHRAM is not set
493# CONFIG_MTD_MTDRAM is not set 501# CONFIG_MTD_MTDRAM is not set
@@ -605,6 +613,7 @@ CONFIG_SCSI_LOWLEVEL=y
605# CONFIG_ISCSI_TCP is not set 613# CONFIG_ISCSI_TCP is not set
606# CONFIG_SCSI_CXGB3_ISCSI is not set 614# CONFIG_SCSI_CXGB3_ISCSI is not set
607# CONFIG_SCSI_BNX2_ISCSI is not set 615# CONFIG_SCSI_BNX2_ISCSI is not set
616# CONFIG_BE2ISCSI is not set
608# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 617# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
609# CONFIG_SCSI_3W_9XXX is not set 618# CONFIG_SCSI_3W_9XXX is not set
610# CONFIG_SCSI_ACARD is not set 619# CONFIG_SCSI_ACARD is not set
@@ -644,11 +653,14 @@ CONFIG_SCSI_LOWLEVEL=y
644# CONFIG_SCSI_DC390T is not set 653# CONFIG_SCSI_DC390T is not set
645# CONFIG_SCSI_NSP32 is not set 654# CONFIG_SCSI_NSP32 is not set
646# CONFIG_SCSI_DEBUG is not set 655# CONFIG_SCSI_DEBUG is not set
656# CONFIG_SCSI_PMCRAID is not set
647# CONFIG_SCSI_SRP is not set 657# CONFIG_SCSI_SRP is not set
658# CONFIG_SCSI_BFA_FC is not set
648# CONFIG_SCSI_DH is not set 659# CONFIG_SCSI_DH is not set
649# CONFIG_SCSI_OSD_INITIATOR is not set 660# CONFIG_SCSI_OSD_INITIATOR is not set
650CONFIG_ATA=y 661CONFIG_ATA=y
651# CONFIG_ATA_NONSTANDARD is not set 662# CONFIG_ATA_NONSTANDARD is not set
663CONFIG_ATA_VERBOSE_ERROR=y
652CONFIG_SATA_PMP=y 664CONFIG_SATA_PMP=y
653# CONFIG_SATA_AHCI is not set 665# CONFIG_SATA_AHCI is not set
654# CONFIG_SATA_SIL24 is not set 666# CONFIG_SATA_SIL24 is not set
@@ -671,6 +683,7 @@ CONFIG_ATA_SFF=y
671# CONFIG_PATA_ALI is not set 683# CONFIG_PATA_ALI is not set
672# CONFIG_PATA_AMD is not set 684# CONFIG_PATA_AMD is not set
673# CONFIG_PATA_ARTOP is not set 685# CONFIG_PATA_ARTOP is not set
686# CONFIG_PATA_ATP867X is not set
674# CONFIG_PATA_ATIIXP is not set 687# CONFIG_PATA_ATIIXP is not set
675# CONFIG_PATA_CMD640_PCI is not set 688# CONFIG_PATA_CMD640_PCI is not set
676# CONFIG_PATA_CMD64X is not set 689# CONFIG_PATA_CMD64X is not set
@@ -698,6 +711,7 @@ CONFIG_ATA_SFF=y
698# CONFIG_PATA_OPTIDMA is not set 711# CONFIG_PATA_OPTIDMA is not set
699# CONFIG_PATA_PDC_OLD is not set 712# CONFIG_PATA_PDC_OLD is not set
700# CONFIG_PATA_RADISYS is not set 713# CONFIG_PATA_RADISYS is not set
714# CONFIG_PATA_RDC is not set
701# CONFIG_PATA_RZ1000 is not set 715# CONFIG_PATA_RZ1000 is not set
702# CONFIG_PATA_SC1200 is not set 716# CONFIG_PATA_SC1200 is not set
703# CONFIG_PATA_SERVERWORKS is not set 717# CONFIG_PATA_SERVERWORKS is not set
@@ -802,9 +816,11 @@ CONFIG_E100=y
802# CONFIG_TLAN is not set 816# CONFIG_TLAN is not set
803# CONFIG_KS8842 is not set 817# CONFIG_KS8842 is not set
804# CONFIG_KS8851 is not set 818# CONFIG_KS8851 is not set
819# CONFIG_KS8851_MLL is not set
805# CONFIG_VIA_RHINE is not set 820# CONFIG_VIA_RHINE is not set
806# CONFIG_SC92031 is not set 821# CONFIG_SC92031 is not set
807# CONFIG_ATL2 is not set 822# CONFIG_ATL2 is not set
823# CONFIG_XILINX_EMACLITE is not set
808CONFIG_NETDEV_1000=y 824CONFIG_NETDEV_1000=y
809# CONFIG_ACENIC is not set 825# CONFIG_ACENIC is not set
810# CONFIG_DL2K is not set 826# CONFIG_DL2K is not set
@@ -852,10 +868,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
852# CONFIG_SFC is not set 868# CONFIG_SFC is not set
853# CONFIG_BE2NET is not set 869# CONFIG_BE2NET is not set
854# CONFIG_TR is not set 870# CONFIG_TR is not set
855 871CONFIG_WLAN=y
856#
857# Wireless LAN
858#
859# CONFIG_WLAN_PRE80211 is not set 872# CONFIG_WLAN_PRE80211 is not set
860# CONFIG_WLAN_80211 is not set 873# CONFIG_WLAN_80211 is not set
861 874
@@ -957,6 +970,7 @@ CONFIG_HW_RANDOM=y
957CONFIG_DEVPORT=y 970CONFIG_DEVPORT=y
958CONFIG_I2C=y 971CONFIG_I2C=y
959CONFIG_I2C_BOARDINFO=y 972CONFIG_I2C_BOARDINFO=y
973CONFIG_I2C_COMPAT=y
960CONFIG_I2C_CHARDEV=y 974CONFIG_I2C_CHARDEV=y
961CONFIG_I2C_HELPER_AUTO=y 975CONFIG_I2C_HELPER_AUTO=y
962 976
@@ -1011,9 +1025,6 @@ CONFIG_I2C_MPC=y
1011# Miscellaneous I2C Chip support 1025# Miscellaneous I2C Chip support
1012# 1026#
1013# CONFIG_DS1682 is not set 1027# CONFIG_DS1682 is not set
1014# CONFIG_SENSORS_PCF8574 is not set
1015# CONFIG_PCF8575 is not set
1016# CONFIG_SENSORS_PCA9539 is not set
1017# CONFIG_SENSORS_TSL2550 is not set 1028# CONFIG_SENSORS_TSL2550 is not set
1018# CONFIG_I2C_DEBUG_CORE is not set 1029# CONFIG_I2C_DEBUG_CORE is not set
1019# CONFIG_I2C_DEBUG_ALGO is not set 1030# CONFIG_I2C_DEBUG_ALGO is not set
@@ -1045,6 +1056,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
1045# CONFIG_POWER_SUPPLY is not set 1056# CONFIG_POWER_SUPPLY is not set
1046CONFIG_HWMON=y 1057CONFIG_HWMON=y
1047# CONFIG_HWMON_VID is not set 1058# CONFIG_HWMON_VID is not set
1059# CONFIG_HWMON_DEBUG_CHIP is not set
1060
1061#
1062# Native drivers
1063#
1048# CONFIG_SENSORS_AD7414 is not set 1064# CONFIG_SENSORS_AD7414 is not set
1049# CONFIG_SENSORS_AD7418 is not set 1065# CONFIG_SENSORS_AD7418 is not set
1050# CONFIG_SENSORS_ADCXX is not set 1066# CONFIG_SENSORS_ADCXX is not set
@@ -1097,6 +1113,7 @@ CONFIG_HWMON=y
1097# CONFIG_SENSORS_ADS7828 is not set 1113# CONFIG_SENSORS_ADS7828 is not set
1098# CONFIG_SENSORS_THMC50 is not set 1114# CONFIG_SENSORS_THMC50 is not set
1099# CONFIG_SENSORS_TMP401 is not set 1115# CONFIG_SENSORS_TMP401 is not set
1116# CONFIG_SENSORS_TMP421 is not set
1100# CONFIG_SENSORS_VIA686A is not set 1117# CONFIG_SENSORS_VIA686A is not set
1101# CONFIG_SENSORS_VT1211 is not set 1118# CONFIG_SENSORS_VT1211 is not set
1102# CONFIG_SENSORS_VT8231 is not set 1119# CONFIG_SENSORS_VT8231 is not set
@@ -1109,9 +1126,7 @@ CONFIG_HWMON=y
1109# CONFIG_SENSORS_W83627HF is not set 1126# CONFIG_SENSORS_W83627HF is not set
1110# CONFIG_SENSORS_W83627EHF is not set 1127# CONFIG_SENSORS_W83627EHF is not set
1111# CONFIG_SENSORS_LIS3_SPI is not set 1128# CONFIG_SENSORS_LIS3_SPI is not set
1112# CONFIG_HWMON_DEBUG_CHIP is not set
1113# CONFIG_THERMAL is not set 1129# CONFIG_THERMAL is not set
1114# CONFIG_THERMAL_HWMON is not set
1115CONFIG_WATCHDOG=y 1130CONFIG_WATCHDOG=y
1116# CONFIG_WATCHDOG_NOWAYOUT is not set 1131# CONFIG_WATCHDOG_NOWAYOUT is not set
1117 1132
@@ -1149,8 +1164,10 @@ CONFIG_SSB_POSSIBLE=y
1149# CONFIG_MFD_TMIO is not set 1164# CONFIG_MFD_TMIO is not set
1150# CONFIG_PMIC_DA903X is not set 1165# CONFIG_PMIC_DA903X is not set
1151# CONFIG_MFD_WM8400 is not set 1166# CONFIG_MFD_WM8400 is not set
1167# CONFIG_MFD_WM831X is not set
1152# CONFIG_MFD_WM8350_I2C is not set 1168# CONFIG_MFD_WM8350_I2C is not set
1153# CONFIG_MFD_PCF50633 is not set 1169# CONFIG_MFD_PCF50633 is not set
1170# CONFIG_MFD_MC13783 is not set
1154# CONFIG_AB3100_CORE is not set 1171# CONFIG_AB3100_CORE is not set
1155# CONFIG_EZX_PCAP is not set 1172# CONFIG_EZX_PCAP is not set
1156# CONFIG_REGULATOR is not set 1173# CONFIG_REGULATOR is not set
@@ -1160,6 +1177,7 @@ CONFIG_SSB_POSSIBLE=y
1160# Graphics support 1177# Graphics support
1161# 1178#
1162# CONFIG_AGP is not set 1179# CONFIG_AGP is not set
1180CONFIG_VGA_ARB=y
1163# CONFIG_DRM is not set 1181# CONFIG_DRM is not set
1164# CONFIG_VGASTATE is not set 1182# CONFIG_VGASTATE is not set
1165CONFIG_VIDEO_OUTPUT_CONTROL=m 1183CONFIG_VIDEO_OUTPUT_CONTROL=m
@@ -1173,7 +1191,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m
1173# CONFIG_SOUND is not set 1191# CONFIG_SOUND is not set
1174CONFIG_HID_SUPPORT=y 1192CONFIG_HID_SUPPORT=y
1175CONFIG_HID=y 1193CONFIG_HID=y
1176# CONFIG_HID_DEBUG is not set
1177# CONFIG_HIDRAW is not set 1194# CONFIG_HIDRAW is not set
1178 1195
1179# 1196#
@@ -1225,6 +1242,7 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y
1225# CONFIG_USB_OXU210HP_HCD is not set 1242# CONFIG_USB_OXU210HP_HCD is not set
1226# CONFIG_USB_ISP116X_HCD is not set 1243# CONFIG_USB_ISP116X_HCD is not set
1227# CONFIG_USB_ISP1760_HCD is not set 1244# CONFIG_USB_ISP1760_HCD is not set
1245# CONFIG_USB_ISP1362_HCD is not set
1228CONFIG_USB_OHCI_HCD=y 1246CONFIG_USB_OHCI_HCD=y
1229CONFIG_USB_OHCI_HCD_PPC_OF_BE=y 1247CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
1230# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set 1248# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set
@@ -1316,6 +1334,7 @@ CONFIG_USB_GADGET_SELECTED=y
1316# CONFIG_USB_GADGET_LH7A40X is not set 1334# CONFIG_USB_GADGET_LH7A40X is not set
1317# CONFIG_USB_GADGET_OMAP is not set 1335# CONFIG_USB_GADGET_OMAP is not set
1318# CONFIG_USB_GADGET_PXA25X is not set 1336# CONFIG_USB_GADGET_PXA25X is not set
1337# CONFIG_USB_GADGET_R8A66597 is not set
1319# CONFIG_USB_GADGET_PXA27X is not set 1338# CONFIG_USB_GADGET_PXA27X is not set
1320# CONFIG_USB_GADGET_S3C_HSOTG is not set 1339# CONFIG_USB_GADGET_S3C_HSOTG is not set
1321# CONFIG_USB_GADGET_IMX is not set 1340# CONFIG_USB_GADGET_IMX is not set
@@ -1334,6 +1353,7 @@ CONFIG_USB_GADGET_DUALSPEED=y
1334# CONFIG_USB_AUDIO is not set 1353# CONFIG_USB_AUDIO is not set
1335CONFIG_USB_ETH=y 1354CONFIG_USB_ETH=y
1336CONFIG_USB_ETH_RNDIS=y 1355CONFIG_USB_ETH_RNDIS=y
1356# CONFIG_USB_ETH_EEM is not set
1337# CONFIG_USB_GADGETFS is not set 1357# CONFIG_USB_GADGETFS is not set
1338# CONFIG_USB_FILE_STORAGE is not set 1358# CONFIG_USB_FILE_STORAGE is not set
1339# CONFIG_USB_G_SERIAL is not set 1359# CONFIG_USB_G_SERIAL is not set
@@ -1395,6 +1415,7 @@ CONFIG_RTC_DRV_DS1307=y
1395# CONFIG_RTC_DRV_R9701 is not set 1415# CONFIG_RTC_DRV_R9701 is not set
1396# CONFIG_RTC_DRV_RS5C348 is not set 1416# CONFIG_RTC_DRV_RS5C348 is not set
1397# CONFIG_RTC_DRV_DS3234 is not set 1417# CONFIG_RTC_DRV_DS3234 is not set
1418# CONFIG_RTC_DRV_PCF2123 is not set
1398 1419
1399# 1420#
1400# Platform RTC drivers 1421# Platform RTC drivers
@@ -1445,6 +1466,7 @@ CONFIG_FS_MBCACHE=y
1445# CONFIG_GFS2_FS is not set 1466# CONFIG_GFS2_FS is not set
1446# CONFIG_OCFS2_FS is not set 1467# CONFIG_OCFS2_FS is not set
1447# CONFIG_BTRFS_FS is not set 1468# CONFIG_BTRFS_FS is not set
1469# CONFIG_NILFS2_FS is not set
1448CONFIG_FILE_LOCKING=y 1470CONFIG_FILE_LOCKING=y
1449CONFIG_FSNOTIFY=y 1471CONFIG_FSNOTIFY=y
1450CONFIG_DNOTIFY=y 1472CONFIG_DNOTIFY=y
@@ -1514,7 +1536,6 @@ CONFIG_JFFS2_RTIME=y
1514# CONFIG_ROMFS_FS is not set 1536# CONFIG_ROMFS_FS is not set
1515# CONFIG_SYSV_FS is not set 1537# CONFIG_SYSV_FS is not set
1516# CONFIG_UFS_FS is not set 1538# CONFIG_UFS_FS is not set
1517# CONFIG_NILFS2_FS is not set
1518CONFIG_NETWORK_FILESYSTEMS=y 1539CONFIG_NETWORK_FILESYSTEMS=y
1519CONFIG_NFS_FS=y 1540CONFIG_NFS_FS=y
1520CONFIG_NFS_V3=y 1541CONFIG_NFS_V3=y
@@ -1630,6 +1651,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
1630CONFIG_ENABLE_MUST_CHECK=y 1651CONFIG_ENABLE_MUST_CHECK=y
1631CONFIG_FRAME_WARN=1024 1652CONFIG_FRAME_WARN=1024
1632# CONFIG_MAGIC_SYSRQ is not set 1653# CONFIG_MAGIC_SYSRQ is not set
1654# CONFIG_STRIP_ASM_SYMS is not set
1633# CONFIG_UNUSED_SYMBOLS is not set 1655# CONFIG_UNUSED_SYMBOLS is not set
1634# CONFIG_DEBUG_FS is not set 1656# CONFIG_DEBUG_FS is not set
1635# CONFIG_HEADERS_CHECK is not set 1657# CONFIG_HEADERS_CHECK is not set
@@ -1647,6 +1669,7 @@ CONFIG_SCHED_DEBUG=y
1647# CONFIG_DEBUG_OBJECTS is not set 1669# CONFIG_DEBUG_OBJECTS is not set
1648# CONFIG_SLUB_DEBUG_ON is not set 1670# CONFIG_SLUB_DEBUG_ON is not set
1649# CONFIG_SLUB_STATS is not set 1671# CONFIG_SLUB_STATS is not set
1672# CONFIG_DEBUG_KMEMLEAK is not set
1650# CONFIG_DEBUG_RT_MUTEXES is not set 1673# CONFIG_DEBUG_RT_MUTEXES is not set
1651# CONFIG_RT_MUTEX_TESTER is not set 1674# CONFIG_RT_MUTEX_TESTER is not set
1652# CONFIG_DEBUG_SPINLOCK is not set 1675# CONFIG_DEBUG_SPINLOCK is not set
@@ -1665,10 +1688,12 @@ CONFIG_SCHED_DEBUG=y
1665# CONFIG_DEBUG_LIST is not set 1688# CONFIG_DEBUG_LIST is not set
1666# CONFIG_DEBUG_SG is not set 1689# CONFIG_DEBUG_SG is not set
1667# CONFIG_DEBUG_NOTIFIERS is not set 1690# CONFIG_DEBUG_NOTIFIERS is not set
1691# CONFIG_DEBUG_CREDENTIALS is not set
1668# CONFIG_RCU_TORTURE_TEST is not set 1692# CONFIG_RCU_TORTURE_TEST is not set
1669# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1693# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1670# CONFIG_BACKTRACE_SELF_TEST is not set 1694# CONFIG_BACKTRACE_SELF_TEST is not set
1671# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 1695# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1696# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
1672# CONFIG_FAULT_INJECTION is not set 1697# CONFIG_FAULT_INJECTION is not set
1673# CONFIG_LATENCYTOP is not set 1698# CONFIG_LATENCYTOP is not set
1674CONFIG_SYSCTL_SYSCALL_CHECK=y 1699CONFIG_SYSCTL_SYSCALL_CHECK=y
@@ -1691,10 +1716,10 @@ CONFIG_BRANCH_PROFILE_NONE=y
1691# CONFIG_KMEMTRACE is not set 1716# CONFIG_KMEMTRACE is not set
1692# CONFIG_WORKQUEUE_TRACER is not set 1717# CONFIG_WORKQUEUE_TRACER is not set
1693# CONFIG_BLK_DEV_IO_TRACE is not set 1718# CONFIG_BLK_DEV_IO_TRACE is not set
1719# CONFIG_DMA_API_DEBUG is not set
1694# CONFIG_SAMPLES is not set 1720# CONFIG_SAMPLES is not set
1695CONFIG_HAVE_ARCH_KGDB=y 1721CONFIG_HAVE_ARCH_KGDB=y
1696# CONFIG_KGDB is not set 1722# CONFIG_KGDB is not set
1697# CONFIG_KMEMCHECK is not set
1698# CONFIG_PPC_DISABLE_WERROR is not set 1723# CONFIG_PPC_DISABLE_WERROR is not set
1699CONFIG_PPC_WERROR=y 1724CONFIG_PPC_WERROR=y
1700CONFIG_PRINT_STACK_DEPTH=64 1725CONFIG_PRINT_STACK_DEPTH=64
@@ -1721,7 +1746,6 @@ CONFIG_CRYPTO=y
1721# 1746#
1722# Crypto core or helper 1747# Crypto core or helper
1723# 1748#
1724# CONFIG_CRYPTO_FIPS is not set
1725CONFIG_CRYPTO_ALGAPI=y 1749CONFIG_CRYPTO_ALGAPI=y
1726CONFIG_CRYPTO_ALGAPI2=y 1750CONFIG_CRYPTO_ALGAPI2=y
1727CONFIG_CRYPTO_AEAD2=y 1751CONFIG_CRYPTO_AEAD2=y
@@ -1763,11 +1787,13 @@ CONFIG_CRYPTO_PCBC=m
1763# 1787#
1764# CONFIG_CRYPTO_HMAC is not set 1788# CONFIG_CRYPTO_HMAC is not set
1765# CONFIG_CRYPTO_XCBC is not set 1789# CONFIG_CRYPTO_XCBC is not set
1790# CONFIG_CRYPTO_VMAC is not set
1766 1791
1767# 1792#
1768# Digest 1793# Digest
1769# 1794#
1770# CONFIG_CRYPTO_CRC32C is not set 1795# CONFIG_CRYPTO_CRC32C is not set
1796# CONFIG_CRYPTO_GHASH is not set
1771# CONFIG_CRYPTO_MD4 is not set 1797# CONFIG_CRYPTO_MD4 is not set
1772CONFIG_CRYPTO_MD5=y 1798CONFIG_CRYPTO_MD5=y
1773# CONFIG_CRYPTO_MICHAEL_MIC is not set 1799# CONFIG_CRYPTO_MICHAEL_MIC is not set
diff --git a/arch/powerpc/configs/83xx/mpc832x_mds_defconfig b/arch/powerpc/configs/83xx/mpc832x_mds_defconfig
index e0e36a113409..7def83518a6c 100644
--- a/arch/powerpc/configs/83xx/mpc832x_mds_defconfig
+++ b/arch/powerpc/configs/83xx/mpc832x_mds_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.31-rc4 3# Linux kernel version: 2.6.32-rc5
4# Wed Jul 29 23:32:06 2009 4# Thu Nov 5 08:20:24 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -35,6 +35,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
35CONFIG_GENERIC_HARDIRQS=y 35CONFIG_GENERIC_HARDIRQS=y
36CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 36CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
38CONFIG_IRQ_PER_CPU=y 39CONFIG_IRQ_PER_CPU=y
39CONFIG_STACKTRACE_SUPPORT=y 40CONFIG_STACKTRACE_SUPPORT=y
40CONFIG_HAVE_LATENCYTOP_SUPPORT=y 41CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -84,11 +85,12 @@ CONFIG_SYSVIPC_SYSCTL=y
84# 85#
85# RCU Subsystem 86# RCU Subsystem
86# 87#
87CONFIG_CLASSIC_RCU=y 88CONFIG_TREE_RCU=y
88# CONFIG_TREE_RCU is not set 89# CONFIG_TREE_PREEMPT_RCU is not set
89# CONFIG_PREEMPT_RCU is not set 90# CONFIG_RCU_TRACE is not set
91CONFIG_RCU_FANOUT=32
92# CONFIG_RCU_FANOUT_EXACT is not set
90# CONFIG_TREE_RCU_TRACE is not set 93# CONFIG_TREE_RCU_TRACE is not set
91# CONFIG_PREEMPT_RCU_TRACE is not set
92# CONFIG_IKCONFIG is not set 94# CONFIG_IKCONFIG is not set
93CONFIG_LOG_BUF_SHIFT=14 95CONFIG_LOG_BUF_SHIFT=14
94CONFIG_GROUP_SCHED=y 96CONFIG_GROUP_SCHED=y
@@ -124,28 +126,29 @@ CONFIG_TIMERFD=y
124CONFIG_EVENTFD=y 126CONFIG_EVENTFD=y
125CONFIG_SHMEM=y 127CONFIG_SHMEM=y
126CONFIG_AIO=y 128CONFIG_AIO=y
127CONFIG_HAVE_PERF_COUNTERS=y 129CONFIG_HAVE_PERF_EVENTS=y
128 130
129# 131#
130# Performance Counters 132# Kernel Performance Events And Counters
131# 133#
134# CONFIG_PERF_EVENTS is not set
132# CONFIG_PERF_COUNTERS is not set 135# CONFIG_PERF_COUNTERS is not set
133CONFIG_VM_EVENT_COUNTERS=y 136CONFIG_VM_EVENT_COUNTERS=y
134CONFIG_PCI_QUIRKS=y 137CONFIG_PCI_QUIRKS=y
135CONFIG_SLUB_DEBUG=y 138CONFIG_SLUB_DEBUG=y
136# CONFIG_STRIP_ASM_SYMS is not set
137CONFIG_COMPAT_BRK=y 139CONFIG_COMPAT_BRK=y
138# CONFIG_SLAB is not set 140# CONFIG_SLAB is not set
139CONFIG_SLUB=y 141CONFIG_SLUB=y
140# CONFIG_SLOB is not set 142# CONFIG_SLOB is not set
141# CONFIG_PROFILING is not set 143# CONFIG_PROFILING is not set
142# CONFIG_MARKERS is not set
143CONFIG_HAVE_OPROFILE=y 144CONFIG_HAVE_OPROFILE=y
144CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 145CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
145CONFIG_HAVE_IOREMAP_PROT=y 146CONFIG_HAVE_IOREMAP_PROT=y
146CONFIG_HAVE_KPROBES=y 147CONFIG_HAVE_KPROBES=y
147CONFIG_HAVE_KRETPROBES=y 148CONFIG_HAVE_KRETPROBES=y
148CONFIG_HAVE_ARCH_TRACEHOOK=y 149CONFIG_HAVE_ARCH_TRACEHOOK=y
150CONFIG_HAVE_DMA_ATTRS=y
151CONFIG_HAVE_DMA_API_DEBUG=y
149 152
150# 153#
151# GCOV-based kernel profiling 154# GCOV-based kernel profiling
@@ -257,6 +260,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
257CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 260CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
258# CONFIG_KEXEC is not set 261# CONFIG_KEXEC is not set
259# CONFIG_CRASH_DUMP is not set 262# CONFIG_CRASH_DUMP is not set
263CONFIG_MAX_ACTIVE_REGIONS=32
260CONFIG_ARCH_FLATMEM_ENABLE=y 264CONFIG_ARCH_FLATMEM_ENABLE=y
261CONFIG_ARCH_POPULATES_NODE_MAP=y 265CONFIG_ARCH_POPULATES_NODE_MAP=y
262CONFIG_SELECT_MEMORY_MODEL=y 266CONFIG_SELECT_MEMORY_MODEL=y
@@ -274,6 +278,7 @@ CONFIG_BOUNCE=y
274CONFIG_VIRT_TO_BUS=y 278CONFIG_VIRT_TO_BUS=y
275CONFIG_HAVE_MLOCK=y 279CONFIG_HAVE_MLOCK=y
276CONFIG_HAVE_MLOCKED_PAGE_BIT=y 280CONFIG_HAVE_MLOCKED_PAGE_BIT=y
281# CONFIG_KSM is not set
277CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 282CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
278CONFIG_PPC_4K_PAGES=y 283CONFIG_PPC_4K_PAGES=y
279# CONFIG_PPC_16K_PAGES is not set 284# CONFIG_PPC_16K_PAGES is not set
@@ -369,6 +374,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
369# CONFIG_NETFILTER is not set 374# CONFIG_NETFILTER is not set
370# CONFIG_IP_DCCP is not set 375# CONFIG_IP_DCCP is not set
371# CONFIG_IP_SCTP is not set 376# CONFIG_IP_SCTP is not set
377# CONFIG_RDS is not set
372# CONFIG_TIPC is not set 378# CONFIG_TIPC is not set
373# CONFIG_ATM is not set 379# CONFIG_ATM is not set
374# CONFIG_BRIDGE is not set 380# CONFIG_BRIDGE is not set
@@ -398,6 +404,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
398# CONFIG_AF_RXRPC is not set 404# CONFIG_AF_RXRPC is not set
399CONFIG_WIRELESS=y 405CONFIG_WIRELESS=y
400# CONFIG_CFG80211 is not set 406# CONFIG_CFG80211 is not set
407CONFIG_CFG80211_DEFAULT_PS_VALUE=0
401CONFIG_WIRELESS_OLD_REGULATORY=y 408CONFIG_WIRELESS_OLD_REGULATORY=y
402# CONFIG_WIRELESS_EXT is not set 409# CONFIG_WIRELESS_EXT is not set
403# CONFIG_LIB80211 is not set 410# CONFIG_LIB80211 is not set
@@ -405,7 +412,6 @@ CONFIG_WIRELESS_OLD_REGULATORY=y
405# 412#
406# CFG80211 needs to be enabled for MAC80211 413# CFG80211 needs to be enabled for MAC80211
407# 414#
408CONFIG_MAC80211_DEFAULT_PS_VALUE=0
409# CONFIG_WIMAX is not set 415# CONFIG_WIMAX is not set
410# CONFIG_RFKILL is not set 416# CONFIG_RFKILL is not set
411# CONFIG_NET_9P is not set 417# CONFIG_NET_9P is not set
@@ -418,6 +424,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
418# Generic Driver Options 424# Generic Driver Options
419# 425#
420CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 426CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
427# CONFIG_DEVTMPFS is not set
421CONFIG_STANDALONE=y 428CONFIG_STANDALONE=y
422CONFIG_PREVENT_FIRMWARE_BUILD=y 429CONFIG_PREVENT_FIRMWARE_BUILD=y
423# CONFIG_FW_LOADER is not set 430# CONFIG_FW_LOADER is not set
@@ -504,6 +511,7 @@ CONFIG_SCSI_LOWLEVEL=y
504# CONFIG_ISCSI_TCP is not set 511# CONFIG_ISCSI_TCP is not set
505# CONFIG_SCSI_CXGB3_ISCSI is not set 512# CONFIG_SCSI_CXGB3_ISCSI is not set
506# CONFIG_SCSI_BNX2_ISCSI is not set 513# CONFIG_SCSI_BNX2_ISCSI is not set
514# CONFIG_BE2ISCSI is not set
507# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 515# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
508# CONFIG_SCSI_3W_9XXX is not set 516# CONFIG_SCSI_3W_9XXX is not set
509# CONFIG_SCSI_ACARD is not set 517# CONFIG_SCSI_ACARD is not set
@@ -542,7 +550,9 @@ CONFIG_SCSI_LOWLEVEL=y
542# CONFIG_SCSI_DC390T is not set 550# CONFIG_SCSI_DC390T is not set
543# CONFIG_SCSI_NSP32 is not set 551# CONFIG_SCSI_NSP32 is not set
544# CONFIG_SCSI_DEBUG is not set 552# CONFIG_SCSI_DEBUG is not set
553# CONFIG_SCSI_PMCRAID is not set
545# CONFIG_SCSI_SRP is not set 554# CONFIG_SCSI_SRP is not set
555# CONFIG_SCSI_BFA_FC is not set
546# CONFIG_SCSI_DH is not set 556# CONFIG_SCSI_DH is not set
547# CONFIG_SCSI_OSD_INITIATOR is not set 557# CONFIG_SCSI_OSD_INITIATOR is not set
548# CONFIG_ATA is not set 558# CONFIG_ATA is not set
@@ -612,7 +622,9 @@ CONFIG_MII=y
612# CONFIG_NET_PCI is not set 622# CONFIG_NET_PCI is not set
613# CONFIG_B44 is not set 623# CONFIG_B44 is not set
614# CONFIG_KS8842 is not set 624# CONFIG_KS8842 is not set
625# CONFIG_KS8851_MLL is not set
615# CONFIG_ATL2 is not set 626# CONFIG_ATL2 is not set
627# CONFIG_XILINX_EMACLITE is not set
616CONFIG_NETDEV_1000=y 628CONFIG_NETDEV_1000=y
617# CONFIG_ACENIC is not set 629# CONFIG_ACENIC is not set
618# CONFIG_DL2K is not set 630# CONFIG_DL2K is not set
@@ -635,7 +647,6 @@ CONFIG_NETDEV_1000=y
635CONFIG_FSL_PQ_MDIO=y 647CONFIG_FSL_PQ_MDIO=y
636# CONFIG_GIANFAR is not set 648# CONFIG_GIANFAR is not set
637CONFIG_UCC_GETH=y 649CONFIG_UCC_GETH=y
638# CONFIG_UGETH_MAGIC_PACKET is not set
639# CONFIG_UGETH_TX_ON_DEMAND is not set 650# CONFIG_UGETH_TX_ON_DEMAND is not set
640# CONFIG_MV643XX_ETH is not set 651# CONFIG_MV643XX_ETH is not set
641# CONFIG_QLA3XXX is not set 652# CONFIG_QLA3XXX is not set
@@ -663,10 +674,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
663# CONFIG_SFC is not set 674# CONFIG_SFC is not set
664# CONFIG_BE2NET is not set 675# CONFIG_BE2NET is not set
665# CONFIG_TR is not set 676# CONFIG_TR is not set
666 677CONFIG_WLAN=y
667#
668# Wireless LAN
669#
670# CONFIG_WLAN_PRE80211 is not set 678# CONFIG_WLAN_PRE80211 is not set
671# CONFIG_WLAN_80211 is not set 679# CONFIG_WLAN_80211 is not set
672 680
@@ -759,6 +767,7 @@ CONFIG_HW_RANDOM=y
759CONFIG_DEVPORT=y 767CONFIG_DEVPORT=y
760CONFIG_I2C=y 768CONFIG_I2C=y
761CONFIG_I2C_BOARDINFO=y 769CONFIG_I2C_BOARDINFO=y
770CONFIG_I2C_COMPAT=y
762CONFIG_I2C_CHARDEV=y 771CONFIG_I2C_CHARDEV=y
763CONFIG_I2C_HELPER_AUTO=y 772CONFIG_I2C_HELPER_AUTO=y
764 773
@@ -812,9 +821,6 @@ CONFIG_I2C_MPC=y
812# Miscellaneous I2C Chip support 821# Miscellaneous I2C Chip support
813# 822#
814# CONFIG_DS1682 is not set 823# CONFIG_DS1682 is not set
815# CONFIG_SENSORS_PCF8574 is not set
816# CONFIG_PCF8575 is not set
817# CONFIG_SENSORS_PCA9539 is not set
818# CONFIG_SENSORS_TSL2550 is not set 824# CONFIG_SENSORS_TSL2550 is not set
819# CONFIG_I2C_DEBUG_CORE is not set 825# CONFIG_I2C_DEBUG_CORE is not set
820# CONFIG_I2C_DEBUG_ALGO is not set 826# CONFIG_I2C_DEBUG_ALGO is not set
@@ -832,6 +838,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
832# CONFIG_POWER_SUPPLY is not set 838# CONFIG_POWER_SUPPLY is not set
833CONFIG_HWMON=y 839CONFIG_HWMON=y
834# CONFIG_HWMON_VID is not set 840# CONFIG_HWMON_VID is not set
841# CONFIG_HWMON_DEBUG_CHIP is not set
842
843#
844# Native drivers
845#
835# CONFIG_SENSORS_AD7414 is not set 846# CONFIG_SENSORS_AD7414 is not set
836# CONFIG_SENSORS_AD7418 is not set 847# CONFIG_SENSORS_AD7418 is not set
837# CONFIG_SENSORS_ADM1021 is not set 848# CONFIG_SENSORS_ADM1021 is not set
@@ -881,6 +892,7 @@ CONFIG_HWMON=y
881# CONFIG_SENSORS_ADS7828 is not set 892# CONFIG_SENSORS_ADS7828 is not set
882# CONFIG_SENSORS_THMC50 is not set 893# CONFIG_SENSORS_THMC50 is not set
883# CONFIG_SENSORS_TMP401 is not set 894# CONFIG_SENSORS_TMP401 is not set
895# CONFIG_SENSORS_TMP421 is not set
884# CONFIG_SENSORS_VIA686A is not set 896# CONFIG_SENSORS_VIA686A is not set
885# CONFIG_SENSORS_VT1211 is not set 897# CONFIG_SENSORS_VT1211 is not set
886# CONFIG_SENSORS_VT8231 is not set 898# CONFIG_SENSORS_VT8231 is not set
@@ -892,9 +904,7 @@ CONFIG_HWMON=y
892# CONFIG_SENSORS_W83L786NG is not set 904# CONFIG_SENSORS_W83L786NG is not set
893# CONFIG_SENSORS_W83627HF is not set 905# CONFIG_SENSORS_W83627HF is not set
894# CONFIG_SENSORS_W83627EHF is not set 906# CONFIG_SENSORS_W83627EHF is not set
895# CONFIG_HWMON_DEBUG_CHIP is not set
896# CONFIG_THERMAL is not set 907# CONFIG_THERMAL is not set
897# CONFIG_THERMAL_HWMON is not set
898CONFIG_WATCHDOG=y 908CONFIG_WATCHDOG=y
899# CONFIG_WATCHDOG_NOWAYOUT is not set 909# CONFIG_WATCHDOG_NOWAYOUT is not set
900 910
@@ -927,6 +937,7 @@ CONFIG_SSB_POSSIBLE=y
927# CONFIG_MFD_TMIO is not set 937# CONFIG_MFD_TMIO is not set
928# CONFIG_PMIC_DA903X is not set 938# CONFIG_PMIC_DA903X is not set
929# CONFIG_MFD_WM8400 is not set 939# CONFIG_MFD_WM8400 is not set
940# CONFIG_MFD_WM831X is not set
930# CONFIG_MFD_WM8350_I2C is not set 941# CONFIG_MFD_WM8350_I2C is not set
931# CONFIG_MFD_PCF50633 is not set 942# CONFIG_MFD_PCF50633 is not set
932# CONFIG_AB3100_CORE is not set 943# CONFIG_AB3100_CORE is not set
@@ -937,6 +948,7 @@ CONFIG_SSB_POSSIBLE=y
937# Graphics support 948# Graphics support
938# 949#
939# CONFIG_AGP is not set 950# CONFIG_AGP is not set
951CONFIG_VGA_ARB=y
940# CONFIG_DRM is not set 952# CONFIG_DRM is not set
941# CONFIG_VGASTATE is not set 953# CONFIG_VGASTATE is not set
942CONFIG_VIDEO_OUTPUT_CONTROL=m 954CONFIG_VIDEO_OUTPUT_CONTROL=m
@@ -950,7 +962,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m
950# CONFIG_SOUND is not set 962# CONFIG_SOUND is not set
951CONFIG_HID_SUPPORT=y 963CONFIG_HID_SUPPORT=y
952CONFIG_HID=y 964CONFIG_HID=y
953# CONFIG_HID_DEBUG is not set
954# CONFIG_HIDRAW is not set 965# CONFIG_HIDRAW is not set
955# CONFIG_HID_PID is not set 966# CONFIG_HID_PID is not set
956 967
@@ -1070,6 +1081,7 @@ CONFIG_FS_MBCACHE=y
1070# CONFIG_GFS2_FS is not set 1081# CONFIG_GFS2_FS is not set
1071# CONFIG_OCFS2_FS is not set 1082# CONFIG_OCFS2_FS is not set
1072# CONFIG_BTRFS_FS is not set 1083# CONFIG_BTRFS_FS is not set
1084# CONFIG_NILFS2_FS is not set
1073CONFIG_FILE_LOCKING=y 1085CONFIG_FILE_LOCKING=y
1074CONFIG_FSNOTIFY=y 1086CONFIG_FSNOTIFY=y
1075CONFIG_DNOTIFY=y 1087CONFIG_DNOTIFY=y
@@ -1128,7 +1140,6 @@ CONFIG_MISC_FILESYSTEMS=y
1128# CONFIG_ROMFS_FS is not set 1140# CONFIG_ROMFS_FS is not set
1129# CONFIG_SYSV_FS is not set 1141# CONFIG_SYSV_FS is not set
1130# CONFIG_UFS_FS is not set 1142# CONFIG_UFS_FS is not set
1131# CONFIG_NILFS2_FS is not set
1132CONFIG_NETWORK_FILESYSTEMS=y 1143CONFIG_NETWORK_FILESYSTEMS=y
1133CONFIG_NFS_FS=y 1144CONFIG_NFS_FS=y
1134CONFIG_NFS_V3=y 1145CONFIG_NFS_V3=y
@@ -1202,6 +1213,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
1202CONFIG_ENABLE_MUST_CHECK=y 1213CONFIG_ENABLE_MUST_CHECK=y
1203CONFIG_FRAME_WARN=1024 1214CONFIG_FRAME_WARN=1024
1204# CONFIG_MAGIC_SYSRQ is not set 1215# CONFIG_MAGIC_SYSRQ is not set
1216# CONFIG_STRIP_ASM_SYMS is not set
1205# CONFIG_UNUSED_SYMBOLS is not set 1217# CONFIG_UNUSED_SYMBOLS is not set
1206# CONFIG_DEBUG_FS is not set 1218# CONFIG_DEBUG_FS is not set
1207# CONFIG_HEADERS_CHECK is not set 1219# CONFIG_HEADERS_CHECK is not set
@@ -1219,6 +1231,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
1219CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1231CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1220CONFIG_TRACING_SUPPORT=y 1232CONFIG_TRACING_SUPPORT=y
1221# CONFIG_FTRACE is not set 1233# CONFIG_FTRACE is not set
1234# CONFIG_DMA_API_DEBUG is not set
1222# CONFIG_SAMPLES is not set 1235# CONFIG_SAMPLES is not set
1223CONFIG_HAVE_ARCH_KGDB=y 1236CONFIG_HAVE_ARCH_KGDB=y
1224# CONFIG_PPC_DISABLE_WERROR is not set 1237# CONFIG_PPC_DISABLE_WERROR is not set
@@ -1240,7 +1253,6 @@ CONFIG_CRYPTO=y
1240# 1253#
1241# Crypto core or helper 1254# Crypto core or helper
1242# 1255#
1243# CONFIG_CRYPTO_FIPS is not set
1244CONFIG_CRYPTO_ALGAPI=y 1256CONFIG_CRYPTO_ALGAPI=y
1245CONFIG_CRYPTO_ALGAPI2=y 1257CONFIG_CRYPTO_ALGAPI2=y
1246CONFIG_CRYPTO_AEAD2=y 1258CONFIG_CRYPTO_AEAD2=y
@@ -1282,11 +1294,13 @@ CONFIG_CRYPTO_PCBC=m
1282# 1294#
1283# CONFIG_CRYPTO_HMAC is not set 1295# CONFIG_CRYPTO_HMAC is not set
1284# CONFIG_CRYPTO_XCBC is not set 1296# CONFIG_CRYPTO_XCBC is not set
1297# CONFIG_CRYPTO_VMAC is not set
1285 1298
1286# 1299#
1287# Digest 1300# Digest
1288# 1301#
1289# CONFIG_CRYPTO_CRC32C is not set 1302# CONFIG_CRYPTO_CRC32C is not set
1303# CONFIG_CRYPTO_GHASH is not set
1290# CONFIG_CRYPTO_MD4 is not set 1304# CONFIG_CRYPTO_MD4 is not set
1291CONFIG_CRYPTO_MD5=y 1305CONFIG_CRYPTO_MD5=y
1292# CONFIG_CRYPTO_MICHAEL_MIC is not set 1306# CONFIG_CRYPTO_MICHAEL_MIC is not set
diff --git a/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig b/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig
index 4f27d4548223..b398b9b2b635 100644
--- a/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig
+++ b/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.31-rc4 3# Linux kernel version: 2.6.32-rc5
4# Wed Jul 29 23:32:07 2009 4# Thu Nov 5 08:20:24 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -35,6 +35,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
35CONFIG_GENERIC_HARDIRQS=y 35CONFIG_GENERIC_HARDIRQS=y
36CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 36CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
38CONFIG_IRQ_PER_CPU=y 39CONFIG_IRQ_PER_CPU=y
39CONFIG_STACKTRACE_SUPPORT=y 40CONFIG_STACKTRACE_SUPPORT=y
40CONFIG_HAVE_LATENCYTOP_SUPPORT=y 41CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -84,11 +85,12 @@ CONFIG_SYSVIPC_SYSCTL=y
84# 85#
85# RCU Subsystem 86# RCU Subsystem
86# 87#
87CONFIG_CLASSIC_RCU=y 88CONFIG_TREE_RCU=y
88# CONFIG_TREE_RCU is not set 89# CONFIG_TREE_PREEMPT_RCU is not set
89# CONFIG_PREEMPT_RCU is not set 90# CONFIG_RCU_TRACE is not set
91CONFIG_RCU_FANOUT=32
92# CONFIG_RCU_FANOUT_EXACT is not set
90# CONFIG_TREE_RCU_TRACE is not set 93# CONFIG_TREE_RCU_TRACE is not set
91# CONFIG_PREEMPT_RCU_TRACE is not set
92# CONFIG_IKCONFIG is not set 94# CONFIG_IKCONFIG is not set
93CONFIG_LOG_BUF_SHIFT=14 95CONFIG_LOG_BUF_SHIFT=14
94CONFIG_GROUP_SCHED=y 96CONFIG_GROUP_SCHED=y
@@ -124,28 +126,29 @@ CONFIG_TIMERFD=y
124CONFIG_EVENTFD=y 126CONFIG_EVENTFD=y
125CONFIG_SHMEM=y 127CONFIG_SHMEM=y
126CONFIG_AIO=y 128CONFIG_AIO=y
127CONFIG_HAVE_PERF_COUNTERS=y 129CONFIG_HAVE_PERF_EVENTS=y
128 130
129# 131#
130# Performance Counters 132# Kernel Performance Events And Counters
131# 133#
134# CONFIG_PERF_EVENTS is not set
132# CONFIG_PERF_COUNTERS is not set 135# CONFIG_PERF_COUNTERS is not set
133CONFIG_VM_EVENT_COUNTERS=y 136CONFIG_VM_EVENT_COUNTERS=y
134CONFIG_PCI_QUIRKS=y 137CONFIG_PCI_QUIRKS=y
135CONFIG_SLUB_DEBUG=y 138CONFIG_SLUB_DEBUG=y
136# CONFIG_STRIP_ASM_SYMS is not set
137CONFIG_COMPAT_BRK=y 139CONFIG_COMPAT_BRK=y
138# CONFIG_SLAB is not set 140# CONFIG_SLAB is not set
139CONFIG_SLUB=y 141CONFIG_SLUB=y
140# CONFIG_SLOB is not set 142# CONFIG_SLOB is not set
141# CONFIG_PROFILING is not set 143# CONFIG_PROFILING is not set
142# CONFIG_MARKERS is not set
143CONFIG_HAVE_OPROFILE=y 144CONFIG_HAVE_OPROFILE=y
144CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 145CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
145CONFIG_HAVE_IOREMAP_PROT=y 146CONFIG_HAVE_IOREMAP_PROT=y
146CONFIG_HAVE_KPROBES=y 147CONFIG_HAVE_KPROBES=y
147CONFIG_HAVE_KRETPROBES=y 148CONFIG_HAVE_KRETPROBES=y
148CONFIG_HAVE_ARCH_TRACEHOOK=y 149CONFIG_HAVE_ARCH_TRACEHOOK=y
150CONFIG_HAVE_DMA_ATTRS=y
151CONFIG_HAVE_DMA_API_DEBUG=y
149 152
150# 153#
151# GCOV-based kernel profiling 154# GCOV-based kernel profiling
@@ -257,6 +260,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
257CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 260CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
258# CONFIG_KEXEC is not set 261# CONFIG_KEXEC is not set
259# CONFIG_CRASH_DUMP is not set 262# CONFIG_CRASH_DUMP is not set
263CONFIG_MAX_ACTIVE_REGIONS=32
260CONFIG_ARCH_FLATMEM_ENABLE=y 264CONFIG_ARCH_FLATMEM_ENABLE=y
261CONFIG_ARCH_POPULATES_NODE_MAP=y 265CONFIG_ARCH_POPULATES_NODE_MAP=y
262CONFIG_SELECT_MEMORY_MODEL=y 266CONFIG_SELECT_MEMORY_MODEL=y
@@ -274,6 +278,7 @@ CONFIG_BOUNCE=y
274CONFIG_VIRT_TO_BUS=y 278CONFIG_VIRT_TO_BUS=y
275CONFIG_HAVE_MLOCK=y 279CONFIG_HAVE_MLOCK=y
276CONFIG_HAVE_MLOCKED_PAGE_BIT=y 280CONFIG_HAVE_MLOCKED_PAGE_BIT=y
281# CONFIG_KSM is not set
277CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 282CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
278CONFIG_PPC_4K_PAGES=y 283CONFIG_PPC_4K_PAGES=y
279# CONFIG_PPC_16K_PAGES is not set 284# CONFIG_PPC_16K_PAGES is not set
@@ -369,6 +374,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
369# CONFIG_NETFILTER is not set 374# CONFIG_NETFILTER is not set
370# CONFIG_IP_DCCP is not set 375# CONFIG_IP_DCCP is not set
371# CONFIG_IP_SCTP is not set 376# CONFIG_IP_SCTP is not set
377# CONFIG_RDS is not set
372# CONFIG_TIPC is not set 378# CONFIG_TIPC is not set
373# CONFIG_ATM is not set 379# CONFIG_ATM is not set
374# CONFIG_BRIDGE is not set 380# CONFIG_BRIDGE is not set
@@ -398,6 +404,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
398# CONFIG_AF_RXRPC is not set 404# CONFIG_AF_RXRPC is not set
399CONFIG_WIRELESS=y 405CONFIG_WIRELESS=y
400# CONFIG_CFG80211 is not set 406# CONFIG_CFG80211 is not set
407CONFIG_CFG80211_DEFAULT_PS_VALUE=0
401CONFIG_WIRELESS_OLD_REGULATORY=y 408CONFIG_WIRELESS_OLD_REGULATORY=y
402# CONFIG_WIRELESS_EXT is not set 409# CONFIG_WIRELESS_EXT is not set
403# CONFIG_LIB80211 is not set 410# CONFIG_LIB80211 is not set
@@ -405,7 +412,6 @@ CONFIG_WIRELESS_OLD_REGULATORY=y
405# 412#
406# CFG80211 needs to be enabled for MAC80211 413# CFG80211 needs to be enabled for MAC80211
407# 414#
408CONFIG_MAC80211_DEFAULT_PS_VALUE=0
409# CONFIG_WIMAX is not set 415# CONFIG_WIMAX is not set
410# CONFIG_RFKILL is not set 416# CONFIG_RFKILL is not set
411# CONFIG_NET_9P is not set 417# CONFIG_NET_9P is not set
@@ -418,6 +424,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
418# Generic Driver Options 424# Generic Driver Options
419# 425#
420CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 426CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
427# CONFIG_DEVTMPFS is not set
421CONFIG_STANDALONE=y 428CONFIG_STANDALONE=y
422CONFIG_PREVENT_FIRMWARE_BUILD=y 429CONFIG_PREVENT_FIRMWARE_BUILD=y
423# CONFIG_FW_LOADER is not set 430# CONFIG_FW_LOADER is not set
@@ -507,6 +514,7 @@ CONFIG_SCSI_LOWLEVEL=y
507# CONFIG_ISCSI_TCP is not set 514# CONFIG_ISCSI_TCP is not set
508# CONFIG_SCSI_CXGB3_ISCSI is not set 515# CONFIG_SCSI_CXGB3_ISCSI is not set
509# CONFIG_SCSI_BNX2_ISCSI is not set 516# CONFIG_SCSI_BNX2_ISCSI is not set
517# CONFIG_BE2ISCSI is not set
510# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 518# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
511# CONFIG_SCSI_3W_9XXX is not set 519# CONFIG_SCSI_3W_9XXX is not set
512# CONFIG_SCSI_ACARD is not set 520# CONFIG_SCSI_ACARD is not set
@@ -545,7 +553,9 @@ CONFIG_SCSI_LOWLEVEL=y
545# CONFIG_SCSI_DC390T is not set 553# CONFIG_SCSI_DC390T is not set
546# CONFIG_SCSI_NSP32 is not set 554# CONFIG_SCSI_NSP32 is not set
547# CONFIG_SCSI_DEBUG is not set 555# CONFIG_SCSI_DEBUG is not set
556# CONFIG_SCSI_PMCRAID is not set
548# CONFIG_SCSI_SRP is not set 557# CONFIG_SCSI_SRP is not set
558# CONFIG_SCSI_BFA_FC is not set
549# CONFIG_SCSI_DH is not set 559# CONFIG_SCSI_DH is not set
550# CONFIG_SCSI_OSD_INITIATOR is not set 560# CONFIG_SCSI_OSD_INITIATOR is not set
551# CONFIG_ATA is not set 561# CONFIG_ATA is not set
@@ -617,7 +627,9 @@ CONFIG_MII=y
617# CONFIG_B44 is not set 627# CONFIG_B44 is not set
618# CONFIG_KS8842 is not set 628# CONFIG_KS8842 is not set
619# CONFIG_KS8851 is not set 629# CONFIG_KS8851 is not set
630# CONFIG_KS8851_MLL is not set
620# CONFIG_ATL2 is not set 631# CONFIG_ATL2 is not set
632# CONFIG_XILINX_EMACLITE is not set
621CONFIG_NETDEV_1000=y 633CONFIG_NETDEV_1000=y
622# CONFIG_ACENIC is not set 634# CONFIG_ACENIC is not set
623# CONFIG_DL2K is not set 635# CONFIG_DL2K is not set
@@ -640,7 +652,6 @@ CONFIG_E1000=y
640CONFIG_FSL_PQ_MDIO=y 652CONFIG_FSL_PQ_MDIO=y
641# CONFIG_GIANFAR is not set 653# CONFIG_GIANFAR is not set
642CONFIG_UCC_GETH=y 654CONFIG_UCC_GETH=y
643# CONFIG_UGETH_MAGIC_PACKET is not set
644# CONFIG_UGETH_TX_ON_DEMAND is not set 655# CONFIG_UGETH_TX_ON_DEMAND is not set
645# CONFIG_MV643XX_ETH is not set 656# CONFIG_MV643XX_ETH is not set
646# CONFIG_QLA3XXX is not set 657# CONFIG_QLA3XXX is not set
@@ -668,10 +679,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
668# CONFIG_SFC is not set 679# CONFIG_SFC is not set
669# CONFIG_BE2NET is not set 680# CONFIG_BE2NET is not set
670# CONFIG_TR is not set 681# CONFIG_TR is not set
671 682CONFIG_WLAN=y
672#
673# Wireless LAN
674#
675# CONFIG_WLAN_PRE80211 is not set 683# CONFIG_WLAN_PRE80211 is not set
676# CONFIG_WLAN_80211 is not set 684# CONFIG_WLAN_80211 is not set
677 685
@@ -776,6 +784,7 @@ CONFIG_GEN_RTC=y
776CONFIG_DEVPORT=y 784CONFIG_DEVPORT=y
777CONFIG_I2C=y 785CONFIG_I2C=y
778CONFIG_I2C_BOARDINFO=y 786CONFIG_I2C_BOARDINFO=y
787CONFIG_I2C_COMPAT=y
779CONFIG_I2C_CHARDEV=y 788CONFIG_I2C_CHARDEV=y
780CONFIG_I2C_HELPER_AUTO=y 789CONFIG_I2C_HELPER_AUTO=y
781 790
@@ -830,9 +839,6 @@ CONFIG_I2C_MPC=y
830# Miscellaneous I2C Chip support 839# Miscellaneous I2C Chip support
831# 840#
832# CONFIG_DS1682 is not set 841# CONFIG_DS1682 is not set
833# CONFIG_SENSORS_PCF8574 is not set
834# CONFIG_PCF8575 is not set
835# CONFIG_SENSORS_PCA9539 is not set
836# CONFIG_SENSORS_TSL2550 is not set 842# CONFIG_SENSORS_TSL2550 is not set
837# CONFIG_I2C_DEBUG_CORE is not set 843# CONFIG_I2C_DEBUG_CORE is not set
838# CONFIG_I2C_DEBUG_ALGO is not set 844# CONFIG_I2C_DEBUG_ALGO is not set
@@ -863,6 +869,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
863# CONFIG_POWER_SUPPLY is not set 869# CONFIG_POWER_SUPPLY is not set
864CONFIG_HWMON=y 870CONFIG_HWMON=y
865# CONFIG_HWMON_VID is not set 871# CONFIG_HWMON_VID is not set
872# CONFIG_HWMON_DEBUG_CHIP is not set
873
874#
875# Native drivers
876#
866# CONFIG_SENSORS_AD7414 is not set 877# CONFIG_SENSORS_AD7414 is not set
867# CONFIG_SENSORS_AD7418 is not set 878# CONFIG_SENSORS_AD7418 is not set
868# CONFIG_SENSORS_ADCXX is not set 879# CONFIG_SENSORS_ADCXX is not set
@@ -915,6 +926,7 @@ CONFIG_HWMON=y
915# CONFIG_SENSORS_ADS7828 is not set 926# CONFIG_SENSORS_ADS7828 is not set
916# CONFIG_SENSORS_THMC50 is not set 927# CONFIG_SENSORS_THMC50 is not set
917# CONFIG_SENSORS_TMP401 is not set 928# CONFIG_SENSORS_TMP401 is not set
929# CONFIG_SENSORS_TMP421 is not set
918# CONFIG_SENSORS_VIA686A is not set 930# CONFIG_SENSORS_VIA686A is not set
919# CONFIG_SENSORS_VT1211 is not set 931# CONFIG_SENSORS_VT1211 is not set
920# CONFIG_SENSORS_VT8231 is not set 932# CONFIG_SENSORS_VT8231 is not set
@@ -927,9 +939,7 @@ CONFIG_HWMON=y
927# CONFIG_SENSORS_W83627HF is not set 939# CONFIG_SENSORS_W83627HF is not set
928# CONFIG_SENSORS_W83627EHF is not set 940# CONFIG_SENSORS_W83627EHF is not set
929# CONFIG_SENSORS_LIS3_SPI is not set 941# CONFIG_SENSORS_LIS3_SPI is not set
930# CONFIG_HWMON_DEBUG_CHIP is not set
931# CONFIG_THERMAL is not set 942# CONFIG_THERMAL is not set
932# CONFIG_THERMAL_HWMON is not set
933CONFIG_WATCHDOG=y 943CONFIG_WATCHDOG=y
934# CONFIG_WATCHDOG_NOWAYOUT is not set 944# CONFIG_WATCHDOG_NOWAYOUT is not set
935 945
@@ -967,8 +977,10 @@ CONFIG_SSB_POSSIBLE=y
967# CONFIG_MFD_TMIO is not set 977# CONFIG_MFD_TMIO is not set
968# CONFIG_PMIC_DA903X is not set 978# CONFIG_PMIC_DA903X is not set
969# CONFIG_MFD_WM8400 is not set 979# CONFIG_MFD_WM8400 is not set
980# CONFIG_MFD_WM831X is not set
970# CONFIG_MFD_WM8350_I2C is not set 981# CONFIG_MFD_WM8350_I2C is not set
971# CONFIG_MFD_PCF50633 is not set 982# CONFIG_MFD_PCF50633 is not set
983# CONFIG_MFD_MC13783 is not set
972# CONFIG_AB3100_CORE is not set 984# CONFIG_AB3100_CORE is not set
973# CONFIG_EZX_PCAP is not set 985# CONFIG_EZX_PCAP is not set
974# CONFIG_REGULATOR is not set 986# CONFIG_REGULATOR is not set
@@ -978,6 +990,7 @@ CONFIG_SSB_POSSIBLE=y
978# Graphics support 990# Graphics support
979# 991#
980# CONFIG_AGP is not set 992# CONFIG_AGP is not set
993CONFIG_VGA_ARB=y
981# CONFIG_DRM is not set 994# CONFIG_DRM is not set
982# CONFIG_VGASTATE is not set 995# CONFIG_VGASTATE is not set
983CONFIG_VIDEO_OUTPUT_CONTROL=m 996CONFIG_VIDEO_OUTPUT_CONTROL=m
@@ -991,7 +1004,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m
991# CONFIG_SOUND is not set 1004# CONFIG_SOUND is not set
992CONFIG_HID_SUPPORT=y 1005CONFIG_HID_SUPPORT=y
993CONFIG_HID=y 1006CONFIG_HID=y
994# CONFIG_HID_DEBUG is not set
995# CONFIG_HIDRAW is not set 1007# CONFIG_HIDRAW is not set
996 1008
997# 1009#
@@ -1043,6 +1055,7 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y
1043# CONFIG_USB_OXU210HP_HCD is not set 1055# CONFIG_USB_OXU210HP_HCD is not set
1044# CONFIG_USB_ISP116X_HCD is not set 1056# CONFIG_USB_ISP116X_HCD is not set
1045# CONFIG_USB_ISP1760_HCD is not set 1057# CONFIG_USB_ISP1760_HCD is not set
1058# CONFIG_USB_ISP1362_HCD is not set
1046CONFIG_USB_OHCI_HCD=y 1059CONFIG_USB_OHCI_HCD=y
1047CONFIG_USB_OHCI_HCD_PPC_OF_BE=y 1060CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
1048# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set 1061# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set
@@ -1146,6 +1159,8 @@ CONFIG_MMC_BLOCK_BOUNCE=y
1146# 1159#
1147# CONFIG_MMC_SDHCI is not set 1160# CONFIG_MMC_SDHCI is not set
1148# CONFIG_MMC_WBSD is not set 1161# CONFIG_MMC_WBSD is not set
1162# CONFIG_MMC_AT91 is not set
1163# CONFIG_MMC_ATMELMCI is not set
1149# CONFIG_MMC_TIFM_SD is not set 1164# CONFIG_MMC_TIFM_SD is not set
1150CONFIG_MMC_SPI=y 1165CONFIG_MMC_SPI=y
1151# CONFIG_MMC_CB710 is not set 1166# CONFIG_MMC_CB710 is not set
@@ -1186,6 +1201,7 @@ CONFIG_FS_MBCACHE=y
1186# CONFIG_GFS2_FS is not set 1201# CONFIG_GFS2_FS is not set
1187# CONFIG_OCFS2_FS is not set 1202# CONFIG_OCFS2_FS is not set
1188# CONFIG_BTRFS_FS is not set 1203# CONFIG_BTRFS_FS is not set
1204# CONFIG_NILFS2_FS is not set
1189CONFIG_FILE_LOCKING=y 1205CONFIG_FILE_LOCKING=y
1190CONFIG_FSNOTIFY=y 1206CONFIG_FSNOTIFY=y
1191CONFIG_DNOTIFY=y 1207CONFIG_DNOTIFY=y
@@ -1247,7 +1263,6 @@ CONFIG_MISC_FILESYSTEMS=y
1247# CONFIG_ROMFS_FS is not set 1263# CONFIG_ROMFS_FS is not set
1248# CONFIG_SYSV_FS is not set 1264# CONFIG_SYSV_FS is not set
1249# CONFIG_UFS_FS is not set 1265# CONFIG_UFS_FS is not set
1250# CONFIG_NILFS2_FS is not set
1251CONFIG_NETWORK_FILESYSTEMS=y 1266CONFIG_NETWORK_FILESYSTEMS=y
1252CONFIG_NFS_FS=y 1267CONFIG_NFS_FS=y
1253CONFIG_NFS_V3=y 1268CONFIG_NFS_V3=y
@@ -1365,6 +1380,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
1365CONFIG_ENABLE_MUST_CHECK=y 1380CONFIG_ENABLE_MUST_CHECK=y
1366CONFIG_FRAME_WARN=1024 1381CONFIG_FRAME_WARN=1024
1367# CONFIG_MAGIC_SYSRQ is not set 1382# CONFIG_MAGIC_SYSRQ is not set
1383# CONFIG_STRIP_ASM_SYMS is not set
1368# CONFIG_UNUSED_SYMBOLS is not set 1384# CONFIG_UNUSED_SYMBOLS is not set
1369# CONFIG_DEBUG_FS is not set 1385# CONFIG_DEBUG_FS is not set
1370# CONFIG_HEADERS_CHECK is not set 1386# CONFIG_HEADERS_CHECK is not set
@@ -1382,6 +1398,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
1382CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1398CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1383CONFIG_TRACING_SUPPORT=y 1399CONFIG_TRACING_SUPPORT=y
1384# CONFIG_FTRACE is not set 1400# CONFIG_FTRACE is not set
1401# CONFIG_DMA_API_DEBUG is not set
1385# CONFIG_SAMPLES is not set 1402# CONFIG_SAMPLES is not set
1386CONFIG_HAVE_ARCH_KGDB=y 1403CONFIG_HAVE_ARCH_KGDB=y
1387# CONFIG_PPC_DISABLE_WERROR is not set 1404# CONFIG_PPC_DISABLE_WERROR is not set
@@ -1403,7 +1420,6 @@ CONFIG_CRYPTO=y
1403# 1420#
1404# Crypto core or helper 1421# Crypto core or helper
1405# 1422#
1406# CONFIG_CRYPTO_FIPS is not set
1407CONFIG_CRYPTO_ALGAPI=y 1423CONFIG_CRYPTO_ALGAPI=y
1408CONFIG_CRYPTO_ALGAPI2=y 1424CONFIG_CRYPTO_ALGAPI2=y
1409CONFIG_CRYPTO_AEAD2=y 1425CONFIG_CRYPTO_AEAD2=y
@@ -1445,11 +1461,13 @@ CONFIG_CRYPTO_PCBC=m
1445# 1461#
1446# CONFIG_CRYPTO_HMAC is not set 1462# CONFIG_CRYPTO_HMAC is not set
1447# CONFIG_CRYPTO_XCBC is not set 1463# CONFIG_CRYPTO_XCBC is not set
1464# CONFIG_CRYPTO_VMAC is not set
1448 1465
1449# 1466#
1450# Digest 1467# Digest
1451# 1468#
1452# CONFIG_CRYPTO_CRC32C is not set 1469# CONFIG_CRYPTO_CRC32C is not set
1470# CONFIG_CRYPTO_GHASH is not set
1453# CONFIG_CRYPTO_MD4 is not set 1471# CONFIG_CRYPTO_MD4 is not set
1454CONFIG_CRYPTO_MD5=y 1472CONFIG_CRYPTO_MD5=y
1455# CONFIG_CRYPTO_MICHAEL_MIC is not set 1473# CONFIG_CRYPTO_MICHAEL_MIC is not set
diff --git a/arch/powerpc/configs/83xx/mpc834x_itx_defconfig b/arch/powerpc/configs/83xx/mpc834x_itx_defconfig
index 648dac0c9d8d..f67317e1934c 100644
--- a/arch/powerpc/configs/83xx/mpc834x_itx_defconfig
+++ b/arch/powerpc/configs/83xx/mpc834x_itx_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.31-rc4 3# Linux kernel version: 2.6.32-rc5
4# Wed Jul 29 23:32:07 2009 4# Thu Nov 5 08:20:25 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -35,6 +35,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
35CONFIG_GENERIC_HARDIRQS=y 35CONFIG_GENERIC_HARDIRQS=y
36CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 36CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
38CONFIG_IRQ_PER_CPU=y 39CONFIG_IRQ_PER_CPU=y
39CONFIG_STACKTRACE_SUPPORT=y 40CONFIG_STACKTRACE_SUPPORT=y
40CONFIG_HAVE_LATENCYTOP_SUPPORT=y 41CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -84,11 +85,12 @@ CONFIG_SYSVIPC_SYSCTL=y
84# 85#
85# RCU Subsystem 86# RCU Subsystem
86# 87#
87CONFIG_CLASSIC_RCU=y 88CONFIG_TREE_RCU=y
88# CONFIG_TREE_RCU is not set 89# CONFIG_TREE_PREEMPT_RCU is not set
89# CONFIG_PREEMPT_RCU is not set 90# CONFIG_RCU_TRACE is not set
91CONFIG_RCU_FANOUT=32
92# CONFIG_RCU_FANOUT_EXACT is not set
90# CONFIG_TREE_RCU_TRACE is not set 93# CONFIG_TREE_RCU_TRACE is not set
91# CONFIG_PREEMPT_RCU_TRACE is not set
92# CONFIG_IKCONFIG is not set 94# CONFIG_IKCONFIG is not set
93CONFIG_LOG_BUF_SHIFT=14 95CONFIG_LOG_BUF_SHIFT=14
94CONFIG_GROUP_SCHED=y 96CONFIG_GROUP_SCHED=y
@@ -124,28 +126,29 @@ CONFIG_TIMERFD=y
124CONFIG_EVENTFD=y 126CONFIG_EVENTFD=y
125CONFIG_SHMEM=y 127CONFIG_SHMEM=y
126CONFIG_AIO=y 128CONFIG_AIO=y
127CONFIG_HAVE_PERF_COUNTERS=y 129CONFIG_HAVE_PERF_EVENTS=y
128 130
129# 131#
130# Performance Counters 132# Kernel Performance Events And Counters
131# 133#
134# CONFIG_PERF_EVENTS is not set
132# CONFIG_PERF_COUNTERS is not set 135# CONFIG_PERF_COUNTERS is not set
133CONFIG_VM_EVENT_COUNTERS=y 136CONFIG_VM_EVENT_COUNTERS=y
134CONFIG_PCI_QUIRKS=y 137CONFIG_PCI_QUIRKS=y
135CONFIG_SLUB_DEBUG=y 138CONFIG_SLUB_DEBUG=y
136# CONFIG_STRIP_ASM_SYMS is not set
137CONFIG_COMPAT_BRK=y 139CONFIG_COMPAT_BRK=y
138# CONFIG_SLAB is not set 140# CONFIG_SLAB is not set
139CONFIG_SLUB=y 141CONFIG_SLUB=y
140# CONFIG_SLOB is not set 142# CONFIG_SLOB is not set
141# CONFIG_PROFILING is not set 143# CONFIG_PROFILING is not set
142# CONFIG_MARKERS is not set
143CONFIG_HAVE_OPROFILE=y 144CONFIG_HAVE_OPROFILE=y
144CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 145CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
145CONFIG_HAVE_IOREMAP_PROT=y 146CONFIG_HAVE_IOREMAP_PROT=y
146CONFIG_HAVE_KPROBES=y 147CONFIG_HAVE_KPROBES=y
147CONFIG_HAVE_KRETPROBES=y 148CONFIG_HAVE_KRETPROBES=y
148CONFIG_HAVE_ARCH_TRACEHOOK=y 149CONFIG_HAVE_ARCH_TRACEHOOK=y
150CONFIG_HAVE_DMA_ATTRS=y
151CONFIG_HAVE_DMA_API_DEBUG=y
149 152
150# 153#
151# GCOV-based kernel profiling 154# GCOV-based kernel profiling
@@ -256,6 +259,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
256CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 259CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
257# CONFIG_KEXEC is not set 260# CONFIG_KEXEC is not set
258# CONFIG_CRASH_DUMP is not set 261# CONFIG_CRASH_DUMP is not set
262CONFIG_MAX_ACTIVE_REGIONS=32
259CONFIG_ARCH_FLATMEM_ENABLE=y 263CONFIG_ARCH_FLATMEM_ENABLE=y
260CONFIG_ARCH_POPULATES_NODE_MAP=y 264CONFIG_ARCH_POPULATES_NODE_MAP=y
261CONFIG_SELECT_MEMORY_MODEL=y 265CONFIG_SELECT_MEMORY_MODEL=y
@@ -273,6 +277,7 @@ CONFIG_BOUNCE=y
273CONFIG_VIRT_TO_BUS=y 277CONFIG_VIRT_TO_BUS=y
274CONFIG_HAVE_MLOCK=y 278CONFIG_HAVE_MLOCK=y
275CONFIG_HAVE_MLOCKED_PAGE_BIT=y 279CONFIG_HAVE_MLOCKED_PAGE_BIT=y
280# CONFIG_KSM is not set
276CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 281CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
277CONFIG_PPC_4K_PAGES=y 282CONFIG_PPC_4K_PAGES=y
278# CONFIG_PPC_16K_PAGES is not set 283# CONFIG_PPC_16K_PAGES is not set
@@ -368,6 +373,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
368# CONFIG_NETFILTER is not set 373# CONFIG_NETFILTER is not set
369# CONFIG_IP_DCCP is not set 374# CONFIG_IP_DCCP is not set
370# CONFIG_IP_SCTP is not set 375# CONFIG_IP_SCTP is not set
376# CONFIG_RDS is not set
371# CONFIG_TIPC is not set 377# CONFIG_TIPC is not set
372# CONFIG_ATM is not set 378# CONFIG_ATM is not set
373# CONFIG_BRIDGE is not set 379# CONFIG_BRIDGE is not set
@@ -397,6 +403,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
397# CONFIG_AF_RXRPC is not set 403# CONFIG_AF_RXRPC is not set
398CONFIG_WIRELESS=y 404CONFIG_WIRELESS=y
399# CONFIG_CFG80211 is not set 405# CONFIG_CFG80211 is not set
406CONFIG_CFG80211_DEFAULT_PS_VALUE=0
400CONFIG_WIRELESS_OLD_REGULATORY=y 407CONFIG_WIRELESS_OLD_REGULATORY=y
401# CONFIG_WIRELESS_EXT is not set 408# CONFIG_WIRELESS_EXT is not set
402# CONFIG_LIB80211 is not set 409# CONFIG_LIB80211 is not set
@@ -404,7 +411,6 @@ CONFIG_WIRELESS_OLD_REGULATORY=y
404# 411#
405# CFG80211 needs to be enabled for MAC80211 412# CFG80211 needs to be enabled for MAC80211
406# 413#
407CONFIG_MAC80211_DEFAULT_PS_VALUE=0
408# CONFIG_WIMAX is not set 414# CONFIG_WIMAX is not set
409# CONFIG_RFKILL is not set 415# CONFIG_RFKILL is not set
410# CONFIG_NET_9P is not set 416# CONFIG_NET_9P is not set
@@ -417,6 +423,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
417# Generic Driver Options 423# Generic Driver Options
418# 424#
419CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 425CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
426# CONFIG_DEVTMPFS is not set
420CONFIG_STANDALONE=y 427CONFIG_STANDALONE=y
421CONFIG_PREVENT_FIRMWARE_BUILD=y 428CONFIG_PREVENT_FIRMWARE_BUILD=y
422# CONFIG_FW_LOADER is not set 429# CONFIG_FW_LOADER is not set
@@ -424,9 +431,9 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
424# CONFIG_CONNECTOR is not set 431# CONFIG_CONNECTOR is not set
425CONFIG_MTD=y 432CONFIG_MTD=y
426# CONFIG_MTD_DEBUG is not set 433# CONFIG_MTD_DEBUG is not set
434# CONFIG_MTD_TESTS is not set
427# CONFIG_MTD_CONCAT is not set 435# CONFIG_MTD_CONCAT is not set
428# CONFIG_MTD_PARTITIONS is not set 436# CONFIG_MTD_PARTITIONS is not set
429# CONFIG_MTD_TESTS is not set
430 437
431# 438#
432# User Modules And Translation Layers 439# User Modules And Translation Layers
@@ -483,6 +490,7 @@ CONFIG_MTD_PHYSMAP=y
483# CONFIG_MTD_PMC551 is not set 490# CONFIG_MTD_PMC551 is not set
484# CONFIG_MTD_DATAFLASH is not set 491# CONFIG_MTD_DATAFLASH is not set
485# CONFIG_MTD_M25P80 is not set 492# CONFIG_MTD_M25P80 is not set
493# CONFIG_MTD_SST25L is not set
486# CONFIG_MTD_SLRAM is not set 494# CONFIG_MTD_SLRAM is not set
487# CONFIG_MTD_PHRAM is not set 495# CONFIG_MTD_PHRAM is not set
488# CONFIG_MTD_MTDRAM is not set 496# CONFIG_MTD_MTDRAM is not set
@@ -637,6 +645,7 @@ CONFIG_SCSI_LOWLEVEL=y
637# CONFIG_ISCSI_TCP is not set 645# CONFIG_ISCSI_TCP is not set
638# CONFIG_SCSI_CXGB3_ISCSI is not set 646# CONFIG_SCSI_CXGB3_ISCSI is not set
639# CONFIG_SCSI_BNX2_ISCSI is not set 647# CONFIG_SCSI_BNX2_ISCSI is not set
648# CONFIG_BE2ISCSI is not set
640# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 649# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
641# CONFIG_SCSI_3W_9XXX is not set 650# CONFIG_SCSI_3W_9XXX is not set
642# CONFIG_SCSI_ACARD is not set 651# CONFIG_SCSI_ACARD is not set
@@ -676,11 +685,14 @@ CONFIG_SCSI_LOWLEVEL=y
676# CONFIG_SCSI_DC390T is not set 685# CONFIG_SCSI_DC390T is not set
677# CONFIG_SCSI_NSP32 is not set 686# CONFIG_SCSI_NSP32 is not set
678# CONFIG_SCSI_DEBUG is not set 687# CONFIG_SCSI_DEBUG is not set
688# CONFIG_SCSI_PMCRAID is not set
679# CONFIG_SCSI_SRP is not set 689# CONFIG_SCSI_SRP is not set
690# CONFIG_SCSI_BFA_FC is not set
680# CONFIG_SCSI_DH is not set 691# CONFIG_SCSI_DH is not set
681# CONFIG_SCSI_OSD_INITIATOR is not set 692# CONFIG_SCSI_OSD_INITIATOR is not set
682CONFIG_ATA=y 693CONFIG_ATA=y
683# CONFIG_ATA_NONSTANDARD is not set 694# CONFIG_ATA_NONSTANDARD is not set
695CONFIG_ATA_VERBOSE_ERROR=y
684CONFIG_SATA_PMP=y 696CONFIG_SATA_PMP=y
685# CONFIG_SATA_AHCI is not set 697# CONFIG_SATA_AHCI is not set
686# CONFIG_SATA_SIL24 is not set 698# CONFIG_SATA_SIL24 is not set
@@ -703,6 +715,7 @@ CONFIG_SATA_SIL=y
703# CONFIG_PATA_ALI is not set 715# CONFIG_PATA_ALI is not set
704# CONFIG_PATA_AMD is not set 716# CONFIG_PATA_AMD is not set
705# CONFIG_PATA_ARTOP is not set 717# CONFIG_PATA_ARTOP is not set
718# CONFIG_PATA_ATP867X is not set
706# CONFIG_PATA_ATIIXP is not set 719# CONFIG_PATA_ATIIXP is not set
707# CONFIG_PATA_CMD640_PCI is not set 720# CONFIG_PATA_CMD640_PCI is not set
708# CONFIG_PATA_CMD64X is not set 721# CONFIG_PATA_CMD64X is not set
@@ -730,6 +743,7 @@ CONFIG_SATA_SIL=y
730# CONFIG_PATA_OPTIDMA is not set 743# CONFIG_PATA_OPTIDMA is not set
731# CONFIG_PATA_PDC_OLD is not set 744# CONFIG_PATA_PDC_OLD is not set
732# CONFIG_PATA_RADISYS is not set 745# CONFIG_PATA_RADISYS is not set
746# CONFIG_PATA_RDC is not set
733# CONFIG_PATA_RZ1000 is not set 747# CONFIG_PATA_RZ1000 is not set
734# CONFIG_PATA_SC1200 is not set 748# CONFIG_PATA_SC1200 is not set
735# CONFIG_PATA_SERVERWORKS is not set 749# CONFIG_PATA_SERVERWORKS is not set
@@ -845,10 +859,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
845# CONFIG_SFC is not set 859# CONFIG_SFC is not set
846# CONFIG_BE2NET is not set 860# CONFIG_BE2NET is not set
847# CONFIG_TR is not set 861# CONFIG_TR is not set
848 862CONFIG_WLAN=y
849#
850# Wireless LAN
851#
852# CONFIG_WLAN_PRE80211 is not set 863# CONFIG_WLAN_PRE80211 is not set
853# CONFIG_WLAN_80211 is not set 864# CONFIG_WLAN_80211 is not set
854 865
@@ -930,6 +941,7 @@ CONFIG_HW_RANDOM=y
930CONFIG_DEVPORT=y 941CONFIG_DEVPORT=y
931CONFIG_I2C=y 942CONFIG_I2C=y
932CONFIG_I2C_BOARDINFO=y 943CONFIG_I2C_BOARDINFO=y
944CONFIG_I2C_COMPAT=y
933CONFIG_I2C_CHARDEV=y 945CONFIG_I2C_CHARDEV=y
934CONFIG_I2C_HELPER_AUTO=y 946CONFIG_I2C_HELPER_AUTO=y
935 947
@@ -984,9 +996,6 @@ CONFIG_I2C_MPC=y
984# Miscellaneous I2C Chip support 996# Miscellaneous I2C Chip support
985# 997#
986# CONFIG_DS1682 is not set 998# CONFIG_DS1682 is not set
987CONFIG_SENSORS_PCF8574=y
988# CONFIG_PCF8575 is not set
989# CONFIG_SENSORS_PCA9539 is not set
990# CONFIG_SENSORS_TSL2550 is not set 999# CONFIG_SENSORS_TSL2550 is not set
991# CONFIG_I2C_DEBUG_CORE is not set 1000# CONFIG_I2C_DEBUG_CORE is not set
992# CONFIG_I2C_DEBUG_ALGO is not set 1001# CONFIG_I2C_DEBUG_ALGO is not set
@@ -1017,7 +1026,6 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
1017# CONFIG_POWER_SUPPLY is not set 1026# CONFIG_POWER_SUPPLY is not set
1018# CONFIG_HWMON is not set 1027# CONFIG_HWMON is not set
1019# CONFIG_THERMAL is not set 1028# CONFIG_THERMAL is not set
1020# CONFIG_THERMAL_HWMON is not set
1021CONFIG_WATCHDOG=y 1029CONFIG_WATCHDOG=y
1022# CONFIG_WATCHDOG_NOWAYOUT is not set 1030# CONFIG_WATCHDOG_NOWAYOUT is not set
1023 1031
@@ -1055,8 +1063,10 @@ CONFIG_SSB_POSSIBLE=y
1055# CONFIG_MFD_TMIO is not set 1063# CONFIG_MFD_TMIO is not set
1056# CONFIG_PMIC_DA903X is not set 1064# CONFIG_PMIC_DA903X is not set
1057# CONFIG_MFD_WM8400 is not set 1065# CONFIG_MFD_WM8400 is not set
1066# CONFIG_MFD_WM831X is not set
1058# CONFIG_MFD_WM8350_I2C is not set 1067# CONFIG_MFD_WM8350_I2C is not set
1059# CONFIG_MFD_PCF50633 is not set 1068# CONFIG_MFD_PCF50633 is not set
1069# CONFIG_MFD_MC13783 is not set
1060# CONFIG_AB3100_CORE is not set 1070# CONFIG_AB3100_CORE is not set
1061# CONFIG_EZX_PCAP is not set 1071# CONFIG_EZX_PCAP is not set
1062# CONFIG_REGULATOR is not set 1072# CONFIG_REGULATOR is not set
@@ -1066,6 +1076,7 @@ CONFIG_SSB_POSSIBLE=y
1066# Graphics support 1076# Graphics support
1067# 1077#
1068# CONFIG_AGP is not set 1078# CONFIG_AGP is not set
1079CONFIG_VGA_ARB=y
1069# CONFIG_DRM is not set 1080# CONFIG_DRM is not set
1070# CONFIG_VGASTATE is not set 1081# CONFIG_VGASTATE is not set
1071CONFIG_VIDEO_OUTPUT_CONTROL=m 1082CONFIG_VIDEO_OUTPUT_CONTROL=m
@@ -1111,6 +1122,7 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y
1111# CONFIG_USB_OXU210HP_HCD is not set 1122# CONFIG_USB_OXU210HP_HCD is not set
1112# CONFIG_USB_ISP116X_HCD is not set 1123# CONFIG_USB_ISP116X_HCD is not set
1113# CONFIG_USB_ISP1760_HCD is not set 1124# CONFIG_USB_ISP1760_HCD is not set
1125# CONFIG_USB_ISP1362_HCD is not set
1114# CONFIG_USB_OHCI_HCD is not set 1126# CONFIG_USB_OHCI_HCD is not set
1115CONFIG_USB_UHCI_HCD=y 1127CONFIG_USB_UHCI_HCD=y
1116# CONFIG_USB_SL811_HCD is not set 1128# CONFIG_USB_SL811_HCD is not set
@@ -1238,6 +1250,7 @@ CONFIG_RTC_DRV_DS1307=y
1238# CONFIG_RTC_DRV_R9701 is not set 1250# CONFIG_RTC_DRV_R9701 is not set
1239# CONFIG_RTC_DRV_RS5C348 is not set 1251# CONFIG_RTC_DRV_RS5C348 is not set
1240# CONFIG_RTC_DRV_DS3234 is not set 1252# CONFIG_RTC_DRV_DS3234 is not set
1253# CONFIG_RTC_DRV_PCF2123 is not set
1241 1254
1242# 1255#
1243# Platform RTC drivers 1256# Platform RTC drivers
@@ -1288,6 +1301,7 @@ CONFIG_FS_MBCACHE=y
1288# CONFIG_GFS2_FS is not set 1301# CONFIG_GFS2_FS is not set
1289# CONFIG_OCFS2_FS is not set 1302# CONFIG_OCFS2_FS is not set
1290# CONFIG_BTRFS_FS is not set 1303# CONFIG_BTRFS_FS is not set
1304# CONFIG_NILFS2_FS is not set
1291CONFIG_FILE_LOCKING=y 1305CONFIG_FILE_LOCKING=y
1292CONFIG_FSNOTIFY=y 1306CONFIG_FSNOTIFY=y
1293CONFIG_DNOTIFY=y 1307CONFIG_DNOTIFY=y
@@ -1350,7 +1364,6 @@ CONFIG_MISC_FILESYSTEMS=y
1350# CONFIG_ROMFS_FS is not set 1364# CONFIG_ROMFS_FS is not set
1351# CONFIG_SYSV_FS is not set 1365# CONFIG_SYSV_FS is not set
1352# CONFIG_UFS_FS is not set 1366# CONFIG_UFS_FS is not set
1353# CONFIG_NILFS2_FS is not set
1354CONFIG_NETWORK_FILESYSTEMS=y 1367CONFIG_NETWORK_FILESYSTEMS=y
1355CONFIG_NFS_FS=y 1368CONFIG_NFS_FS=y
1356CONFIG_NFS_V3=y 1369CONFIG_NFS_V3=y
@@ -1465,6 +1478,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
1465CONFIG_ENABLE_MUST_CHECK=y 1478CONFIG_ENABLE_MUST_CHECK=y
1466CONFIG_FRAME_WARN=1024 1479CONFIG_FRAME_WARN=1024
1467# CONFIG_MAGIC_SYSRQ is not set 1480# CONFIG_MAGIC_SYSRQ is not set
1481# CONFIG_STRIP_ASM_SYMS is not set
1468# CONFIG_UNUSED_SYMBOLS is not set 1482# CONFIG_UNUSED_SYMBOLS is not set
1469# CONFIG_DEBUG_FS is not set 1483# CONFIG_DEBUG_FS is not set
1470# CONFIG_HEADERS_CHECK is not set 1484# CONFIG_HEADERS_CHECK is not set
@@ -1482,6 +1496,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
1482CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1496CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1483CONFIG_TRACING_SUPPORT=y 1497CONFIG_TRACING_SUPPORT=y
1484# CONFIG_FTRACE is not set 1498# CONFIG_FTRACE is not set
1499# CONFIG_DMA_API_DEBUG is not set
1485# CONFIG_SAMPLES is not set 1500# CONFIG_SAMPLES is not set
1486CONFIG_HAVE_ARCH_KGDB=y 1501CONFIG_HAVE_ARCH_KGDB=y
1487# CONFIG_PPC_DISABLE_WERROR is not set 1502# CONFIG_PPC_DISABLE_WERROR is not set
@@ -1503,7 +1518,6 @@ CONFIG_CRYPTO=y
1503# 1518#
1504# Crypto core or helper 1519# Crypto core or helper
1505# 1520#
1506# CONFIG_CRYPTO_FIPS is not set
1507CONFIG_CRYPTO_ALGAPI=y 1521CONFIG_CRYPTO_ALGAPI=y
1508CONFIG_CRYPTO_ALGAPI2=y 1522CONFIG_CRYPTO_ALGAPI2=y
1509CONFIG_CRYPTO_AEAD2=y 1523CONFIG_CRYPTO_AEAD2=y
@@ -1545,11 +1559,13 @@ CONFIG_CRYPTO_PCBC=m
1545# 1559#
1546# CONFIG_CRYPTO_HMAC is not set 1560# CONFIG_CRYPTO_HMAC is not set
1547# CONFIG_CRYPTO_XCBC is not set 1561# CONFIG_CRYPTO_XCBC is not set
1562# CONFIG_CRYPTO_VMAC is not set
1548 1563
1549# 1564#
1550# Digest 1565# Digest
1551# 1566#
1552# CONFIG_CRYPTO_CRC32C is not set 1567# CONFIG_CRYPTO_CRC32C is not set
1568# CONFIG_CRYPTO_GHASH is not set
1553# CONFIG_CRYPTO_MD4 is not set 1569# CONFIG_CRYPTO_MD4 is not set
1554CONFIG_CRYPTO_MD5=y 1570CONFIG_CRYPTO_MD5=y
1555# CONFIG_CRYPTO_MICHAEL_MIC is not set 1571# CONFIG_CRYPTO_MICHAEL_MIC is not set
diff --git a/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig b/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig
index bf6deb831dc3..a668110c10f6 100644
--- a/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig
+++ b/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.31-rc4 3# Linux kernel version: 2.6.32-rc5
4# Wed Jul 29 23:32:08 2009 4# Thu Nov 5 08:20:26 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -35,6 +35,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
35CONFIG_GENERIC_HARDIRQS=y 35CONFIG_GENERIC_HARDIRQS=y
36CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 36CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
38CONFIG_IRQ_PER_CPU=y 39CONFIG_IRQ_PER_CPU=y
39CONFIG_STACKTRACE_SUPPORT=y 40CONFIG_STACKTRACE_SUPPORT=y
40CONFIG_HAVE_LATENCYTOP_SUPPORT=y 41CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -84,11 +85,12 @@ CONFIG_SYSVIPC_SYSCTL=y
84# 85#
85# RCU Subsystem 86# RCU Subsystem
86# 87#
87CONFIG_CLASSIC_RCU=y 88CONFIG_TREE_RCU=y
88# CONFIG_TREE_RCU is not set 89# CONFIG_TREE_PREEMPT_RCU is not set
89# CONFIG_PREEMPT_RCU is not set 90# CONFIG_RCU_TRACE is not set
91CONFIG_RCU_FANOUT=32
92# CONFIG_RCU_FANOUT_EXACT is not set
90# CONFIG_TREE_RCU_TRACE is not set 93# CONFIG_TREE_RCU_TRACE is not set
91# CONFIG_PREEMPT_RCU_TRACE is not set
92# CONFIG_IKCONFIG is not set 94# CONFIG_IKCONFIG is not set
93CONFIG_LOG_BUF_SHIFT=14 95CONFIG_LOG_BUF_SHIFT=14
94CONFIG_GROUP_SCHED=y 96CONFIG_GROUP_SCHED=y
@@ -124,28 +126,29 @@ CONFIG_TIMERFD=y
124CONFIG_EVENTFD=y 126CONFIG_EVENTFD=y
125CONFIG_SHMEM=y 127CONFIG_SHMEM=y
126CONFIG_AIO=y 128CONFIG_AIO=y
127CONFIG_HAVE_PERF_COUNTERS=y 129CONFIG_HAVE_PERF_EVENTS=y
128 130
129# 131#
130# Performance Counters 132# Kernel Performance Events And Counters
131# 133#
134# CONFIG_PERF_EVENTS is not set
132# CONFIG_PERF_COUNTERS is not set 135# CONFIG_PERF_COUNTERS is not set
133CONFIG_VM_EVENT_COUNTERS=y 136CONFIG_VM_EVENT_COUNTERS=y
134CONFIG_PCI_QUIRKS=y 137CONFIG_PCI_QUIRKS=y
135CONFIG_SLUB_DEBUG=y 138CONFIG_SLUB_DEBUG=y
136# CONFIG_STRIP_ASM_SYMS is not set
137CONFIG_COMPAT_BRK=y 139CONFIG_COMPAT_BRK=y
138# CONFIG_SLAB is not set 140# CONFIG_SLAB is not set
139CONFIG_SLUB=y 141CONFIG_SLUB=y
140# CONFIG_SLOB is not set 142# CONFIG_SLOB is not set
141# CONFIG_PROFILING is not set 143# CONFIG_PROFILING is not set
142# CONFIG_MARKERS is not set
143CONFIG_HAVE_OPROFILE=y 144CONFIG_HAVE_OPROFILE=y
144CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 145CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
145CONFIG_HAVE_IOREMAP_PROT=y 146CONFIG_HAVE_IOREMAP_PROT=y
146CONFIG_HAVE_KPROBES=y 147CONFIG_HAVE_KPROBES=y
147CONFIG_HAVE_KRETPROBES=y 148CONFIG_HAVE_KRETPROBES=y
148CONFIG_HAVE_ARCH_TRACEHOOK=y 149CONFIG_HAVE_ARCH_TRACEHOOK=y
150CONFIG_HAVE_DMA_ATTRS=y
151CONFIG_HAVE_DMA_API_DEBUG=y
149 152
150# 153#
151# GCOV-based kernel profiling 154# GCOV-based kernel profiling
@@ -256,6 +259,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
256CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 259CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
257# CONFIG_KEXEC is not set 260# CONFIG_KEXEC is not set
258# CONFIG_CRASH_DUMP is not set 261# CONFIG_CRASH_DUMP is not set
262CONFIG_MAX_ACTIVE_REGIONS=32
259CONFIG_ARCH_FLATMEM_ENABLE=y 263CONFIG_ARCH_FLATMEM_ENABLE=y
260CONFIG_ARCH_POPULATES_NODE_MAP=y 264CONFIG_ARCH_POPULATES_NODE_MAP=y
261CONFIG_SELECT_MEMORY_MODEL=y 265CONFIG_SELECT_MEMORY_MODEL=y
@@ -273,6 +277,7 @@ CONFIG_BOUNCE=y
273CONFIG_VIRT_TO_BUS=y 277CONFIG_VIRT_TO_BUS=y
274CONFIG_HAVE_MLOCK=y 278CONFIG_HAVE_MLOCK=y
275CONFIG_HAVE_MLOCKED_PAGE_BIT=y 279CONFIG_HAVE_MLOCKED_PAGE_BIT=y
280# CONFIG_KSM is not set
276CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 281CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
277CONFIG_PPC_4K_PAGES=y 282CONFIG_PPC_4K_PAGES=y
278# CONFIG_PPC_16K_PAGES is not set 283# CONFIG_PPC_16K_PAGES is not set
@@ -368,6 +373,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
368# CONFIG_NETFILTER is not set 373# CONFIG_NETFILTER is not set
369# CONFIG_IP_DCCP is not set 374# CONFIG_IP_DCCP is not set
370# CONFIG_IP_SCTP is not set 375# CONFIG_IP_SCTP is not set
376# CONFIG_RDS is not set
371# CONFIG_TIPC is not set 377# CONFIG_TIPC is not set
372# CONFIG_ATM is not set 378# CONFIG_ATM is not set
373# CONFIG_BRIDGE is not set 379# CONFIG_BRIDGE is not set
@@ -397,6 +403,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
397# CONFIG_AF_RXRPC is not set 403# CONFIG_AF_RXRPC is not set
398CONFIG_WIRELESS=y 404CONFIG_WIRELESS=y
399# CONFIG_CFG80211 is not set 405# CONFIG_CFG80211 is not set
406CONFIG_CFG80211_DEFAULT_PS_VALUE=0
400CONFIG_WIRELESS_OLD_REGULATORY=y 407CONFIG_WIRELESS_OLD_REGULATORY=y
401# CONFIG_WIRELESS_EXT is not set 408# CONFIG_WIRELESS_EXT is not set
402# CONFIG_LIB80211 is not set 409# CONFIG_LIB80211 is not set
@@ -404,7 +411,6 @@ CONFIG_WIRELESS_OLD_REGULATORY=y
404# 411#
405# CFG80211 needs to be enabled for MAC80211 412# CFG80211 needs to be enabled for MAC80211
406# 413#
407CONFIG_MAC80211_DEFAULT_PS_VALUE=0
408# CONFIG_WIMAX is not set 414# CONFIG_WIMAX is not set
409# CONFIG_RFKILL is not set 415# CONFIG_RFKILL is not set
410# CONFIG_NET_9P is not set 416# CONFIG_NET_9P is not set
@@ -417,6 +423,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
417# Generic Driver Options 423# Generic Driver Options
418# 424#
419CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 425CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
426# CONFIG_DEVTMPFS is not set
420CONFIG_STANDALONE=y 427CONFIG_STANDALONE=y
421CONFIG_PREVENT_FIRMWARE_BUILD=y 428CONFIG_PREVENT_FIRMWARE_BUILD=y
422# CONFIG_FW_LOADER is not set 429# CONFIG_FW_LOADER is not set
@@ -424,9 +431,9 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
424# CONFIG_CONNECTOR is not set 431# CONFIG_CONNECTOR is not set
425CONFIG_MTD=y 432CONFIG_MTD=y
426# CONFIG_MTD_DEBUG is not set 433# CONFIG_MTD_DEBUG is not set
434# CONFIG_MTD_TESTS is not set
427# CONFIG_MTD_CONCAT is not set 435# CONFIG_MTD_CONCAT is not set
428# CONFIG_MTD_PARTITIONS is not set 436# CONFIG_MTD_PARTITIONS is not set
429# CONFIG_MTD_TESTS is not set
430 437
431# 438#
432# User Modules And Translation Layers 439# User Modules And Translation Layers
@@ -483,6 +490,7 @@ CONFIG_MTD_PHYSMAP=y
483# CONFIG_MTD_PMC551 is not set 490# CONFIG_MTD_PMC551 is not set
484# CONFIG_MTD_DATAFLASH is not set 491# CONFIG_MTD_DATAFLASH is not set
485# CONFIG_MTD_M25P80 is not set 492# CONFIG_MTD_M25P80 is not set
493# CONFIG_MTD_SST25L is not set
486# CONFIG_MTD_SLRAM is not set 494# CONFIG_MTD_SLRAM is not set
487# CONFIG_MTD_PHRAM is not set 495# CONFIG_MTD_PHRAM is not set
488# CONFIG_MTD_MTDRAM is not set 496# CONFIG_MTD_MTDRAM is not set
@@ -589,6 +597,7 @@ CONFIG_SCSI_LOWLEVEL=y
589# CONFIG_ISCSI_TCP is not set 597# CONFIG_ISCSI_TCP is not set
590# CONFIG_SCSI_CXGB3_ISCSI is not set 598# CONFIG_SCSI_CXGB3_ISCSI is not set
591# CONFIG_SCSI_BNX2_ISCSI is not set 599# CONFIG_SCSI_BNX2_ISCSI is not set
600# CONFIG_BE2ISCSI is not set
592# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 601# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
593# CONFIG_SCSI_3W_9XXX is not set 602# CONFIG_SCSI_3W_9XXX is not set
594# CONFIG_SCSI_ACARD is not set 603# CONFIG_SCSI_ACARD is not set
@@ -627,7 +636,9 @@ CONFIG_SCSI_LOWLEVEL=y
627# CONFIG_SCSI_DC390T is not set 636# CONFIG_SCSI_DC390T is not set
628# CONFIG_SCSI_NSP32 is not set 637# CONFIG_SCSI_NSP32 is not set
629# CONFIG_SCSI_DEBUG is not set 638# CONFIG_SCSI_DEBUG is not set
639# CONFIG_SCSI_PMCRAID is not set
630# CONFIG_SCSI_SRP is not set 640# CONFIG_SCSI_SRP is not set
641# CONFIG_SCSI_BFA_FC is not set
631# CONFIG_SCSI_DH is not set 642# CONFIG_SCSI_DH is not set
632# CONFIG_SCSI_OSD_INITIATOR is not set 643# CONFIG_SCSI_OSD_INITIATOR is not set
633# CONFIG_ATA is not set 644# CONFIG_ATA is not set
@@ -725,10 +736,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
725# CONFIG_SFC is not set 736# CONFIG_SFC is not set
726# CONFIG_BE2NET is not set 737# CONFIG_BE2NET is not set
727# CONFIG_TR is not set 738# CONFIG_TR is not set
728 739CONFIG_WLAN=y
729#
730# Wireless LAN
731#
732# CONFIG_WLAN_PRE80211 is not set 740# CONFIG_WLAN_PRE80211 is not set
733# CONFIG_WLAN_80211 is not set 741# CONFIG_WLAN_80211 is not set
734 742
@@ -810,6 +818,7 @@ CONFIG_HW_RANDOM=y
810CONFIG_DEVPORT=y 818CONFIG_DEVPORT=y
811CONFIG_I2C=y 819CONFIG_I2C=y
812CONFIG_I2C_BOARDINFO=y 820CONFIG_I2C_BOARDINFO=y
821CONFIG_I2C_COMPAT=y
813CONFIG_I2C_CHARDEV=y 822CONFIG_I2C_CHARDEV=y
814CONFIG_I2C_HELPER_AUTO=y 823CONFIG_I2C_HELPER_AUTO=y
815 824
@@ -864,9 +873,6 @@ CONFIG_I2C_MPC=y
864# Miscellaneous I2C Chip support 873# Miscellaneous I2C Chip support
865# 874#
866# CONFIG_DS1682 is not set 875# CONFIG_DS1682 is not set
867CONFIG_SENSORS_PCF8574=y
868# CONFIG_PCF8575 is not set
869# CONFIG_SENSORS_PCA9539 is not set
870# CONFIG_SENSORS_TSL2550 is not set 876# CONFIG_SENSORS_TSL2550 is not set
871# CONFIG_I2C_DEBUG_CORE is not set 877# CONFIG_I2C_DEBUG_CORE is not set
872# CONFIG_I2C_DEBUG_ALGO is not set 878# CONFIG_I2C_DEBUG_ALGO is not set
@@ -897,7 +903,6 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
897# CONFIG_POWER_SUPPLY is not set 903# CONFIG_POWER_SUPPLY is not set
898# CONFIG_HWMON is not set 904# CONFIG_HWMON is not set
899# CONFIG_THERMAL is not set 905# CONFIG_THERMAL is not set
900# CONFIG_THERMAL_HWMON is not set
901CONFIG_WATCHDOG=y 906CONFIG_WATCHDOG=y
902# CONFIG_WATCHDOG_NOWAYOUT is not set 907# CONFIG_WATCHDOG_NOWAYOUT is not set
903 908
@@ -935,8 +940,10 @@ CONFIG_SSB_POSSIBLE=y
935# CONFIG_MFD_TMIO is not set 940# CONFIG_MFD_TMIO is not set
936# CONFIG_PMIC_DA903X is not set 941# CONFIG_PMIC_DA903X is not set
937# CONFIG_MFD_WM8400 is not set 942# CONFIG_MFD_WM8400 is not set
943# CONFIG_MFD_WM831X is not set
938# CONFIG_MFD_WM8350_I2C is not set 944# CONFIG_MFD_WM8350_I2C is not set
939# CONFIG_MFD_PCF50633 is not set 945# CONFIG_MFD_PCF50633 is not set
946# CONFIG_MFD_MC13783 is not set
940# CONFIG_AB3100_CORE is not set 947# CONFIG_AB3100_CORE is not set
941# CONFIG_EZX_PCAP is not set 948# CONFIG_EZX_PCAP is not set
942# CONFIG_REGULATOR is not set 949# CONFIG_REGULATOR is not set
@@ -946,6 +953,7 @@ CONFIG_SSB_POSSIBLE=y
946# Graphics support 953# Graphics support
947# 954#
948# CONFIG_AGP is not set 955# CONFIG_AGP is not set
956CONFIG_VGA_ARB=y
949# CONFIG_DRM is not set 957# CONFIG_DRM is not set
950# CONFIG_VGASTATE is not set 958# CONFIG_VGASTATE is not set
951CONFIG_VIDEO_OUTPUT_CONTROL=m 959CONFIG_VIDEO_OUTPUT_CONTROL=m
@@ -991,6 +999,7 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y
991# CONFIG_USB_OXU210HP_HCD is not set 999# CONFIG_USB_OXU210HP_HCD is not set
992# CONFIG_USB_ISP116X_HCD is not set 1000# CONFIG_USB_ISP116X_HCD is not set
993# CONFIG_USB_ISP1760_HCD is not set 1001# CONFIG_USB_ISP1760_HCD is not set
1002# CONFIG_USB_ISP1362_HCD is not set
994# CONFIG_USB_OHCI_HCD is not set 1003# CONFIG_USB_OHCI_HCD is not set
995CONFIG_USB_UHCI_HCD=y 1004CONFIG_USB_UHCI_HCD=y
996# CONFIG_USB_SL811_HCD is not set 1005# CONFIG_USB_SL811_HCD is not set
@@ -1059,6 +1068,7 @@ CONFIG_USB_STORAGE=y
1059# CONFIG_USB_LD is not set 1068# CONFIG_USB_LD is not set
1060# CONFIG_USB_TRANCEVIBRATOR is not set 1069# CONFIG_USB_TRANCEVIBRATOR is not set
1061# CONFIG_USB_IOWARRIOR is not set 1070# CONFIG_USB_IOWARRIOR is not set
1071# CONFIG_USB_TEST is not set
1062# CONFIG_USB_ISIGHTFW is not set 1072# CONFIG_USB_ISIGHTFW is not set
1063# CONFIG_USB_VST is not set 1073# CONFIG_USB_VST is not set
1064# CONFIG_USB_GADGET is not set 1074# CONFIG_USB_GADGET is not set
@@ -1117,6 +1127,7 @@ CONFIG_RTC_DRV_DS1307=y
1117# CONFIG_RTC_DRV_R9701 is not set 1127# CONFIG_RTC_DRV_R9701 is not set
1118# CONFIG_RTC_DRV_RS5C348 is not set 1128# CONFIG_RTC_DRV_RS5C348 is not set
1119# CONFIG_RTC_DRV_DS3234 is not set 1129# CONFIG_RTC_DRV_DS3234 is not set
1130# CONFIG_RTC_DRV_PCF2123 is not set
1120 1131
1121# 1132#
1122# Platform RTC drivers 1133# Platform RTC drivers
@@ -1167,6 +1178,7 @@ CONFIG_FS_MBCACHE=y
1167# CONFIG_GFS2_FS is not set 1178# CONFIG_GFS2_FS is not set
1168# CONFIG_OCFS2_FS is not set 1179# CONFIG_OCFS2_FS is not set
1169# CONFIG_BTRFS_FS is not set 1180# CONFIG_BTRFS_FS is not set
1181# CONFIG_NILFS2_FS is not set
1170CONFIG_FILE_LOCKING=y 1182CONFIG_FILE_LOCKING=y
1171CONFIG_FSNOTIFY=y 1183CONFIG_FSNOTIFY=y
1172CONFIG_DNOTIFY=y 1184CONFIG_DNOTIFY=y
@@ -1229,7 +1241,6 @@ CONFIG_MISC_FILESYSTEMS=y
1229# CONFIG_ROMFS_FS is not set 1241# CONFIG_ROMFS_FS is not set
1230# CONFIG_SYSV_FS is not set 1242# CONFIG_SYSV_FS is not set
1231# CONFIG_UFS_FS is not set 1243# CONFIG_UFS_FS is not set
1232# CONFIG_NILFS2_FS is not set
1233CONFIG_NETWORK_FILESYSTEMS=y 1244CONFIG_NETWORK_FILESYSTEMS=y
1234CONFIG_NFS_FS=y 1245CONFIG_NFS_FS=y
1235CONFIG_NFS_V3=y 1246CONFIG_NFS_V3=y
@@ -1344,6 +1355,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
1344CONFIG_ENABLE_MUST_CHECK=y 1355CONFIG_ENABLE_MUST_CHECK=y
1345CONFIG_FRAME_WARN=1024 1356CONFIG_FRAME_WARN=1024
1346# CONFIG_MAGIC_SYSRQ is not set 1357# CONFIG_MAGIC_SYSRQ is not set
1358# CONFIG_STRIP_ASM_SYMS is not set
1347# CONFIG_UNUSED_SYMBOLS is not set 1359# CONFIG_UNUSED_SYMBOLS is not set
1348# CONFIG_DEBUG_FS is not set 1360# CONFIG_DEBUG_FS is not set
1349# CONFIG_HEADERS_CHECK is not set 1361# CONFIG_HEADERS_CHECK is not set
@@ -1361,6 +1373,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
1361CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1373CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1362CONFIG_TRACING_SUPPORT=y 1374CONFIG_TRACING_SUPPORT=y
1363# CONFIG_FTRACE is not set 1375# CONFIG_FTRACE is not set
1376# CONFIG_DMA_API_DEBUG is not set
1364# CONFIG_SAMPLES is not set 1377# CONFIG_SAMPLES is not set
1365CONFIG_HAVE_ARCH_KGDB=y 1378CONFIG_HAVE_ARCH_KGDB=y
1366# CONFIG_PPC_DISABLE_WERROR is not set 1379# CONFIG_PPC_DISABLE_WERROR is not set
@@ -1382,7 +1395,6 @@ CONFIG_CRYPTO=y
1382# 1395#
1383# Crypto core or helper 1396# Crypto core or helper
1384# 1397#
1385# CONFIG_CRYPTO_FIPS is not set
1386CONFIG_CRYPTO_ALGAPI=y 1398CONFIG_CRYPTO_ALGAPI=y
1387CONFIG_CRYPTO_ALGAPI2=y 1399CONFIG_CRYPTO_ALGAPI2=y
1388CONFIG_CRYPTO_AEAD2=y 1400CONFIG_CRYPTO_AEAD2=y
@@ -1424,11 +1436,13 @@ CONFIG_CRYPTO_PCBC=m
1424# 1436#
1425# CONFIG_CRYPTO_HMAC is not set 1437# CONFIG_CRYPTO_HMAC is not set
1426# CONFIG_CRYPTO_XCBC is not set 1438# CONFIG_CRYPTO_XCBC is not set
1439# CONFIG_CRYPTO_VMAC is not set
1427 1440
1428# 1441#
1429# Digest 1442# Digest
1430# 1443#
1431# CONFIG_CRYPTO_CRC32C is not set 1444# CONFIG_CRYPTO_CRC32C is not set
1445# CONFIG_CRYPTO_GHASH is not set
1432# CONFIG_CRYPTO_MD4 is not set 1446# CONFIG_CRYPTO_MD4 is not set
1433CONFIG_CRYPTO_MD5=y 1447CONFIG_CRYPTO_MD5=y
1434# CONFIG_CRYPTO_MICHAEL_MIC is not set 1448# CONFIG_CRYPTO_MICHAEL_MIC is not set
diff --git a/arch/powerpc/configs/83xx/mpc834x_mds_defconfig b/arch/powerpc/configs/83xx/mpc834x_mds_defconfig
index 3236c47712c2..c4e92ba5c38b 100644
--- a/arch/powerpc/configs/83xx/mpc834x_mds_defconfig
+++ b/arch/powerpc/configs/83xx/mpc834x_mds_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.31-rc4 3# Linux kernel version: 2.6.32-rc5
4# Wed Jul 29 23:32:09 2009 4# Thu Nov 5 08:20:27 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -35,6 +35,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
35CONFIG_GENERIC_HARDIRQS=y 35CONFIG_GENERIC_HARDIRQS=y
36CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 36CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
38CONFIG_IRQ_PER_CPU=y 39CONFIG_IRQ_PER_CPU=y
39CONFIG_STACKTRACE_SUPPORT=y 40CONFIG_STACKTRACE_SUPPORT=y
40CONFIG_HAVE_LATENCYTOP_SUPPORT=y 41CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -84,11 +85,12 @@ CONFIG_SYSVIPC_SYSCTL=y
84# 85#
85# RCU Subsystem 86# RCU Subsystem
86# 87#
87CONFIG_CLASSIC_RCU=y 88CONFIG_TREE_RCU=y
88# CONFIG_TREE_RCU is not set 89# CONFIG_TREE_PREEMPT_RCU is not set
89# CONFIG_PREEMPT_RCU is not set 90# CONFIG_RCU_TRACE is not set
91CONFIG_RCU_FANOUT=32
92# CONFIG_RCU_FANOUT_EXACT is not set
90# CONFIG_TREE_RCU_TRACE is not set 93# CONFIG_TREE_RCU_TRACE is not set
91# CONFIG_PREEMPT_RCU_TRACE is not set
92# CONFIG_IKCONFIG is not set 94# CONFIG_IKCONFIG is not set
93CONFIG_LOG_BUF_SHIFT=14 95CONFIG_LOG_BUF_SHIFT=14
94CONFIG_GROUP_SCHED=y 96CONFIG_GROUP_SCHED=y
@@ -124,28 +126,29 @@ CONFIG_TIMERFD=y
124CONFIG_EVENTFD=y 126CONFIG_EVENTFD=y
125CONFIG_SHMEM=y 127CONFIG_SHMEM=y
126CONFIG_AIO=y 128CONFIG_AIO=y
127CONFIG_HAVE_PERF_COUNTERS=y 129CONFIG_HAVE_PERF_EVENTS=y
128 130
129# 131#
130# Performance Counters 132# Kernel Performance Events And Counters
131# 133#
134# CONFIG_PERF_EVENTS is not set
132# CONFIG_PERF_COUNTERS is not set 135# CONFIG_PERF_COUNTERS is not set
133CONFIG_VM_EVENT_COUNTERS=y 136CONFIG_VM_EVENT_COUNTERS=y
134CONFIG_PCI_QUIRKS=y 137CONFIG_PCI_QUIRKS=y
135CONFIG_SLUB_DEBUG=y 138CONFIG_SLUB_DEBUG=y
136# CONFIG_STRIP_ASM_SYMS is not set
137CONFIG_COMPAT_BRK=y 139CONFIG_COMPAT_BRK=y
138# CONFIG_SLAB is not set 140# CONFIG_SLAB is not set
139CONFIG_SLUB=y 141CONFIG_SLUB=y
140# CONFIG_SLOB is not set 142# CONFIG_SLOB is not set
141# CONFIG_PROFILING is not set 143# CONFIG_PROFILING is not set
142# CONFIG_MARKERS is not set
143CONFIG_HAVE_OPROFILE=y 144CONFIG_HAVE_OPROFILE=y
144CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 145CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
145CONFIG_HAVE_IOREMAP_PROT=y 146CONFIG_HAVE_IOREMAP_PROT=y
146CONFIG_HAVE_KPROBES=y 147CONFIG_HAVE_KPROBES=y
147CONFIG_HAVE_KRETPROBES=y 148CONFIG_HAVE_KRETPROBES=y
148CONFIG_HAVE_ARCH_TRACEHOOK=y 149CONFIG_HAVE_ARCH_TRACEHOOK=y
150CONFIG_HAVE_DMA_ATTRS=y
151CONFIG_HAVE_DMA_API_DEBUG=y
149 152
150# 153#
151# GCOV-based kernel profiling 154# GCOV-based kernel profiling
@@ -256,6 +259,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
256CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 259CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
257# CONFIG_KEXEC is not set 260# CONFIG_KEXEC is not set
258# CONFIG_CRASH_DUMP is not set 261# CONFIG_CRASH_DUMP is not set
262CONFIG_MAX_ACTIVE_REGIONS=32
259CONFIG_ARCH_FLATMEM_ENABLE=y 263CONFIG_ARCH_FLATMEM_ENABLE=y
260CONFIG_ARCH_POPULATES_NODE_MAP=y 264CONFIG_ARCH_POPULATES_NODE_MAP=y
261CONFIG_SELECT_MEMORY_MODEL=y 265CONFIG_SELECT_MEMORY_MODEL=y
@@ -273,6 +277,7 @@ CONFIG_BOUNCE=y
273CONFIG_VIRT_TO_BUS=y 277CONFIG_VIRT_TO_BUS=y
274CONFIG_HAVE_MLOCK=y 278CONFIG_HAVE_MLOCK=y
275CONFIG_HAVE_MLOCKED_PAGE_BIT=y 279CONFIG_HAVE_MLOCKED_PAGE_BIT=y
280# CONFIG_KSM is not set
276CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 281CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
277CONFIG_PPC_4K_PAGES=y 282CONFIG_PPC_4K_PAGES=y
278# CONFIG_PPC_16K_PAGES is not set 283# CONFIG_PPC_16K_PAGES is not set
@@ -368,6 +373,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
368# CONFIG_NETFILTER is not set 373# CONFIG_NETFILTER is not set
369# CONFIG_IP_DCCP is not set 374# CONFIG_IP_DCCP is not set
370# CONFIG_IP_SCTP is not set 375# CONFIG_IP_SCTP is not set
376# CONFIG_RDS is not set
371# CONFIG_TIPC is not set 377# CONFIG_TIPC is not set
372# CONFIG_ATM is not set 378# CONFIG_ATM is not set
373# CONFIG_BRIDGE is not set 379# CONFIG_BRIDGE is not set
@@ -397,6 +403,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
397# CONFIG_AF_RXRPC is not set 403# CONFIG_AF_RXRPC is not set
398CONFIG_WIRELESS=y 404CONFIG_WIRELESS=y
399# CONFIG_CFG80211 is not set 405# CONFIG_CFG80211 is not set
406CONFIG_CFG80211_DEFAULT_PS_VALUE=0
400CONFIG_WIRELESS_OLD_REGULATORY=y 407CONFIG_WIRELESS_OLD_REGULATORY=y
401# CONFIG_WIRELESS_EXT is not set 408# CONFIG_WIRELESS_EXT is not set
402# CONFIG_LIB80211 is not set 409# CONFIG_LIB80211 is not set
@@ -404,7 +411,6 @@ CONFIG_WIRELESS_OLD_REGULATORY=y
404# 411#
405# CFG80211 needs to be enabled for MAC80211 412# CFG80211 needs to be enabled for MAC80211
406# 413#
407CONFIG_MAC80211_DEFAULT_PS_VALUE=0
408# CONFIG_WIMAX is not set 414# CONFIG_WIMAX is not set
409# CONFIG_RFKILL is not set 415# CONFIG_RFKILL is not set
410# CONFIG_NET_9P is not set 416# CONFIG_NET_9P is not set
@@ -417,6 +423,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
417# Generic Driver Options 423# Generic Driver Options
418# 424#
419CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 425CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
426# CONFIG_DEVTMPFS is not set
420CONFIG_STANDALONE=y 427CONFIG_STANDALONE=y
421CONFIG_PREVENT_FIRMWARE_BUILD=y 428CONFIG_PREVENT_FIRMWARE_BUILD=y
422# CONFIG_FW_LOADER is not set 429# CONFIG_FW_LOADER is not set
@@ -556,9 +563,11 @@ CONFIG_E100=y
556# CONFIG_SUNDANCE is not set 563# CONFIG_SUNDANCE is not set
557# CONFIG_TLAN is not set 564# CONFIG_TLAN is not set
558# CONFIG_KS8842 is not set 565# CONFIG_KS8842 is not set
566# CONFIG_KS8851_MLL is not set
559# CONFIG_VIA_RHINE is not set 567# CONFIG_VIA_RHINE is not set
560# CONFIG_SC92031 is not set 568# CONFIG_SC92031 is not set
561# CONFIG_ATL2 is not set 569# CONFIG_ATL2 is not set
570# CONFIG_XILINX_EMACLITE is not set
562CONFIG_NETDEV_1000=y 571CONFIG_NETDEV_1000=y
563# CONFIG_ACENIC is not set 572# CONFIG_ACENIC is not set
564# CONFIG_DL2K is not set 573# CONFIG_DL2K is not set
@@ -606,10 +615,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
606# CONFIG_SFC is not set 615# CONFIG_SFC is not set
607# CONFIG_BE2NET is not set 616# CONFIG_BE2NET is not set
608# CONFIG_TR is not set 617# CONFIG_TR is not set
609 618CONFIG_WLAN=y
610#
611# Wireless LAN
612#
613# CONFIG_WLAN_PRE80211 is not set 619# CONFIG_WLAN_PRE80211 is not set
614# CONFIG_WLAN_80211 is not set 620# CONFIG_WLAN_80211 is not set
615 621
@@ -699,6 +705,7 @@ CONFIG_LEGACY_PTY_COUNT=256
699CONFIG_DEVPORT=y 705CONFIG_DEVPORT=y
700CONFIG_I2C=y 706CONFIG_I2C=y
701CONFIG_I2C_BOARDINFO=y 707CONFIG_I2C_BOARDINFO=y
708CONFIG_I2C_COMPAT=y
702CONFIG_I2C_CHARDEV=y 709CONFIG_I2C_CHARDEV=y
703CONFIG_I2C_HELPER_AUTO=y 710CONFIG_I2C_HELPER_AUTO=y
704 711
@@ -752,9 +759,6 @@ CONFIG_I2C_MPC=y
752# Miscellaneous I2C Chip support 759# Miscellaneous I2C Chip support
753# 760#
754# CONFIG_DS1682 is not set 761# CONFIG_DS1682 is not set
755# CONFIG_SENSORS_PCF8574 is not set
756# CONFIG_PCF8575 is not set
757# CONFIG_SENSORS_PCA9539 is not set
758# CONFIG_SENSORS_TSL2550 is not set 762# CONFIG_SENSORS_TSL2550 is not set
759# CONFIG_I2C_DEBUG_CORE is not set 763# CONFIG_I2C_DEBUG_CORE is not set
760# CONFIG_I2C_DEBUG_ALGO is not set 764# CONFIG_I2C_DEBUG_ALGO is not set
@@ -772,6 +776,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
772# CONFIG_POWER_SUPPLY is not set 776# CONFIG_POWER_SUPPLY is not set
773CONFIG_HWMON=y 777CONFIG_HWMON=y
774# CONFIG_HWMON_VID is not set 778# CONFIG_HWMON_VID is not set
779# CONFIG_HWMON_DEBUG_CHIP is not set
780
781#
782# Native drivers
783#
775# CONFIG_SENSORS_AD7414 is not set 784# CONFIG_SENSORS_AD7414 is not set
776# CONFIG_SENSORS_AD7418 is not set 785# CONFIG_SENSORS_AD7418 is not set
777# CONFIG_SENSORS_ADM1021 is not set 786# CONFIG_SENSORS_ADM1021 is not set
@@ -821,6 +830,7 @@ CONFIG_HWMON=y
821# CONFIG_SENSORS_ADS7828 is not set 830# CONFIG_SENSORS_ADS7828 is not set
822# CONFIG_SENSORS_THMC50 is not set 831# CONFIG_SENSORS_THMC50 is not set
823# CONFIG_SENSORS_TMP401 is not set 832# CONFIG_SENSORS_TMP401 is not set
833# CONFIG_SENSORS_TMP421 is not set
824# CONFIG_SENSORS_VIA686A is not set 834# CONFIG_SENSORS_VIA686A is not set
825# CONFIG_SENSORS_VT1211 is not set 835# CONFIG_SENSORS_VT1211 is not set
826# CONFIG_SENSORS_VT8231 is not set 836# CONFIG_SENSORS_VT8231 is not set
@@ -832,9 +842,7 @@ CONFIG_HWMON=y
832# CONFIG_SENSORS_W83L786NG is not set 842# CONFIG_SENSORS_W83L786NG is not set
833# CONFIG_SENSORS_W83627HF is not set 843# CONFIG_SENSORS_W83627HF is not set
834# CONFIG_SENSORS_W83627EHF is not set 844# CONFIG_SENSORS_W83627EHF is not set
835# CONFIG_HWMON_DEBUG_CHIP is not set
836# CONFIG_THERMAL is not set 845# CONFIG_THERMAL is not set
837# CONFIG_THERMAL_HWMON is not set
838CONFIG_WATCHDOG=y 846CONFIG_WATCHDOG=y
839# CONFIG_WATCHDOG_NOWAYOUT is not set 847# CONFIG_WATCHDOG_NOWAYOUT is not set
840 848
@@ -867,6 +875,7 @@ CONFIG_SSB_POSSIBLE=y
867# CONFIG_MFD_TMIO is not set 875# CONFIG_MFD_TMIO is not set
868# CONFIG_PMIC_DA903X is not set 876# CONFIG_PMIC_DA903X is not set
869# CONFIG_MFD_WM8400 is not set 877# CONFIG_MFD_WM8400 is not set
878# CONFIG_MFD_WM831X is not set
870# CONFIG_MFD_WM8350_I2C is not set 879# CONFIG_MFD_WM8350_I2C is not set
871# CONFIG_MFD_PCF50633 is not set 880# CONFIG_MFD_PCF50633 is not set
872# CONFIG_AB3100_CORE is not set 881# CONFIG_AB3100_CORE is not set
@@ -877,6 +886,7 @@ CONFIG_SSB_POSSIBLE=y
877# Graphics support 886# Graphics support
878# 887#
879# CONFIG_AGP is not set 888# CONFIG_AGP is not set
889CONFIG_VGA_ARB=y
880# CONFIG_DRM is not set 890# CONFIG_DRM is not set
881# CONFIG_VGASTATE is not set 891# CONFIG_VGASTATE is not set
882CONFIG_VIDEO_OUTPUT_CONTROL=m 892CONFIG_VIDEO_OUTPUT_CONTROL=m
@@ -890,7 +900,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m
890# CONFIG_SOUND is not set 900# CONFIG_SOUND is not set
891CONFIG_HID_SUPPORT=y 901CONFIG_HID_SUPPORT=y
892CONFIG_HID=y 902CONFIG_HID=y
893# CONFIG_HID_DEBUG is not set
894# CONFIG_HIDRAW is not set 903# CONFIG_HIDRAW is not set
895# CONFIG_HID_PID is not set 904# CONFIG_HID_PID is not set
896 905
@@ -1010,6 +1019,7 @@ CONFIG_FS_MBCACHE=y
1010# CONFIG_GFS2_FS is not set 1019# CONFIG_GFS2_FS is not set
1011# CONFIG_OCFS2_FS is not set 1020# CONFIG_OCFS2_FS is not set
1012# CONFIG_BTRFS_FS is not set 1021# CONFIG_BTRFS_FS is not set
1022# CONFIG_NILFS2_FS is not set
1013CONFIG_FILE_LOCKING=y 1023CONFIG_FILE_LOCKING=y
1014CONFIG_FSNOTIFY=y 1024CONFIG_FSNOTIFY=y
1015CONFIG_DNOTIFY=y 1025CONFIG_DNOTIFY=y
@@ -1068,7 +1078,6 @@ CONFIG_MISC_FILESYSTEMS=y
1068# CONFIG_ROMFS_FS is not set 1078# CONFIG_ROMFS_FS is not set
1069# CONFIG_SYSV_FS is not set 1079# CONFIG_SYSV_FS is not set
1070# CONFIG_UFS_FS is not set 1080# CONFIG_UFS_FS is not set
1071# CONFIG_NILFS2_FS is not set
1072CONFIG_NETWORK_FILESYSTEMS=y 1081CONFIG_NETWORK_FILESYSTEMS=y
1073CONFIG_NFS_FS=y 1082CONFIG_NFS_FS=y
1074CONFIG_NFS_V3=y 1083CONFIG_NFS_V3=y
@@ -1140,6 +1149,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
1140CONFIG_ENABLE_MUST_CHECK=y 1149CONFIG_ENABLE_MUST_CHECK=y
1141CONFIG_FRAME_WARN=1024 1150CONFIG_FRAME_WARN=1024
1142# CONFIG_MAGIC_SYSRQ is not set 1151# CONFIG_MAGIC_SYSRQ is not set
1152# CONFIG_STRIP_ASM_SYMS is not set
1143# CONFIG_UNUSED_SYMBOLS is not set 1153# CONFIG_UNUSED_SYMBOLS is not set
1144# CONFIG_DEBUG_FS is not set 1154# CONFIG_DEBUG_FS is not set
1145# CONFIG_HEADERS_CHECK is not set 1155# CONFIG_HEADERS_CHECK is not set
@@ -1157,6 +1167,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
1157CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1167CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1158CONFIG_TRACING_SUPPORT=y 1168CONFIG_TRACING_SUPPORT=y
1159# CONFIG_FTRACE is not set 1169# CONFIG_FTRACE is not set
1170# CONFIG_DMA_API_DEBUG is not set
1160# CONFIG_SAMPLES is not set 1171# CONFIG_SAMPLES is not set
1161CONFIG_HAVE_ARCH_KGDB=y 1172CONFIG_HAVE_ARCH_KGDB=y
1162# CONFIG_PPC_DISABLE_WERROR is not set 1173# CONFIG_PPC_DISABLE_WERROR is not set
@@ -1178,7 +1189,6 @@ CONFIG_CRYPTO=y
1178# 1189#
1179# Crypto core or helper 1190# Crypto core or helper
1180# 1191#
1181# CONFIG_CRYPTO_FIPS is not set
1182CONFIG_CRYPTO_ALGAPI=y 1192CONFIG_CRYPTO_ALGAPI=y
1183CONFIG_CRYPTO_ALGAPI2=y 1193CONFIG_CRYPTO_ALGAPI2=y
1184CONFIG_CRYPTO_AEAD2=y 1194CONFIG_CRYPTO_AEAD2=y
@@ -1220,11 +1230,13 @@ CONFIG_CRYPTO_PCBC=m
1220# 1230#
1221# CONFIG_CRYPTO_HMAC is not set 1231# CONFIG_CRYPTO_HMAC is not set
1222# CONFIG_CRYPTO_XCBC is not set 1232# CONFIG_CRYPTO_XCBC is not set
1233# CONFIG_CRYPTO_VMAC is not set
1223 1234
1224# 1235#
1225# Digest 1236# Digest
1226# 1237#
1227# CONFIG_CRYPTO_CRC32C is not set 1238# CONFIG_CRYPTO_CRC32C is not set
1239# CONFIG_CRYPTO_GHASH is not set
1228# CONFIG_CRYPTO_MD4 is not set 1240# CONFIG_CRYPTO_MD4 is not set
1229CONFIG_CRYPTO_MD5=y 1241CONFIG_CRYPTO_MD5=y
1230# CONFIG_CRYPTO_MICHAEL_MIC is not set 1242# CONFIG_CRYPTO_MICHAEL_MIC is not set
diff --git a/arch/powerpc/configs/83xx/mpc836x_mds_defconfig b/arch/powerpc/configs/83xx/mpc836x_mds_defconfig
index 8c5299d74813..4f434b1492fa 100644
--- a/arch/powerpc/configs/83xx/mpc836x_mds_defconfig
+++ b/arch/powerpc/configs/83xx/mpc836x_mds_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.31-rc4 3# Linux kernel version: 2.6.32-rc5
4# Wed Jul 29 23:32:10 2009 4# Thu Nov 5 08:20:28 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -35,6 +35,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
35CONFIG_GENERIC_HARDIRQS=y 35CONFIG_GENERIC_HARDIRQS=y
36CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 36CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
38CONFIG_IRQ_PER_CPU=y 39CONFIG_IRQ_PER_CPU=y
39CONFIG_STACKTRACE_SUPPORT=y 40CONFIG_STACKTRACE_SUPPORT=y
40CONFIG_HAVE_LATENCYTOP_SUPPORT=y 41CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -84,11 +85,12 @@ CONFIG_SYSVIPC_SYSCTL=y
84# 85#
85# RCU Subsystem 86# RCU Subsystem
86# 87#
87CONFIG_CLASSIC_RCU=y 88CONFIG_TREE_RCU=y
88# CONFIG_TREE_RCU is not set 89# CONFIG_TREE_PREEMPT_RCU is not set
89# CONFIG_PREEMPT_RCU is not set 90# CONFIG_RCU_TRACE is not set
91CONFIG_RCU_FANOUT=32
92# CONFIG_RCU_FANOUT_EXACT is not set
90# CONFIG_TREE_RCU_TRACE is not set 93# CONFIG_TREE_RCU_TRACE is not set
91# CONFIG_PREEMPT_RCU_TRACE is not set
92# CONFIG_IKCONFIG is not set 94# CONFIG_IKCONFIG is not set
93CONFIG_LOG_BUF_SHIFT=14 95CONFIG_LOG_BUF_SHIFT=14
94CONFIG_GROUP_SCHED=y 96CONFIG_GROUP_SCHED=y
@@ -124,28 +126,29 @@ CONFIG_TIMERFD=y
124CONFIG_EVENTFD=y 126CONFIG_EVENTFD=y
125CONFIG_SHMEM=y 127CONFIG_SHMEM=y
126CONFIG_AIO=y 128CONFIG_AIO=y
127CONFIG_HAVE_PERF_COUNTERS=y 129CONFIG_HAVE_PERF_EVENTS=y
128 130
129# 131#
130# Performance Counters 132# Kernel Performance Events And Counters
131# 133#
134# CONFIG_PERF_EVENTS is not set
132# CONFIG_PERF_COUNTERS is not set 135# CONFIG_PERF_COUNTERS is not set
133CONFIG_VM_EVENT_COUNTERS=y 136CONFIG_VM_EVENT_COUNTERS=y
134CONFIG_PCI_QUIRKS=y 137CONFIG_PCI_QUIRKS=y
135CONFIG_SLUB_DEBUG=y 138CONFIG_SLUB_DEBUG=y
136# CONFIG_STRIP_ASM_SYMS is not set
137CONFIG_COMPAT_BRK=y 139CONFIG_COMPAT_BRK=y
138# CONFIG_SLAB is not set 140# CONFIG_SLAB is not set
139CONFIG_SLUB=y 141CONFIG_SLUB=y
140# CONFIG_SLOB is not set 142# CONFIG_SLOB is not set
141# CONFIG_PROFILING is not set 143# CONFIG_PROFILING is not set
142# CONFIG_MARKERS is not set
143CONFIG_HAVE_OPROFILE=y 144CONFIG_HAVE_OPROFILE=y
144CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 145CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
145CONFIG_HAVE_IOREMAP_PROT=y 146CONFIG_HAVE_IOREMAP_PROT=y
146CONFIG_HAVE_KPROBES=y 147CONFIG_HAVE_KPROBES=y
147CONFIG_HAVE_KRETPROBES=y 148CONFIG_HAVE_KRETPROBES=y
148CONFIG_HAVE_ARCH_TRACEHOOK=y 149CONFIG_HAVE_ARCH_TRACEHOOK=y
150CONFIG_HAVE_DMA_ATTRS=y
151CONFIG_HAVE_DMA_API_DEBUG=y
149 152
150# 153#
151# GCOV-based kernel profiling 154# GCOV-based kernel profiling
@@ -255,6 +258,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
255CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 258CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
256# CONFIG_KEXEC is not set 259# CONFIG_KEXEC is not set
257# CONFIG_CRASH_DUMP is not set 260# CONFIG_CRASH_DUMP is not set
261CONFIG_MAX_ACTIVE_REGIONS=32
258CONFIG_ARCH_FLATMEM_ENABLE=y 262CONFIG_ARCH_FLATMEM_ENABLE=y
259CONFIG_ARCH_POPULATES_NODE_MAP=y 263CONFIG_ARCH_POPULATES_NODE_MAP=y
260CONFIG_SELECT_MEMORY_MODEL=y 264CONFIG_SELECT_MEMORY_MODEL=y
@@ -272,6 +276,7 @@ CONFIG_BOUNCE=y
272CONFIG_VIRT_TO_BUS=y 276CONFIG_VIRT_TO_BUS=y
273CONFIG_HAVE_MLOCK=y 277CONFIG_HAVE_MLOCK=y
274CONFIG_HAVE_MLOCKED_PAGE_BIT=y 278CONFIG_HAVE_MLOCKED_PAGE_BIT=y
279# CONFIG_KSM is not set
275CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 280CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
276CONFIG_PPC_4K_PAGES=y 281CONFIG_PPC_4K_PAGES=y
277# CONFIG_PPC_16K_PAGES is not set 282# CONFIG_PPC_16K_PAGES is not set
@@ -367,6 +372,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
367# CONFIG_NETFILTER is not set 372# CONFIG_NETFILTER is not set
368# CONFIG_IP_DCCP is not set 373# CONFIG_IP_DCCP is not set
369# CONFIG_IP_SCTP is not set 374# CONFIG_IP_SCTP is not set
375# CONFIG_RDS is not set
370# CONFIG_TIPC is not set 376# CONFIG_TIPC is not set
371# CONFIG_ATM is not set 377# CONFIG_ATM is not set
372# CONFIG_BRIDGE is not set 378# CONFIG_BRIDGE is not set
@@ -396,6 +402,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
396# CONFIG_AF_RXRPC is not set 402# CONFIG_AF_RXRPC is not set
397CONFIG_WIRELESS=y 403CONFIG_WIRELESS=y
398# CONFIG_CFG80211 is not set 404# CONFIG_CFG80211 is not set
405CONFIG_CFG80211_DEFAULT_PS_VALUE=0
399CONFIG_WIRELESS_OLD_REGULATORY=y 406CONFIG_WIRELESS_OLD_REGULATORY=y
400# CONFIG_WIRELESS_EXT is not set 407# CONFIG_WIRELESS_EXT is not set
401# CONFIG_LIB80211 is not set 408# CONFIG_LIB80211 is not set
@@ -403,7 +410,6 @@ CONFIG_WIRELESS_OLD_REGULATORY=y
403# 410#
404# CFG80211 needs to be enabled for MAC80211 411# CFG80211 needs to be enabled for MAC80211
405# 412#
406CONFIG_MAC80211_DEFAULT_PS_VALUE=0
407# CONFIG_WIMAX is not set 413# CONFIG_WIMAX is not set
408# CONFIG_RFKILL is not set 414# CONFIG_RFKILL is not set
409# CONFIG_NET_9P is not set 415# CONFIG_NET_9P is not set
@@ -416,6 +422,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
416# Generic Driver Options 422# Generic Driver Options
417# 423#
418CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 424CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
425# CONFIG_DEVTMPFS is not set
419CONFIG_STANDALONE=y 426CONFIG_STANDALONE=y
420CONFIG_PREVENT_FIRMWARE_BUILD=y 427CONFIG_PREVENT_FIRMWARE_BUILD=y
421# CONFIG_FW_LOADER is not set 428# CONFIG_FW_LOADER is not set
@@ -423,9 +430,9 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
423# CONFIG_CONNECTOR is not set 430# CONFIG_CONNECTOR is not set
424CONFIG_MTD=y 431CONFIG_MTD=y
425# CONFIG_MTD_DEBUG is not set 432# CONFIG_MTD_DEBUG is not set
433# CONFIG_MTD_TESTS is not set
426# CONFIG_MTD_CONCAT is not set 434# CONFIG_MTD_CONCAT is not set
427CONFIG_MTD_PARTITIONS=y 435CONFIG_MTD_PARTITIONS=y
428# CONFIG_MTD_TESTS is not set
429# CONFIG_MTD_REDBOOT_PARTS is not set 436# CONFIG_MTD_REDBOOT_PARTS is not set
430CONFIG_MTD_CMDLINE_PARTS=y 437CONFIG_MTD_CMDLINE_PARTS=y
431# CONFIG_MTD_OF_PARTS is not set 438# CONFIG_MTD_OF_PARTS is not set
@@ -585,6 +592,7 @@ CONFIG_SCSI_LOWLEVEL=y
585# CONFIG_ISCSI_TCP is not set 592# CONFIG_ISCSI_TCP is not set
586# CONFIG_SCSI_CXGB3_ISCSI is not set 593# CONFIG_SCSI_CXGB3_ISCSI is not set
587# CONFIG_SCSI_BNX2_ISCSI is not set 594# CONFIG_SCSI_BNX2_ISCSI is not set
595# CONFIG_BE2ISCSI is not set
588# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 596# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
589# CONFIG_SCSI_3W_9XXX is not set 597# CONFIG_SCSI_3W_9XXX is not set
590# CONFIG_SCSI_ACARD is not set 598# CONFIG_SCSI_ACARD is not set
@@ -623,7 +631,9 @@ CONFIG_SCSI_LOWLEVEL=y
623# CONFIG_SCSI_DC390T is not set 631# CONFIG_SCSI_DC390T is not set
624# CONFIG_SCSI_NSP32 is not set 632# CONFIG_SCSI_NSP32 is not set
625# CONFIG_SCSI_DEBUG is not set 633# CONFIG_SCSI_DEBUG is not set
634# CONFIG_SCSI_PMCRAID is not set
626# CONFIG_SCSI_SRP is not set 635# CONFIG_SCSI_SRP is not set
636# CONFIG_SCSI_BFA_FC is not set
627# CONFIG_SCSI_DH is not set 637# CONFIG_SCSI_DH is not set
628# CONFIG_SCSI_OSD_INITIATOR is not set 638# CONFIG_SCSI_OSD_INITIATOR is not set
629# CONFIG_ATA is not set 639# CONFIG_ATA is not set
@@ -693,7 +703,9 @@ CONFIG_MII=y
693# CONFIG_NET_PCI is not set 703# CONFIG_NET_PCI is not set
694# CONFIG_B44 is not set 704# CONFIG_B44 is not set
695# CONFIG_KS8842 is not set 705# CONFIG_KS8842 is not set
706# CONFIG_KS8851_MLL is not set
696# CONFIG_ATL2 is not set 707# CONFIG_ATL2 is not set
708# CONFIG_XILINX_EMACLITE is not set
697CONFIG_NETDEV_1000=y 709CONFIG_NETDEV_1000=y
698# CONFIG_ACENIC is not set 710# CONFIG_ACENIC is not set
699# CONFIG_DL2K is not set 711# CONFIG_DL2K is not set
@@ -716,7 +728,6 @@ CONFIG_NETDEV_1000=y
716CONFIG_FSL_PQ_MDIO=y 728CONFIG_FSL_PQ_MDIO=y
717# CONFIG_GIANFAR is not set 729# CONFIG_GIANFAR is not set
718CONFIG_UCC_GETH=y 730CONFIG_UCC_GETH=y
719# CONFIG_UGETH_MAGIC_PACKET is not set
720# CONFIG_UGETH_TX_ON_DEMAND is not set 731# CONFIG_UGETH_TX_ON_DEMAND is not set
721# CONFIG_MV643XX_ETH is not set 732# CONFIG_MV643XX_ETH is not set
722# CONFIG_QLA3XXX is not set 733# CONFIG_QLA3XXX is not set
@@ -744,10 +755,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
744# CONFIG_SFC is not set 755# CONFIG_SFC is not set
745# CONFIG_BE2NET is not set 756# CONFIG_BE2NET is not set
746# CONFIG_TR is not set 757# CONFIG_TR is not set
747 758CONFIG_WLAN=y
748#
749# Wireless LAN
750#
751# CONFIG_WLAN_PRE80211 is not set 759# CONFIG_WLAN_PRE80211 is not set
752# CONFIG_WLAN_80211 is not set 760# CONFIG_WLAN_80211 is not set
753 761
@@ -840,6 +848,7 @@ CONFIG_HW_RANDOM=y
840CONFIG_DEVPORT=y 848CONFIG_DEVPORT=y
841CONFIG_I2C=y 849CONFIG_I2C=y
842CONFIG_I2C_BOARDINFO=y 850CONFIG_I2C_BOARDINFO=y
851CONFIG_I2C_COMPAT=y
843CONFIG_I2C_CHARDEV=y 852CONFIG_I2C_CHARDEV=y
844CONFIG_I2C_HELPER_AUTO=y 853CONFIG_I2C_HELPER_AUTO=y
845 854
@@ -893,9 +902,6 @@ CONFIG_I2C_MPC=y
893# Miscellaneous I2C Chip support 902# Miscellaneous I2C Chip support
894# 903#
895# CONFIG_DS1682 is not set 904# CONFIG_DS1682 is not set
896# CONFIG_SENSORS_PCF8574 is not set
897# CONFIG_PCF8575 is not set
898# CONFIG_SENSORS_PCA9539 is not set
899# CONFIG_SENSORS_TSL2550 is not set 905# CONFIG_SENSORS_TSL2550 is not set
900# CONFIG_I2C_DEBUG_CORE is not set 906# CONFIG_I2C_DEBUG_CORE is not set
901# CONFIG_I2C_DEBUG_ALGO is not set 907# CONFIG_I2C_DEBUG_ALGO is not set
@@ -913,6 +919,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
913# CONFIG_POWER_SUPPLY is not set 919# CONFIG_POWER_SUPPLY is not set
914CONFIG_HWMON=y 920CONFIG_HWMON=y
915# CONFIG_HWMON_VID is not set 921# CONFIG_HWMON_VID is not set
922# CONFIG_HWMON_DEBUG_CHIP is not set
923
924#
925# Native drivers
926#
916# CONFIG_SENSORS_AD7414 is not set 927# CONFIG_SENSORS_AD7414 is not set
917# CONFIG_SENSORS_AD7418 is not set 928# CONFIG_SENSORS_AD7418 is not set
918# CONFIG_SENSORS_ADM1021 is not set 929# CONFIG_SENSORS_ADM1021 is not set
@@ -962,6 +973,7 @@ CONFIG_HWMON=y
962# CONFIG_SENSORS_ADS7828 is not set 973# CONFIG_SENSORS_ADS7828 is not set
963# CONFIG_SENSORS_THMC50 is not set 974# CONFIG_SENSORS_THMC50 is not set
964# CONFIG_SENSORS_TMP401 is not set 975# CONFIG_SENSORS_TMP401 is not set
976# CONFIG_SENSORS_TMP421 is not set
965# CONFIG_SENSORS_VIA686A is not set 977# CONFIG_SENSORS_VIA686A is not set
966# CONFIG_SENSORS_VT1211 is not set 978# CONFIG_SENSORS_VT1211 is not set
967# CONFIG_SENSORS_VT8231 is not set 979# CONFIG_SENSORS_VT8231 is not set
@@ -973,9 +985,7 @@ CONFIG_HWMON=y
973# CONFIG_SENSORS_W83L786NG is not set 985# CONFIG_SENSORS_W83L786NG is not set
974# CONFIG_SENSORS_W83627HF is not set 986# CONFIG_SENSORS_W83627HF is not set
975# CONFIG_SENSORS_W83627EHF is not set 987# CONFIG_SENSORS_W83627EHF is not set
976# CONFIG_HWMON_DEBUG_CHIP is not set
977# CONFIG_THERMAL is not set 988# CONFIG_THERMAL is not set
978# CONFIG_THERMAL_HWMON is not set
979CONFIG_WATCHDOG=y 989CONFIG_WATCHDOG=y
980# CONFIG_WATCHDOG_NOWAYOUT is not set 990# CONFIG_WATCHDOG_NOWAYOUT is not set
981 991
@@ -1008,6 +1018,7 @@ CONFIG_SSB_POSSIBLE=y
1008# CONFIG_MFD_TMIO is not set 1018# CONFIG_MFD_TMIO is not set
1009# CONFIG_PMIC_DA903X is not set 1019# CONFIG_PMIC_DA903X is not set
1010# CONFIG_MFD_WM8400 is not set 1020# CONFIG_MFD_WM8400 is not set
1021# CONFIG_MFD_WM831X is not set
1011# CONFIG_MFD_WM8350_I2C is not set 1022# CONFIG_MFD_WM8350_I2C is not set
1012# CONFIG_MFD_PCF50633 is not set 1023# CONFIG_MFD_PCF50633 is not set
1013# CONFIG_AB3100_CORE is not set 1024# CONFIG_AB3100_CORE is not set
@@ -1018,6 +1029,7 @@ CONFIG_SSB_POSSIBLE=y
1018# Graphics support 1029# Graphics support
1019# 1030#
1020# CONFIG_AGP is not set 1031# CONFIG_AGP is not set
1032CONFIG_VGA_ARB=y
1021# CONFIG_DRM is not set 1033# CONFIG_DRM is not set
1022# CONFIG_VGASTATE is not set 1034# CONFIG_VGASTATE is not set
1023CONFIG_VIDEO_OUTPUT_CONTROL=m 1035CONFIG_VIDEO_OUTPUT_CONTROL=m
@@ -1031,7 +1043,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m
1031# CONFIG_SOUND is not set 1043# CONFIG_SOUND is not set
1032CONFIG_HID_SUPPORT=y 1044CONFIG_HID_SUPPORT=y
1033CONFIG_HID=y 1045CONFIG_HID=y
1034# CONFIG_HID_DEBUG is not set
1035# CONFIG_HIDRAW is not set 1046# CONFIG_HIDRAW is not set
1036# CONFIG_HID_PID is not set 1047# CONFIG_HID_PID is not set
1037 1048
@@ -1151,6 +1162,7 @@ CONFIG_FS_MBCACHE=y
1151# CONFIG_GFS2_FS is not set 1162# CONFIG_GFS2_FS is not set
1152# CONFIG_OCFS2_FS is not set 1163# CONFIG_OCFS2_FS is not set
1153# CONFIG_BTRFS_FS is not set 1164# CONFIG_BTRFS_FS is not set
1165# CONFIG_NILFS2_FS is not set
1154CONFIG_FILE_LOCKING=y 1166CONFIG_FILE_LOCKING=y
1155CONFIG_FSNOTIFY=y 1167CONFIG_FSNOTIFY=y
1156CONFIG_DNOTIFY=y 1168CONFIG_DNOTIFY=y
@@ -1210,7 +1222,6 @@ CONFIG_MISC_FILESYSTEMS=y
1210# CONFIG_ROMFS_FS is not set 1222# CONFIG_ROMFS_FS is not set
1211# CONFIG_SYSV_FS is not set 1223# CONFIG_SYSV_FS is not set
1212# CONFIG_UFS_FS is not set 1224# CONFIG_UFS_FS is not set
1213# CONFIG_NILFS2_FS is not set
1214CONFIG_NETWORK_FILESYSTEMS=y 1225CONFIG_NETWORK_FILESYSTEMS=y
1215CONFIG_NFS_FS=y 1226CONFIG_NFS_FS=y
1216CONFIG_NFS_V3=y 1227CONFIG_NFS_V3=y
@@ -1284,6 +1295,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
1284CONFIG_ENABLE_MUST_CHECK=y 1295CONFIG_ENABLE_MUST_CHECK=y
1285CONFIG_FRAME_WARN=1024 1296CONFIG_FRAME_WARN=1024
1286# CONFIG_MAGIC_SYSRQ is not set 1297# CONFIG_MAGIC_SYSRQ is not set
1298# CONFIG_STRIP_ASM_SYMS is not set
1287# CONFIG_UNUSED_SYMBOLS is not set 1299# CONFIG_UNUSED_SYMBOLS is not set
1288# CONFIG_DEBUG_FS is not set 1300# CONFIG_DEBUG_FS is not set
1289# CONFIG_HEADERS_CHECK is not set 1301# CONFIG_HEADERS_CHECK is not set
@@ -1301,6 +1313,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
1301CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1313CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1302CONFIG_TRACING_SUPPORT=y 1314CONFIG_TRACING_SUPPORT=y
1303# CONFIG_FTRACE is not set 1315# CONFIG_FTRACE is not set
1316# CONFIG_DMA_API_DEBUG is not set
1304# CONFIG_SAMPLES is not set 1317# CONFIG_SAMPLES is not set
1305CONFIG_HAVE_ARCH_KGDB=y 1318CONFIG_HAVE_ARCH_KGDB=y
1306# CONFIG_PPC_DISABLE_WERROR is not set 1319# CONFIG_PPC_DISABLE_WERROR is not set
@@ -1322,7 +1335,6 @@ CONFIG_CRYPTO=y
1322# 1335#
1323# Crypto core or helper 1336# Crypto core or helper
1324# 1337#
1325# CONFIG_CRYPTO_FIPS is not set
1326CONFIG_CRYPTO_ALGAPI=y 1338CONFIG_CRYPTO_ALGAPI=y
1327CONFIG_CRYPTO_ALGAPI2=y 1339CONFIG_CRYPTO_ALGAPI2=y
1328CONFIG_CRYPTO_AEAD2=y 1340CONFIG_CRYPTO_AEAD2=y
@@ -1364,11 +1376,13 @@ CONFIG_CRYPTO_PCBC=m
1364# 1376#
1365# CONFIG_CRYPTO_HMAC is not set 1377# CONFIG_CRYPTO_HMAC is not set
1366# CONFIG_CRYPTO_XCBC is not set 1378# CONFIG_CRYPTO_XCBC is not set
1379# CONFIG_CRYPTO_VMAC is not set
1367 1380
1368# 1381#
1369# Digest 1382# Digest
1370# 1383#
1371# CONFIG_CRYPTO_CRC32C is not set 1384# CONFIG_CRYPTO_CRC32C is not set
1385# CONFIG_CRYPTO_GHASH is not set
1372# CONFIG_CRYPTO_MD4 is not set 1386# CONFIG_CRYPTO_MD4 is not set
1373CONFIG_CRYPTO_MD5=y 1387CONFIG_CRYPTO_MD5=y
1374# CONFIG_CRYPTO_MICHAEL_MIC is not set 1388# CONFIG_CRYPTO_MICHAEL_MIC is not set
diff --git a/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig b/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig
index ff31667a890b..b52ec0861679 100644
--- a/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig
+++ b/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.31-rc4 3# Linux kernel version: 2.6.32-rc5
4# Wed Jul 29 23:32:12 2009 4# Thu Nov 5 08:20:30 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -35,6 +35,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
35CONFIG_GENERIC_HARDIRQS=y 35CONFIG_GENERIC_HARDIRQS=y
36CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 36CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
38CONFIG_IRQ_PER_CPU=y 39CONFIG_IRQ_PER_CPU=y
39CONFIG_STACKTRACE_SUPPORT=y 40CONFIG_STACKTRACE_SUPPORT=y
40CONFIG_HAVE_LATENCYTOP_SUPPORT=y 41CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -85,11 +86,12 @@ CONFIG_SYSVIPC_SYSCTL=y
85# 86#
86# RCU Subsystem 87# RCU Subsystem
87# 88#
88CONFIG_CLASSIC_RCU=y 89CONFIG_TREE_RCU=y
89# CONFIG_TREE_RCU is not set 90# CONFIG_TREE_PREEMPT_RCU is not set
90# CONFIG_PREEMPT_RCU is not set 91# CONFIG_RCU_TRACE is not set
92CONFIG_RCU_FANOUT=32
93# CONFIG_RCU_FANOUT_EXACT is not set
91# CONFIG_TREE_RCU_TRACE is not set 94# CONFIG_TREE_RCU_TRACE is not set
92# CONFIG_PREEMPT_RCU_TRACE is not set
93# CONFIG_IKCONFIG is not set 95# CONFIG_IKCONFIG is not set
94CONFIG_LOG_BUF_SHIFT=14 96CONFIG_LOG_BUF_SHIFT=14
95CONFIG_GROUP_SCHED=y 97CONFIG_GROUP_SCHED=y
@@ -125,28 +127,29 @@ CONFIG_TIMERFD=y
125CONFIG_EVENTFD=y 127CONFIG_EVENTFD=y
126CONFIG_SHMEM=y 128CONFIG_SHMEM=y
127CONFIG_AIO=y 129CONFIG_AIO=y
128CONFIG_HAVE_PERF_COUNTERS=y 130CONFIG_HAVE_PERF_EVENTS=y
129 131
130# 132#
131# Performance Counters 133# Kernel Performance Events And Counters
132# 134#
135# CONFIG_PERF_EVENTS is not set
133# CONFIG_PERF_COUNTERS is not set 136# CONFIG_PERF_COUNTERS is not set
134CONFIG_VM_EVENT_COUNTERS=y 137CONFIG_VM_EVENT_COUNTERS=y
135CONFIG_PCI_QUIRKS=y 138CONFIG_PCI_QUIRKS=y
136CONFIG_SLUB_DEBUG=y 139CONFIG_SLUB_DEBUG=y
137# CONFIG_STRIP_ASM_SYMS is not set
138CONFIG_COMPAT_BRK=y 140CONFIG_COMPAT_BRK=y
139# CONFIG_SLAB is not set 141# CONFIG_SLAB is not set
140CONFIG_SLUB=y 142CONFIG_SLUB=y
141# CONFIG_SLOB is not set 143# CONFIG_SLOB is not set
142# CONFIG_PROFILING is not set 144# CONFIG_PROFILING is not set
143# CONFIG_MARKERS is not set
144CONFIG_HAVE_OPROFILE=y 145CONFIG_HAVE_OPROFILE=y
145CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 146CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
146CONFIG_HAVE_IOREMAP_PROT=y 147CONFIG_HAVE_IOREMAP_PROT=y
147CONFIG_HAVE_KPROBES=y 148CONFIG_HAVE_KPROBES=y
148CONFIG_HAVE_KRETPROBES=y 149CONFIG_HAVE_KRETPROBES=y
149CONFIG_HAVE_ARCH_TRACEHOOK=y 150CONFIG_HAVE_ARCH_TRACEHOOK=y
151CONFIG_HAVE_DMA_ATTRS=y
152CONFIG_HAVE_DMA_API_DEBUG=y
150 153
151# 154#
152# GCOV-based kernel profiling 155# GCOV-based kernel profiling
@@ -255,6 +258,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
255CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 258CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
256# CONFIG_KEXEC is not set 259# CONFIG_KEXEC is not set
257# CONFIG_CRASH_DUMP is not set 260# CONFIG_CRASH_DUMP is not set
261CONFIG_MAX_ACTIVE_REGIONS=32
258CONFIG_ARCH_FLATMEM_ENABLE=y 262CONFIG_ARCH_FLATMEM_ENABLE=y
259CONFIG_ARCH_POPULATES_NODE_MAP=y 263CONFIG_ARCH_POPULATES_NODE_MAP=y
260CONFIG_SELECT_MEMORY_MODEL=y 264CONFIG_SELECT_MEMORY_MODEL=y
@@ -272,6 +276,7 @@ CONFIG_BOUNCE=y
272CONFIG_VIRT_TO_BUS=y 276CONFIG_VIRT_TO_BUS=y
273CONFIG_HAVE_MLOCK=y 277CONFIG_HAVE_MLOCK=y
274CONFIG_HAVE_MLOCKED_PAGE_BIT=y 278CONFIG_HAVE_MLOCKED_PAGE_BIT=y
279# CONFIG_KSM is not set
275CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 280CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
276CONFIG_PPC_4K_PAGES=y 281CONFIG_PPC_4K_PAGES=y
277# CONFIG_PPC_16K_PAGES is not set 282# CONFIG_PPC_16K_PAGES is not set
@@ -369,6 +374,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
369# CONFIG_NETFILTER is not set 374# CONFIG_NETFILTER is not set
370# CONFIG_IP_DCCP is not set 375# CONFIG_IP_DCCP is not set
371# CONFIG_IP_SCTP is not set 376# CONFIG_IP_SCTP is not set
377# CONFIG_RDS is not set
372# CONFIG_TIPC is not set 378# CONFIG_TIPC is not set
373# CONFIG_ATM is not set 379# CONFIG_ATM is not set
374# CONFIG_BRIDGE is not set 380# CONFIG_BRIDGE is not set
@@ -398,6 +404,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
398# CONFIG_AF_RXRPC is not set 404# CONFIG_AF_RXRPC is not set
399CONFIG_WIRELESS=y 405CONFIG_WIRELESS=y
400# CONFIG_CFG80211 is not set 406# CONFIG_CFG80211 is not set
407CONFIG_CFG80211_DEFAULT_PS_VALUE=0
401CONFIG_WIRELESS_OLD_REGULATORY=y 408CONFIG_WIRELESS_OLD_REGULATORY=y
402# CONFIG_WIRELESS_EXT is not set 409# CONFIG_WIRELESS_EXT is not set
403# CONFIG_LIB80211 is not set 410# CONFIG_LIB80211 is not set
@@ -405,7 +412,6 @@ CONFIG_WIRELESS_OLD_REGULATORY=y
405# 412#
406# CFG80211 needs to be enabled for MAC80211 413# CFG80211 needs to be enabled for MAC80211
407# 414#
408CONFIG_MAC80211_DEFAULT_PS_VALUE=0
409# CONFIG_WIMAX is not set 415# CONFIG_WIMAX is not set
410# CONFIG_RFKILL is not set 416# CONFIG_RFKILL is not set
411# CONFIG_NET_9P is not set 417# CONFIG_NET_9P is not set
@@ -418,6 +424,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
418# Generic Driver Options 424# Generic Driver Options
419# 425#
420CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 426CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
427# CONFIG_DEVTMPFS is not set
421CONFIG_STANDALONE=y 428CONFIG_STANDALONE=y
422CONFIG_PREVENT_FIRMWARE_BUILD=y 429CONFIG_PREVENT_FIRMWARE_BUILD=y
423CONFIG_FW_LOADER=y 430CONFIG_FW_LOADER=y
@@ -427,9 +434,9 @@ CONFIG_EXTRA_FIRMWARE=""
427# CONFIG_CONNECTOR is not set 434# CONFIG_CONNECTOR is not set
428CONFIG_MTD=y 435CONFIG_MTD=y
429# CONFIG_MTD_DEBUG is not set 436# CONFIG_MTD_DEBUG is not set
437# CONFIG_MTD_TESTS is not set
430# CONFIG_MTD_CONCAT is not set 438# CONFIG_MTD_CONCAT is not set
431CONFIG_MTD_PARTITIONS=y 439CONFIG_MTD_PARTITIONS=y
432# CONFIG_MTD_TESTS is not set
433# CONFIG_MTD_REDBOOT_PARTS is not set 440# CONFIG_MTD_REDBOOT_PARTS is not set
434CONFIG_MTD_CMDLINE_PARTS=y 441CONFIG_MTD_CMDLINE_PARTS=y
435# CONFIG_MTD_OF_PARTS is not set 442# CONFIG_MTD_OF_PARTS is not set
@@ -493,6 +500,7 @@ CONFIG_MTD_PHYSMAP_OF=y
493# CONFIG_MTD_PMC551 is not set 500# CONFIG_MTD_PMC551 is not set
494# CONFIG_MTD_DATAFLASH is not set 501# CONFIG_MTD_DATAFLASH is not set
495# CONFIG_MTD_M25P80 is not set 502# CONFIG_MTD_M25P80 is not set
503# CONFIG_MTD_SST25L is not set
496# CONFIG_MTD_SLRAM is not set 504# CONFIG_MTD_SLRAM is not set
497# CONFIG_MTD_PHRAM is not set 505# CONFIG_MTD_PHRAM is not set
498# CONFIG_MTD_MTDRAM is not set 506# CONFIG_MTD_MTDRAM is not set
@@ -639,7 +647,6 @@ CONFIG_NETDEV_1000=y
639CONFIG_FSL_PQ_MDIO=y 647CONFIG_FSL_PQ_MDIO=y
640# CONFIG_GIANFAR is not set 648# CONFIG_GIANFAR is not set
641CONFIG_UCC_GETH=y 649CONFIG_UCC_GETH=y
642# CONFIG_UGETH_MAGIC_PACKET is not set
643# CONFIG_UGETH_TX_ON_DEMAND is not set 650# CONFIG_UGETH_TX_ON_DEMAND is not set
644# CONFIG_MV643XX_ETH is not set 651# CONFIG_MV643XX_ETH is not set
645# CONFIG_QLA3XXX is not set 652# CONFIG_QLA3XXX is not set
@@ -649,10 +656,7 @@ CONFIG_UCC_GETH=y
649# CONFIG_JME is not set 656# CONFIG_JME is not set
650# CONFIG_NETDEV_10000 is not set 657# CONFIG_NETDEV_10000 is not set
651# CONFIG_TR is not set 658# CONFIG_TR is not set
652 659CONFIG_WLAN=y
653#
654# Wireless LAN
655#
656# CONFIG_WLAN_PRE80211 is not set 660# CONFIG_WLAN_PRE80211 is not set
657# CONFIG_WLAN_80211 is not set 661# CONFIG_WLAN_80211 is not set
658 662
@@ -750,6 +754,7 @@ CONFIG_HW_RANDOM=y
750CONFIG_DEVPORT=y 754CONFIG_DEVPORT=y
751CONFIG_I2C=y 755CONFIG_I2C=y
752CONFIG_I2C_BOARDINFO=y 756CONFIG_I2C_BOARDINFO=y
757CONFIG_I2C_COMPAT=y
753CONFIG_I2C_CHARDEV=y 758CONFIG_I2C_CHARDEV=y
754CONFIG_I2C_HELPER_AUTO=y 759CONFIG_I2C_HELPER_AUTO=y
755 760
@@ -804,9 +809,6 @@ CONFIG_I2C_MPC=y
804# Miscellaneous I2C Chip support 809# Miscellaneous I2C Chip support
805# 810#
806# CONFIG_DS1682 is not set 811# CONFIG_DS1682 is not set
807# CONFIG_SENSORS_PCF8574 is not set
808# CONFIG_PCF8575 is not set
809# CONFIG_SENSORS_PCA9539 is not set
810# CONFIG_SENSORS_TSL2550 is not set 812# CONFIG_SENSORS_TSL2550 is not set
811# CONFIG_I2C_DEBUG_CORE is not set 813# CONFIG_I2C_DEBUG_CORE is not set
812# CONFIG_I2C_DEBUG_ALGO is not set 814# CONFIG_I2C_DEBUG_ALGO is not set
@@ -853,17 +855,22 @@ CONFIG_GPIOLIB=y
853# PCI GPIO expanders: 855# PCI GPIO expanders:
854# 856#
855# CONFIG_GPIO_BT8XX is not set 857# CONFIG_GPIO_BT8XX is not set
858# CONFIG_GPIO_LANGWELL is not set
856 859
857# 860#
858# SPI GPIO expanders: 861# SPI GPIO expanders:
859# 862#
860# CONFIG_GPIO_MAX7301 is not set 863# CONFIG_GPIO_MAX7301 is not set
861# CONFIG_GPIO_MCP23S08 is not set 864# CONFIG_GPIO_MCP23S08 is not set
865# CONFIG_GPIO_MC33880 is not set
866
867#
868# AC97 GPIO expanders:
869#
862# CONFIG_W1 is not set 870# CONFIG_W1 is not set
863# CONFIG_POWER_SUPPLY is not set 871# CONFIG_POWER_SUPPLY is not set
864# CONFIG_HWMON is not set 872# CONFIG_HWMON is not set
865# CONFIG_THERMAL is not set 873# CONFIG_THERMAL is not set
866# CONFIG_THERMAL_HWMON is not set
867CONFIG_WATCHDOG=y 874CONFIG_WATCHDOG=y
868# CONFIG_WATCHDOG_NOWAYOUT is not set 875# CONFIG_WATCHDOG_NOWAYOUT is not set
869 876
@@ -897,8 +904,10 @@ CONFIG_SSB_POSSIBLE=y
897# CONFIG_MFD_TMIO is not set 904# CONFIG_MFD_TMIO is not set
898# CONFIG_PMIC_DA903X is not set 905# CONFIG_PMIC_DA903X is not set
899# CONFIG_MFD_WM8400 is not set 906# CONFIG_MFD_WM8400 is not set
907# CONFIG_MFD_WM831X is not set
900# CONFIG_MFD_WM8350_I2C is not set 908# CONFIG_MFD_WM8350_I2C is not set
901# CONFIG_MFD_PCF50633 is not set 909# CONFIG_MFD_PCF50633 is not set
910# CONFIG_MFD_MC13783 is not set
902# CONFIG_AB3100_CORE is not set 911# CONFIG_AB3100_CORE is not set
903# CONFIG_EZX_PCAP is not set 912# CONFIG_EZX_PCAP is not set
904# CONFIG_REGULATOR is not set 913# CONFIG_REGULATOR is not set
@@ -908,6 +917,7 @@ CONFIG_SSB_POSSIBLE=y
908# Graphics support 917# Graphics support
909# 918#
910# CONFIG_AGP is not set 919# CONFIG_AGP is not set
920CONFIG_VGA_ARB=y
911# CONFIG_DRM is not set 921# CONFIG_DRM is not set
912# CONFIG_VGASTATE is not set 922# CONFIG_VGASTATE is not set
913# CONFIG_VIDEO_OUTPUT_CONTROL is not set 923# CONFIG_VIDEO_OUTPUT_CONTROL is not set
@@ -992,7 +1002,6 @@ CONFIG_LOGO_LINUX_CLUT224=y
992# CONFIG_SOUND is not set 1002# CONFIG_SOUND is not set
993CONFIG_HID_SUPPORT=y 1003CONFIG_HID_SUPPORT=y
994CONFIG_HID=y 1004CONFIG_HID=y
995# CONFIG_HID_DEBUG is not set
996# CONFIG_HIDRAW is not set 1005# CONFIG_HIDRAW is not set
997# CONFIG_HID_PID is not set 1006# CONFIG_HID_PID is not set
998 1007
@@ -1038,6 +1047,7 @@ CONFIG_FS_MBCACHE=y
1038# CONFIG_GFS2_FS is not set 1047# CONFIG_GFS2_FS is not set
1039# CONFIG_OCFS2_FS is not set 1048# CONFIG_OCFS2_FS is not set
1040# CONFIG_BTRFS_FS is not set 1049# CONFIG_BTRFS_FS is not set
1050# CONFIG_NILFS2_FS is not set
1041CONFIG_FILE_LOCKING=y 1051CONFIG_FILE_LOCKING=y
1042CONFIG_FSNOTIFY=y 1052CONFIG_FSNOTIFY=y
1043CONFIG_DNOTIFY=y 1053CONFIG_DNOTIFY=y
@@ -1107,7 +1117,6 @@ CONFIG_JFFS2_RTIME=y
1107# CONFIG_ROMFS_FS is not set 1117# CONFIG_ROMFS_FS is not set
1108# CONFIG_SYSV_FS is not set 1118# CONFIG_SYSV_FS is not set
1109# CONFIG_UFS_FS is not set 1119# CONFIG_UFS_FS is not set
1110# CONFIG_NILFS2_FS is not set
1111CONFIG_NETWORK_FILESYSTEMS=y 1120CONFIG_NETWORK_FILESYSTEMS=y
1112CONFIG_NFS_FS=y 1121CONFIG_NFS_FS=y
1113CONFIG_NFS_V3=y 1122CONFIG_NFS_V3=y
@@ -1183,6 +1192,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
1183CONFIG_ENABLE_MUST_CHECK=y 1192CONFIG_ENABLE_MUST_CHECK=y
1184CONFIG_FRAME_WARN=1024 1193CONFIG_FRAME_WARN=1024
1185# CONFIG_MAGIC_SYSRQ is not set 1194# CONFIG_MAGIC_SYSRQ is not set
1195# CONFIG_STRIP_ASM_SYMS is not set
1186# CONFIG_UNUSED_SYMBOLS is not set 1196# CONFIG_UNUSED_SYMBOLS is not set
1187# CONFIG_DEBUG_FS is not set 1197# CONFIG_DEBUG_FS is not set
1188# CONFIG_HEADERS_CHECK is not set 1198# CONFIG_HEADERS_CHECK is not set
@@ -1200,6 +1210,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
1200CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1210CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1201CONFIG_TRACING_SUPPORT=y 1211CONFIG_TRACING_SUPPORT=y
1202# CONFIG_FTRACE is not set 1212# CONFIG_FTRACE is not set
1213# CONFIG_DMA_API_DEBUG is not set
1203# CONFIG_SAMPLES is not set 1214# CONFIG_SAMPLES is not set
1204CONFIG_HAVE_ARCH_KGDB=y 1215CONFIG_HAVE_ARCH_KGDB=y
1205# CONFIG_PPC_DISABLE_WERROR is not set 1216# CONFIG_PPC_DISABLE_WERROR is not set
@@ -1232,7 +1243,6 @@ CONFIG_CRYPTO=y
1232# 1243#
1233# Crypto core or helper 1244# Crypto core or helper
1234# 1245#
1235# CONFIG_CRYPTO_FIPS is not set
1236CONFIG_CRYPTO_ALGAPI=y 1246CONFIG_CRYPTO_ALGAPI=y
1237CONFIG_CRYPTO_ALGAPI2=y 1247CONFIG_CRYPTO_ALGAPI2=y
1238CONFIG_CRYPTO_AEAD2=y 1248CONFIG_CRYPTO_AEAD2=y
@@ -1274,11 +1284,13 @@ CONFIG_CRYPTO_CBC=y
1274# 1284#
1275# CONFIG_CRYPTO_HMAC is not set 1285# CONFIG_CRYPTO_HMAC is not set
1276# CONFIG_CRYPTO_XCBC is not set 1286# CONFIG_CRYPTO_XCBC is not set
1287# CONFIG_CRYPTO_VMAC is not set
1277 1288
1278# 1289#
1279# Digest 1290# Digest
1280# 1291#
1281# CONFIG_CRYPTO_CRC32C is not set 1292# CONFIG_CRYPTO_CRC32C is not set
1293# CONFIG_CRYPTO_GHASH is not set
1282# CONFIG_CRYPTO_MD4 is not set 1294# CONFIG_CRYPTO_MD4 is not set
1283CONFIG_CRYPTO_MD5=y 1295CONFIG_CRYPTO_MD5=y
1284# CONFIG_CRYPTO_MICHAEL_MIC is not set 1296# CONFIG_CRYPTO_MICHAEL_MIC is not set
diff --git a/arch/powerpc/configs/83xx/mpc837x_mds_defconfig b/arch/powerpc/configs/83xx/mpc837x_mds_defconfig
index e285ec0fe958..730061574f96 100644
--- a/arch/powerpc/configs/83xx/mpc837x_mds_defconfig
+++ b/arch/powerpc/configs/83xx/mpc837x_mds_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.31-rc4 3# Linux kernel version: 2.6.32-rc5
4# Wed Jul 29 23:32:11 2009 4# Thu Nov 5 08:20:29 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -35,6 +35,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
35CONFIG_GENERIC_HARDIRQS=y 35CONFIG_GENERIC_HARDIRQS=y
36CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 36CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
38CONFIG_IRQ_PER_CPU=y 39CONFIG_IRQ_PER_CPU=y
39CONFIG_STACKTRACE_SUPPORT=y 40CONFIG_STACKTRACE_SUPPORT=y
40CONFIG_HAVE_LATENCYTOP_SUPPORT=y 41CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -84,11 +85,12 @@ CONFIG_SYSVIPC_SYSCTL=y
84# 85#
85# RCU Subsystem 86# RCU Subsystem
86# 87#
87CONFIG_CLASSIC_RCU=y 88CONFIG_TREE_RCU=y
88# CONFIG_TREE_RCU is not set 89# CONFIG_TREE_PREEMPT_RCU is not set
89# CONFIG_PREEMPT_RCU is not set 90# CONFIG_RCU_TRACE is not set
91CONFIG_RCU_FANOUT=32
92# CONFIG_RCU_FANOUT_EXACT is not set
90# CONFIG_TREE_RCU_TRACE is not set 93# CONFIG_TREE_RCU_TRACE is not set
91# CONFIG_PREEMPT_RCU_TRACE is not set
92# CONFIG_IKCONFIG is not set 94# CONFIG_IKCONFIG is not set
93CONFIG_LOG_BUF_SHIFT=14 95CONFIG_LOG_BUF_SHIFT=14
94CONFIG_GROUP_SCHED=y 96CONFIG_GROUP_SCHED=y
@@ -125,21 +127,20 @@ CONFIG_TIMERFD=y
125CONFIG_EVENTFD=y 127CONFIG_EVENTFD=y
126CONFIG_SHMEM=y 128CONFIG_SHMEM=y
127CONFIG_AIO=y 129CONFIG_AIO=y
128CONFIG_HAVE_PERF_COUNTERS=y 130CONFIG_HAVE_PERF_EVENTS=y
129 131
130# 132#
131# Performance Counters 133# Kernel Performance Events And Counters
132# 134#
135# CONFIG_PERF_EVENTS is not set
133# CONFIG_PERF_COUNTERS is not set 136# CONFIG_PERF_COUNTERS is not set
134CONFIG_VM_EVENT_COUNTERS=y 137CONFIG_VM_EVENT_COUNTERS=y
135CONFIG_PCI_QUIRKS=y 138CONFIG_PCI_QUIRKS=y
136# CONFIG_STRIP_ASM_SYMS is not set
137CONFIG_COMPAT_BRK=y 139CONFIG_COMPAT_BRK=y
138CONFIG_SLAB=y 140CONFIG_SLAB=y
139# CONFIG_SLUB is not set 141# CONFIG_SLUB is not set
140# CONFIG_SLOB is not set 142# CONFIG_SLOB is not set
141# CONFIG_PROFILING is not set 143# CONFIG_PROFILING is not set
142# CONFIG_MARKERS is not set
143CONFIG_HAVE_OPROFILE=y 144CONFIG_HAVE_OPROFILE=y
144# CONFIG_KPROBES is not set 145# CONFIG_KPROBES is not set
145CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 146CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -147,6 +148,8 @@ CONFIG_HAVE_IOREMAP_PROT=y
147CONFIG_HAVE_KPROBES=y 148CONFIG_HAVE_KPROBES=y
148CONFIG_HAVE_KRETPROBES=y 149CONFIG_HAVE_KRETPROBES=y
149CONFIG_HAVE_ARCH_TRACEHOOK=y 150CONFIG_HAVE_ARCH_TRACEHOOK=y
151CONFIG_HAVE_DMA_ATTRS=y
152CONFIG_HAVE_DMA_API_DEBUG=y
150 153
151# 154#
152# GCOV-based kernel profiling 155# GCOV-based kernel profiling
@@ -256,6 +259,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
256CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 259CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
257# CONFIG_KEXEC is not set 260# CONFIG_KEXEC is not set
258# CONFIG_CRASH_DUMP is not set 261# CONFIG_CRASH_DUMP is not set
262CONFIG_MAX_ACTIVE_REGIONS=32
259CONFIG_ARCH_FLATMEM_ENABLE=y 263CONFIG_ARCH_FLATMEM_ENABLE=y
260CONFIG_ARCH_POPULATES_NODE_MAP=y 264CONFIG_ARCH_POPULATES_NODE_MAP=y
261CONFIG_SELECT_MEMORY_MODEL=y 265CONFIG_SELECT_MEMORY_MODEL=y
@@ -273,6 +277,7 @@ CONFIG_BOUNCE=y
273CONFIG_VIRT_TO_BUS=y 277CONFIG_VIRT_TO_BUS=y
274CONFIG_HAVE_MLOCK=y 278CONFIG_HAVE_MLOCK=y
275CONFIG_HAVE_MLOCKED_PAGE_BIT=y 279CONFIG_HAVE_MLOCKED_PAGE_BIT=y
280# CONFIG_KSM is not set
276CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 281CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
277CONFIG_PPC_4K_PAGES=y 282CONFIG_PPC_4K_PAGES=y
278# CONFIG_PPC_16K_PAGES is not set 283# CONFIG_PPC_16K_PAGES is not set
@@ -368,6 +373,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
368# CONFIG_NETFILTER is not set 373# CONFIG_NETFILTER is not set
369# CONFIG_IP_DCCP is not set 374# CONFIG_IP_DCCP is not set
370# CONFIG_IP_SCTP is not set 375# CONFIG_IP_SCTP is not set
376# CONFIG_RDS is not set
371# CONFIG_TIPC is not set 377# CONFIG_TIPC is not set
372# CONFIG_ATM is not set 378# CONFIG_ATM is not set
373# CONFIG_BRIDGE is not set 379# CONFIG_BRIDGE is not set
@@ -397,6 +403,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
397# CONFIG_AF_RXRPC is not set 403# CONFIG_AF_RXRPC is not set
398CONFIG_WIRELESS=y 404CONFIG_WIRELESS=y
399# CONFIG_CFG80211 is not set 405# CONFIG_CFG80211 is not set
406CONFIG_CFG80211_DEFAULT_PS_VALUE=0
400CONFIG_WIRELESS_OLD_REGULATORY=y 407CONFIG_WIRELESS_OLD_REGULATORY=y
401# CONFIG_WIRELESS_EXT is not set 408# CONFIG_WIRELESS_EXT is not set
402# CONFIG_LIB80211 is not set 409# CONFIG_LIB80211 is not set
@@ -404,7 +411,6 @@ CONFIG_WIRELESS_OLD_REGULATORY=y
404# 411#
405# CFG80211 needs to be enabled for MAC80211 412# CFG80211 needs to be enabled for MAC80211
406# 413#
407CONFIG_MAC80211_DEFAULT_PS_VALUE=0
408# CONFIG_WIMAX is not set 414# CONFIG_WIMAX is not set
409# CONFIG_RFKILL is not set 415# CONFIG_RFKILL is not set
410# CONFIG_NET_9P is not set 416# CONFIG_NET_9P is not set
@@ -417,6 +423,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
417# Generic Driver Options 423# Generic Driver Options
418# 424#
419CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 425CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
426# CONFIG_DEVTMPFS is not set
420CONFIG_STANDALONE=y 427CONFIG_STANDALONE=y
421CONFIG_PREVENT_FIRMWARE_BUILD=y 428CONFIG_PREVENT_FIRMWARE_BUILD=y
422# CONFIG_FW_LOADER is not set 429# CONFIG_FW_LOADER is not set
@@ -503,6 +510,7 @@ CONFIG_SCSI_LOWLEVEL=y
503# CONFIG_ISCSI_TCP is not set 510# CONFIG_ISCSI_TCP is not set
504# CONFIG_SCSI_CXGB3_ISCSI is not set 511# CONFIG_SCSI_CXGB3_ISCSI is not set
505# CONFIG_SCSI_BNX2_ISCSI is not set 512# CONFIG_SCSI_BNX2_ISCSI is not set
513# CONFIG_BE2ISCSI is not set
506# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 514# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
507# CONFIG_SCSI_3W_9XXX is not set 515# CONFIG_SCSI_3W_9XXX is not set
508# CONFIG_SCSI_ACARD is not set 516# CONFIG_SCSI_ACARD is not set
@@ -542,11 +550,14 @@ CONFIG_SCSI_LOWLEVEL=y
542# CONFIG_SCSI_DC390T is not set 550# CONFIG_SCSI_DC390T is not set
543# CONFIG_SCSI_NSP32 is not set 551# CONFIG_SCSI_NSP32 is not set
544# CONFIG_SCSI_DEBUG is not set 552# CONFIG_SCSI_DEBUG is not set
553# CONFIG_SCSI_PMCRAID is not set
545# CONFIG_SCSI_SRP is not set 554# CONFIG_SCSI_SRP is not set
555# CONFIG_SCSI_BFA_FC is not set
546# CONFIG_SCSI_DH is not set 556# CONFIG_SCSI_DH is not set
547# CONFIG_SCSI_OSD_INITIATOR is not set 557# CONFIG_SCSI_OSD_INITIATOR is not set
548CONFIG_ATA=y 558CONFIG_ATA=y
549# CONFIG_ATA_NONSTANDARD is not set 559# CONFIG_ATA_NONSTANDARD is not set
560CONFIG_ATA_VERBOSE_ERROR=y
550CONFIG_SATA_PMP=y 561CONFIG_SATA_PMP=y
551# CONFIG_SATA_AHCI is not set 562# CONFIG_SATA_AHCI is not set
552# CONFIG_SATA_SIL24 is not set 563# CONFIG_SATA_SIL24 is not set
@@ -569,6 +580,7 @@ CONFIG_ATA_SFF=y
569# CONFIG_PATA_ALI is not set 580# CONFIG_PATA_ALI is not set
570# CONFIG_PATA_AMD is not set 581# CONFIG_PATA_AMD is not set
571# CONFIG_PATA_ARTOP is not set 582# CONFIG_PATA_ARTOP is not set
583# CONFIG_PATA_ATP867X is not set
572# CONFIG_PATA_ATIIXP is not set 584# CONFIG_PATA_ATIIXP is not set
573# CONFIG_PATA_CMD640_PCI is not set 585# CONFIG_PATA_CMD640_PCI is not set
574# CONFIG_PATA_CMD64X is not set 586# CONFIG_PATA_CMD64X is not set
@@ -596,6 +608,7 @@ CONFIG_ATA_SFF=y
596# CONFIG_PATA_OPTIDMA is not set 608# CONFIG_PATA_OPTIDMA is not set
597# CONFIG_PATA_PDC_OLD is not set 609# CONFIG_PATA_PDC_OLD is not set
598# CONFIG_PATA_RADISYS is not set 610# CONFIG_PATA_RADISYS is not set
611# CONFIG_PATA_RDC is not set
599# CONFIG_PATA_RZ1000 is not set 612# CONFIG_PATA_RZ1000 is not set
600# CONFIG_PATA_SC1200 is not set 613# CONFIG_PATA_SC1200 is not set
601# CONFIG_PATA_SERVERWORKS is not set 614# CONFIG_PATA_SERVERWORKS is not set
@@ -672,7 +685,9 @@ CONFIG_MII=y
672# CONFIG_NET_PCI is not set 685# CONFIG_NET_PCI is not set
673# CONFIG_B44 is not set 686# CONFIG_B44 is not set
674# CONFIG_KS8842 is not set 687# CONFIG_KS8842 is not set
688# CONFIG_KS8851_MLL is not set
675# CONFIG_ATL2 is not set 689# CONFIG_ATL2 is not set
690# CONFIG_XILINX_EMACLITE is not set
676CONFIG_NETDEV_1000=y 691CONFIG_NETDEV_1000=y
677# CONFIG_ACENIC is not set 692# CONFIG_ACENIC is not set
678# CONFIG_DL2K is not set 693# CONFIG_DL2K is not set
@@ -720,10 +735,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
720# CONFIG_SFC is not set 735# CONFIG_SFC is not set
721# CONFIG_BE2NET is not set 736# CONFIG_BE2NET is not set
722# CONFIG_TR is not set 737# CONFIG_TR is not set
723 738CONFIG_WLAN=y
724#
725# Wireless LAN
726#
727# CONFIG_WLAN_PRE80211 is not set 739# CONFIG_WLAN_PRE80211 is not set
728# CONFIG_WLAN_80211 is not set 740# CONFIG_WLAN_80211 is not set
729 741
@@ -816,6 +828,7 @@ CONFIG_GEN_RTC=y
816CONFIG_DEVPORT=y 828CONFIG_DEVPORT=y
817CONFIG_I2C=y 829CONFIG_I2C=y
818CONFIG_I2C_BOARDINFO=y 830CONFIG_I2C_BOARDINFO=y
831CONFIG_I2C_COMPAT=y
819CONFIG_I2C_CHARDEV=y 832CONFIG_I2C_CHARDEV=y
820CONFIG_I2C_HELPER_AUTO=y 833CONFIG_I2C_HELPER_AUTO=y
821 834
@@ -869,9 +882,6 @@ CONFIG_I2C_MPC=y
869# Miscellaneous I2C Chip support 882# Miscellaneous I2C Chip support
870# 883#
871# CONFIG_DS1682 is not set 884# CONFIG_DS1682 is not set
872# CONFIG_SENSORS_PCF8574 is not set
873# CONFIG_PCF8575 is not set
874# CONFIG_SENSORS_PCA9539 is not set
875# CONFIG_SENSORS_TSL2550 is not set 885# CONFIG_SENSORS_TSL2550 is not set
876# CONFIG_I2C_DEBUG_CORE is not set 886# CONFIG_I2C_DEBUG_CORE is not set
877# CONFIG_I2C_DEBUG_ALGO is not set 887# CONFIG_I2C_DEBUG_ALGO is not set
@@ -889,6 +899,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
889# CONFIG_POWER_SUPPLY is not set 899# CONFIG_POWER_SUPPLY is not set
890CONFIG_HWMON=y 900CONFIG_HWMON=y
891# CONFIG_HWMON_VID is not set 901# CONFIG_HWMON_VID is not set
902# CONFIG_HWMON_DEBUG_CHIP is not set
903
904#
905# Native drivers
906#
892# CONFIG_SENSORS_AD7414 is not set 907# CONFIG_SENSORS_AD7414 is not set
893# CONFIG_SENSORS_AD7418 is not set 908# CONFIG_SENSORS_AD7418 is not set
894# CONFIG_SENSORS_ADM1021 is not set 909# CONFIG_SENSORS_ADM1021 is not set
@@ -938,6 +953,7 @@ CONFIG_HWMON=y
938# CONFIG_SENSORS_ADS7828 is not set 953# CONFIG_SENSORS_ADS7828 is not set
939# CONFIG_SENSORS_THMC50 is not set 954# CONFIG_SENSORS_THMC50 is not set
940# CONFIG_SENSORS_TMP401 is not set 955# CONFIG_SENSORS_TMP401 is not set
956# CONFIG_SENSORS_TMP421 is not set
941# CONFIG_SENSORS_VIA686A is not set 957# CONFIG_SENSORS_VIA686A is not set
942# CONFIG_SENSORS_VT1211 is not set 958# CONFIG_SENSORS_VT1211 is not set
943# CONFIG_SENSORS_VT8231 is not set 959# CONFIG_SENSORS_VT8231 is not set
@@ -949,9 +965,7 @@ CONFIG_HWMON=y
949# CONFIG_SENSORS_W83L786NG is not set 965# CONFIG_SENSORS_W83L786NG is not set
950# CONFIG_SENSORS_W83627HF is not set 966# CONFIG_SENSORS_W83627HF is not set
951# CONFIG_SENSORS_W83627EHF is not set 967# CONFIG_SENSORS_W83627EHF is not set
952# CONFIG_HWMON_DEBUG_CHIP is not set
953# CONFIG_THERMAL is not set 968# CONFIG_THERMAL is not set
954# CONFIG_THERMAL_HWMON is not set
955CONFIG_WATCHDOG=y 969CONFIG_WATCHDOG=y
956# CONFIG_WATCHDOG_NOWAYOUT is not set 970# CONFIG_WATCHDOG_NOWAYOUT is not set
957 971
@@ -984,6 +998,7 @@ CONFIG_SSB_POSSIBLE=y
984# CONFIG_MFD_TMIO is not set 998# CONFIG_MFD_TMIO is not set
985# CONFIG_PMIC_DA903X is not set 999# CONFIG_PMIC_DA903X is not set
986# CONFIG_MFD_WM8400 is not set 1000# CONFIG_MFD_WM8400 is not set
1001# CONFIG_MFD_WM831X is not set
987# CONFIG_MFD_WM8350_I2C is not set 1002# CONFIG_MFD_WM8350_I2C is not set
988# CONFIG_MFD_PCF50633 is not set 1003# CONFIG_MFD_PCF50633 is not set
989# CONFIG_AB3100_CORE is not set 1004# CONFIG_AB3100_CORE is not set
@@ -994,6 +1009,7 @@ CONFIG_SSB_POSSIBLE=y
994# Graphics support 1009# Graphics support
995# 1010#
996# CONFIG_AGP is not set 1011# CONFIG_AGP is not set
1012CONFIG_VGA_ARB=y
997# CONFIG_DRM is not set 1013# CONFIG_DRM is not set
998# CONFIG_VGASTATE is not set 1014# CONFIG_VGASTATE is not set
999CONFIG_VIDEO_OUTPUT_CONTROL=m 1015CONFIG_VIDEO_OUTPUT_CONTROL=m
@@ -1007,7 +1023,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m
1007# CONFIG_SOUND is not set 1023# CONFIG_SOUND is not set
1008CONFIG_HID_SUPPORT=y 1024CONFIG_HID_SUPPORT=y
1009CONFIG_HID=y 1025CONFIG_HID=y
1010# CONFIG_HID_DEBUG is not set
1011# CONFIG_HIDRAW is not set 1026# CONFIG_HIDRAW is not set
1012# CONFIG_HID_PID is not set 1027# CONFIG_HID_PID is not set
1013 1028
@@ -1072,6 +1087,7 @@ CONFIG_FS_MBCACHE=y
1072# CONFIG_GFS2_FS is not set 1087# CONFIG_GFS2_FS is not set
1073# CONFIG_OCFS2_FS is not set 1088# CONFIG_OCFS2_FS is not set
1074# CONFIG_BTRFS_FS is not set 1089# CONFIG_BTRFS_FS is not set
1090# CONFIG_NILFS2_FS is not set
1075CONFIG_FILE_LOCKING=y 1091CONFIG_FILE_LOCKING=y
1076CONFIG_FSNOTIFY=y 1092CONFIG_FSNOTIFY=y
1077CONFIG_DNOTIFY=y 1093CONFIG_DNOTIFY=y
@@ -1130,7 +1146,6 @@ CONFIG_MISC_FILESYSTEMS=y
1130# CONFIG_ROMFS_FS is not set 1146# CONFIG_ROMFS_FS is not set
1131# CONFIG_SYSV_FS is not set 1147# CONFIG_SYSV_FS is not set
1132# CONFIG_UFS_FS is not set 1148# CONFIG_UFS_FS is not set
1133# CONFIG_NILFS2_FS is not set
1134CONFIG_NETWORK_FILESYSTEMS=y 1149CONFIG_NETWORK_FILESYSTEMS=y
1135CONFIG_NFS_FS=y 1150CONFIG_NFS_FS=y
1136CONFIG_NFS_V3=y 1151CONFIG_NFS_V3=y
@@ -1206,6 +1221,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
1206CONFIG_ENABLE_MUST_CHECK=y 1221CONFIG_ENABLE_MUST_CHECK=y
1207CONFIG_FRAME_WARN=1024 1222CONFIG_FRAME_WARN=1024
1208# CONFIG_MAGIC_SYSRQ is not set 1223# CONFIG_MAGIC_SYSRQ is not set
1224# CONFIG_STRIP_ASM_SYMS is not set
1209# CONFIG_UNUSED_SYMBOLS is not set 1225# CONFIG_UNUSED_SYMBOLS is not set
1210# CONFIG_DEBUG_FS is not set 1226# CONFIG_DEBUG_FS is not set
1211# CONFIG_HEADERS_CHECK is not set 1227# CONFIG_HEADERS_CHECK is not set
@@ -1221,6 +1237,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
1221CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1237CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1222CONFIG_TRACING_SUPPORT=y 1238CONFIG_TRACING_SUPPORT=y
1223# CONFIG_FTRACE is not set 1239# CONFIG_FTRACE is not set
1240# CONFIG_DMA_API_DEBUG is not set
1224# CONFIG_SAMPLES is not set 1241# CONFIG_SAMPLES is not set
1225CONFIG_HAVE_ARCH_KGDB=y 1242CONFIG_HAVE_ARCH_KGDB=y
1226# CONFIG_PPC_DISABLE_WERROR is not set 1243# CONFIG_PPC_DISABLE_WERROR is not set
@@ -1242,7 +1259,6 @@ CONFIG_CRYPTO=y
1242# 1259#
1243# Crypto core or helper 1260# Crypto core or helper
1244# 1261#
1245# CONFIG_CRYPTO_FIPS is not set
1246CONFIG_CRYPTO_ALGAPI=y 1262CONFIG_CRYPTO_ALGAPI=y
1247CONFIG_CRYPTO_ALGAPI2=y 1263CONFIG_CRYPTO_ALGAPI2=y
1248CONFIG_CRYPTO_AEAD2=y 1264CONFIG_CRYPTO_AEAD2=y
@@ -1284,11 +1300,13 @@ CONFIG_CRYPTO_PCBC=m
1284# 1300#
1285# CONFIG_CRYPTO_HMAC is not set 1301# CONFIG_CRYPTO_HMAC is not set
1286# CONFIG_CRYPTO_XCBC is not set 1302# CONFIG_CRYPTO_XCBC is not set
1303# CONFIG_CRYPTO_VMAC is not set
1287 1304
1288# 1305#
1289# Digest 1306# Digest
1290# 1307#
1291# CONFIG_CRYPTO_CRC32C is not set 1308# CONFIG_CRYPTO_CRC32C is not set
1309# CONFIG_CRYPTO_GHASH is not set
1292# CONFIG_CRYPTO_MD4 is not set 1310# CONFIG_CRYPTO_MD4 is not set
1293CONFIG_CRYPTO_MD5=y 1311CONFIG_CRYPTO_MD5=y
1294# CONFIG_CRYPTO_MICHAEL_MIC is not set 1312# CONFIG_CRYPTO_MICHAEL_MIC is not set
diff --git a/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig b/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig
index 1ab3e4cd3018..9e9158a5b190 100644
--- a/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig
+++ b/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.31-rc4 3# Linux kernel version: 2.6.32-rc5
4# Wed Jul 29 23:32:13 2009 4# Thu Nov 5 08:20:30 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -35,6 +35,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
35CONFIG_GENERIC_HARDIRQS=y 35CONFIG_GENERIC_HARDIRQS=y
36CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 36CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
38CONFIG_IRQ_PER_CPU=y 39CONFIG_IRQ_PER_CPU=y
39CONFIG_STACKTRACE_SUPPORT=y 40CONFIG_STACKTRACE_SUPPORT=y
40CONFIG_HAVE_LATENCYTOP_SUPPORT=y 41CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -84,11 +85,12 @@ CONFIG_SYSVIPC_SYSCTL=y
84# 85#
85# RCU Subsystem 86# RCU Subsystem
86# 87#
87CONFIG_CLASSIC_RCU=y 88CONFIG_TREE_RCU=y
88# CONFIG_TREE_RCU is not set 89# CONFIG_TREE_PREEMPT_RCU is not set
89# CONFIG_PREEMPT_RCU is not set 90# CONFIG_RCU_TRACE is not set
91CONFIG_RCU_FANOUT=32
92# CONFIG_RCU_FANOUT_EXACT is not set
90# CONFIG_TREE_RCU_TRACE is not set 93# CONFIG_TREE_RCU_TRACE is not set
91# CONFIG_PREEMPT_RCU_TRACE is not set
92# CONFIG_IKCONFIG is not set 94# CONFIG_IKCONFIG is not set
93CONFIG_LOG_BUF_SHIFT=14 95CONFIG_LOG_BUF_SHIFT=14
94CONFIG_GROUP_SCHED=y 96CONFIG_GROUP_SCHED=y
@@ -125,21 +127,20 @@ CONFIG_TIMERFD=y
125CONFIG_EVENTFD=y 127CONFIG_EVENTFD=y
126CONFIG_SHMEM=y 128CONFIG_SHMEM=y
127CONFIG_AIO=y 129CONFIG_AIO=y
128CONFIG_HAVE_PERF_COUNTERS=y 130CONFIG_HAVE_PERF_EVENTS=y
129 131
130# 132#
131# Performance Counters 133# Kernel Performance Events And Counters
132# 134#
135# CONFIG_PERF_EVENTS is not set
133# CONFIG_PERF_COUNTERS is not set 136# CONFIG_PERF_COUNTERS is not set
134CONFIG_VM_EVENT_COUNTERS=y 137CONFIG_VM_EVENT_COUNTERS=y
135CONFIG_PCI_QUIRKS=y 138CONFIG_PCI_QUIRKS=y
136# CONFIG_STRIP_ASM_SYMS is not set
137CONFIG_COMPAT_BRK=y 139CONFIG_COMPAT_BRK=y
138CONFIG_SLAB=y 140CONFIG_SLAB=y
139# CONFIG_SLUB is not set 141# CONFIG_SLUB is not set
140# CONFIG_SLOB is not set 142# CONFIG_SLOB is not set
141# CONFIG_PROFILING is not set 143# CONFIG_PROFILING is not set
142# CONFIG_MARKERS is not set
143CONFIG_HAVE_OPROFILE=y 144CONFIG_HAVE_OPROFILE=y
144# CONFIG_KPROBES is not set 145# CONFIG_KPROBES is not set
145CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 146CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -147,6 +148,8 @@ CONFIG_HAVE_IOREMAP_PROT=y
147CONFIG_HAVE_KPROBES=y 148CONFIG_HAVE_KPROBES=y
148CONFIG_HAVE_KRETPROBES=y 149CONFIG_HAVE_KRETPROBES=y
149CONFIG_HAVE_ARCH_TRACEHOOK=y 150CONFIG_HAVE_ARCH_TRACEHOOK=y
151CONFIG_HAVE_DMA_ATTRS=y
152CONFIG_HAVE_DMA_API_DEBUG=y
150 153
151# 154#
152# GCOV-based kernel profiling 155# GCOV-based kernel profiling
@@ -256,6 +259,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
256CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 259CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
257# CONFIG_KEXEC is not set 260# CONFIG_KEXEC is not set
258# CONFIG_CRASH_DUMP is not set 261# CONFIG_CRASH_DUMP is not set
262CONFIG_MAX_ACTIVE_REGIONS=32
259CONFIG_ARCH_FLATMEM_ENABLE=y 263CONFIG_ARCH_FLATMEM_ENABLE=y
260CONFIG_ARCH_POPULATES_NODE_MAP=y 264CONFIG_ARCH_POPULATES_NODE_MAP=y
261CONFIG_SELECT_MEMORY_MODEL=y 265CONFIG_SELECT_MEMORY_MODEL=y
@@ -273,6 +277,7 @@ CONFIG_BOUNCE=y
273CONFIG_VIRT_TO_BUS=y 277CONFIG_VIRT_TO_BUS=y
274CONFIG_HAVE_MLOCK=y 278CONFIG_HAVE_MLOCK=y
275CONFIG_HAVE_MLOCKED_PAGE_BIT=y 279CONFIG_HAVE_MLOCKED_PAGE_BIT=y
280# CONFIG_KSM is not set
276CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 281CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
277CONFIG_PPC_4K_PAGES=y 282CONFIG_PPC_4K_PAGES=y
278# CONFIG_PPC_16K_PAGES is not set 283# CONFIG_PPC_16K_PAGES is not set
@@ -363,6 +368,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
363# CONFIG_NETFILTER is not set 368# CONFIG_NETFILTER is not set
364# CONFIG_IP_DCCP is not set 369# CONFIG_IP_DCCP is not set
365# CONFIG_IP_SCTP is not set 370# CONFIG_IP_SCTP is not set
371# CONFIG_RDS is not set
366# CONFIG_TIPC is not set 372# CONFIG_TIPC is not set
367# CONFIG_ATM is not set 373# CONFIG_ATM is not set
368# CONFIG_BRIDGE is not set 374# CONFIG_BRIDGE is not set
@@ -392,6 +398,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
392# CONFIG_AF_RXRPC is not set 398# CONFIG_AF_RXRPC is not set
393CONFIG_WIRELESS=y 399CONFIG_WIRELESS=y
394# CONFIG_CFG80211 is not set 400# CONFIG_CFG80211 is not set
401CONFIG_CFG80211_DEFAULT_PS_VALUE=0
395CONFIG_WIRELESS_OLD_REGULATORY=y 402CONFIG_WIRELESS_OLD_REGULATORY=y
396# CONFIG_WIRELESS_EXT is not set 403# CONFIG_WIRELESS_EXT is not set
397# CONFIG_LIB80211 is not set 404# CONFIG_LIB80211 is not set
@@ -399,7 +406,6 @@ CONFIG_WIRELESS_OLD_REGULATORY=y
399# 406#
400# CFG80211 needs to be enabled for MAC80211 407# CFG80211 needs to be enabled for MAC80211
401# 408#
402CONFIG_MAC80211_DEFAULT_PS_VALUE=0
403# CONFIG_WIMAX is not set 409# CONFIG_WIMAX is not set
404# CONFIG_RFKILL is not set 410# CONFIG_RFKILL is not set
405# CONFIG_NET_9P is not set 411# CONFIG_NET_9P is not set
@@ -412,6 +418,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
412# Generic Driver Options 418# Generic Driver Options
413# 419#
414CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 420CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
421# CONFIG_DEVTMPFS is not set
415CONFIG_STANDALONE=y 422CONFIG_STANDALONE=y
416CONFIG_PREVENT_FIRMWARE_BUILD=y 423CONFIG_PREVENT_FIRMWARE_BUILD=y
417# CONFIG_FW_LOADER is not set 424# CONFIG_FW_LOADER is not set
@@ -498,6 +505,7 @@ CONFIG_SCSI_WAIT_SCAN=m
498CONFIG_SCSI_LOWLEVEL=y 505CONFIG_SCSI_LOWLEVEL=y
499# CONFIG_ISCSI_TCP is not set 506# CONFIG_ISCSI_TCP is not set
500# CONFIG_SCSI_BNX2_ISCSI is not set 507# CONFIG_SCSI_BNX2_ISCSI is not set
508# CONFIG_BE2ISCSI is not set
501# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 509# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
502# CONFIG_SCSI_3W_9XXX is not set 510# CONFIG_SCSI_3W_9XXX is not set
503# CONFIG_SCSI_ACARD is not set 511# CONFIG_SCSI_ACARD is not set
@@ -537,11 +545,14 @@ CONFIG_SCSI_LOWLEVEL=y
537# CONFIG_SCSI_DC390T is not set 545# CONFIG_SCSI_DC390T is not set
538# CONFIG_SCSI_NSP32 is not set 546# CONFIG_SCSI_NSP32 is not set
539# CONFIG_SCSI_DEBUG is not set 547# CONFIG_SCSI_DEBUG is not set
548# CONFIG_SCSI_PMCRAID is not set
540# CONFIG_SCSI_SRP is not set 549# CONFIG_SCSI_SRP is not set
550# CONFIG_SCSI_BFA_FC is not set
541# CONFIG_SCSI_DH is not set 551# CONFIG_SCSI_DH is not set
542# CONFIG_SCSI_OSD_INITIATOR is not set 552# CONFIG_SCSI_OSD_INITIATOR is not set
543CONFIG_ATA=y 553CONFIG_ATA=y
544# CONFIG_ATA_NONSTANDARD is not set 554# CONFIG_ATA_NONSTANDARD is not set
555CONFIG_ATA_VERBOSE_ERROR=y
545CONFIG_SATA_PMP=y 556CONFIG_SATA_PMP=y
546# CONFIG_SATA_AHCI is not set 557# CONFIG_SATA_AHCI is not set
547# CONFIG_SATA_SIL24 is not set 558# CONFIG_SATA_SIL24 is not set
@@ -564,6 +575,7 @@ CONFIG_ATA_SFF=y
564# CONFIG_PATA_ALI is not set 575# CONFIG_PATA_ALI is not set
565# CONFIG_PATA_AMD is not set 576# CONFIG_PATA_AMD is not set
566# CONFIG_PATA_ARTOP is not set 577# CONFIG_PATA_ARTOP is not set
578# CONFIG_PATA_ATP867X is not set
567# CONFIG_PATA_ATIIXP is not set 579# CONFIG_PATA_ATIIXP is not set
568# CONFIG_PATA_CMD640_PCI is not set 580# CONFIG_PATA_CMD640_PCI is not set
569# CONFIG_PATA_CMD64X is not set 581# CONFIG_PATA_CMD64X is not set
@@ -591,6 +603,7 @@ CONFIG_ATA_SFF=y
591# CONFIG_PATA_OPTIDMA is not set 603# CONFIG_PATA_OPTIDMA is not set
592# CONFIG_PATA_PDC_OLD is not set 604# CONFIG_PATA_PDC_OLD is not set
593# CONFIG_PATA_RADISYS is not set 605# CONFIG_PATA_RADISYS is not set
606# CONFIG_PATA_RDC is not set
594# CONFIG_PATA_RZ1000 is not set 607# CONFIG_PATA_RZ1000 is not set
595# CONFIG_PATA_SC1200 is not set 608# CONFIG_PATA_SC1200 is not set
596# CONFIG_PATA_SERVERWORKS is not set 609# CONFIG_PATA_SERVERWORKS is not set
@@ -610,6 +623,7 @@ CONFIG_MD_RAID1=y
610# CONFIG_MD_RAID10 is not set 623# CONFIG_MD_RAID10 is not set
611CONFIG_MD_RAID456=y 624CONFIG_MD_RAID456=y
612CONFIG_MD_RAID6_PQ=y 625CONFIG_MD_RAID6_PQ=y
626# CONFIG_ASYNC_RAID6_TEST is not set
613# CONFIG_MD_MULTIPATH is not set 627# CONFIG_MD_MULTIPATH is not set
614# CONFIG_MD_FAULTY is not set 628# CONFIG_MD_FAULTY is not set
615# CONFIG_BLK_DEV_DM is not set 629# CONFIG_BLK_DEV_DM is not set
@@ -678,7 +692,9 @@ CONFIG_MII=y
678# CONFIG_NET_PCI is not set 692# CONFIG_NET_PCI is not set
679# CONFIG_B44 is not set 693# CONFIG_B44 is not set
680# CONFIG_KS8842 is not set 694# CONFIG_KS8842 is not set
695# CONFIG_KS8851_MLL is not set
681# CONFIG_ATL2 is not set 696# CONFIG_ATL2 is not set
697# CONFIG_XILINX_EMACLITE is not set
682CONFIG_NETDEV_1000=y 698CONFIG_NETDEV_1000=y
683# CONFIG_ACENIC is not set 699# CONFIG_ACENIC is not set
684# CONFIG_DL2K is not set 700# CONFIG_DL2K is not set
@@ -708,10 +724,7 @@ CONFIG_GIANFAR=y
708# CONFIG_JME is not set 724# CONFIG_JME is not set
709# CONFIG_NETDEV_10000 is not set 725# CONFIG_NETDEV_10000 is not set
710# CONFIG_TR is not set 726# CONFIG_TR is not set
711 727CONFIG_WLAN=y
712#
713# Wireless LAN
714#
715# CONFIG_WLAN_PRE80211 is not set 728# CONFIG_WLAN_PRE80211 is not set
716# CONFIG_WLAN_80211 is not set 729# CONFIG_WLAN_80211 is not set
717 730
@@ -813,6 +826,7 @@ CONFIG_GEN_RTC=y
813CONFIG_DEVPORT=y 826CONFIG_DEVPORT=y
814CONFIG_I2C=y 827CONFIG_I2C=y
815CONFIG_I2C_BOARDINFO=y 828CONFIG_I2C_BOARDINFO=y
829CONFIG_I2C_COMPAT=y
816CONFIG_I2C_CHARDEV=y 830CONFIG_I2C_CHARDEV=y
817CONFIG_I2C_HELPER_AUTO=y 831CONFIG_I2C_HELPER_AUTO=y
818 832
@@ -867,9 +881,6 @@ CONFIG_I2C_MPC=y
867# Miscellaneous I2C Chip support 881# Miscellaneous I2C Chip support
868# 882#
869# CONFIG_DS1682 is not set 883# CONFIG_DS1682 is not set
870# CONFIG_SENSORS_PCF8574 is not set
871# CONFIG_PCF8575 is not set
872# CONFIG_SENSORS_PCA9539 is not set
873# CONFIG_SENSORS_TSL2550 is not set 884# CONFIG_SENSORS_TSL2550 is not set
874# CONFIG_I2C_DEBUG_CORE is not set 885# CONFIG_I2C_DEBUG_CORE is not set
875# CONFIG_I2C_DEBUG_ALGO is not set 886# CONFIG_I2C_DEBUG_ALGO is not set
@@ -887,6 +898,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
887# CONFIG_POWER_SUPPLY is not set 898# CONFIG_POWER_SUPPLY is not set
888CONFIG_HWMON=y 899CONFIG_HWMON=y
889# CONFIG_HWMON_VID is not set 900# CONFIG_HWMON_VID is not set
901# CONFIG_HWMON_DEBUG_CHIP is not set
902
903#
904# Native drivers
905#
890# CONFIG_SENSORS_AD7414 is not set 906# CONFIG_SENSORS_AD7414 is not set
891# CONFIG_SENSORS_AD7418 is not set 907# CONFIG_SENSORS_AD7418 is not set
892# CONFIG_SENSORS_ADM1021 is not set 908# CONFIG_SENSORS_ADM1021 is not set
@@ -936,6 +952,7 @@ CONFIG_HWMON=y
936# CONFIG_SENSORS_ADS7828 is not set 952# CONFIG_SENSORS_ADS7828 is not set
937# CONFIG_SENSORS_THMC50 is not set 953# CONFIG_SENSORS_THMC50 is not set
938# CONFIG_SENSORS_TMP401 is not set 954# CONFIG_SENSORS_TMP401 is not set
955# CONFIG_SENSORS_TMP421 is not set
939# CONFIG_SENSORS_VIA686A is not set 956# CONFIG_SENSORS_VIA686A is not set
940# CONFIG_SENSORS_VT1211 is not set 957# CONFIG_SENSORS_VT1211 is not set
941# CONFIG_SENSORS_VT8231 is not set 958# CONFIG_SENSORS_VT8231 is not set
@@ -947,9 +964,7 @@ CONFIG_HWMON=y
947# CONFIG_SENSORS_W83L786NG is not set 964# CONFIG_SENSORS_W83L786NG is not set
948# CONFIG_SENSORS_W83627HF is not set 965# CONFIG_SENSORS_W83627HF is not set
949# CONFIG_SENSORS_W83627EHF is not set 966# CONFIG_SENSORS_W83627EHF is not set
950# CONFIG_HWMON_DEBUG_CHIP is not set
951# CONFIG_THERMAL is not set 967# CONFIG_THERMAL is not set
952# CONFIG_THERMAL_HWMON is not set
953CONFIG_WATCHDOG=y 968CONFIG_WATCHDOG=y
954# CONFIG_WATCHDOG_NOWAYOUT is not set 969# CONFIG_WATCHDOG_NOWAYOUT is not set
955 970
@@ -987,6 +1002,7 @@ CONFIG_SSB_POSSIBLE=y
987# CONFIG_MFD_TMIO is not set 1002# CONFIG_MFD_TMIO is not set
988# CONFIG_PMIC_DA903X is not set 1003# CONFIG_PMIC_DA903X is not set
989# CONFIG_MFD_WM8400 is not set 1004# CONFIG_MFD_WM8400 is not set
1005# CONFIG_MFD_WM831X is not set
990# CONFIG_MFD_WM8350_I2C is not set 1006# CONFIG_MFD_WM8350_I2C is not set
991# CONFIG_MFD_PCF50633 is not set 1007# CONFIG_MFD_PCF50633 is not set
992# CONFIG_AB3100_CORE is not set 1008# CONFIG_AB3100_CORE is not set
@@ -997,6 +1013,7 @@ CONFIG_SSB_POSSIBLE=y
997# Graphics support 1013# Graphics support
998# 1014#
999# CONFIG_AGP is not set 1015# CONFIG_AGP is not set
1016CONFIG_VGA_ARB=y
1000# CONFIG_DRM is not set 1017# CONFIG_DRM is not set
1001# CONFIG_VGASTATE is not set 1018# CONFIG_VGASTATE is not set
1002CONFIG_VIDEO_OUTPUT_CONTROL=m 1019CONFIG_VIDEO_OUTPUT_CONTROL=m
@@ -1010,7 +1027,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m
1010# CONFIG_SOUND is not set 1027# CONFIG_SOUND is not set
1011CONFIG_HID_SUPPORT=y 1028CONFIG_HID_SUPPORT=y
1012CONFIG_HID=y 1029CONFIG_HID=y
1013# CONFIG_HID_DEBUG is not set
1014# CONFIG_HIDRAW is not set 1030# CONFIG_HIDRAW is not set
1015 1031
1016# 1032#
@@ -1033,6 +1049,7 @@ CONFIG_HID_CYPRESS=y
1033CONFIG_HID_EZKEY=y 1049CONFIG_HID_EZKEY=y
1034# CONFIG_HID_KYE is not set 1050# CONFIG_HID_KYE is not set
1035CONFIG_HID_GYRATION=y 1051CONFIG_HID_GYRATION=y
1052# CONFIG_HID_TWINHAN is not set
1036# CONFIG_HID_KENSINGTON is not set 1053# CONFIG_HID_KENSINGTON is not set
1037CONFIG_HID_LOGITECH=y 1054CONFIG_HID_LOGITECH=y
1038# CONFIG_LOGITECH_FF is not set 1055# CONFIG_LOGITECH_FF is not set
@@ -1085,6 +1102,7 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y
1085# CONFIG_USB_OXU210HP_HCD is not set 1102# CONFIG_USB_OXU210HP_HCD is not set
1086# CONFIG_USB_ISP116X_HCD is not set 1103# CONFIG_USB_ISP116X_HCD is not set
1087# CONFIG_USB_ISP1760_HCD is not set 1104# CONFIG_USB_ISP1760_HCD is not set
1105# CONFIG_USB_ISP1362_HCD is not set
1088# CONFIG_USB_OHCI_HCD is not set 1106# CONFIG_USB_OHCI_HCD is not set
1089# CONFIG_USB_UHCI_HCD is not set 1107# CONFIG_USB_UHCI_HCD is not set
1090# CONFIG_USB_SL811_HCD is not set 1108# CONFIG_USB_SL811_HCD is not set
@@ -1142,6 +1160,7 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y
1142# CONFIG_USB_LD is not set 1160# CONFIG_USB_LD is not set
1143# CONFIG_USB_TRANCEVIBRATOR is not set 1161# CONFIG_USB_TRANCEVIBRATOR is not set
1144# CONFIG_USB_IOWARRIOR is not set 1162# CONFIG_USB_IOWARRIOR is not set
1163# CONFIG_USB_TEST is not set
1145# CONFIG_USB_ISIGHTFW is not set 1164# CONFIG_USB_ISIGHTFW is not set
1146# CONFIG_USB_VST is not set 1165# CONFIG_USB_VST is not set
1147# CONFIG_USB_GADGET is not set 1166# CONFIG_USB_GADGET is not set
@@ -1188,6 +1207,7 @@ CONFIG_FS_MBCACHE=y
1188# CONFIG_GFS2_FS is not set 1207# CONFIG_GFS2_FS is not set
1189# CONFIG_OCFS2_FS is not set 1208# CONFIG_OCFS2_FS is not set
1190# CONFIG_BTRFS_FS is not set 1209# CONFIG_BTRFS_FS is not set
1210# CONFIG_NILFS2_FS is not set
1191CONFIG_FILE_LOCKING=y 1211CONFIG_FILE_LOCKING=y
1192CONFIG_FSNOTIFY=y 1212CONFIG_FSNOTIFY=y
1193CONFIG_DNOTIFY=y 1213CONFIG_DNOTIFY=y
@@ -1246,7 +1266,6 @@ CONFIG_MISC_FILESYSTEMS=y
1246# CONFIG_ROMFS_FS is not set 1266# CONFIG_ROMFS_FS is not set
1247# CONFIG_SYSV_FS is not set 1267# CONFIG_SYSV_FS is not set
1248# CONFIG_UFS_FS is not set 1268# CONFIG_UFS_FS is not set
1249# CONFIG_NILFS2_FS is not set
1250CONFIG_NETWORK_FILESYSTEMS=y 1269CONFIG_NETWORK_FILESYSTEMS=y
1251CONFIG_NFS_FS=y 1270CONFIG_NFS_FS=y
1252CONFIG_NFS_V3=y 1271CONFIG_NFS_V3=y
@@ -1361,6 +1380,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
1361# CONFIG_ENABLE_MUST_CHECK is not set 1380# CONFIG_ENABLE_MUST_CHECK is not set
1362CONFIG_FRAME_WARN=1024 1381CONFIG_FRAME_WARN=1024
1363# CONFIG_MAGIC_SYSRQ is not set 1382# CONFIG_MAGIC_SYSRQ is not set
1383# CONFIG_STRIP_ASM_SYMS is not set
1364# CONFIG_UNUSED_SYMBOLS is not set 1384# CONFIG_UNUSED_SYMBOLS is not set
1365# CONFIG_DEBUG_FS is not set 1385# CONFIG_DEBUG_FS is not set
1366# CONFIG_HEADERS_CHECK is not set 1386# CONFIG_HEADERS_CHECK is not set
@@ -1376,6 +1396,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
1376CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1396CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1377CONFIG_TRACING_SUPPORT=y 1397CONFIG_TRACING_SUPPORT=y
1378# CONFIG_FTRACE is not set 1398# CONFIG_FTRACE is not set
1399# CONFIG_DMA_API_DEBUG is not set
1379# CONFIG_SAMPLES is not set 1400# CONFIG_SAMPLES is not set
1380CONFIG_HAVE_ARCH_KGDB=y 1401CONFIG_HAVE_ARCH_KGDB=y
1381# CONFIG_PPC_DISABLE_WERROR is not set 1402# CONFIG_PPC_DISABLE_WERROR is not set
@@ -1396,12 +1417,13 @@ CONFIG_XOR_BLOCKS=y
1396CONFIG_ASYNC_CORE=y 1417CONFIG_ASYNC_CORE=y
1397CONFIG_ASYNC_MEMCPY=y 1418CONFIG_ASYNC_MEMCPY=y
1398CONFIG_ASYNC_XOR=y 1419CONFIG_ASYNC_XOR=y
1420CONFIG_ASYNC_PQ=y
1421CONFIG_ASYNC_RAID6_RECOV=y
1399CONFIG_CRYPTO=y 1422CONFIG_CRYPTO=y
1400 1423
1401# 1424#
1402# Crypto core or helper 1425# Crypto core or helper
1403# 1426#
1404# CONFIG_CRYPTO_FIPS is not set
1405CONFIG_CRYPTO_ALGAPI=y 1427CONFIG_CRYPTO_ALGAPI=y
1406CONFIG_CRYPTO_ALGAPI2=y 1428CONFIG_CRYPTO_ALGAPI2=y
1407CONFIG_CRYPTO_AEAD2=y 1429CONFIG_CRYPTO_AEAD2=y
@@ -1443,11 +1465,13 @@ CONFIG_CRYPTO_PCBC=m
1443# 1465#
1444# CONFIG_CRYPTO_HMAC is not set 1466# CONFIG_CRYPTO_HMAC is not set
1445# CONFIG_CRYPTO_XCBC is not set 1467# CONFIG_CRYPTO_XCBC is not set
1468# CONFIG_CRYPTO_VMAC is not set
1446 1469
1447# 1470#
1448# Digest 1471# Digest
1449# 1472#
1450# CONFIG_CRYPTO_CRC32C is not set 1473# CONFIG_CRYPTO_CRC32C is not set
1474# CONFIG_CRYPTO_GHASH is not set
1451# CONFIG_CRYPTO_MD4 is not set 1475# CONFIG_CRYPTO_MD4 is not set
1452CONFIG_CRYPTO_MD5=y 1476CONFIG_CRYPTO_MD5=y
1453# CONFIG_CRYPTO_MICHAEL_MIC is not set 1477# CONFIG_CRYPTO_MICHAEL_MIC is not set
diff --git a/arch/powerpc/configs/83xx/sbc834x_defconfig b/arch/powerpc/configs/83xx/sbc834x_defconfig
index 3a68f861b1bd..6b399154970f 100644
--- a/arch/powerpc/configs/83xx/sbc834x_defconfig
+++ b/arch/powerpc/configs/83xx/sbc834x_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.31-rc5 3# Linux kernel version: 2.6.32-rc5
4# Tue Aug 11 19:57:51 2009 4# Thu Nov 5 08:20:31 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -35,6 +35,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
35CONFIG_GENERIC_HARDIRQS=y 35CONFIG_GENERIC_HARDIRQS=y
36CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 36CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
38CONFIG_IRQ_PER_CPU=y 39CONFIG_IRQ_PER_CPU=y
39CONFIG_STACKTRACE_SUPPORT=y 40CONFIG_STACKTRACE_SUPPORT=y
40CONFIG_HAVE_LATENCYTOP_SUPPORT=y 41CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -84,11 +85,12 @@ CONFIG_SYSVIPC_SYSCTL=y
84# 85#
85# RCU Subsystem 86# RCU Subsystem
86# 87#
87CONFIG_CLASSIC_RCU=y 88CONFIG_TREE_RCU=y
88# CONFIG_TREE_RCU is not set 89# CONFIG_TREE_PREEMPT_RCU is not set
89# CONFIG_PREEMPT_RCU is not set 90# CONFIG_RCU_TRACE is not set
91CONFIG_RCU_FANOUT=32
92# CONFIG_RCU_FANOUT_EXACT is not set
90# CONFIG_TREE_RCU_TRACE is not set 93# CONFIG_TREE_RCU_TRACE is not set
91# CONFIG_PREEMPT_RCU_TRACE is not set
92# CONFIG_IKCONFIG is not set 94# CONFIG_IKCONFIG is not set
93CONFIG_LOG_BUF_SHIFT=14 95CONFIG_LOG_BUF_SHIFT=14
94CONFIG_GROUP_SCHED=y 96CONFIG_GROUP_SCHED=y
@@ -124,27 +126,28 @@ CONFIG_TIMERFD=y
124CONFIG_EVENTFD=y 126CONFIG_EVENTFD=y
125CONFIG_SHMEM=y 127CONFIG_SHMEM=y
126CONFIG_AIO=y 128CONFIG_AIO=y
127CONFIG_HAVE_PERF_COUNTERS=y 129CONFIG_HAVE_PERF_EVENTS=y
128 130
129# 131#
130# Performance Counters 132# Kernel Performance Events And Counters
131# 133#
134# CONFIG_PERF_EVENTS is not set
132# CONFIG_PERF_COUNTERS is not set 135# CONFIG_PERF_COUNTERS is not set
133CONFIG_VM_EVENT_COUNTERS=y 136CONFIG_VM_EVENT_COUNTERS=y
134CONFIG_PCI_QUIRKS=y 137CONFIG_PCI_QUIRKS=y
135# CONFIG_STRIP_ASM_SYMS is not set
136CONFIG_COMPAT_BRK=y 138CONFIG_COMPAT_BRK=y
137CONFIG_SLAB=y 139CONFIG_SLAB=y
138# CONFIG_SLUB is not set 140# CONFIG_SLUB is not set
139# CONFIG_SLOB is not set 141# CONFIG_SLOB is not set
140# CONFIG_PROFILING is not set 142# CONFIG_PROFILING is not set
141# CONFIG_MARKERS is not set
142CONFIG_HAVE_OPROFILE=y 143CONFIG_HAVE_OPROFILE=y
143CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 144CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
144CONFIG_HAVE_IOREMAP_PROT=y 145CONFIG_HAVE_IOREMAP_PROT=y
145CONFIG_HAVE_KPROBES=y 146CONFIG_HAVE_KPROBES=y
146CONFIG_HAVE_KRETPROBES=y 147CONFIG_HAVE_KRETPROBES=y
147CONFIG_HAVE_ARCH_TRACEHOOK=y 148CONFIG_HAVE_ARCH_TRACEHOOK=y
149CONFIG_HAVE_DMA_ATTRS=y
150CONFIG_HAVE_DMA_API_DEBUG=y
148 151
149# 152#
150# GCOV-based kernel profiling 153# GCOV-based kernel profiling
@@ -254,6 +257,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
254CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 257CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
255# CONFIG_KEXEC is not set 258# CONFIG_KEXEC is not set
256# CONFIG_CRASH_DUMP is not set 259# CONFIG_CRASH_DUMP is not set
260CONFIG_MAX_ACTIVE_REGIONS=32
257CONFIG_ARCH_FLATMEM_ENABLE=y 261CONFIG_ARCH_FLATMEM_ENABLE=y
258CONFIG_ARCH_POPULATES_NODE_MAP=y 262CONFIG_ARCH_POPULATES_NODE_MAP=y
259CONFIG_SELECT_MEMORY_MODEL=y 263CONFIG_SELECT_MEMORY_MODEL=y
@@ -271,6 +275,7 @@ CONFIG_BOUNCE=y
271CONFIG_VIRT_TO_BUS=y 275CONFIG_VIRT_TO_BUS=y
272CONFIG_HAVE_MLOCK=y 276CONFIG_HAVE_MLOCK=y
273CONFIG_HAVE_MLOCKED_PAGE_BIT=y 277CONFIG_HAVE_MLOCKED_PAGE_BIT=y
278# CONFIG_KSM is not set
274CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 279CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
275CONFIG_PPC_4K_PAGES=y 280CONFIG_PPC_4K_PAGES=y
276# CONFIG_PPC_16K_PAGES is not set 281# CONFIG_PPC_16K_PAGES is not set
@@ -366,6 +371,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
366# CONFIG_NETFILTER is not set 371# CONFIG_NETFILTER is not set
367# CONFIG_IP_DCCP is not set 372# CONFIG_IP_DCCP is not set
368# CONFIG_IP_SCTP is not set 373# CONFIG_IP_SCTP is not set
374# CONFIG_RDS is not set
369# CONFIG_TIPC is not set 375# CONFIG_TIPC is not set
370# CONFIG_ATM is not set 376# CONFIG_ATM is not set
371# CONFIG_BRIDGE is not set 377# CONFIG_BRIDGE is not set
@@ -395,6 +401,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
395# CONFIG_AF_RXRPC is not set 401# CONFIG_AF_RXRPC is not set
396CONFIG_WIRELESS=y 402CONFIG_WIRELESS=y
397# CONFIG_CFG80211 is not set 403# CONFIG_CFG80211 is not set
404CONFIG_CFG80211_DEFAULT_PS_VALUE=0
398CONFIG_WIRELESS_OLD_REGULATORY=y 405CONFIG_WIRELESS_OLD_REGULATORY=y
399# CONFIG_WIRELESS_EXT is not set 406# CONFIG_WIRELESS_EXT is not set
400# CONFIG_LIB80211 is not set 407# CONFIG_LIB80211 is not set
@@ -402,7 +409,6 @@ CONFIG_WIRELESS_OLD_REGULATORY=y
402# 409#
403# CFG80211 needs to be enabled for MAC80211 410# CFG80211 needs to be enabled for MAC80211
404# 411#
405CONFIG_MAC80211_DEFAULT_PS_VALUE=0
406# CONFIG_WIMAX is not set 412# CONFIG_WIMAX is not set
407# CONFIG_RFKILL is not set 413# CONFIG_RFKILL is not set
408# CONFIG_NET_9P is not set 414# CONFIG_NET_9P is not set
@@ -415,6 +421,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
415# Generic Driver Options 421# Generic Driver Options
416# 422#
417CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 423CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
424# CONFIG_DEVTMPFS is not set
418CONFIG_STANDALONE=y 425CONFIG_STANDALONE=y
419CONFIG_PREVENT_FIRMWARE_BUILD=y 426CONFIG_PREVENT_FIRMWARE_BUILD=y
420# CONFIG_FW_LOADER is not set 427# CONFIG_FW_LOADER is not set
@@ -422,9 +429,9 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
422# CONFIG_CONNECTOR is not set 429# CONFIG_CONNECTOR is not set
423CONFIG_MTD=y 430CONFIG_MTD=y
424# CONFIG_MTD_DEBUG is not set 431# CONFIG_MTD_DEBUG is not set
432# CONFIG_MTD_TESTS is not set
425CONFIG_MTD_CONCAT=y 433CONFIG_MTD_CONCAT=y
426CONFIG_MTD_PARTITIONS=y 434CONFIG_MTD_PARTITIONS=y
427# CONFIG_MTD_TESTS is not set
428# CONFIG_MTD_REDBOOT_PARTS is not set 435# CONFIG_MTD_REDBOOT_PARTS is not set
429CONFIG_MTD_CMDLINE_PARTS=y 436CONFIG_MTD_CMDLINE_PARTS=y
430CONFIG_MTD_OF_PARTS=y 437CONFIG_MTD_OF_PARTS=y
@@ -651,7 +658,9 @@ CONFIG_MII=y
651# CONFIG_NET_PCI is not set 658# CONFIG_NET_PCI is not set
652# CONFIG_B44 is not set 659# CONFIG_B44 is not set
653# CONFIG_KS8842 is not set 660# CONFIG_KS8842 is not set
661# CONFIG_KS8851_MLL is not set
654# CONFIG_ATL2 is not set 662# CONFIG_ATL2 is not set
663# CONFIG_XILINX_EMACLITE is not set
655CONFIG_NETDEV_1000=y 664CONFIG_NETDEV_1000=y
656# CONFIG_ACENIC is not set 665# CONFIG_ACENIC is not set
657# CONFIG_DL2K is not set 666# CONFIG_DL2K is not set
@@ -681,10 +690,7 @@ CONFIG_GIANFAR=y
681# CONFIG_JME is not set 690# CONFIG_JME is not set
682# CONFIG_NETDEV_10000 is not set 691# CONFIG_NETDEV_10000 is not set
683# CONFIG_TR is not set 692# CONFIG_TR is not set
684 693CONFIG_WLAN=y
685#
686# Wireless LAN
687#
688# CONFIG_WLAN_PRE80211 is not set 694# CONFIG_WLAN_PRE80211 is not set
689# CONFIG_WLAN_80211 is not set 695# CONFIG_WLAN_80211 is not set
690 696
@@ -786,6 +792,7 @@ CONFIG_GEN_RTC=y
786CONFIG_DEVPORT=y 792CONFIG_DEVPORT=y
787CONFIG_I2C=y 793CONFIG_I2C=y
788CONFIG_I2C_BOARDINFO=y 794CONFIG_I2C_BOARDINFO=y
795CONFIG_I2C_COMPAT=y
789CONFIG_I2C_CHARDEV=y 796CONFIG_I2C_CHARDEV=y
790CONFIG_I2C_HELPER_AUTO=y 797CONFIG_I2C_HELPER_AUTO=y
791 798
@@ -840,9 +847,6 @@ CONFIG_I2C_MPC=y
840# Miscellaneous I2C Chip support 847# Miscellaneous I2C Chip support
841# 848#
842# CONFIG_DS1682 is not set 849# CONFIG_DS1682 is not set
843# CONFIG_SENSORS_PCF8574 is not set
844# CONFIG_PCF8575 is not set
845# CONFIG_SENSORS_PCA9539 is not set
846# CONFIG_SENSORS_TSL2550 is not set 850# CONFIG_SENSORS_TSL2550 is not set
847# CONFIG_I2C_DEBUG_CORE is not set 851# CONFIG_I2C_DEBUG_CORE is not set
848# CONFIG_I2C_DEBUG_ALGO is not set 852# CONFIG_I2C_DEBUG_ALGO is not set
@@ -860,6 +864,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
860# CONFIG_POWER_SUPPLY is not set 864# CONFIG_POWER_SUPPLY is not set
861CONFIG_HWMON=y 865CONFIG_HWMON=y
862# CONFIG_HWMON_VID is not set 866# CONFIG_HWMON_VID is not set
867# CONFIG_HWMON_DEBUG_CHIP is not set
868
869#
870# Native drivers
871#
863# CONFIG_SENSORS_AD7414 is not set 872# CONFIG_SENSORS_AD7414 is not set
864# CONFIG_SENSORS_AD7418 is not set 873# CONFIG_SENSORS_AD7418 is not set
865# CONFIG_SENSORS_ADM1021 is not set 874# CONFIG_SENSORS_ADM1021 is not set
@@ -909,6 +918,7 @@ CONFIG_HWMON=y
909# CONFIG_SENSORS_ADS7828 is not set 918# CONFIG_SENSORS_ADS7828 is not set
910# CONFIG_SENSORS_THMC50 is not set 919# CONFIG_SENSORS_THMC50 is not set
911# CONFIG_SENSORS_TMP401 is not set 920# CONFIG_SENSORS_TMP401 is not set
921# CONFIG_SENSORS_TMP421 is not set
912# CONFIG_SENSORS_VIA686A is not set 922# CONFIG_SENSORS_VIA686A is not set
913# CONFIG_SENSORS_VT1211 is not set 923# CONFIG_SENSORS_VT1211 is not set
914# CONFIG_SENSORS_VT8231 is not set 924# CONFIG_SENSORS_VT8231 is not set
@@ -920,9 +930,7 @@ CONFIG_HWMON=y
920# CONFIG_SENSORS_W83L786NG is not set 930# CONFIG_SENSORS_W83L786NG is not set
921# CONFIG_SENSORS_W83627HF is not set 931# CONFIG_SENSORS_W83627HF is not set
922# CONFIG_SENSORS_W83627EHF is not set 932# CONFIG_SENSORS_W83627EHF is not set
923# CONFIG_HWMON_DEBUG_CHIP is not set
924# CONFIG_THERMAL is not set 933# CONFIG_THERMAL is not set
925# CONFIG_THERMAL_HWMON is not set
926CONFIG_WATCHDOG=y 934CONFIG_WATCHDOG=y
927# CONFIG_WATCHDOG_NOWAYOUT is not set 935# CONFIG_WATCHDOG_NOWAYOUT is not set
928 936
@@ -960,6 +968,7 @@ CONFIG_SSB_POSSIBLE=y
960# CONFIG_MFD_TMIO is not set 968# CONFIG_MFD_TMIO is not set
961# CONFIG_PMIC_DA903X is not set 969# CONFIG_PMIC_DA903X is not set
962# CONFIG_MFD_WM8400 is not set 970# CONFIG_MFD_WM8400 is not set
971# CONFIG_MFD_WM831X is not set
963# CONFIG_MFD_WM8350_I2C is not set 972# CONFIG_MFD_WM8350_I2C is not set
964# CONFIG_MFD_PCF50633 is not set 973# CONFIG_MFD_PCF50633 is not set
965# CONFIG_AB3100_CORE is not set 974# CONFIG_AB3100_CORE is not set
@@ -970,6 +979,7 @@ CONFIG_SSB_POSSIBLE=y
970# Graphics support 979# Graphics support
971# 980#
972# CONFIG_AGP is not set 981# CONFIG_AGP is not set
982CONFIG_VGA_ARB=y
973# CONFIG_DRM is not set 983# CONFIG_DRM is not set
974# CONFIG_VGASTATE is not set 984# CONFIG_VGASTATE is not set
975# CONFIG_VIDEO_OUTPUT_CONTROL is not set 985# CONFIG_VIDEO_OUTPUT_CONTROL is not set
@@ -983,7 +993,6 @@ CONFIG_SSB_POSSIBLE=y
983# CONFIG_SOUND is not set 993# CONFIG_SOUND is not set
984CONFIG_HID_SUPPORT=y 994CONFIG_HID_SUPPORT=y
985CONFIG_HID=y 995CONFIG_HID=y
986# CONFIG_HID_DEBUG is not set
987# CONFIG_HIDRAW is not set 996# CONFIG_HIDRAW is not set
988 997
989# 998#
@@ -1035,6 +1044,7 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y
1035# CONFIG_USB_OXU210HP_HCD is not set 1044# CONFIG_USB_OXU210HP_HCD is not set
1036# CONFIG_USB_ISP116X_HCD is not set 1045# CONFIG_USB_ISP116X_HCD is not set
1037# CONFIG_USB_ISP1760_HCD is not set 1046# CONFIG_USB_ISP1760_HCD is not set
1047# CONFIG_USB_ISP1362_HCD is not set
1038# CONFIG_USB_OHCI_HCD is not set 1048# CONFIG_USB_OHCI_HCD is not set
1039# CONFIG_USB_UHCI_HCD is not set 1049# CONFIG_USB_UHCI_HCD is not set
1040# CONFIG_USB_SL811_HCD is not set 1050# CONFIG_USB_SL811_HCD is not set
@@ -1148,6 +1158,7 @@ CONFIG_JBD=y
1148# CONFIG_GFS2_FS is not set 1158# CONFIG_GFS2_FS is not set
1149# CONFIG_OCFS2_FS is not set 1159# CONFIG_OCFS2_FS is not set
1150# CONFIG_BTRFS_FS is not set 1160# CONFIG_BTRFS_FS is not set
1161# CONFIG_NILFS2_FS is not set
1151CONFIG_FILE_LOCKING=y 1162CONFIG_FILE_LOCKING=y
1152CONFIG_FSNOTIFY=y 1163CONFIG_FSNOTIFY=y
1153CONFIG_DNOTIFY=y 1164CONFIG_DNOTIFY=y
@@ -1207,7 +1218,6 @@ CONFIG_MISC_FILESYSTEMS=y
1207# CONFIG_ROMFS_FS is not set 1218# CONFIG_ROMFS_FS is not set
1208# CONFIG_SYSV_FS is not set 1219# CONFIG_SYSV_FS is not set
1209# CONFIG_UFS_FS is not set 1220# CONFIG_UFS_FS is not set
1210# CONFIG_NILFS2_FS is not set
1211CONFIG_NETWORK_FILESYSTEMS=y 1221CONFIG_NETWORK_FILESYSTEMS=y
1212CONFIG_NFS_FS=y 1222CONFIG_NFS_FS=y
1213CONFIG_NFS_V3=y 1223CONFIG_NFS_V3=y
@@ -1306,6 +1316,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
1306CONFIG_ENABLE_MUST_CHECK=y 1316CONFIG_ENABLE_MUST_CHECK=y
1307CONFIG_FRAME_WARN=1024 1317CONFIG_FRAME_WARN=1024
1308# CONFIG_MAGIC_SYSRQ is not set 1318# CONFIG_MAGIC_SYSRQ is not set
1319# CONFIG_STRIP_ASM_SYMS is not set
1309# CONFIG_UNUSED_SYMBOLS is not set 1320# CONFIG_UNUSED_SYMBOLS is not set
1310# CONFIG_DEBUG_FS is not set 1321# CONFIG_DEBUG_FS is not set
1311# CONFIG_HEADERS_CHECK is not set 1322# CONFIG_HEADERS_CHECK is not set
@@ -1321,6 +1332,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
1321CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1332CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1322CONFIG_TRACING_SUPPORT=y 1333CONFIG_TRACING_SUPPORT=y
1323# CONFIG_FTRACE is not set 1334# CONFIG_FTRACE is not set
1335# CONFIG_DMA_API_DEBUG is not set
1324# CONFIG_SAMPLES is not set 1336# CONFIG_SAMPLES is not set
1325CONFIG_HAVE_ARCH_KGDB=y 1337CONFIG_HAVE_ARCH_KGDB=y
1326# CONFIG_PPC_DISABLE_WERROR is not set 1338# CONFIG_PPC_DISABLE_WERROR is not set
@@ -1342,7 +1354,6 @@ CONFIG_CRYPTO=y
1342# 1354#
1343# Crypto core or helper 1355# Crypto core or helper
1344# 1356#
1345# CONFIG_CRYPTO_FIPS is not set
1346CONFIG_CRYPTO_ALGAPI=y 1357CONFIG_CRYPTO_ALGAPI=y
1347CONFIG_CRYPTO_ALGAPI2=y 1358CONFIG_CRYPTO_ALGAPI2=y
1348CONFIG_CRYPTO_AEAD2=y 1359CONFIG_CRYPTO_AEAD2=y
@@ -1384,11 +1395,13 @@ CONFIG_CRYPTO_PCBC=m
1384# 1395#
1385# CONFIG_CRYPTO_HMAC is not set 1396# CONFIG_CRYPTO_HMAC is not set
1386# CONFIG_CRYPTO_XCBC is not set 1397# CONFIG_CRYPTO_XCBC is not set
1398# CONFIG_CRYPTO_VMAC is not set
1387 1399
1388# 1400#
1389# Digest 1401# Digest
1390# 1402#
1391# CONFIG_CRYPTO_CRC32C is not set 1403# CONFIG_CRYPTO_CRC32C is not set
1404# CONFIG_CRYPTO_GHASH is not set
1392# CONFIG_CRYPTO_MD4 is not set 1405# CONFIG_CRYPTO_MD4 is not set
1393CONFIG_CRYPTO_MD5=y 1406CONFIG_CRYPTO_MD5=y
1394# CONFIG_CRYPTO_MICHAEL_MIC is not set 1407# CONFIG_CRYPTO_MICHAEL_MIC is not set
diff --git a/arch/powerpc/configs/85xx/ksi8560_defconfig b/arch/powerpc/configs/85xx/ksi8560_defconfig
index ff04e1028f5e..a5bde8da462c 100644
--- a/arch/powerpc/configs/85xx/ksi8560_defconfig
+++ b/arch/powerpc/configs/85xx/ksi8560_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.31-rc4 3# Linux kernel version: 2.6.32-rc5
4# Wed Jul 29 23:32:14 2009 4# Thu Nov 5 08:20:32 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -22,6 +22,7 @@ CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set 22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y 23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y 24CONFIG_PPC_MMU_NOHASH=y
25CONFIG_PPC_MMU_NOHASH_32=y
25CONFIG_PPC_BOOK3E_MMU=y 26CONFIG_PPC_BOOK3E_MMU=y
26# CONFIG_PPC_MM_SLICES is not set 27# CONFIG_PPC_MM_SLICES is not set
27# CONFIG_SMP is not set 28# CONFIG_SMP is not set
@@ -36,6 +37,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
36CONFIG_GENERIC_HARDIRQS=y 37CONFIG_GENERIC_HARDIRQS=y
37CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 38CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
38# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
39CONFIG_IRQ_PER_CPU=y 41CONFIG_IRQ_PER_CPU=y
40CONFIG_STACKTRACE_SUPPORT=y 42CONFIG_STACKTRACE_SUPPORT=y
41CONFIG_HAVE_LATENCYTOP_SUPPORT=y 43CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -85,11 +87,12 @@ CONFIG_SYSVIPC_SYSCTL=y
85# 87#
86# RCU Subsystem 88# RCU Subsystem
87# 89#
88CONFIG_CLASSIC_RCU=y 90CONFIG_TREE_RCU=y
89# CONFIG_TREE_RCU is not set 91# CONFIG_TREE_PREEMPT_RCU is not set
90# CONFIG_PREEMPT_RCU is not set 92# CONFIG_RCU_TRACE is not set
93CONFIG_RCU_FANOUT=32
94# CONFIG_RCU_FANOUT_EXACT is not set
91# CONFIG_TREE_RCU_TRACE is not set 95# CONFIG_TREE_RCU_TRACE is not set
92# CONFIG_PREEMPT_RCU_TRACE is not set
93# CONFIG_IKCONFIG is not set 96# CONFIG_IKCONFIG is not set
94CONFIG_LOG_BUF_SHIFT=14 97CONFIG_LOG_BUF_SHIFT=14
95# CONFIG_GROUP_SCHED is not set 98# CONFIG_GROUP_SCHED is not set
@@ -123,28 +126,29 @@ CONFIG_TIMERFD=y
123CONFIG_EVENTFD=y 126CONFIG_EVENTFD=y
124CONFIG_SHMEM=y 127CONFIG_SHMEM=y
125CONFIG_AIO=y 128CONFIG_AIO=y
126CONFIG_HAVE_PERF_COUNTERS=y 129CONFIG_HAVE_PERF_EVENTS=y
127 130
128# 131#
129# Performance Counters 132# Kernel Performance Events And Counters
130# 133#
134# CONFIG_PERF_EVENTS is not set
131# CONFIG_PERF_COUNTERS is not set 135# CONFIG_PERF_COUNTERS is not set
132CONFIG_VM_EVENT_COUNTERS=y 136CONFIG_VM_EVENT_COUNTERS=y
133CONFIG_SLUB_DEBUG=y 137CONFIG_SLUB_DEBUG=y
134# CONFIG_STRIP_ASM_SYMS is not set
135CONFIG_COMPAT_BRK=y 138CONFIG_COMPAT_BRK=y
136# CONFIG_SLAB is not set 139# CONFIG_SLAB is not set
137CONFIG_SLUB=y 140CONFIG_SLUB=y
138# CONFIG_SLOB is not set 141# CONFIG_SLOB is not set
139# CONFIG_PROFILING is not set 142# CONFIG_PROFILING is not set
140# CONFIG_MARKERS is not set
141CONFIG_HAVE_OPROFILE=y 143CONFIG_HAVE_OPROFILE=y
142CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 144CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
143CONFIG_HAVE_IOREMAP_PROT=y 145CONFIG_HAVE_IOREMAP_PROT=y
144CONFIG_HAVE_KPROBES=y 146CONFIG_HAVE_KPROBES=y
145CONFIG_HAVE_KRETPROBES=y 147CONFIG_HAVE_KRETPROBES=y
146CONFIG_HAVE_ARCH_TRACEHOOK=y 148CONFIG_HAVE_ARCH_TRACEHOOK=y
149CONFIG_HAVE_DMA_ATTRS=y
147CONFIG_HAVE_CLK=y 150CONFIG_HAVE_CLK=y
151CONFIG_HAVE_DMA_API_DEBUG=y
148 152
149# 153#
150# GCOV-based kernel profiling 154# GCOV-based kernel profiling
@@ -188,6 +192,7 @@ CONFIG_MPC85xx=y
188# CONFIG_MPC85xx_MDS is not set 192# CONFIG_MPC85xx_MDS is not set
189# CONFIG_MPC8536_DS is not set 193# CONFIG_MPC8536_DS is not set
190# CONFIG_MPC85xx_DS is not set 194# CONFIG_MPC85xx_DS is not set
195# CONFIG_MPC85xx_RDB is not set
191# CONFIG_SOCRATES is not set 196# CONFIG_SOCRATES is not set
192CONFIG_KSI8560=y 197CONFIG_KSI8560=y
193# CONFIG_XES_MPC85xx is not set 198# CONFIG_XES_MPC85xx is not set
@@ -243,6 +248,7 @@ CONFIG_MATH_EMULATION=y
243CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 248CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
244CONFIG_ARCH_HAS_WALK_MEMORY=y 249CONFIG_ARCH_HAS_WALK_MEMORY=y
245CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 250CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
251CONFIG_MAX_ACTIVE_REGIONS=32
246CONFIG_ARCH_FLATMEM_ENABLE=y 252CONFIG_ARCH_FLATMEM_ENABLE=y
247CONFIG_ARCH_POPULATES_NODE_MAP=y 253CONFIG_ARCH_POPULATES_NODE_MAP=y
248CONFIG_SELECT_MEMORY_MODEL=y 254CONFIG_SELECT_MEMORY_MODEL=y
@@ -260,6 +266,7 @@ CONFIG_BOUNCE=y
260CONFIG_VIRT_TO_BUS=y 266CONFIG_VIRT_TO_BUS=y
261CONFIG_HAVE_MLOCK=y 267CONFIG_HAVE_MLOCK=y
262CONFIG_HAVE_MLOCKED_PAGE_BIT=y 268CONFIG_HAVE_MLOCKED_PAGE_BIT=y
269# CONFIG_KSM is not set
263CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 270CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
264CONFIG_PPC_4K_PAGES=y 271CONFIG_PPC_4K_PAGES=y
265# CONFIG_PPC_16K_PAGES is not set 272# CONFIG_PPC_16K_PAGES is not set
@@ -348,6 +355,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
348# CONFIG_NETFILTER is not set 355# CONFIG_NETFILTER is not set
349# CONFIG_IP_DCCP is not set 356# CONFIG_IP_DCCP is not set
350# CONFIG_IP_SCTP is not set 357# CONFIG_IP_SCTP is not set
358# CONFIG_RDS is not set
351# CONFIG_TIPC is not set 359# CONFIG_TIPC is not set
352# CONFIG_ATM is not set 360# CONFIG_ATM is not set
353# CONFIG_BRIDGE is not set 361# CONFIG_BRIDGE is not set
@@ -377,6 +385,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
377# CONFIG_AF_RXRPC is not set 385# CONFIG_AF_RXRPC is not set
378CONFIG_WIRELESS=y 386CONFIG_WIRELESS=y
379# CONFIG_CFG80211 is not set 387# CONFIG_CFG80211 is not set
388CONFIG_CFG80211_DEFAULT_PS_VALUE=0
380CONFIG_WIRELESS_OLD_REGULATORY=y 389CONFIG_WIRELESS_OLD_REGULATORY=y
381# CONFIG_WIRELESS_EXT is not set 390# CONFIG_WIRELESS_EXT is not set
382# CONFIG_LIB80211 is not set 391# CONFIG_LIB80211 is not set
@@ -384,7 +393,6 @@ CONFIG_WIRELESS_OLD_REGULATORY=y
384# 393#
385# CFG80211 needs to be enabled for MAC80211 394# CFG80211 needs to be enabled for MAC80211
386# 395#
387CONFIG_MAC80211_DEFAULT_PS_VALUE=0
388# CONFIG_WIMAX is not set 396# CONFIG_WIMAX is not set
389# CONFIG_RFKILL is not set 397# CONFIG_RFKILL is not set
390# CONFIG_NET_9P is not set 398# CONFIG_NET_9P is not set
@@ -397,6 +405,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
397# Generic Driver Options 405# Generic Driver Options
398# 406#
399CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 407CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
408# CONFIG_DEVTMPFS is not set
400CONFIG_STANDALONE=y 409CONFIG_STANDALONE=y
401CONFIG_PREVENT_FIRMWARE_BUILD=y 410CONFIG_PREVENT_FIRMWARE_BUILD=y
402# CONFIG_FW_LOADER is not set 411# CONFIG_FW_LOADER is not set
@@ -582,6 +591,8 @@ CONFIG_MII=y
582# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set 591# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
583# CONFIG_B44 is not set 592# CONFIG_B44 is not set
584# CONFIG_KS8842 is not set 593# CONFIG_KS8842 is not set
594# CONFIG_KS8851_MLL is not set
595# CONFIG_XILINX_EMACLITE is not set
585CONFIG_FS_ENET=y 596CONFIG_FS_ENET=y
586# CONFIG_FS_ENET_HAS_SCC is not set 597# CONFIG_FS_ENET_HAS_SCC is not set
587CONFIG_FS_ENET_HAS_FCC=y 598CONFIG_FS_ENET_HAS_FCC=y
@@ -591,10 +602,7 @@ CONFIG_FSL_PQ_MDIO=y
591CONFIG_GIANFAR=y 602CONFIG_GIANFAR=y
592# CONFIG_MV643XX_ETH is not set 603# CONFIG_MV643XX_ETH is not set
593CONFIG_NETDEV_10000=y 604CONFIG_NETDEV_10000=y
594 605CONFIG_WLAN=y
595#
596# Wireless LAN
597#
598# CONFIG_WLAN_PRE80211 is not set 606# CONFIG_WLAN_PRE80211 is not set
599# CONFIG_WLAN_80211 is not set 607# CONFIG_WLAN_80211 is not set
600 608
@@ -704,10 +712,19 @@ CONFIG_GPIOLIB=y
704# 712#
705# SPI GPIO expanders: 713# SPI GPIO expanders:
706# 714#
715
716#
717# AC97 GPIO expanders:
718#
707# CONFIG_W1 is not set 719# CONFIG_W1 is not set
708# CONFIG_POWER_SUPPLY is not set 720# CONFIG_POWER_SUPPLY is not set
709CONFIG_HWMON=y 721CONFIG_HWMON=y
710# CONFIG_HWMON_VID is not set 722# CONFIG_HWMON_VID is not set
723# CONFIG_HWMON_DEBUG_CHIP is not set
724
725#
726# Native drivers
727#
711# CONFIG_SENSORS_F71805F is not set 728# CONFIG_SENSORS_F71805F is not set
712# CONFIG_SENSORS_F71882FG is not set 729# CONFIG_SENSORS_F71882FG is not set
713# CONFIG_SENSORS_IT87 is not set 730# CONFIG_SENSORS_IT87 is not set
@@ -719,9 +736,7 @@ CONFIG_HWMON=y
719# CONFIG_SENSORS_VT1211 is not set 736# CONFIG_SENSORS_VT1211 is not set
720# CONFIG_SENSORS_W83627HF is not set 737# CONFIG_SENSORS_W83627HF is not set
721# CONFIG_SENSORS_W83627EHF is not set 738# CONFIG_SENSORS_W83627EHF is not set
722# CONFIG_HWMON_DEBUG_CHIP is not set
723# CONFIG_THERMAL is not set 739# CONFIG_THERMAL is not set
724# CONFIG_THERMAL_HWMON is not set
725# CONFIG_WATCHDOG is not set 740# CONFIG_WATCHDOG is not set
726CONFIG_SSB_POSSIBLE=y 741CONFIG_SSB_POSSIBLE=y
727 742
@@ -755,7 +770,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y
755# CONFIG_SOUND is not set 770# CONFIG_SOUND is not set
756CONFIG_HID_SUPPORT=y 771CONFIG_HID_SUPPORT=y
757CONFIG_HID=y 772CONFIG_HID=y
758# CONFIG_HID_DEBUG is not set
759# CONFIG_HIDRAW is not set 773# CONFIG_HIDRAW is not set
760# CONFIG_HID_PID is not set 774# CONFIG_HID_PID is not set
761 775
@@ -818,6 +832,7 @@ CONFIG_FS_MBCACHE=y
818# CONFIG_GFS2_FS is not set 832# CONFIG_GFS2_FS is not set
819# CONFIG_OCFS2_FS is not set 833# CONFIG_OCFS2_FS is not set
820# CONFIG_BTRFS_FS is not set 834# CONFIG_BTRFS_FS is not set
835# CONFIG_NILFS2_FS is not set
821CONFIG_FILE_LOCKING=y 836CONFIG_FILE_LOCKING=y
822CONFIG_FSNOTIFY=y 837CONFIG_FSNOTIFY=y
823CONFIG_DNOTIFY=y 838CONFIG_DNOTIFY=y
@@ -877,7 +892,6 @@ CONFIG_MISC_FILESYSTEMS=y
877# CONFIG_ROMFS_FS is not set 892# CONFIG_ROMFS_FS is not set
878# CONFIG_SYSV_FS is not set 893# CONFIG_SYSV_FS is not set
879# CONFIG_UFS_FS is not set 894# CONFIG_UFS_FS is not set
880# CONFIG_NILFS2_FS is not set
881CONFIG_NETWORK_FILESYSTEMS=y 895CONFIG_NETWORK_FILESYSTEMS=y
882CONFIG_NFS_FS=y 896CONFIG_NFS_FS=y
883# CONFIG_NFS_V3 is not set 897# CONFIG_NFS_V3 is not set
@@ -945,6 +959,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
945CONFIG_ENABLE_MUST_CHECK=y 959CONFIG_ENABLE_MUST_CHECK=y
946CONFIG_FRAME_WARN=1024 960CONFIG_FRAME_WARN=1024
947# CONFIG_MAGIC_SYSRQ is not set 961# CONFIG_MAGIC_SYSRQ is not set
962# CONFIG_STRIP_ASM_SYMS is not set
948# CONFIG_UNUSED_SYMBOLS is not set 963# CONFIG_UNUSED_SYMBOLS is not set
949CONFIG_DEBUG_FS=y 964CONFIG_DEBUG_FS=y
950# CONFIG_HEADERS_CHECK is not set 965# CONFIG_HEADERS_CHECK is not set
@@ -962,6 +977,7 @@ CONFIG_SCHED_DEBUG=y
962# CONFIG_DEBUG_OBJECTS is not set 977# CONFIG_DEBUG_OBJECTS is not set
963# CONFIG_SLUB_DEBUG_ON is not set 978# CONFIG_SLUB_DEBUG_ON is not set
964# CONFIG_SLUB_STATS is not set 979# CONFIG_SLUB_STATS is not set
980# CONFIG_DEBUG_KMEMLEAK is not set
965# CONFIG_DEBUG_RT_MUTEXES is not set 981# CONFIG_DEBUG_RT_MUTEXES is not set
966# CONFIG_RT_MUTEX_TESTER is not set 982# CONFIG_RT_MUTEX_TESTER is not set
967# CONFIG_DEBUG_SPINLOCK is not set 983# CONFIG_DEBUG_SPINLOCK is not set
@@ -981,10 +997,12 @@ CONFIG_DEBUG_MUTEXES=y
981# CONFIG_DEBUG_LIST is not set 997# CONFIG_DEBUG_LIST is not set
982# CONFIG_DEBUG_SG is not set 998# CONFIG_DEBUG_SG is not set
983# CONFIG_DEBUG_NOTIFIERS is not set 999# CONFIG_DEBUG_NOTIFIERS is not set
1000# CONFIG_DEBUG_CREDENTIALS is not set
984# CONFIG_RCU_TORTURE_TEST is not set 1001# CONFIG_RCU_TORTURE_TEST is not set
985# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1002# CONFIG_RCU_CPU_STALL_DETECTOR is not set
986# CONFIG_BACKTRACE_SELF_TEST is not set 1003# CONFIG_BACKTRACE_SELF_TEST is not set
987# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 1004# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1005# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
988# CONFIG_FAULT_INJECTION is not set 1006# CONFIG_FAULT_INJECTION is not set
989# CONFIG_LATENCYTOP is not set 1007# CONFIG_LATENCYTOP is not set
990CONFIG_SYSCTL_SYSCALL_CHECK=y 1008CONFIG_SYSCTL_SYSCALL_CHECK=y
@@ -1008,10 +1026,10 @@ CONFIG_BRANCH_PROFILE_NONE=y
1008# CONFIG_WORKQUEUE_TRACER is not set 1026# CONFIG_WORKQUEUE_TRACER is not set
1009# CONFIG_BLK_DEV_IO_TRACE is not set 1027# CONFIG_BLK_DEV_IO_TRACE is not set
1010# CONFIG_DYNAMIC_DEBUG is not set 1028# CONFIG_DYNAMIC_DEBUG is not set
1029# CONFIG_DMA_API_DEBUG is not set
1011# CONFIG_SAMPLES is not set 1030# CONFIG_SAMPLES is not set
1012CONFIG_HAVE_ARCH_KGDB=y 1031CONFIG_HAVE_ARCH_KGDB=y
1013# CONFIG_KGDB is not set 1032# CONFIG_KGDB is not set
1014# CONFIG_KMEMCHECK is not set
1015# CONFIG_PPC_DISABLE_WERROR is not set 1033# CONFIG_PPC_DISABLE_WERROR is not set
1016CONFIG_PPC_WERROR=y 1034CONFIG_PPC_WERROR=y
1017CONFIG_PRINT_STACK_DEPTH=64 1035CONFIG_PRINT_STACK_DEPTH=64
@@ -1039,7 +1057,6 @@ CONFIG_CRYPTO=y
1039# 1057#
1040# Crypto core or helper 1058# Crypto core or helper
1041# 1059#
1042# CONFIG_CRYPTO_FIPS is not set
1043# CONFIG_CRYPTO_MANAGER is not set 1060# CONFIG_CRYPTO_MANAGER is not set
1044# CONFIG_CRYPTO_MANAGER2 is not set 1061# CONFIG_CRYPTO_MANAGER2 is not set
1045# CONFIG_CRYPTO_GF128MUL is not set 1062# CONFIG_CRYPTO_GF128MUL is not set
@@ -1070,11 +1087,13 @@ CONFIG_CRYPTO=y
1070# 1087#
1071# CONFIG_CRYPTO_HMAC is not set 1088# CONFIG_CRYPTO_HMAC is not set
1072# CONFIG_CRYPTO_XCBC is not set 1089# CONFIG_CRYPTO_XCBC is not set
1090# CONFIG_CRYPTO_VMAC is not set
1073 1091
1074# 1092#
1075# Digest 1093# Digest
1076# 1094#
1077# CONFIG_CRYPTO_CRC32C is not set 1095# CONFIG_CRYPTO_CRC32C is not set
1096# CONFIG_CRYPTO_GHASH is not set
1078# CONFIG_CRYPTO_MD4 is not set 1097# CONFIG_CRYPTO_MD4 is not set
1079# CONFIG_CRYPTO_MD5 is not set 1098# CONFIG_CRYPTO_MD5 is not set
1080# CONFIG_CRYPTO_MICHAEL_MIC is not set 1099# CONFIG_CRYPTO_MICHAEL_MIC is not set
diff --git a/arch/powerpc/configs/85xx/mpc8540_ads_defconfig b/arch/powerpc/configs/85xx/mpc8540_ads_defconfig
index fb10cc83702e..c10e26f8763f 100644
--- a/arch/powerpc/configs/85xx/mpc8540_ads_defconfig
+++ b/arch/powerpc/configs/85xx/mpc8540_ads_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.31-rc4 3# Linux kernel version: 2.6.32-rc5
4# Wed Jul 29 23:32:15 2009 4# Thu Nov 5 08:20:33 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -22,6 +22,7 @@ CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set 22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y 23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y 24CONFIG_PPC_MMU_NOHASH=y
25CONFIG_PPC_MMU_NOHASH_32=y
25CONFIG_PPC_BOOK3E_MMU=y 26CONFIG_PPC_BOOK3E_MMU=y
26# CONFIG_PPC_MM_SLICES is not set 27# CONFIG_PPC_MM_SLICES is not set
27# CONFIG_SMP is not set 28# CONFIG_SMP is not set
@@ -36,6 +37,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
36CONFIG_GENERIC_HARDIRQS=y 37CONFIG_GENERIC_HARDIRQS=y
37CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 38CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
38# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
39CONFIG_IRQ_PER_CPU=y 41CONFIG_IRQ_PER_CPU=y
40CONFIG_STACKTRACE_SUPPORT=y 42CONFIG_STACKTRACE_SUPPORT=y
41CONFIG_HAVE_LATENCYTOP_SUPPORT=y 43CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -84,11 +86,12 @@ CONFIG_SYSVIPC_SYSCTL=y
84# 86#
85# RCU Subsystem 87# RCU Subsystem
86# 88#
87CONFIG_CLASSIC_RCU=y 89CONFIG_TREE_RCU=y
88# CONFIG_TREE_RCU is not set 90# CONFIG_TREE_PREEMPT_RCU is not set
89# CONFIG_PREEMPT_RCU is not set 91# CONFIG_RCU_TRACE is not set
92CONFIG_RCU_FANOUT=32
93# CONFIG_RCU_FANOUT_EXACT is not set
90# CONFIG_TREE_RCU_TRACE is not set 94# CONFIG_TREE_RCU_TRACE is not set
91# CONFIG_PREEMPT_RCU_TRACE is not set
92# CONFIG_IKCONFIG is not set 95# CONFIG_IKCONFIG is not set
93CONFIG_LOG_BUF_SHIFT=14 96CONFIG_LOG_BUF_SHIFT=14
94CONFIG_GROUP_SCHED=y 97CONFIG_GROUP_SCHED=y
@@ -126,27 +129,28 @@ CONFIG_TIMERFD=y
126CONFIG_EVENTFD=y 129CONFIG_EVENTFD=y
127CONFIG_SHMEM=y 130CONFIG_SHMEM=y
128CONFIG_AIO=y 131CONFIG_AIO=y
129CONFIG_HAVE_PERF_COUNTERS=y 132CONFIG_HAVE_PERF_EVENTS=y
130 133
131# 134#
132# Performance Counters 135# Kernel Performance Events And Counters
133# 136#
137# CONFIG_PERF_EVENTS is not set
134# CONFIG_PERF_COUNTERS is not set 138# CONFIG_PERF_COUNTERS is not set
135CONFIG_VM_EVENT_COUNTERS=y 139CONFIG_VM_EVENT_COUNTERS=y
136CONFIG_SLUB_DEBUG=y 140CONFIG_SLUB_DEBUG=y
137# CONFIG_STRIP_ASM_SYMS is not set
138CONFIG_COMPAT_BRK=y 141CONFIG_COMPAT_BRK=y
139# CONFIG_SLAB is not set 142# CONFIG_SLAB is not set
140CONFIG_SLUB=y 143CONFIG_SLUB=y
141# CONFIG_SLOB is not set 144# CONFIG_SLOB is not set
142# CONFIG_PROFILING is not set 145# CONFIG_PROFILING is not set
143# CONFIG_MARKERS is not set
144CONFIG_HAVE_OPROFILE=y 146CONFIG_HAVE_OPROFILE=y
145CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 147CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
146CONFIG_HAVE_IOREMAP_PROT=y 148CONFIG_HAVE_IOREMAP_PROT=y
147CONFIG_HAVE_KPROBES=y 149CONFIG_HAVE_KPROBES=y
148CONFIG_HAVE_KRETPROBES=y 150CONFIG_HAVE_KRETPROBES=y
149CONFIG_HAVE_ARCH_TRACEHOOK=y 151CONFIG_HAVE_ARCH_TRACEHOOK=y
152CONFIG_HAVE_DMA_ATTRS=y
153CONFIG_HAVE_DMA_API_DEBUG=y
150 154
151# 155#
152# GCOV-based kernel profiling 156# GCOV-based kernel profiling
@@ -189,6 +193,7 @@ CONFIG_MPC8540_ADS=y
189# CONFIG_MPC85xx_MDS is not set 193# CONFIG_MPC85xx_MDS is not set
190# CONFIG_MPC8536_DS is not set 194# CONFIG_MPC8536_DS is not set
191# CONFIG_MPC85xx_DS is not set 195# CONFIG_MPC85xx_DS is not set
196# CONFIG_MPC85xx_RDB is not set
192# CONFIG_SOCRATES is not set 197# CONFIG_SOCRATES is not set
193# CONFIG_KSI8560 is not set 198# CONFIG_KSI8560 is not set
194# CONFIG_XES_MPC85xx is not set 199# CONFIG_XES_MPC85xx is not set
@@ -244,6 +249,7 @@ CONFIG_MATH_EMULATION=y
244CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 249CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
245CONFIG_ARCH_HAS_WALK_MEMORY=y 250CONFIG_ARCH_HAS_WALK_MEMORY=y
246CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 251CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
252CONFIG_MAX_ACTIVE_REGIONS=32
247CONFIG_ARCH_FLATMEM_ENABLE=y 253CONFIG_ARCH_FLATMEM_ENABLE=y
248CONFIG_ARCH_POPULATES_NODE_MAP=y 254CONFIG_ARCH_POPULATES_NODE_MAP=y
249CONFIG_SELECT_MEMORY_MODEL=y 255CONFIG_SELECT_MEMORY_MODEL=y
@@ -261,6 +267,7 @@ CONFIG_BOUNCE=y
261CONFIG_VIRT_TO_BUS=y 267CONFIG_VIRT_TO_BUS=y
262CONFIG_HAVE_MLOCK=y 268CONFIG_HAVE_MLOCK=y
263CONFIG_HAVE_MLOCKED_PAGE_BIT=y 269CONFIG_HAVE_MLOCKED_PAGE_BIT=y
270# CONFIG_KSM is not set
264CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 271CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
265CONFIG_PPC_4K_PAGES=y 272CONFIG_PPC_4K_PAGES=y
266# CONFIG_PPC_16K_PAGES is not set 273# CONFIG_PPC_16K_PAGES is not set
@@ -349,6 +356,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
349# CONFIG_NETFILTER is not set 356# CONFIG_NETFILTER is not set
350# CONFIG_IP_DCCP is not set 357# CONFIG_IP_DCCP is not set
351# CONFIG_IP_SCTP is not set 358# CONFIG_IP_SCTP is not set
359# CONFIG_RDS is not set
352# CONFIG_TIPC is not set 360# CONFIG_TIPC is not set
353# CONFIG_ATM is not set 361# CONFIG_ATM is not set
354# CONFIG_BRIDGE is not set 362# CONFIG_BRIDGE is not set
@@ -378,6 +386,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
378# CONFIG_AF_RXRPC is not set 386# CONFIG_AF_RXRPC is not set
379CONFIG_WIRELESS=y 387CONFIG_WIRELESS=y
380# CONFIG_CFG80211 is not set 388# CONFIG_CFG80211 is not set
389CONFIG_CFG80211_DEFAULT_PS_VALUE=0
381CONFIG_WIRELESS_OLD_REGULATORY=y 390CONFIG_WIRELESS_OLD_REGULATORY=y
382# CONFIG_WIRELESS_EXT is not set 391# CONFIG_WIRELESS_EXT is not set
383# CONFIG_LIB80211 is not set 392# CONFIG_LIB80211 is not set
@@ -385,7 +394,6 @@ CONFIG_WIRELESS_OLD_REGULATORY=y
385# 394#
386# CFG80211 needs to be enabled for MAC80211 395# CFG80211 needs to be enabled for MAC80211
387# 396#
388CONFIG_MAC80211_DEFAULT_PS_VALUE=0
389# CONFIG_WIMAX is not set 397# CONFIG_WIMAX is not set
390# CONFIG_RFKILL is not set 398# CONFIG_RFKILL is not set
391# CONFIG_NET_9P is not set 399# CONFIG_NET_9P is not set
@@ -398,6 +406,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
398# Generic Driver Options 406# Generic Driver Options
399# 407#
400CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 408CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
409# CONFIG_DEVTMPFS is not set
401CONFIG_STANDALONE=y 410CONFIG_STANDALONE=y
402CONFIG_PREVENT_FIRMWARE_BUILD=y 411CONFIG_PREVENT_FIRMWARE_BUILD=y
403# CONFIG_FW_LOADER is not set 412# CONFIG_FW_LOADER is not set
@@ -483,15 +492,14 @@ CONFIG_MII=y
483# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set 492# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
484# CONFIG_B44 is not set 493# CONFIG_B44 is not set
485# CONFIG_KS8842 is not set 494# CONFIG_KS8842 is not set
495# CONFIG_KS8851_MLL is not set
496# CONFIG_XILINX_EMACLITE is not set
486CONFIG_NETDEV_1000=y 497CONFIG_NETDEV_1000=y
487CONFIG_FSL_PQ_MDIO=y 498CONFIG_FSL_PQ_MDIO=y
488CONFIG_GIANFAR=y 499CONFIG_GIANFAR=y
489# CONFIG_MV643XX_ETH is not set 500# CONFIG_MV643XX_ETH is not set
490CONFIG_NETDEV_10000=y 501CONFIG_NETDEV_10000=y
491 502CONFIG_WLAN=y
492#
493# Wireless LAN
494#
495# CONFIG_WLAN_PRE80211 is not set 503# CONFIG_WLAN_PRE80211 is not set
496# CONFIG_WLAN_80211 is not set 504# CONFIG_WLAN_80211 is not set
497 505
@@ -588,6 +596,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
588# CONFIG_POWER_SUPPLY is not set 596# CONFIG_POWER_SUPPLY is not set
589CONFIG_HWMON=y 597CONFIG_HWMON=y
590# CONFIG_HWMON_VID is not set 598# CONFIG_HWMON_VID is not set
599# CONFIG_HWMON_DEBUG_CHIP is not set
600
601#
602# Native drivers
603#
591# CONFIG_SENSORS_F71805F is not set 604# CONFIG_SENSORS_F71805F is not set
592# CONFIG_SENSORS_F71882FG is not set 605# CONFIG_SENSORS_F71882FG is not set
593# CONFIG_SENSORS_IT87 is not set 606# CONFIG_SENSORS_IT87 is not set
@@ -598,9 +611,7 @@ CONFIG_HWMON=y
598# CONFIG_SENSORS_VT1211 is not set 611# CONFIG_SENSORS_VT1211 is not set
599# CONFIG_SENSORS_W83627HF is not set 612# CONFIG_SENSORS_W83627HF is not set
600# CONFIG_SENSORS_W83627EHF is not set 613# CONFIG_SENSORS_W83627EHF is not set
601# CONFIG_HWMON_DEBUG_CHIP is not set
602# CONFIG_THERMAL is not set 614# CONFIG_THERMAL is not set
603# CONFIG_THERMAL_HWMON is not set
604# CONFIG_WATCHDOG is not set 615# CONFIG_WATCHDOG is not set
605CONFIG_SSB_POSSIBLE=y 616CONFIG_SSB_POSSIBLE=y
606 617
@@ -634,7 +645,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y
634# CONFIG_SOUND is not set 645# CONFIG_SOUND is not set
635CONFIG_HID_SUPPORT=y 646CONFIG_HID_SUPPORT=y
636CONFIG_HID=y 647CONFIG_HID=y
637# CONFIG_HID_DEBUG is not set
638# CONFIG_HIDRAW is not set 648# CONFIG_HIDRAW is not set
639# CONFIG_HID_PID is not set 649# CONFIG_HID_PID is not set
640 650
@@ -696,6 +706,7 @@ CONFIG_FS_MBCACHE=y
696# CONFIG_GFS2_FS is not set 706# CONFIG_GFS2_FS is not set
697# CONFIG_OCFS2_FS is not set 707# CONFIG_OCFS2_FS is not set
698# CONFIG_BTRFS_FS is not set 708# CONFIG_BTRFS_FS is not set
709# CONFIG_NILFS2_FS is not set
699CONFIG_FILE_LOCKING=y 710CONFIG_FILE_LOCKING=y
700CONFIG_FSNOTIFY=y 711CONFIG_FSNOTIFY=y
701CONFIG_DNOTIFY=y 712CONFIG_DNOTIFY=y
@@ -754,7 +765,6 @@ CONFIG_MISC_FILESYSTEMS=y
754# CONFIG_ROMFS_FS is not set 765# CONFIG_ROMFS_FS is not set
755# CONFIG_SYSV_FS is not set 766# CONFIG_SYSV_FS is not set
756# CONFIG_UFS_FS is not set 767# CONFIG_UFS_FS is not set
757# CONFIG_NILFS2_FS is not set
758CONFIG_NETWORK_FILESYSTEMS=y 768CONFIG_NETWORK_FILESYSTEMS=y
759CONFIG_NFS_FS=y 769CONFIG_NFS_FS=y
760# CONFIG_NFS_V3 is not set 770# CONFIG_NFS_V3 is not set
@@ -822,6 +832,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
822CONFIG_ENABLE_MUST_CHECK=y 832CONFIG_ENABLE_MUST_CHECK=y
823CONFIG_FRAME_WARN=1024 833CONFIG_FRAME_WARN=1024
824# CONFIG_MAGIC_SYSRQ is not set 834# CONFIG_MAGIC_SYSRQ is not set
835# CONFIG_STRIP_ASM_SYMS is not set
825# CONFIG_UNUSED_SYMBOLS is not set 836# CONFIG_UNUSED_SYMBOLS is not set
826# CONFIG_DEBUG_FS is not set 837# CONFIG_DEBUG_FS is not set
827# CONFIG_HEADERS_CHECK is not set 838# CONFIG_HEADERS_CHECK is not set
@@ -839,6 +850,7 @@ CONFIG_SCHED_DEBUG=y
839# CONFIG_DEBUG_OBJECTS is not set 850# CONFIG_DEBUG_OBJECTS is not set
840# CONFIG_SLUB_DEBUG_ON is not set 851# CONFIG_SLUB_DEBUG_ON is not set
841# CONFIG_SLUB_STATS is not set 852# CONFIG_SLUB_STATS is not set
853# CONFIG_DEBUG_KMEMLEAK is not set
842# CONFIG_DEBUG_RT_MUTEXES is not set 854# CONFIG_DEBUG_RT_MUTEXES is not set
843# CONFIG_RT_MUTEX_TESTER is not set 855# CONFIG_RT_MUTEX_TESTER is not set
844# CONFIG_DEBUG_SPINLOCK is not set 856# CONFIG_DEBUG_SPINLOCK is not set
@@ -857,10 +869,12 @@ CONFIG_DEBUG_MUTEXES=y
857# CONFIG_DEBUG_LIST is not set 869# CONFIG_DEBUG_LIST is not set
858# CONFIG_DEBUG_SG is not set 870# CONFIG_DEBUG_SG is not set
859# CONFIG_DEBUG_NOTIFIERS is not set 871# CONFIG_DEBUG_NOTIFIERS is not set
872# CONFIG_DEBUG_CREDENTIALS is not set
860# CONFIG_RCU_TORTURE_TEST is not set 873# CONFIG_RCU_TORTURE_TEST is not set
861# CONFIG_RCU_CPU_STALL_DETECTOR is not set 874# CONFIG_RCU_CPU_STALL_DETECTOR is not set
862# CONFIG_BACKTRACE_SELF_TEST is not set 875# CONFIG_BACKTRACE_SELF_TEST is not set
863# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 876# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
877# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
864# CONFIG_FAULT_INJECTION is not set 878# CONFIG_FAULT_INJECTION is not set
865# CONFIG_LATENCYTOP is not set 879# CONFIG_LATENCYTOP is not set
866CONFIG_SYSCTL_SYSCALL_CHECK=y 880CONFIG_SYSCTL_SYSCALL_CHECK=y
@@ -883,10 +897,10 @@ CONFIG_BRANCH_PROFILE_NONE=y
883# CONFIG_KMEMTRACE is not set 897# CONFIG_KMEMTRACE is not set
884# CONFIG_WORKQUEUE_TRACER is not set 898# CONFIG_WORKQUEUE_TRACER is not set
885# CONFIG_BLK_DEV_IO_TRACE is not set 899# CONFIG_BLK_DEV_IO_TRACE is not set
900# CONFIG_DMA_API_DEBUG is not set
886# CONFIG_SAMPLES is not set 901# CONFIG_SAMPLES is not set
887CONFIG_HAVE_ARCH_KGDB=y 902CONFIG_HAVE_ARCH_KGDB=y
888# CONFIG_KGDB is not set 903# CONFIG_KGDB is not set
889# CONFIG_KMEMCHECK is not set
890# CONFIG_PPC_DISABLE_WERROR is not set 904# CONFIG_PPC_DISABLE_WERROR is not set
891CONFIG_PPC_WERROR=y 905CONFIG_PPC_WERROR=y
892CONFIG_PRINT_STACK_DEPTH=64 906CONFIG_PRINT_STACK_DEPTH=64
@@ -912,7 +926,6 @@ CONFIG_CRYPTO=y
912# 926#
913# Crypto core or helper 927# Crypto core or helper
914# 928#
915# CONFIG_CRYPTO_FIPS is not set
916# CONFIG_CRYPTO_MANAGER is not set 929# CONFIG_CRYPTO_MANAGER is not set
917# CONFIG_CRYPTO_MANAGER2 is not set 930# CONFIG_CRYPTO_MANAGER2 is not set
918# CONFIG_CRYPTO_GF128MUL is not set 931# CONFIG_CRYPTO_GF128MUL is not set
@@ -943,11 +956,13 @@ CONFIG_CRYPTO=y
943# 956#
944# CONFIG_CRYPTO_HMAC is not set 957# CONFIG_CRYPTO_HMAC is not set
945# CONFIG_CRYPTO_XCBC is not set 958# CONFIG_CRYPTO_XCBC is not set
959# CONFIG_CRYPTO_VMAC is not set
946 960
947# 961#
948# Digest 962# Digest
949# 963#
950# CONFIG_CRYPTO_CRC32C is not set 964# CONFIG_CRYPTO_CRC32C is not set
965# CONFIG_CRYPTO_GHASH is not set
951# CONFIG_CRYPTO_MD4 is not set 966# CONFIG_CRYPTO_MD4 is not set
952# CONFIG_CRYPTO_MD5 is not set 967# CONFIG_CRYPTO_MD5 is not set
953# CONFIG_CRYPTO_MICHAEL_MIC is not set 968# CONFIG_CRYPTO_MICHAEL_MIC is not set
diff --git a/arch/powerpc/configs/85xx/mpc8560_ads_defconfig b/arch/powerpc/configs/85xx/mpc8560_ads_defconfig
index 5c8ce6978825..8d9f0a4b5205 100644
--- a/arch/powerpc/configs/85xx/mpc8560_ads_defconfig
+++ b/arch/powerpc/configs/85xx/mpc8560_ads_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.31-rc4 3# Linux kernel version: 2.6.32-rc5
4# Wed Jul 29 23:32:16 2009 4# Thu Nov 5 08:20:34 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -22,6 +22,7 @@ CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set 22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y 23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y 24CONFIG_PPC_MMU_NOHASH=y
25CONFIG_PPC_MMU_NOHASH_32=y
25CONFIG_PPC_BOOK3E_MMU=y 26CONFIG_PPC_BOOK3E_MMU=y
26# CONFIG_PPC_MM_SLICES is not set 27# CONFIG_PPC_MM_SLICES is not set
27# CONFIG_SMP is not set 28# CONFIG_SMP is not set
@@ -36,6 +37,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
36CONFIG_GENERIC_HARDIRQS=y 37CONFIG_GENERIC_HARDIRQS=y
37CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 38CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
38# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
39CONFIG_IRQ_PER_CPU=y 41CONFIG_IRQ_PER_CPU=y
40CONFIG_STACKTRACE_SUPPORT=y 42CONFIG_STACKTRACE_SUPPORT=y
41CONFIG_HAVE_LATENCYTOP_SUPPORT=y 43CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -85,11 +87,12 @@ CONFIG_SYSVIPC_SYSCTL=y
85# 87#
86# RCU Subsystem 88# RCU Subsystem
87# 89#
88CONFIG_CLASSIC_RCU=y 90CONFIG_TREE_RCU=y
89# CONFIG_TREE_RCU is not set 91# CONFIG_TREE_PREEMPT_RCU is not set
90# CONFIG_PREEMPT_RCU is not set 92# CONFIG_RCU_TRACE is not set
93CONFIG_RCU_FANOUT=32
94# CONFIG_RCU_FANOUT_EXACT is not set
91# CONFIG_TREE_RCU_TRACE is not set 95# CONFIG_TREE_RCU_TRACE is not set
92# CONFIG_PREEMPT_RCU_TRACE is not set
93# CONFIG_IKCONFIG is not set 96# CONFIG_IKCONFIG is not set
94CONFIG_LOG_BUF_SHIFT=14 97CONFIG_LOG_BUF_SHIFT=14
95CONFIG_GROUP_SCHED=y 98CONFIG_GROUP_SCHED=y
@@ -127,29 +130,30 @@ CONFIG_TIMERFD=y
127CONFIG_EVENTFD=y 130CONFIG_EVENTFD=y
128CONFIG_SHMEM=y 131CONFIG_SHMEM=y
129CONFIG_AIO=y 132CONFIG_AIO=y
130CONFIG_HAVE_PERF_COUNTERS=y 133CONFIG_HAVE_PERF_EVENTS=y
131 134
132# 135#
133# Performance Counters 136# Kernel Performance Events And Counters
134# 137#
138# CONFIG_PERF_EVENTS is not set
135# CONFIG_PERF_COUNTERS is not set 139# CONFIG_PERF_COUNTERS is not set
136CONFIG_VM_EVENT_COUNTERS=y 140CONFIG_VM_EVENT_COUNTERS=y
137CONFIG_PCI_QUIRKS=y 141CONFIG_PCI_QUIRKS=y
138CONFIG_SLUB_DEBUG=y 142CONFIG_SLUB_DEBUG=y
139# CONFIG_STRIP_ASM_SYMS is not set
140CONFIG_COMPAT_BRK=y 143CONFIG_COMPAT_BRK=y
141# CONFIG_SLAB is not set 144# CONFIG_SLAB is not set
142CONFIG_SLUB=y 145CONFIG_SLUB=y
143# CONFIG_SLOB is not set 146# CONFIG_SLOB is not set
144# CONFIG_PROFILING is not set 147# CONFIG_PROFILING is not set
145# CONFIG_MARKERS is not set
146CONFIG_HAVE_OPROFILE=y 148CONFIG_HAVE_OPROFILE=y
147CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 149CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
148CONFIG_HAVE_IOREMAP_PROT=y 150CONFIG_HAVE_IOREMAP_PROT=y
149CONFIG_HAVE_KPROBES=y 151CONFIG_HAVE_KPROBES=y
150CONFIG_HAVE_KRETPROBES=y 152CONFIG_HAVE_KRETPROBES=y
151CONFIG_HAVE_ARCH_TRACEHOOK=y 153CONFIG_HAVE_ARCH_TRACEHOOK=y
154CONFIG_HAVE_DMA_ATTRS=y
152CONFIG_HAVE_CLK=y 155CONFIG_HAVE_CLK=y
156CONFIG_HAVE_DMA_API_DEBUG=y
153 157
154# 158#
155# GCOV-based kernel profiling 159# GCOV-based kernel profiling
@@ -192,6 +196,7 @@ CONFIG_MPC8560_ADS=y
192# CONFIG_MPC85xx_MDS is not set 196# CONFIG_MPC85xx_MDS is not set
193# CONFIG_MPC8536_DS is not set 197# CONFIG_MPC8536_DS is not set
194# CONFIG_MPC85xx_DS is not set 198# CONFIG_MPC85xx_DS is not set
199# CONFIG_MPC85xx_RDB is not set
195# CONFIG_SOCRATES is not set 200# CONFIG_SOCRATES is not set
196# CONFIG_KSI8560 is not set 201# CONFIG_KSI8560 is not set
197# CONFIG_XES_MPC85xx is not set 202# CONFIG_XES_MPC85xx is not set
@@ -247,6 +252,7 @@ CONFIG_MATH_EMULATION=y
247CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 252CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
248CONFIG_ARCH_HAS_WALK_MEMORY=y 253CONFIG_ARCH_HAS_WALK_MEMORY=y
249CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 254CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
255CONFIG_MAX_ACTIVE_REGIONS=32
250CONFIG_ARCH_FLATMEM_ENABLE=y 256CONFIG_ARCH_FLATMEM_ENABLE=y
251CONFIG_ARCH_POPULATES_NODE_MAP=y 257CONFIG_ARCH_POPULATES_NODE_MAP=y
252CONFIG_SELECT_MEMORY_MODEL=y 258CONFIG_SELECT_MEMORY_MODEL=y
@@ -264,6 +270,7 @@ CONFIG_BOUNCE=y
264CONFIG_VIRT_TO_BUS=y 270CONFIG_VIRT_TO_BUS=y
265CONFIG_HAVE_MLOCK=y 271CONFIG_HAVE_MLOCK=y
266CONFIG_HAVE_MLOCKED_PAGE_BIT=y 272CONFIG_HAVE_MLOCKED_PAGE_BIT=y
273# CONFIG_KSM is not set
267CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 274CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
268CONFIG_PPC_4K_PAGES=y 275CONFIG_PPC_4K_PAGES=y
269# CONFIG_PPC_16K_PAGES is not set 276# CONFIG_PPC_16K_PAGES is not set
@@ -361,6 +368,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
361# CONFIG_NETFILTER is not set 368# CONFIG_NETFILTER is not set
362# CONFIG_IP_DCCP is not set 369# CONFIG_IP_DCCP is not set
363# CONFIG_IP_SCTP is not set 370# CONFIG_IP_SCTP is not set
371# CONFIG_RDS is not set
364# CONFIG_TIPC is not set 372# CONFIG_TIPC is not set
365# CONFIG_ATM is not set 373# CONFIG_ATM is not set
366# CONFIG_BRIDGE is not set 374# CONFIG_BRIDGE is not set
@@ -390,6 +398,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
390# CONFIG_AF_RXRPC is not set 398# CONFIG_AF_RXRPC is not set
391CONFIG_WIRELESS=y 399CONFIG_WIRELESS=y
392# CONFIG_CFG80211 is not set 400# CONFIG_CFG80211 is not set
401CONFIG_CFG80211_DEFAULT_PS_VALUE=0
393CONFIG_WIRELESS_OLD_REGULATORY=y 402CONFIG_WIRELESS_OLD_REGULATORY=y
394# CONFIG_WIRELESS_EXT is not set 403# CONFIG_WIRELESS_EXT is not set
395# CONFIG_LIB80211 is not set 404# CONFIG_LIB80211 is not set
@@ -397,7 +406,6 @@ CONFIG_WIRELESS_OLD_REGULATORY=y
397# 406#
398# CFG80211 needs to be enabled for MAC80211 407# CFG80211 needs to be enabled for MAC80211
399# 408#
400CONFIG_MAC80211_DEFAULT_PS_VALUE=0
401# CONFIG_WIMAX is not set 409# CONFIG_WIMAX is not set
402# CONFIG_RFKILL is not set 410# CONFIG_RFKILL is not set
403# CONFIG_NET_9P is not set 411# CONFIG_NET_9P is not set
@@ -410,6 +418,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
410# Generic Driver Options 418# Generic Driver Options
411# 419#
412CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 420CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
421# CONFIG_DEVTMPFS is not set
413CONFIG_STANDALONE=y 422CONFIG_STANDALONE=y
414CONFIG_PREVENT_FIRMWARE_BUILD=y 423CONFIG_PREVENT_FIRMWARE_BUILD=y
415# CONFIG_FW_LOADER is not set 424# CONFIG_FW_LOADER is not set
@@ -530,7 +539,9 @@ CONFIG_MII=y
530# CONFIG_NET_PCI is not set 539# CONFIG_NET_PCI is not set
531# CONFIG_B44 is not set 540# CONFIG_B44 is not set
532# CONFIG_KS8842 is not set 541# CONFIG_KS8842 is not set
542# CONFIG_KS8851_MLL is not set
533# CONFIG_ATL2 is not set 543# CONFIG_ATL2 is not set
544# CONFIG_XILINX_EMACLITE is not set
534CONFIG_FS_ENET=y 545CONFIG_FS_ENET=y
535# CONFIG_FS_ENET_HAS_SCC is not set 546# CONFIG_FS_ENET_HAS_SCC is not set
536CONFIG_FS_ENET_HAS_FCC=y 547CONFIG_FS_ENET_HAS_FCC=y
@@ -582,10 +593,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
582# CONFIG_SFC is not set 593# CONFIG_SFC is not set
583# CONFIG_BE2NET is not set 594# CONFIG_BE2NET is not set
584# CONFIG_TR is not set 595# CONFIG_TR is not set
585 596CONFIG_WLAN=y
586#
587# Wireless LAN
588#
589# CONFIG_WLAN_PRE80211 is not set 597# CONFIG_WLAN_PRE80211 is not set
590# CONFIG_WLAN_80211 is not set 598# CONFIG_WLAN_80211 is not set
591 599
@@ -698,14 +706,24 @@ CONFIG_GPIOLIB=y
698# PCI GPIO expanders: 706# PCI GPIO expanders:
699# 707#
700# CONFIG_GPIO_BT8XX is not set 708# CONFIG_GPIO_BT8XX is not set
709# CONFIG_GPIO_LANGWELL is not set
701 710
702# 711#
703# SPI GPIO expanders: 712# SPI GPIO expanders:
704# 713#
714
715#
716# AC97 GPIO expanders:
717#
705# CONFIG_W1 is not set 718# CONFIG_W1 is not set
706# CONFIG_POWER_SUPPLY is not set 719# CONFIG_POWER_SUPPLY is not set
707CONFIG_HWMON=y 720CONFIG_HWMON=y
708# CONFIG_HWMON_VID is not set 721# CONFIG_HWMON_VID is not set
722# CONFIG_HWMON_DEBUG_CHIP is not set
723
724#
725# Native drivers
726#
709# CONFIG_SENSORS_I5K_AMB is not set 727# CONFIG_SENSORS_I5K_AMB is not set
710# CONFIG_SENSORS_F71805F is not set 728# CONFIG_SENSORS_F71805F is not set
711# CONFIG_SENSORS_F71882FG is not set 729# CONFIG_SENSORS_F71882FG is not set
@@ -721,9 +739,7 @@ CONFIG_HWMON=y
721# CONFIG_SENSORS_VT8231 is not set 739# CONFIG_SENSORS_VT8231 is not set
722# CONFIG_SENSORS_W83627HF is not set 740# CONFIG_SENSORS_W83627HF is not set
723# CONFIG_SENSORS_W83627EHF is not set 741# CONFIG_SENSORS_W83627EHF is not set
724# CONFIG_HWMON_DEBUG_CHIP is not set
725# CONFIG_THERMAL is not set 742# CONFIG_THERMAL is not set
726# CONFIG_THERMAL_HWMON is not set
727# CONFIG_WATCHDOG is not set 743# CONFIG_WATCHDOG is not set
728CONFIG_SSB_POSSIBLE=y 744CONFIG_SSB_POSSIBLE=y
729 745
@@ -746,6 +762,7 @@ CONFIG_SSB_POSSIBLE=y
746# Graphics support 762# Graphics support
747# 763#
748# CONFIG_AGP is not set 764# CONFIG_AGP is not set
765CONFIG_VGA_ARB=y
749# CONFIG_DRM is not set 766# CONFIG_DRM is not set
750# CONFIG_VGASTATE is not set 767# CONFIG_VGASTATE is not set
751CONFIG_VIDEO_OUTPUT_CONTROL=y 768CONFIG_VIDEO_OUTPUT_CONTROL=y
@@ -759,7 +776,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y
759# CONFIG_SOUND is not set 776# CONFIG_SOUND is not set
760CONFIG_HID_SUPPORT=y 777CONFIG_HID_SUPPORT=y
761CONFIG_HID=y 778CONFIG_HID=y
762# CONFIG_HID_DEBUG is not set
763# CONFIG_HIDRAW is not set 779# CONFIG_HIDRAW is not set
764# CONFIG_HID_PID is not set 780# CONFIG_HID_PID is not set
765 781
@@ -824,6 +840,7 @@ CONFIG_FS_MBCACHE=y
824# CONFIG_GFS2_FS is not set 840# CONFIG_GFS2_FS is not set
825# CONFIG_OCFS2_FS is not set 841# CONFIG_OCFS2_FS is not set
826# CONFIG_BTRFS_FS is not set 842# CONFIG_BTRFS_FS is not set
843# CONFIG_NILFS2_FS is not set
827CONFIG_FILE_LOCKING=y 844CONFIG_FILE_LOCKING=y
828CONFIG_FSNOTIFY=y 845CONFIG_FSNOTIFY=y
829CONFIG_DNOTIFY=y 846CONFIG_DNOTIFY=y
@@ -882,7 +899,6 @@ CONFIG_MISC_FILESYSTEMS=y
882# CONFIG_ROMFS_FS is not set 899# CONFIG_ROMFS_FS is not set
883# CONFIG_SYSV_FS is not set 900# CONFIG_SYSV_FS is not set
884# CONFIG_UFS_FS is not set 901# CONFIG_UFS_FS is not set
885# CONFIG_NILFS2_FS is not set
886CONFIG_NETWORK_FILESYSTEMS=y 902CONFIG_NETWORK_FILESYSTEMS=y
887CONFIG_NFS_FS=y 903CONFIG_NFS_FS=y
888# CONFIG_NFS_V3 is not set 904# CONFIG_NFS_V3 is not set
@@ -950,6 +966,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
950CONFIG_ENABLE_MUST_CHECK=y 966CONFIG_ENABLE_MUST_CHECK=y
951CONFIG_FRAME_WARN=1024 967CONFIG_FRAME_WARN=1024
952# CONFIG_MAGIC_SYSRQ is not set 968# CONFIG_MAGIC_SYSRQ is not set
969# CONFIG_STRIP_ASM_SYMS is not set
953# CONFIG_UNUSED_SYMBOLS is not set 970# CONFIG_UNUSED_SYMBOLS is not set
954# CONFIG_DEBUG_FS is not set 971# CONFIG_DEBUG_FS is not set
955# CONFIG_HEADERS_CHECK is not set 972# CONFIG_HEADERS_CHECK is not set
@@ -967,6 +984,7 @@ CONFIG_SCHED_DEBUG=y
967# CONFIG_DEBUG_OBJECTS is not set 984# CONFIG_DEBUG_OBJECTS is not set
968# CONFIG_SLUB_DEBUG_ON is not set 985# CONFIG_SLUB_DEBUG_ON is not set
969# CONFIG_SLUB_STATS is not set 986# CONFIG_SLUB_STATS is not set
987# CONFIG_DEBUG_KMEMLEAK is not set
970# CONFIG_DEBUG_RT_MUTEXES is not set 988# CONFIG_DEBUG_RT_MUTEXES is not set
971# CONFIG_RT_MUTEX_TESTER is not set 989# CONFIG_RT_MUTEX_TESTER is not set
972# CONFIG_DEBUG_SPINLOCK is not set 990# CONFIG_DEBUG_SPINLOCK is not set
@@ -985,10 +1003,12 @@ CONFIG_DEBUG_MUTEXES=y
985# CONFIG_DEBUG_LIST is not set 1003# CONFIG_DEBUG_LIST is not set
986# CONFIG_DEBUG_SG is not set 1004# CONFIG_DEBUG_SG is not set
987# CONFIG_DEBUG_NOTIFIERS is not set 1005# CONFIG_DEBUG_NOTIFIERS is not set
1006# CONFIG_DEBUG_CREDENTIALS is not set
988# CONFIG_RCU_TORTURE_TEST is not set 1007# CONFIG_RCU_TORTURE_TEST is not set
989# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1008# CONFIG_RCU_CPU_STALL_DETECTOR is not set
990# CONFIG_BACKTRACE_SELF_TEST is not set 1009# CONFIG_BACKTRACE_SELF_TEST is not set
991# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 1010# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1011# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
992# CONFIG_FAULT_INJECTION is not set 1012# CONFIG_FAULT_INJECTION is not set
993# CONFIG_LATENCYTOP is not set 1013# CONFIG_LATENCYTOP is not set
994CONFIG_SYSCTL_SYSCALL_CHECK=y 1014CONFIG_SYSCTL_SYSCALL_CHECK=y
@@ -1011,10 +1031,10 @@ CONFIG_BRANCH_PROFILE_NONE=y
1011# CONFIG_KMEMTRACE is not set 1031# CONFIG_KMEMTRACE is not set
1012# CONFIG_WORKQUEUE_TRACER is not set 1032# CONFIG_WORKQUEUE_TRACER is not set
1013# CONFIG_BLK_DEV_IO_TRACE is not set 1033# CONFIG_BLK_DEV_IO_TRACE is not set
1034# CONFIG_DMA_API_DEBUG is not set
1014# CONFIG_SAMPLES is not set 1035# CONFIG_SAMPLES is not set
1015CONFIG_HAVE_ARCH_KGDB=y 1036CONFIG_HAVE_ARCH_KGDB=y
1016# CONFIG_KGDB is not set 1037# CONFIG_KGDB is not set
1017# CONFIG_KMEMCHECK is not set
1018# CONFIG_PPC_DISABLE_WERROR is not set 1038# CONFIG_PPC_DISABLE_WERROR is not set
1019CONFIG_PPC_WERROR=y 1039CONFIG_PPC_WERROR=y
1020CONFIG_PRINT_STACK_DEPTH=64 1040CONFIG_PRINT_STACK_DEPTH=64
@@ -1040,7 +1060,6 @@ CONFIG_CRYPTO=y
1040# 1060#
1041# Crypto core or helper 1061# Crypto core or helper
1042# 1062#
1043# CONFIG_CRYPTO_FIPS is not set
1044# CONFIG_CRYPTO_MANAGER is not set 1063# CONFIG_CRYPTO_MANAGER is not set
1045# CONFIG_CRYPTO_MANAGER2 is not set 1064# CONFIG_CRYPTO_MANAGER2 is not set
1046# CONFIG_CRYPTO_GF128MUL is not set 1065# CONFIG_CRYPTO_GF128MUL is not set
@@ -1071,11 +1090,13 @@ CONFIG_CRYPTO=y
1071# 1090#
1072# CONFIG_CRYPTO_HMAC is not set 1091# CONFIG_CRYPTO_HMAC is not set
1073# CONFIG_CRYPTO_XCBC is not set 1092# CONFIG_CRYPTO_XCBC is not set
1093# CONFIG_CRYPTO_VMAC is not set
1074 1094
1075# 1095#
1076# Digest 1096# Digest
1077# 1097#
1078# CONFIG_CRYPTO_CRC32C is not set 1098# CONFIG_CRYPTO_CRC32C is not set
1099# CONFIG_CRYPTO_GHASH is not set
1079# CONFIG_CRYPTO_MD4 is not set 1100# CONFIG_CRYPTO_MD4 is not set
1080# CONFIG_CRYPTO_MD5 is not set 1101# CONFIG_CRYPTO_MD5 is not set
1081# CONFIG_CRYPTO_MICHAEL_MIC is not set 1102# CONFIG_CRYPTO_MICHAEL_MIC is not set
diff --git a/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig b/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig
index 158e63e8607f..9b63e258dac6 100644
--- a/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig
+++ b/arch/powerpc/configs/85xx/mpc85xx_cds_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.31-rc4 3# Linux kernel version: 2.6.32-rc5
4# Wed Jul 29 23:32:17 2009 4# Thu Nov 5 08:20:35 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -22,6 +22,7 @@ CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set 22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y 23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y 24CONFIG_PPC_MMU_NOHASH=y
25CONFIG_PPC_MMU_NOHASH_32=y
25CONFIG_PPC_BOOK3E_MMU=y 26CONFIG_PPC_BOOK3E_MMU=y
26# CONFIG_PPC_MM_SLICES is not set 27# CONFIG_PPC_MM_SLICES is not set
27# CONFIG_SMP is not set 28# CONFIG_SMP is not set
@@ -36,6 +37,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
36CONFIG_GENERIC_HARDIRQS=y 37CONFIG_GENERIC_HARDIRQS=y
37CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 38CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
38# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
39CONFIG_IRQ_PER_CPU=y 41CONFIG_IRQ_PER_CPU=y
40CONFIG_STACKTRACE_SUPPORT=y 42CONFIG_STACKTRACE_SUPPORT=y
41CONFIG_HAVE_LATENCYTOP_SUPPORT=y 43CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -84,11 +86,12 @@ CONFIG_SYSVIPC_SYSCTL=y
84# 86#
85# RCU Subsystem 87# RCU Subsystem
86# 88#
87CONFIG_CLASSIC_RCU=y 89CONFIG_TREE_RCU=y
88# CONFIG_TREE_RCU is not set 90# CONFIG_TREE_PREEMPT_RCU is not set
89# CONFIG_PREEMPT_RCU is not set 91# CONFIG_RCU_TRACE is not set
92CONFIG_RCU_FANOUT=32
93# CONFIG_RCU_FANOUT_EXACT is not set
90# CONFIG_TREE_RCU_TRACE is not set 94# CONFIG_TREE_RCU_TRACE is not set
91# CONFIG_PREEMPT_RCU_TRACE is not set
92# CONFIG_IKCONFIG is not set 95# CONFIG_IKCONFIG is not set
93CONFIG_LOG_BUF_SHIFT=14 96CONFIG_LOG_BUF_SHIFT=14
94CONFIG_GROUP_SCHED=y 97CONFIG_GROUP_SCHED=y
@@ -126,28 +129,29 @@ CONFIG_TIMERFD=y
126CONFIG_EVENTFD=y 129CONFIG_EVENTFD=y
127CONFIG_SHMEM=y 130CONFIG_SHMEM=y
128CONFIG_AIO=y 131CONFIG_AIO=y
129CONFIG_HAVE_PERF_COUNTERS=y 132CONFIG_HAVE_PERF_EVENTS=y
130 133
131# 134#
132# Performance Counters 135# Kernel Performance Events And Counters
133# 136#
137# CONFIG_PERF_EVENTS is not set
134# CONFIG_PERF_COUNTERS is not set 138# CONFIG_PERF_COUNTERS is not set
135CONFIG_VM_EVENT_COUNTERS=y 139CONFIG_VM_EVENT_COUNTERS=y
136CONFIG_PCI_QUIRKS=y 140CONFIG_PCI_QUIRKS=y
137CONFIG_SLUB_DEBUG=y 141CONFIG_SLUB_DEBUG=y
138# CONFIG_STRIP_ASM_SYMS is not set
139CONFIG_COMPAT_BRK=y 142CONFIG_COMPAT_BRK=y
140# CONFIG_SLAB is not set 143# CONFIG_SLAB is not set
141CONFIG_SLUB=y 144CONFIG_SLUB=y
142# CONFIG_SLOB is not set 145# CONFIG_SLOB is not set
143# CONFIG_PROFILING is not set 146# CONFIG_PROFILING is not set
144# CONFIG_MARKERS is not set
145CONFIG_HAVE_OPROFILE=y 147CONFIG_HAVE_OPROFILE=y
146CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 148CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
147CONFIG_HAVE_IOREMAP_PROT=y 149CONFIG_HAVE_IOREMAP_PROT=y
148CONFIG_HAVE_KPROBES=y 150CONFIG_HAVE_KPROBES=y
149CONFIG_HAVE_KRETPROBES=y 151CONFIG_HAVE_KRETPROBES=y
150CONFIG_HAVE_ARCH_TRACEHOOK=y 152CONFIG_HAVE_ARCH_TRACEHOOK=y
153CONFIG_HAVE_DMA_ATTRS=y
154CONFIG_HAVE_DMA_API_DEBUG=y
151 155
152# 156#
153# GCOV-based kernel profiling 157# GCOV-based kernel profiling
@@ -190,6 +194,7 @@ CONFIG_MPC85xx_CDS=y
190# CONFIG_MPC85xx_MDS is not set 194# CONFIG_MPC85xx_MDS is not set
191# CONFIG_MPC8536_DS is not set 195# CONFIG_MPC8536_DS is not set
192# CONFIG_MPC85xx_DS is not set 196# CONFIG_MPC85xx_DS is not set
197# CONFIG_MPC85xx_RDB is not set
193# CONFIG_SOCRATES is not set 198# CONFIG_SOCRATES is not set
194# CONFIG_KSI8560 is not set 199# CONFIG_KSI8560 is not set
195# CONFIG_XES_MPC85xx is not set 200# CONFIG_XES_MPC85xx is not set
@@ -245,6 +250,7 @@ CONFIG_MATH_EMULATION=y
245CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 250CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
246CONFIG_ARCH_HAS_WALK_MEMORY=y 251CONFIG_ARCH_HAS_WALK_MEMORY=y
247CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 252CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
253CONFIG_MAX_ACTIVE_REGIONS=32
248CONFIG_ARCH_FLATMEM_ENABLE=y 254CONFIG_ARCH_FLATMEM_ENABLE=y
249CONFIG_ARCH_POPULATES_NODE_MAP=y 255CONFIG_ARCH_POPULATES_NODE_MAP=y
250CONFIG_SELECT_MEMORY_MODEL=y 256CONFIG_SELECT_MEMORY_MODEL=y
@@ -262,6 +268,7 @@ CONFIG_BOUNCE=y
262CONFIG_VIRT_TO_BUS=y 268CONFIG_VIRT_TO_BUS=y
263CONFIG_HAVE_MLOCK=y 269CONFIG_HAVE_MLOCK=y
264CONFIG_HAVE_MLOCKED_PAGE_BIT=y 270CONFIG_HAVE_MLOCKED_PAGE_BIT=y
271# CONFIG_KSM is not set
265CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 272CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
266CONFIG_PPC_4K_PAGES=y 273CONFIG_PPC_4K_PAGES=y
267# CONFIG_PPC_16K_PAGES is not set 274# CONFIG_PPC_16K_PAGES is not set
@@ -359,6 +366,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
359# CONFIG_NETFILTER is not set 366# CONFIG_NETFILTER is not set
360# CONFIG_IP_DCCP is not set 367# CONFIG_IP_DCCP is not set
361# CONFIG_IP_SCTP is not set 368# CONFIG_IP_SCTP is not set
369# CONFIG_RDS is not set
362# CONFIG_TIPC is not set 370# CONFIG_TIPC is not set
363# CONFIG_ATM is not set 371# CONFIG_ATM is not set
364# CONFIG_BRIDGE is not set 372# CONFIG_BRIDGE is not set
@@ -388,6 +396,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
388# CONFIG_AF_RXRPC is not set 396# CONFIG_AF_RXRPC is not set
389CONFIG_WIRELESS=y 397CONFIG_WIRELESS=y
390# CONFIG_CFG80211 is not set 398# CONFIG_CFG80211 is not set
399CONFIG_CFG80211_DEFAULT_PS_VALUE=0
391CONFIG_WIRELESS_OLD_REGULATORY=y 400CONFIG_WIRELESS_OLD_REGULATORY=y
392# CONFIG_WIRELESS_EXT is not set 401# CONFIG_WIRELESS_EXT is not set
393# CONFIG_LIB80211 is not set 402# CONFIG_LIB80211 is not set
@@ -395,7 +404,6 @@ CONFIG_WIRELESS_OLD_REGULATORY=y
395# 404#
396# CFG80211 needs to be enabled for MAC80211 405# CFG80211 needs to be enabled for MAC80211
397# 406#
398CONFIG_MAC80211_DEFAULT_PS_VALUE=0
399# CONFIG_WIMAX is not set 407# CONFIG_WIMAX is not set
400# CONFIG_RFKILL is not set 408# CONFIG_RFKILL is not set
401# CONFIG_NET_9P is not set 409# CONFIG_NET_9P is not set
@@ -408,6 +416,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
408# Generic Driver Options 416# Generic Driver Options
409# 417#
410CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 418CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
419# CONFIG_DEVTMPFS is not set
411CONFIG_STANDALONE=y 420CONFIG_STANDALONE=y
412CONFIG_PREVENT_FIRMWARE_BUILD=y 421CONFIG_PREVENT_FIRMWARE_BUILD=y
413# CONFIG_FW_LOADER is not set 422# CONFIG_FW_LOADER is not set
@@ -582,7 +591,9 @@ CONFIG_MII=y
582# CONFIG_NET_PCI is not set 591# CONFIG_NET_PCI is not set
583# CONFIG_B44 is not set 592# CONFIG_B44 is not set
584# CONFIG_KS8842 is not set 593# CONFIG_KS8842 is not set
594# CONFIG_KS8851_MLL is not set
585# CONFIG_ATL2 is not set 595# CONFIG_ATL2 is not set
596# CONFIG_XILINX_EMACLITE is not set
586CONFIG_NETDEV_1000=y 597CONFIG_NETDEV_1000=y
587# CONFIG_ACENIC is not set 598# CONFIG_ACENIC is not set
588# CONFIG_DL2K is not set 599# CONFIG_DL2K is not set
@@ -630,10 +641,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
630# CONFIG_SFC is not set 641# CONFIG_SFC is not set
631# CONFIG_BE2NET is not set 642# CONFIG_BE2NET is not set
632# CONFIG_TR is not set 643# CONFIG_TR is not set
633 644CONFIG_WLAN=y
634#
635# Wireless LAN
636#
637# CONFIG_WLAN_PRE80211 is not set 645# CONFIG_WLAN_PRE80211 is not set
638# CONFIG_WLAN_80211 is not set 646# CONFIG_WLAN_80211 is not set
639 647
@@ -737,6 +745,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
737# CONFIG_POWER_SUPPLY is not set 745# CONFIG_POWER_SUPPLY is not set
738CONFIG_HWMON=y 746CONFIG_HWMON=y
739# CONFIG_HWMON_VID is not set 747# CONFIG_HWMON_VID is not set
748# CONFIG_HWMON_DEBUG_CHIP is not set
749
750#
751# Native drivers
752#
740# CONFIG_SENSORS_I5K_AMB is not set 753# CONFIG_SENSORS_I5K_AMB is not set
741# CONFIG_SENSORS_F71805F is not set 754# CONFIG_SENSORS_F71805F is not set
742# CONFIG_SENSORS_F71882FG is not set 755# CONFIG_SENSORS_F71882FG is not set
@@ -751,9 +764,7 @@ CONFIG_HWMON=y
751# CONFIG_SENSORS_VT8231 is not set 764# CONFIG_SENSORS_VT8231 is not set
752# CONFIG_SENSORS_W83627HF is not set 765# CONFIG_SENSORS_W83627HF is not set
753# CONFIG_SENSORS_W83627EHF is not set 766# CONFIG_SENSORS_W83627EHF is not set
754# CONFIG_HWMON_DEBUG_CHIP is not set
755# CONFIG_THERMAL is not set 767# CONFIG_THERMAL is not set
756# CONFIG_THERMAL_HWMON is not set
757# CONFIG_WATCHDOG is not set 768# CONFIG_WATCHDOG is not set
758CONFIG_SSB_POSSIBLE=y 769CONFIG_SSB_POSSIBLE=y
759 770
@@ -776,6 +787,7 @@ CONFIG_SSB_POSSIBLE=y
776# Graphics support 787# Graphics support
777# 788#
778# CONFIG_AGP is not set 789# CONFIG_AGP is not set
790CONFIG_VGA_ARB=y
779# CONFIG_DRM is not set 791# CONFIG_DRM is not set
780# CONFIG_VGASTATE is not set 792# CONFIG_VGASTATE is not set
781CONFIG_VIDEO_OUTPUT_CONTROL=y 793CONFIG_VIDEO_OUTPUT_CONTROL=y
@@ -789,7 +801,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y
789# CONFIG_SOUND is not set 801# CONFIG_SOUND is not set
790CONFIG_HID_SUPPORT=y 802CONFIG_HID_SUPPORT=y
791CONFIG_HID=y 803CONFIG_HID=y
792# CONFIG_HID_DEBUG is not set
793# CONFIG_HIDRAW is not set 804# CONFIG_HIDRAW is not set
794# CONFIG_HID_PID is not set 805# CONFIG_HID_PID is not set
795 806
@@ -854,6 +865,7 @@ CONFIG_FS_MBCACHE=y
854# CONFIG_GFS2_FS is not set 865# CONFIG_GFS2_FS is not set
855# CONFIG_OCFS2_FS is not set 866# CONFIG_OCFS2_FS is not set
856# CONFIG_BTRFS_FS is not set 867# CONFIG_BTRFS_FS is not set
868# CONFIG_NILFS2_FS is not set
857CONFIG_FILE_LOCKING=y 869CONFIG_FILE_LOCKING=y
858CONFIG_FSNOTIFY=y 870CONFIG_FSNOTIFY=y
859CONFIG_DNOTIFY=y 871CONFIG_DNOTIFY=y
@@ -912,7 +924,6 @@ CONFIG_MISC_FILESYSTEMS=y
912# CONFIG_ROMFS_FS is not set 924# CONFIG_ROMFS_FS is not set
913# CONFIG_SYSV_FS is not set 925# CONFIG_SYSV_FS is not set
914# CONFIG_UFS_FS is not set 926# CONFIG_UFS_FS is not set
915# CONFIG_NILFS2_FS is not set
916CONFIG_NETWORK_FILESYSTEMS=y 927CONFIG_NETWORK_FILESYSTEMS=y
917CONFIG_NFS_FS=y 928CONFIG_NFS_FS=y
918# CONFIG_NFS_V3 is not set 929# CONFIG_NFS_V3 is not set
@@ -980,6 +991,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
980CONFIG_ENABLE_MUST_CHECK=y 991CONFIG_ENABLE_MUST_CHECK=y
981CONFIG_FRAME_WARN=1024 992CONFIG_FRAME_WARN=1024
982# CONFIG_MAGIC_SYSRQ is not set 993# CONFIG_MAGIC_SYSRQ is not set
994# CONFIG_STRIP_ASM_SYMS is not set
983# CONFIG_UNUSED_SYMBOLS is not set 995# CONFIG_UNUSED_SYMBOLS is not set
984# CONFIG_DEBUG_FS is not set 996# CONFIG_DEBUG_FS is not set
985# CONFIG_HEADERS_CHECK is not set 997# CONFIG_HEADERS_CHECK is not set
@@ -997,6 +1009,7 @@ CONFIG_SCHED_DEBUG=y
997# CONFIG_DEBUG_OBJECTS is not set 1009# CONFIG_DEBUG_OBJECTS is not set
998# CONFIG_SLUB_DEBUG_ON is not set 1010# CONFIG_SLUB_DEBUG_ON is not set
999# CONFIG_SLUB_STATS is not set 1011# CONFIG_SLUB_STATS is not set
1012# CONFIG_DEBUG_KMEMLEAK is not set
1000# CONFIG_DEBUG_RT_MUTEXES is not set 1013# CONFIG_DEBUG_RT_MUTEXES is not set
1001# CONFIG_RT_MUTEX_TESTER is not set 1014# CONFIG_RT_MUTEX_TESTER is not set
1002# CONFIG_DEBUG_SPINLOCK is not set 1015# CONFIG_DEBUG_SPINLOCK is not set
@@ -1015,10 +1028,12 @@ CONFIG_DEBUG_MUTEXES=y
1015# CONFIG_DEBUG_LIST is not set 1028# CONFIG_DEBUG_LIST is not set
1016# CONFIG_DEBUG_SG is not set 1029# CONFIG_DEBUG_SG is not set
1017# CONFIG_DEBUG_NOTIFIERS is not set 1030# CONFIG_DEBUG_NOTIFIERS is not set
1031# CONFIG_DEBUG_CREDENTIALS is not set
1018# CONFIG_RCU_TORTURE_TEST is not set 1032# CONFIG_RCU_TORTURE_TEST is not set
1019# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1033# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1020# CONFIG_BACKTRACE_SELF_TEST is not set 1034# CONFIG_BACKTRACE_SELF_TEST is not set
1021# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 1035# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1036# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
1022# CONFIG_FAULT_INJECTION is not set 1037# CONFIG_FAULT_INJECTION is not set
1023# CONFIG_LATENCYTOP is not set 1038# CONFIG_LATENCYTOP is not set
1024CONFIG_SYSCTL_SYSCALL_CHECK=y 1039CONFIG_SYSCTL_SYSCALL_CHECK=y
@@ -1041,10 +1056,10 @@ CONFIG_BRANCH_PROFILE_NONE=y
1041# CONFIG_KMEMTRACE is not set 1056# CONFIG_KMEMTRACE is not set
1042# CONFIG_WORKQUEUE_TRACER is not set 1057# CONFIG_WORKQUEUE_TRACER is not set
1043# CONFIG_BLK_DEV_IO_TRACE is not set 1058# CONFIG_BLK_DEV_IO_TRACE is not set
1059# CONFIG_DMA_API_DEBUG is not set
1044# CONFIG_SAMPLES is not set 1060# CONFIG_SAMPLES is not set
1045CONFIG_HAVE_ARCH_KGDB=y 1061CONFIG_HAVE_ARCH_KGDB=y
1046# CONFIG_KGDB is not set 1062# CONFIG_KGDB is not set
1047# CONFIG_KMEMCHECK is not set
1048# CONFIG_PPC_DISABLE_WERROR is not set 1063# CONFIG_PPC_DISABLE_WERROR is not set
1049CONFIG_PPC_WERROR=y 1064CONFIG_PPC_WERROR=y
1050CONFIG_PRINT_STACK_DEPTH=64 1065CONFIG_PRINT_STACK_DEPTH=64
@@ -1070,7 +1085,6 @@ CONFIG_CRYPTO=y
1070# 1085#
1071# Crypto core or helper 1086# Crypto core or helper
1072# 1087#
1073# CONFIG_CRYPTO_FIPS is not set
1074# CONFIG_CRYPTO_MANAGER is not set 1088# CONFIG_CRYPTO_MANAGER is not set
1075# CONFIG_CRYPTO_MANAGER2 is not set 1089# CONFIG_CRYPTO_MANAGER2 is not set
1076# CONFIG_CRYPTO_GF128MUL is not set 1090# CONFIG_CRYPTO_GF128MUL is not set
@@ -1101,11 +1115,13 @@ CONFIG_CRYPTO=y
1101# 1115#
1102# CONFIG_CRYPTO_HMAC is not set 1116# CONFIG_CRYPTO_HMAC is not set
1103# CONFIG_CRYPTO_XCBC is not set 1117# CONFIG_CRYPTO_XCBC is not set
1118# CONFIG_CRYPTO_VMAC is not set
1104 1119
1105# 1120#
1106# Digest 1121# Digest
1107# 1122#
1108# CONFIG_CRYPTO_CRC32C is not set 1123# CONFIG_CRYPTO_CRC32C is not set
1124# CONFIG_CRYPTO_GHASH is not set
1109# CONFIG_CRYPTO_MD4 is not set 1125# CONFIG_CRYPTO_MD4 is not set
1110# CONFIG_CRYPTO_MD5 is not set 1126# CONFIG_CRYPTO_MD5 is not set
1111# CONFIG_CRYPTO_MICHAEL_MIC is not set 1127# CONFIG_CRYPTO_MICHAEL_MIC is not set
diff --git a/arch/powerpc/configs/85xx/sbc8548_defconfig b/arch/powerpc/configs/85xx/sbc8548_defconfig
index 2726fca1d694..1b2356830173 100644
--- a/arch/powerpc/configs/85xx/sbc8548_defconfig
+++ b/arch/powerpc/configs/85xx/sbc8548_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.31-rc4 3# Linux kernel version: 2.6.32-rc5
4# Wed Jul 29 23:32:18 2009 4# Thu Nov 5 08:20:36 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -22,6 +22,7 @@ CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set 22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y 23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y 24CONFIG_PPC_MMU_NOHASH=y
25CONFIG_PPC_MMU_NOHASH_32=y
25CONFIG_PPC_BOOK3E_MMU=y 26CONFIG_PPC_BOOK3E_MMU=y
26# CONFIG_PPC_MM_SLICES is not set 27# CONFIG_PPC_MM_SLICES is not set
27# CONFIG_SMP is not set 28# CONFIG_SMP is not set
@@ -36,6 +37,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
36CONFIG_GENERIC_HARDIRQS=y 37CONFIG_GENERIC_HARDIRQS=y
37CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 38CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
38# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
39CONFIG_IRQ_PER_CPU=y 41CONFIG_IRQ_PER_CPU=y
40CONFIG_STACKTRACE_SUPPORT=y 42CONFIG_STACKTRACE_SUPPORT=y
41CONFIG_HAVE_LATENCYTOP_SUPPORT=y 43CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -84,11 +86,12 @@ CONFIG_SYSVIPC_SYSCTL=y
84# 86#
85# RCU Subsystem 87# RCU Subsystem
86# 88#
87CONFIG_CLASSIC_RCU=y 89CONFIG_TREE_RCU=y
88# CONFIG_TREE_RCU is not set 90# CONFIG_TREE_PREEMPT_RCU is not set
89# CONFIG_PREEMPT_RCU is not set 91# CONFIG_RCU_TRACE is not set
92CONFIG_RCU_FANOUT=32
93# CONFIG_RCU_FANOUT_EXACT is not set
90# CONFIG_TREE_RCU_TRACE is not set 94# CONFIG_TREE_RCU_TRACE is not set
91# CONFIG_PREEMPT_RCU_TRACE is not set
92# CONFIG_IKCONFIG is not set 95# CONFIG_IKCONFIG is not set
93CONFIG_LOG_BUF_SHIFT=14 96CONFIG_LOG_BUF_SHIFT=14
94CONFIG_GROUP_SCHED=y 97CONFIG_GROUP_SCHED=y
@@ -125,27 +128,28 @@ CONFIG_TIMERFD=y
125CONFIG_EVENTFD=y 128CONFIG_EVENTFD=y
126CONFIG_SHMEM=y 129CONFIG_SHMEM=y
127CONFIG_AIO=y 130CONFIG_AIO=y
128CONFIG_HAVE_PERF_COUNTERS=y 131CONFIG_HAVE_PERF_EVENTS=y
129 132
130# 133#
131# Performance Counters 134# Kernel Performance Events And Counters
132# 135#
136# CONFIG_PERF_EVENTS is not set
133# CONFIG_PERF_COUNTERS is not set 137# CONFIG_PERF_COUNTERS is not set
134CONFIG_VM_EVENT_COUNTERS=y 138CONFIG_VM_EVENT_COUNTERS=y
135CONFIG_PCI_QUIRKS=y 139CONFIG_PCI_QUIRKS=y
136# CONFIG_STRIP_ASM_SYMS is not set
137CONFIG_COMPAT_BRK=y 140CONFIG_COMPAT_BRK=y
138CONFIG_SLAB=y 141CONFIG_SLAB=y
139# CONFIG_SLUB is not set 142# CONFIG_SLUB is not set
140# CONFIG_SLOB is not set 143# CONFIG_SLOB is not set
141# CONFIG_PROFILING is not set 144# CONFIG_PROFILING is not set
142# CONFIG_MARKERS is not set
143CONFIG_HAVE_OPROFILE=y 145CONFIG_HAVE_OPROFILE=y
144CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 146CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
145CONFIG_HAVE_IOREMAP_PROT=y 147CONFIG_HAVE_IOREMAP_PROT=y
146CONFIG_HAVE_KPROBES=y 148CONFIG_HAVE_KPROBES=y
147CONFIG_HAVE_KRETPROBES=y 149CONFIG_HAVE_KRETPROBES=y
148CONFIG_HAVE_ARCH_TRACEHOOK=y 150CONFIG_HAVE_ARCH_TRACEHOOK=y
151CONFIG_HAVE_DMA_ATTRS=y
152CONFIG_HAVE_DMA_API_DEBUG=y
149 153
150# 154#
151# GCOV-based kernel profiling 155# GCOV-based kernel profiling
@@ -188,6 +192,7 @@ CONFIG_MPC85xx=y
188# CONFIG_MPC85xx_MDS is not set 192# CONFIG_MPC85xx_MDS is not set
189# CONFIG_MPC8536_DS is not set 193# CONFIG_MPC8536_DS is not set
190# CONFIG_MPC85xx_DS is not set 194# CONFIG_MPC85xx_DS is not set
195# CONFIG_MPC85xx_RDB is not set
191# CONFIG_SOCRATES is not set 196# CONFIG_SOCRATES is not set
192# CONFIG_KSI8560 is not set 197# CONFIG_KSI8560 is not set
193# CONFIG_XES_MPC85xx is not set 198# CONFIG_XES_MPC85xx is not set
@@ -242,6 +247,7 @@ CONFIG_MATH_EMULATION=y
242CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 247CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
243CONFIG_ARCH_HAS_WALK_MEMORY=y 248CONFIG_ARCH_HAS_WALK_MEMORY=y
244CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 249CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
250CONFIG_MAX_ACTIVE_REGIONS=32
245CONFIG_ARCH_FLATMEM_ENABLE=y 251CONFIG_ARCH_FLATMEM_ENABLE=y
246CONFIG_ARCH_POPULATES_NODE_MAP=y 252CONFIG_ARCH_POPULATES_NODE_MAP=y
247CONFIG_SELECT_MEMORY_MODEL=y 253CONFIG_SELECT_MEMORY_MODEL=y
@@ -259,6 +265,7 @@ CONFIG_BOUNCE=y
259CONFIG_VIRT_TO_BUS=y 265CONFIG_VIRT_TO_BUS=y
260CONFIG_HAVE_MLOCK=y 266CONFIG_HAVE_MLOCK=y
261CONFIG_HAVE_MLOCKED_PAGE_BIT=y 267CONFIG_HAVE_MLOCKED_PAGE_BIT=y
268# CONFIG_KSM is not set
262CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 269CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
263CONFIG_PPC_4K_PAGES=y 270CONFIG_PPC_4K_PAGES=y
264# CONFIG_PPC_16K_PAGES is not set 271# CONFIG_PPC_16K_PAGES is not set
@@ -355,6 +362,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
355# CONFIG_NETFILTER is not set 362# CONFIG_NETFILTER is not set
356# CONFIG_IP_DCCP is not set 363# CONFIG_IP_DCCP is not set
357# CONFIG_IP_SCTP is not set 364# CONFIG_IP_SCTP is not set
365# CONFIG_RDS is not set
358# CONFIG_TIPC is not set 366# CONFIG_TIPC is not set
359# CONFIG_ATM is not set 367# CONFIG_ATM is not set
360# CONFIG_BRIDGE is not set 368# CONFIG_BRIDGE is not set
@@ -384,6 +392,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
384# CONFIG_AF_RXRPC is not set 392# CONFIG_AF_RXRPC is not set
385CONFIG_WIRELESS=y 393CONFIG_WIRELESS=y
386# CONFIG_CFG80211 is not set 394# CONFIG_CFG80211 is not set
395CONFIG_CFG80211_DEFAULT_PS_VALUE=0
387CONFIG_WIRELESS_OLD_REGULATORY=y 396CONFIG_WIRELESS_OLD_REGULATORY=y
388# CONFIG_WIRELESS_EXT is not set 397# CONFIG_WIRELESS_EXT is not set
389# CONFIG_LIB80211 is not set 398# CONFIG_LIB80211 is not set
@@ -391,7 +400,6 @@ CONFIG_WIRELESS_OLD_REGULATORY=y
391# 400#
392# CFG80211 needs to be enabled for MAC80211 401# CFG80211 needs to be enabled for MAC80211
393# 402#
394CONFIG_MAC80211_DEFAULT_PS_VALUE=0
395# CONFIG_WIMAX is not set 403# CONFIG_WIMAX is not set
396# CONFIG_RFKILL is not set 404# CONFIG_RFKILL is not set
397# CONFIG_NET_9P is not set 405# CONFIG_NET_9P is not set
@@ -404,6 +412,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
404# Generic Driver Options 412# Generic Driver Options
405# 413#
406CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 414CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
415# CONFIG_DEVTMPFS is not set
407CONFIG_STANDALONE=y 416CONFIG_STANDALONE=y
408CONFIG_PREVENT_FIRMWARE_BUILD=y 417CONFIG_PREVENT_FIRMWARE_BUILD=y
409# CONFIG_FW_LOADER is not set 418# CONFIG_FW_LOADER is not set
@@ -521,7 +530,9 @@ CONFIG_MII=y
521# CONFIG_NET_PCI is not set 530# CONFIG_NET_PCI is not set
522# CONFIG_B44 is not set 531# CONFIG_B44 is not set
523# CONFIG_KS8842 is not set 532# CONFIG_KS8842 is not set
533# CONFIG_KS8851_MLL is not set
524# CONFIG_ATL2 is not set 534# CONFIG_ATL2 is not set
535# CONFIG_XILINX_EMACLITE is not set
525CONFIG_NETDEV_1000=y 536CONFIG_NETDEV_1000=y
526# CONFIG_ACENIC is not set 537# CONFIG_ACENIC is not set
527# CONFIG_DL2K is not set 538# CONFIG_DL2K is not set
@@ -569,10 +580,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
569# CONFIG_SFC is not set 580# CONFIG_SFC is not set
570# CONFIG_BE2NET is not set 581# CONFIG_BE2NET is not set
571# CONFIG_TR is not set 582# CONFIG_TR is not set
572 583CONFIG_WLAN=y
573#
574# Wireless LAN
575#
576# CONFIG_WLAN_PRE80211 is not set 584# CONFIG_WLAN_PRE80211 is not set
577# CONFIG_WLAN_80211 is not set 585# CONFIG_WLAN_80211 is not set
578 586
@@ -676,6 +684,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
676# CONFIG_POWER_SUPPLY is not set 684# CONFIG_POWER_SUPPLY is not set
677CONFIG_HWMON=y 685CONFIG_HWMON=y
678# CONFIG_HWMON_VID is not set 686# CONFIG_HWMON_VID is not set
687# CONFIG_HWMON_DEBUG_CHIP is not set
688
689#
690# Native drivers
691#
679# CONFIG_SENSORS_I5K_AMB is not set 692# CONFIG_SENSORS_I5K_AMB is not set
680# CONFIG_SENSORS_F71805F is not set 693# CONFIG_SENSORS_F71805F is not set
681# CONFIG_SENSORS_F71882FG is not set 694# CONFIG_SENSORS_F71882FG is not set
@@ -690,9 +703,7 @@ CONFIG_HWMON=y
690# CONFIG_SENSORS_VT8231 is not set 703# CONFIG_SENSORS_VT8231 is not set
691# CONFIG_SENSORS_W83627HF is not set 704# CONFIG_SENSORS_W83627HF is not set
692# CONFIG_SENSORS_W83627EHF is not set 705# CONFIG_SENSORS_W83627EHF is not set
693# CONFIG_HWMON_DEBUG_CHIP is not set
694# CONFIG_THERMAL is not set 706# CONFIG_THERMAL is not set
695# CONFIG_THERMAL_HWMON is not set
696# CONFIG_WATCHDOG is not set 707# CONFIG_WATCHDOG is not set
697CONFIG_SSB_POSSIBLE=y 708CONFIG_SSB_POSSIBLE=y
698 709
@@ -715,6 +726,7 @@ CONFIG_SSB_POSSIBLE=y
715# Graphics support 726# Graphics support
716# 727#
717# CONFIG_AGP is not set 728# CONFIG_AGP is not set
729CONFIG_VGA_ARB=y
718# CONFIG_DRM is not set 730# CONFIG_DRM is not set
719# CONFIG_VGASTATE is not set 731# CONFIG_VGASTATE is not set
720CONFIG_VIDEO_OUTPUT_CONTROL=y 732CONFIG_VIDEO_OUTPUT_CONTROL=y
@@ -758,6 +770,7 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y
758# CONFIG_GFS2_FS is not set 770# CONFIG_GFS2_FS is not set
759# CONFIG_OCFS2_FS is not set 771# CONFIG_OCFS2_FS is not set
760# CONFIG_BTRFS_FS is not set 772# CONFIG_BTRFS_FS is not set
773# CONFIG_NILFS2_FS is not set
761CONFIG_FILE_LOCKING=y 774CONFIG_FILE_LOCKING=y
762CONFIG_FSNOTIFY=y 775CONFIG_FSNOTIFY=y
763CONFIG_DNOTIFY=y 776CONFIG_DNOTIFY=y
@@ -816,7 +829,6 @@ CONFIG_MISC_FILESYSTEMS=y
816# CONFIG_ROMFS_FS is not set 829# CONFIG_ROMFS_FS is not set
817# CONFIG_SYSV_FS is not set 830# CONFIG_SYSV_FS is not set
818# CONFIG_UFS_FS is not set 831# CONFIG_UFS_FS is not set
819# CONFIG_NILFS2_FS is not set
820CONFIG_NETWORK_FILESYSTEMS=y 832CONFIG_NETWORK_FILESYSTEMS=y
821CONFIG_NFS_FS=y 833CONFIG_NFS_FS=y
822# CONFIG_NFS_V3 is not set 834# CONFIG_NFS_V3 is not set
@@ -872,6 +884,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
872CONFIG_ENABLE_MUST_CHECK=y 884CONFIG_ENABLE_MUST_CHECK=y
873CONFIG_FRAME_WARN=1024 885CONFIG_FRAME_WARN=1024
874# CONFIG_MAGIC_SYSRQ is not set 886# CONFIG_MAGIC_SYSRQ is not set
887# CONFIG_STRIP_ASM_SYMS is not set
875# CONFIG_UNUSED_SYMBOLS is not set 888# CONFIG_UNUSED_SYMBOLS is not set
876# CONFIG_DEBUG_FS is not set 889# CONFIG_DEBUG_FS is not set
877# CONFIG_HEADERS_CHECK is not set 890# CONFIG_HEADERS_CHECK is not set
@@ -887,6 +900,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
887CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 900CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
888CONFIG_TRACING_SUPPORT=y 901CONFIG_TRACING_SUPPORT=y
889# CONFIG_FTRACE is not set 902# CONFIG_FTRACE is not set
903# CONFIG_DMA_API_DEBUG is not set
890# CONFIG_SAMPLES is not set 904# CONFIG_SAMPLES is not set
891CONFIG_HAVE_ARCH_KGDB=y 905CONFIG_HAVE_ARCH_KGDB=y
892# CONFIG_PPC_DISABLE_WERROR is not set 906# CONFIG_PPC_DISABLE_WERROR is not set
@@ -907,7 +921,6 @@ CONFIG_CRYPTO=y
907# 921#
908# Crypto core or helper 922# Crypto core or helper
909# 923#
910# CONFIG_CRYPTO_FIPS is not set
911# CONFIG_CRYPTO_MANAGER is not set 924# CONFIG_CRYPTO_MANAGER is not set
912# CONFIG_CRYPTO_MANAGER2 is not set 925# CONFIG_CRYPTO_MANAGER2 is not set
913# CONFIG_CRYPTO_GF128MUL is not set 926# CONFIG_CRYPTO_GF128MUL is not set
@@ -938,11 +951,13 @@ CONFIG_CRYPTO=y
938# 951#
939# CONFIG_CRYPTO_HMAC is not set 952# CONFIG_CRYPTO_HMAC is not set
940# CONFIG_CRYPTO_XCBC is not set 953# CONFIG_CRYPTO_XCBC is not set
954# CONFIG_CRYPTO_VMAC is not set
941 955
942# 956#
943# Digest 957# Digest
944# 958#
945# CONFIG_CRYPTO_CRC32C is not set 959# CONFIG_CRYPTO_CRC32C is not set
960# CONFIG_CRYPTO_GHASH is not set
946# CONFIG_CRYPTO_MD4 is not set 961# CONFIG_CRYPTO_MD4 is not set
947# CONFIG_CRYPTO_MD5 is not set 962# CONFIG_CRYPTO_MD5 is not set
948# CONFIG_CRYPTO_MICHAEL_MIC is not set 963# CONFIG_CRYPTO_MICHAEL_MIC is not set
diff --git a/arch/powerpc/configs/85xx/sbc8560_defconfig b/arch/powerpc/configs/85xx/sbc8560_defconfig
index b0c469823b02..959d0281431b 100644
--- a/arch/powerpc/configs/85xx/sbc8560_defconfig
+++ b/arch/powerpc/configs/85xx/sbc8560_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.31-rc4 3# Linux kernel version: 2.6.32-rc5
4# Wed Jul 29 23:32:19 2009 4# Thu Nov 5 08:20:37 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -22,6 +22,7 @@ CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set 22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y 23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y 24CONFIG_PPC_MMU_NOHASH=y
25CONFIG_PPC_MMU_NOHASH_32=y
25CONFIG_PPC_BOOK3E_MMU=y 26CONFIG_PPC_BOOK3E_MMU=y
26# CONFIG_PPC_MM_SLICES is not set 27# CONFIG_PPC_MM_SLICES is not set
27# CONFIG_SMP is not set 28# CONFIG_SMP is not set
@@ -36,6 +37,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
36CONFIG_GENERIC_HARDIRQS=y 37CONFIG_GENERIC_HARDIRQS=y
37CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 38CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
38# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
39CONFIG_IRQ_PER_CPU=y 41CONFIG_IRQ_PER_CPU=y
40CONFIG_STACKTRACE_SUPPORT=y 42CONFIG_STACKTRACE_SUPPORT=y
41CONFIG_HAVE_LATENCYTOP_SUPPORT=y 43CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -84,11 +86,12 @@ CONFIG_SYSVIPC_SYSCTL=y
84# 86#
85# RCU Subsystem 87# RCU Subsystem
86# 88#
87CONFIG_CLASSIC_RCU=y 89CONFIG_TREE_RCU=y
88# CONFIG_TREE_RCU is not set 90# CONFIG_TREE_PREEMPT_RCU is not set
89# CONFIG_PREEMPT_RCU is not set 91# CONFIG_RCU_TRACE is not set
92CONFIG_RCU_FANOUT=32
93# CONFIG_RCU_FANOUT_EXACT is not set
90# CONFIG_TREE_RCU_TRACE is not set 94# CONFIG_TREE_RCU_TRACE is not set
91# CONFIG_PREEMPT_RCU_TRACE is not set
92# CONFIG_IKCONFIG is not set 95# CONFIG_IKCONFIG is not set
93CONFIG_LOG_BUF_SHIFT=14 96CONFIG_LOG_BUF_SHIFT=14
94CONFIG_GROUP_SCHED=y 97CONFIG_GROUP_SCHED=y
@@ -126,26 +129,27 @@ CONFIG_TIMERFD=y
126CONFIG_EVENTFD=y 129CONFIG_EVENTFD=y
127CONFIG_SHMEM=y 130CONFIG_SHMEM=y
128CONFIG_AIO=y 131CONFIG_AIO=y
129CONFIG_HAVE_PERF_COUNTERS=y 132CONFIG_HAVE_PERF_EVENTS=y
130 133
131# 134#
132# Performance Counters 135# Kernel Performance Events And Counters
133# 136#
137# CONFIG_PERF_EVENTS is not set
134# CONFIG_PERF_COUNTERS is not set 138# CONFIG_PERF_COUNTERS is not set
135CONFIG_VM_EVENT_COUNTERS=y 139CONFIG_VM_EVENT_COUNTERS=y
136# CONFIG_STRIP_ASM_SYMS is not set
137CONFIG_COMPAT_BRK=y 140CONFIG_COMPAT_BRK=y
138CONFIG_SLAB=y 141CONFIG_SLAB=y
139# CONFIG_SLUB is not set 142# CONFIG_SLUB is not set
140# CONFIG_SLOB is not set 143# CONFIG_SLOB is not set
141# CONFIG_PROFILING is not set 144# CONFIG_PROFILING is not set
142# CONFIG_MARKERS is not set
143CONFIG_HAVE_OPROFILE=y 145CONFIG_HAVE_OPROFILE=y
144CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 146CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
145CONFIG_HAVE_IOREMAP_PROT=y 147CONFIG_HAVE_IOREMAP_PROT=y
146CONFIG_HAVE_KPROBES=y 148CONFIG_HAVE_KPROBES=y
147CONFIG_HAVE_KRETPROBES=y 149CONFIG_HAVE_KRETPROBES=y
148CONFIG_HAVE_ARCH_TRACEHOOK=y 150CONFIG_HAVE_ARCH_TRACEHOOK=y
151CONFIG_HAVE_DMA_ATTRS=y
152CONFIG_HAVE_DMA_API_DEBUG=y
149 153
150# 154#
151# GCOV-based kernel profiling 155# GCOV-based kernel profiling
@@ -188,6 +192,7 @@ CONFIG_MPC85xx=y
188# CONFIG_MPC85xx_MDS is not set 192# CONFIG_MPC85xx_MDS is not set
189# CONFIG_MPC8536_DS is not set 193# CONFIG_MPC8536_DS is not set
190# CONFIG_MPC85xx_DS is not set 194# CONFIG_MPC85xx_DS is not set
195# CONFIG_MPC85xx_RDB is not set
191# CONFIG_SOCRATES is not set 196# CONFIG_SOCRATES is not set
192# CONFIG_KSI8560 is not set 197# CONFIG_KSI8560 is not set
193# CONFIG_XES_MPC85xx is not set 198# CONFIG_XES_MPC85xx is not set
@@ -242,6 +247,7 @@ CONFIG_BINFMT_MISC=y
242CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 247CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
243CONFIG_ARCH_HAS_WALK_MEMORY=y 248CONFIG_ARCH_HAS_WALK_MEMORY=y
244CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 249CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
250CONFIG_MAX_ACTIVE_REGIONS=32
245CONFIG_ARCH_FLATMEM_ENABLE=y 251CONFIG_ARCH_FLATMEM_ENABLE=y
246CONFIG_ARCH_POPULATES_NODE_MAP=y 252CONFIG_ARCH_POPULATES_NODE_MAP=y
247CONFIG_SELECT_MEMORY_MODEL=y 253CONFIG_SELECT_MEMORY_MODEL=y
@@ -259,6 +265,7 @@ CONFIG_BOUNCE=y
259CONFIG_VIRT_TO_BUS=y 265CONFIG_VIRT_TO_BUS=y
260CONFIG_HAVE_MLOCK=y 266CONFIG_HAVE_MLOCK=y
261CONFIG_HAVE_MLOCKED_PAGE_BIT=y 267CONFIG_HAVE_MLOCKED_PAGE_BIT=y
268# CONFIG_KSM is not set
262CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 269CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
263CONFIG_PPC_4K_PAGES=y 270CONFIG_PPC_4K_PAGES=y
264# CONFIG_PPC_16K_PAGES is not set 271# CONFIG_PPC_16K_PAGES is not set
@@ -347,6 +354,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
347# CONFIG_NETFILTER is not set 354# CONFIG_NETFILTER is not set
348# CONFIG_IP_DCCP is not set 355# CONFIG_IP_DCCP is not set
349# CONFIG_IP_SCTP is not set 356# CONFIG_IP_SCTP is not set
357# CONFIG_RDS is not set
350# CONFIG_TIPC is not set 358# CONFIG_TIPC is not set
351# CONFIG_ATM is not set 359# CONFIG_ATM is not set
352# CONFIG_BRIDGE is not set 360# CONFIG_BRIDGE is not set
@@ -376,6 +384,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
376# CONFIG_AF_RXRPC is not set 384# CONFIG_AF_RXRPC is not set
377CONFIG_WIRELESS=y 385CONFIG_WIRELESS=y
378# CONFIG_CFG80211 is not set 386# CONFIG_CFG80211 is not set
387CONFIG_CFG80211_DEFAULT_PS_VALUE=0
379CONFIG_WIRELESS_OLD_REGULATORY=y 388CONFIG_WIRELESS_OLD_REGULATORY=y
380# CONFIG_WIRELESS_EXT is not set 389# CONFIG_WIRELESS_EXT is not set
381# CONFIG_LIB80211 is not set 390# CONFIG_LIB80211 is not set
@@ -383,7 +392,6 @@ CONFIG_WIRELESS_OLD_REGULATORY=y
383# 392#
384# CFG80211 needs to be enabled for MAC80211 393# CFG80211 needs to be enabled for MAC80211
385# 394#
386CONFIG_MAC80211_DEFAULT_PS_VALUE=0
387# CONFIG_WIMAX is not set 395# CONFIG_WIMAX is not set
388# CONFIG_RFKILL is not set 396# CONFIG_RFKILL is not set
389# CONFIG_NET_9P is not set 397# CONFIG_NET_9P is not set
@@ -396,6 +404,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
396# Generic Driver Options 404# Generic Driver Options
397# 405#
398CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 406CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
407# CONFIG_DEVTMPFS is not set
399CONFIG_STANDALONE=y 408CONFIG_STANDALONE=y
400CONFIG_PREVENT_FIRMWARE_BUILD=y 409CONFIG_PREVENT_FIRMWARE_BUILD=y
401# CONFIG_FW_LOADER is not set 410# CONFIG_FW_LOADER is not set
@@ -481,15 +490,14 @@ CONFIG_MII=y
481# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set 490# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
482# CONFIG_B44 is not set 491# CONFIG_B44 is not set
483# CONFIG_KS8842 is not set 492# CONFIG_KS8842 is not set
493# CONFIG_KS8851_MLL is not set
494# CONFIG_XILINX_EMACLITE is not set
484CONFIG_NETDEV_1000=y 495CONFIG_NETDEV_1000=y
485CONFIG_FSL_PQ_MDIO=y 496CONFIG_FSL_PQ_MDIO=y
486CONFIG_GIANFAR=y 497CONFIG_GIANFAR=y
487# CONFIG_MV643XX_ETH is not set 498# CONFIG_MV643XX_ETH is not set
488CONFIG_NETDEV_10000=y 499CONFIG_NETDEV_10000=y
489 500CONFIG_WLAN=y
490#
491# Wireless LAN
492#
493# CONFIG_WLAN_PRE80211 is not set 501# CONFIG_WLAN_PRE80211 is not set
494# CONFIG_WLAN_80211 is not set 502# CONFIG_WLAN_80211 is not set
495 503
@@ -584,6 +592,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
584# CONFIG_POWER_SUPPLY is not set 592# CONFIG_POWER_SUPPLY is not set
585CONFIG_HWMON=y 593CONFIG_HWMON=y
586# CONFIG_HWMON_VID is not set 594# CONFIG_HWMON_VID is not set
595# CONFIG_HWMON_DEBUG_CHIP is not set
596
597#
598# Native drivers
599#
587# CONFIG_SENSORS_F71805F is not set 600# CONFIG_SENSORS_F71805F is not set
588# CONFIG_SENSORS_F71882FG is not set 601# CONFIG_SENSORS_F71882FG is not set
589# CONFIG_SENSORS_IT87 is not set 602# CONFIG_SENSORS_IT87 is not set
@@ -594,9 +607,7 @@ CONFIG_HWMON=y
594# CONFIG_SENSORS_VT1211 is not set 607# CONFIG_SENSORS_VT1211 is not set
595# CONFIG_SENSORS_W83627HF is not set 608# CONFIG_SENSORS_W83627HF is not set
596# CONFIG_SENSORS_W83627EHF is not set 609# CONFIG_SENSORS_W83627EHF is not set
597# CONFIG_HWMON_DEBUG_CHIP is not set
598# CONFIG_THERMAL is not set 610# CONFIG_THERMAL is not set
599# CONFIG_THERMAL_HWMON is not set
600# CONFIG_WATCHDOG is not set 611# CONFIG_WATCHDOG is not set
601CONFIG_SSB_POSSIBLE=y 612CONFIG_SSB_POSSIBLE=y
602 613
@@ -630,7 +641,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y
630# CONFIG_SOUND is not set 641# CONFIG_SOUND is not set
631CONFIG_HID_SUPPORT=y 642CONFIG_HID_SUPPORT=y
632CONFIG_HID=y 643CONFIG_HID=y
633# CONFIG_HID_DEBUG is not set
634# CONFIG_HIDRAW is not set 644# CONFIG_HIDRAW is not set
635# CONFIG_HID_PID is not set 645# CONFIG_HID_PID is not set
636 646
@@ -721,6 +731,7 @@ CONFIG_RTC_DRV_M48T59=y
721# CONFIG_GFS2_FS is not set 731# CONFIG_GFS2_FS is not set
722# CONFIG_OCFS2_FS is not set 732# CONFIG_OCFS2_FS is not set
723# CONFIG_BTRFS_FS is not set 733# CONFIG_BTRFS_FS is not set
734# CONFIG_NILFS2_FS is not set
724CONFIG_FILE_LOCKING=y 735CONFIG_FILE_LOCKING=y
725CONFIG_FSNOTIFY=y 736CONFIG_FSNOTIFY=y
726CONFIG_DNOTIFY=y 737CONFIG_DNOTIFY=y
@@ -779,7 +790,6 @@ CONFIG_MISC_FILESYSTEMS=y
779# CONFIG_ROMFS_FS is not set 790# CONFIG_ROMFS_FS is not set
780# CONFIG_SYSV_FS is not set 791# CONFIG_SYSV_FS is not set
781# CONFIG_UFS_FS is not set 792# CONFIG_UFS_FS is not set
782# CONFIG_NILFS2_FS is not set
783CONFIG_NETWORK_FILESYSTEMS=y 793CONFIG_NETWORK_FILESYSTEMS=y
784CONFIG_NFS_FS=y 794CONFIG_NFS_FS=y
785# CONFIG_NFS_V3 is not set 795# CONFIG_NFS_V3 is not set
@@ -847,6 +857,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
847CONFIG_ENABLE_MUST_CHECK=y 857CONFIG_ENABLE_MUST_CHECK=y
848CONFIG_FRAME_WARN=1024 858CONFIG_FRAME_WARN=1024
849CONFIG_MAGIC_SYSRQ=y 859CONFIG_MAGIC_SYSRQ=y
860# CONFIG_STRIP_ASM_SYMS is not set
850# CONFIG_UNUSED_SYMBOLS is not set 861# CONFIG_UNUSED_SYMBOLS is not set
851# CONFIG_DEBUG_FS is not set 862# CONFIG_DEBUG_FS is not set
852# CONFIG_HEADERS_CHECK is not set 863# CONFIG_HEADERS_CHECK is not set
@@ -863,6 +874,7 @@ CONFIG_SCHED_DEBUG=y
863# CONFIG_TIMER_STATS is not set 874# CONFIG_TIMER_STATS is not set
864# CONFIG_DEBUG_OBJECTS is not set 875# CONFIG_DEBUG_OBJECTS is not set
865# CONFIG_DEBUG_SLAB is not set 876# CONFIG_DEBUG_SLAB is not set
877# CONFIG_DEBUG_KMEMLEAK is not set
866# CONFIG_DEBUG_RT_MUTEXES is not set 878# CONFIG_DEBUG_RT_MUTEXES is not set
867# CONFIG_RT_MUTEX_TESTER is not set 879# CONFIG_RT_MUTEX_TESTER is not set
868# CONFIG_DEBUG_SPINLOCK is not set 880# CONFIG_DEBUG_SPINLOCK is not set
@@ -881,10 +893,12 @@ CONFIG_DEBUG_MUTEXES=y
881# CONFIG_DEBUG_LIST is not set 893# CONFIG_DEBUG_LIST is not set
882# CONFIG_DEBUG_SG is not set 894# CONFIG_DEBUG_SG is not set
883# CONFIG_DEBUG_NOTIFIERS is not set 895# CONFIG_DEBUG_NOTIFIERS is not set
896# CONFIG_DEBUG_CREDENTIALS is not set
884# CONFIG_RCU_TORTURE_TEST is not set 897# CONFIG_RCU_TORTURE_TEST is not set
885# CONFIG_RCU_CPU_STALL_DETECTOR is not set 898# CONFIG_RCU_CPU_STALL_DETECTOR is not set
886# CONFIG_BACKTRACE_SELF_TEST is not set 899# CONFIG_BACKTRACE_SELF_TEST is not set
887# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 900# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
901# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
888# CONFIG_FAULT_INJECTION is not set 902# CONFIG_FAULT_INJECTION is not set
889# CONFIG_LATENCYTOP is not set 903# CONFIG_LATENCYTOP is not set
890CONFIG_SYSCTL_SYSCALL_CHECK=y 904CONFIG_SYSCTL_SYSCALL_CHECK=y
@@ -907,10 +921,10 @@ CONFIG_BRANCH_PROFILE_NONE=y
907# CONFIG_KMEMTRACE is not set 921# CONFIG_KMEMTRACE is not set
908# CONFIG_WORKQUEUE_TRACER is not set 922# CONFIG_WORKQUEUE_TRACER is not set
909# CONFIG_BLK_DEV_IO_TRACE is not set 923# CONFIG_BLK_DEV_IO_TRACE is not set
924# CONFIG_DMA_API_DEBUG is not set
910# CONFIG_SAMPLES is not set 925# CONFIG_SAMPLES is not set
911CONFIG_HAVE_ARCH_KGDB=y 926CONFIG_HAVE_ARCH_KGDB=y
912# CONFIG_KGDB is not set 927# CONFIG_KGDB is not set
913# CONFIG_KMEMCHECK is not set
914# CONFIG_PPC_DISABLE_WERROR is not set 928# CONFIG_PPC_DISABLE_WERROR is not set
915CONFIG_PPC_WERROR=y 929CONFIG_PPC_WERROR=y
916CONFIG_PRINT_STACK_DEPTH=64 930CONFIG_PRINT_STACK_DEPTH=64
@@ -947,7 +961,6 @@ CONFIG_CRYPTO=y
947# 961#
948# Crypto core or helper 962# Crypto core or helper
949# 963#
950# CONFIG_CRYPTO_FIPS is not set
951# CONFIG_CRYPTO_MANAGER is not set 964# CONFIG_CRYPTO_MANAGER is not set
952# CONFIG_CRYPTO_MANAGER2 is not set 965# CONFIG_CRYPTO_MANAGER2 is not set
953# CONFIG_CRYPTO_GF128MUL is not set 966# CONFIG_CRYPTO_GF128MUL is not set
@@ -978,11 +991,13 @@ CONFIG_CRYPTO=y
978# 991#
979# CONFIG_CRYPTO_HMAC is not set 992# CONFIG_CRYPTO_HMAC is not set
980# CONFIG_CRYPTO_XCBC is not set 993# CONFIG_CRYPTO_XCBC is not set
994# CONFIG_CRYPTO_VMAC is not set
981 995
982# 996#
983# Digest 997# Digest
984# 998#
985# CONFIG_CRYPTO_CRC32C is not set 999# CONFIG_CRYPTO_CRC32C is not set
1000# CONFIG_CRYPTO_GHASH is not set
986# CONFIG_CRYPTO_MD4 is not set 1001# CONFIG_CRYPTO_MD4 is not set
987# CONFIG_CRYPTO_MD5 is not set 1002# CONFIG_CRYPTO_MD5 is not set
988# CONFIG_CRYPTO_MICHAEL_MIC is not set 1003# CONFIG_CRYPTO_MICHAEL_MIC is not set
diff --git a/arch/powerpc/configs/85xx/socrates_defconfig b/arch/powerpc/configs/85xx/socrates_defconfig
index 04c85dada845..7f5ec35bf199 100644
--- a/arch/powerpc/configs/85xx/socrates_defconfig
+++ b/arch/powerpc/configs/85xx/socrates_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.31-rc4 3# Linux kernel version: 2.6.32-rc5
4# Wed Jul 29 23:32:19 2009 4# Thu Nov 5 08:20:37 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -22,6 +22,7 @@ CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set 22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y 23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y 24CONFIG_PPC_MMU_NOHASH=y
25CONFIG_PPC_MMU_NOHASH_32=y
25CONFIG_PPC_BOOK3E_MMU=y 26CONFIG_PPC_BOOK3E_MMU=y
26# CONFIG_PPC_MM_SLICES is not set 27# CONFIG_PPC_MM_SLICES is not set
27# CONFIG_SMP is not set 28# CONFIG_SMP is not set
@@ -36,6 +37,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
36CONFIG_GENERIC_HARDIRQS=y 37CONFIG_GENERIC_HARDIRQS=y
37CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 38CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
38# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
39CONFIG_IRQ_PER_CPU=y 41CONFIG_IRQ_PER_CPU=y
40CONFIG_STACKTRACE_SUPPORT=y 42CONFIG_STACKTRACE_SUPPORT=y
41CONFIG_HAVE_LATENCYTOP_SUPPORT=y 43CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -84,11 +86,12 @@ CONFIG_SYSVIPC_SYSCTL=y
84# 86#
85# RCU Subsystem 87# RCU Subsystem
86# 88#
87CONFIG_CLASSIC_RCU=y 89CONFIG_TREE_RCU=y
88# CONFIG_TREE_RCU is not set 90# CONFIG_TREE_PREEMPT_RCU is not set
89# CONFIG_PREEMPT_RCU is not set 91# CONFIG_RCU_TRACE is not set
92CONFIG_RCU_FANOUT=32
93# CONFIG_RCU_FANOUT_EXACT is not set
90# CONFIG_TREE_RCU_TRACE is not set 94# CONFIG_TREE_RCU_TRACE is not set
91# CONFIG_PREEMPT_RCU_TRACE is not set
92# CONFIG_IKCONFIG is not set 95# CONFIG_IKCONFIG is not set
93CONFIG_LOG_BUF_SHIFT=16 96CONFIG_LOG_BUF_SHIFT=16
94CONFIG_GROUP_SCHED=y 97CONFIG_GROUP_SCHED=y
@@ -124,28 +127,29 @@ CONFIG_TIMERFD=y
124CONFIG_EVENTFD=y 127CONFIG_EVENTFD=y
125CONFIG_SHMEM=y 128CONFIG_SHMEM=y
126CONFIG_AIO=y 129CONFIG_AIO=y
127CONFIG_HAVE_PERF_COUNTERS=y 130CONFIG_HAVE_PERF_EVENTS=y
128 131
129# 132#
130# Performance Counters 133# Kernel Performance Events And Counters
131# 134#
135# CONFIG_PERF_EVENTS is not set
132# CONFIG_PERF_COUNTERS is not set 136# CONFIG_PERF_COUNTERS is not set
133CONFIG_VM_EVENT_COUNTERS=y 137CONFIG_VM_EVENT_COUNTERS=y
134CONFIG_PCI_QUIRKS=y 138CONFIG_PCI_QUIRKS=y
135CONFIG_SLUB_DEBUG=y 139CONFIG_SLUB_DEBUG=y
136# CONFIG_STRIP_ASM_SYMS is not set
137CONFIG_COMPAT_BRK=y 140CONFIG_COMPAT_BRK=y
138# CONFIG_SLAB is not set 141# CONFIG_SLAB is not set
139CONFIG_SLUB=y 142CONFIG_SLUB=y
140# CONFIG_SLOB is not set 143# CONFIG_SLOB is not set
141# CONFIG_PROFILING is not set 144# CONFIG_PROFILING is not set
142# CONFIG_MARKERS is not set
143CONFIG_HAVE_OPROFILE=y 145CONFIG_HAVE_OPROFILE=y
144CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 146CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
145CONFIG_HAVE_IOREMAP_PROT=y 147CONFIG_HAVE_IOREMAP_PROT=y
146CONFIG_HAVE_KPROBES=y 148CONFIG_HAVE_KPROBES=y
147CONFIG_HAVE_KRETPROBES=y 149CONFIG_HAVE_KRETPROBES=y
148CONFIG_HAVE_ARCH_TRACEHOOK=y 150CONFIG_HAVE_ARCH_TRACEHOOK=y
151CONFIG_HAVE_DMA_ATTRS=y
152CONFIG_HAVE_DMA_API_DEBUG=y
149 153
150# 154#
151# GCOV-based kernel profiling 155# GCOV-based kernel profiling
@@ -193,6 +197,7 @@ CONFIG_MPC85xx=y
193# CONFIG_MPC85xx_MDS is not set 197# CONFIG_MPC85xx_MDS is not set
194# CONFIG_MPC8536_DS is not set 198# CONFIG_MPC8536_DS is not set
195# CONFIG_MPC85xx_DS is not set 199# CONFIG_MPC85xx_DS is not set
200# CONFIG_MPC85xx_RDB is not set
196CONFIG_SOCRATES=y 201CONFIG_SOCRATES=y
197# CONFIG_KSI8560 is not set 202# CONFIG_KSI8560 is not set
198# CONFIG_XES_MPC85xx is not set 203# CONFIG_XES_MPC85xx is not set
@@ -247,6 +252,7 @@ CONFIG_MATH_EMULATION=y
247CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 252CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
248CONFIG_ARCH_HAS_WALK_MEMORY=y 253CONFIG_ARCH_HAS_WALK_MEMORY=y
249CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 254CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
255CONFIG_MAX_ACTIVE_REGIONS=32
250CONFIG_ARCH_FLATMEM_ENABLE=y 256CONFIG_ARCH_FLATMEM_ENABLE=y
251CONFIG_ARCH_POPULATES_NODE_MAP=y 257CONFIG_ARCH_POPULATES_NODE_MAP=y
252CONFIG_SELECT_MEMORY_MODEL=y 258CONFIG_SELECT_MEMORY_MODEL=y
@@ -264,6 +270,7 @@ CONFIG_BOUNCE=y
264CONFIG_VIRT_TO_BUS=y 270CONFIG_VIRT_TO_BUS=y
265CONFIG_HAVE_MLOCK=y 271CONFIG_HAVE_MLOCK=y
266CONFIG_HAVE_MLOCKED_PAGE_BIT=y 272CONFIG_HAVE_MLOCKED_PAGE_BIT=y
273# CONFIG_KSM is not set
267CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 274CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
268CONFIG_PPC_4K_PAGES=y 275CONFIG_PPC_4K_PAGES=y
269# CONFIG_PPC_16K_PAGES is not set 276# CONFIG_PPC_16K_PAGES is not set
@@ -358,6 +365,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
358# CONFIG_NETFILTER is not set 365# CONFIG_NETFILTER is not set
359# CONFIG_IP_DCCP is not set 366# CONFIG_IP_DCCP is not set
360# CONFIG_IP_SCTP is not set 367# CONFIG_IP_SCTP is not set
368# CONFIG_RDS is not set
361# CONFIG_TIPC is not set 369# CONFIG_TIPC is not set
362# CONFIG_ATM is not set 370# CONFIG_ATM is not set
363# CONFIG_BRIDGE is not set 371# CONFIG_BRIDGE is not set
@@ -396,6 +404,7 @@ CONFIG_CAN_BCM=y
396# CONFIG_AF_RXRPC is not set 404# CONFIG_AF_RXRPC is not set
397CONFIG_WIRELESS=y 405CONFIG_WIRELESS=y
398# CONFIG_CFG80211 is not set 406# CONFIG_CFG80211 is not set
407CONFIG_CFG80211_DEFAULT_PS_VALUE=0
399# CONFIG_WIRELESS_OLD_REGULATORY is not set 408# CONFIG_WIRELESS_OLD_REGULATORY is not set
400# CONFIG_WIRELESS_EXT is not set 409# CONFIG_WIRELESS_EXT is not set
401# CONFIG_LIB80211 is not set 410# CONFIG_LIB80211 is not set
@@ -403,7 +412,6 @@ CONFIG_WIRELESS=y
403# 412#
404# CFG80211 needs to be enabled for MAC80211 413# CFG80211 needs to be enabled for MAC80211
405# 414#
406CONFIG_MAC80211_DEFAULT_PS_VALUE=0
407# CONFIG_WIMAX is not set 415# CONFIG_WIMAX is not set
408# CONFIG_RFKILL is not set 416# CONFIG_RFKILL is not set
409# CONFIG_NET_9P is not set 417# CONFIG_NET_9P is not set
@@ -421,9 +429,9 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
421# CONFIG_CONNECTOR is not set 429# CONFIG_CONNECTOR is not set
422CONFIG_MTD=y 430CONFIG_MTD=y
423# CONFIG_MTD_DEBUG is not set 431# CONFIG_MTD_DEBUG is not set
432# CONFIG_MTD_TESTS is not set
424CONFIG_MTD_CONCAT=y 433CONFIG_MTD_CONCAT=y
425CONFIG_MTD_PARTITIONS=y 434CONFIG_MTD_PARTITIONS=y
426# CONFIG_MTD_TESTS is not set
427# CONFIG_MTD_REDBOOT_PARTS is not set 435# CONFIG_MTD_REDBOOT_PARTS is not set
428CONFIG_MTD_CMDLINE_PARTS=y 436CONFIG_MTD_CMDLINE_PARTS=y
429CONFIG_MTD_OF_PARTS=y 437CONFIG_MTD_OF_PARTS=y
@@ -482,6 +490,7 @@ CONFIG_MTD_PHYSMAP_OF=y
482# CONFIG_MTD_PMC551 is not set 490# CONFIG_MTD_PMC551 is not set
483# CONFIG_MTD_DATAFLASH is not set 491# CONFIG_MTD_DATAFLASH is not set
484# CONFIG_MTD_M25P80 is not set 492# CONFIG_MTD_M25P80 is not set
493# CONFIG_MTD_SST25L is not set
485# CONFIG_MTD_SLRAM is not set 494# CONFIG_MTD_SLRAM is not set
486# CONFIG_MTD_PHRAM is not set 495# CONFIG_MTD_PHRAM is not set
487# CONFIG_MTD_MTDRAM is not set 496# CONFIG_MTD_MTDRAM is not set
@@ -668,7 +677,9 @@ CONFIG_MII=y
668# CONFIG_B44 is not set 677# CONFIG_B44 is not set
669# CONFIG_KS8842 is not set 678# CONFIG_KS8842 is not set
670# CONFIG_KS8851 is not set 679# CONFIG_KS8851 is not set
680# CONFIG_KS8851_MLL is not set
671# CONFIG_ATL2 is not set 681# CONFIG_ATL2 is not set
682# CONFIG_XILINX_EMACLITE is not set
672CONFIG_NETDEV_1000=y 683CONFIG_NETDEV_1000=y
673# CONFIG_ACENIC is not set 684# CONFIG_ACENIC is not set
674# CONFIG_DL2K is not set 685# CONFIG_DL2K is not set
@@ -698,10 +709,7 @@ CONFIG_GIANFAR=y
698# CONFIG_JME is not set 709# CONFIG_JME is not set
699# CONFIG_NETDEV_10000 is not set 710# CONFIG_NETDEV_10000 is not set
700# CONFIG_TR is not set 711# CONFIG_TR is not set
701 712CONFIG_WLAN=y
702#
703# Wireless LAN
704#
705# CONFIG_WLAN_PRE80211 is not set 713# CONFIG_WLAN_PRE80211 is not set
706# CONFIG_WLAN_80211 is not set 714# CONFIG_WLAN_80211 is not set
707 715
@@ -765,6 +773,7 @@ CONFIG_INPUT_TOUCHSCREEN=y
765# CONFIG_TOUCHSCREEN_GUNZE is not set 773# CONFIG_TOUCHSCREEN_GUNZE is not set
766# CONFIG_TOUCHSCREEN_ELO is not set 774# CONFIG_TOUCHSCREEN_ELO is not set
767# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set 775# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
776# CONFIG_TOUCHSCREEN_MCS5000 is not set
768# CONFIG_TOUCHSCREEN_MTOUCH is not set 777# CONFIG_TOUCHSCREEN_MTOUCH is not set
769# CONFIG_TOUCHSCREEN_INEXIO is not set 778# CONFIG_TOUCHSCREEN_INEXIO is not set
770# CONFIG_TOUCHSCREEN_MK712 is not set 779# CONFIG_TOUCHSCREEN_MK712 is not set
@@ -774,7 +783,6 @@ CONFIG_INPUT_TOUCHSCREEN=y
774# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set 783# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
775# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set 784# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
776# CONFIG_TOUCHSCREEN_TSC2007 is not set 785# CONFIG_TOUCHSCREEN_TSC2007 is not set
777# CONFIG_TOUCHSCREEN_W90X900 is not set
778# CONFIG_INPUT_MISC is not set 786# CONFIG_INPUT_MISC is not set
779 787
780# 788#
@@ -834,6 +842,7 @@ CONFIG_HW_RANDOM=y
834CONFIG_DEVPORT=y 842CONFIG_DEVPORT=y
835CONFIG_I2C=y 843CONFIG_I2C=y
836CONFIG_I2C_BOARDINFO=y 844CONFIG_I2C_BOARDINFO=y
845CONFIG_I2C_COMPAT=y
837CONFIG_I2C_CHARDEV=y 846CONFIG_I2C_CHARDEV=y
838CONFIG_I2C_HELPER_AUTO=y 847CONFIG_I2C_HELPER_AUTO=y
839 848
@@ -888,9 +897,6 @@ CONFIG_I2C_MPC=y
888# Miscellaneous I2C Chip support 897# Miscellaneous I2C Chip support
889# 898#
890# CONFIG_DS1682 is not set 899# CONFIG_DS1682 is not set
891# CONFIG_SENSORS_PCF8574 is not set
892# CONFIG_PCF8575 is not set
893# CONFIG_SENSORS_PCA9539 is not set
894# CONFIG_SENSORS_TSL2550 is not set 900# CONFIG_SENSORS_TSL2550 is not set
895# CONFIG_I2C_DEBUG_CORE is not set 901# CONFIG_I2C_DEBUG_CORE is not set
896# CONFIG_I2C_DEBUG_ALGO is not set 902# CONFIG_I2C_DEBUG_ALGO is not set
@@ -921,6 +927,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
921# CONFIG_POWER_SUPPLY is not set 927# CONFIG_POWER_SUPPLY is not set
922CONFIG_HWMON=y 928CONFIG_HWMON=y
923CONFIG_HWMON_VID=y 929CONFIG_HWMON_VID=y
930CONFIG_HWMON_DEBUG_CHIP=y
931
932#
933# Native drivers
934#
924# CONFIG_SENSORS_AD7414 is not set 935# CONFIG_SENSORS_AD7414 is not set
925# CONFIG_SENSORS_AD7418 is not set 936# CONFIG_SENSORS_AD7418 is not set
926# CONFIG_SENSORS_ADCXX is not set 937# CONFIG_SENSORS_ADCXX is not set
@@ -973,6 +984,7 @@ CONFIG_SENSORS_LM75=y
973# CONFIG_SENSORS_ADS7828 is not set 984# CONFIG_SENSORS_ADS7828 is not set
974# CONFIG_SENSORS_THMC50 is not set 985# CONFIG_SENSORS_THMC50 is not set
975# CONFIG_SENSORS_TMP401 is not set 986# CONFIG_SENSORS_TMP401 is not set
987# CONFIG_SENSORS_TMP421 is not set
976# CONFIG_SENSORS_VIA686A is not set 988# CONFIG_SENSORS_VIA686A is not set
977# CONFIG_SENSORS_VT1211 is not set 989# CONFIG_SENSORS_VT1211 is not set
978# CONFIG_SENSORS_VT8231 is not set 990# CONFIG_SENSORS_VT8231 is not set
@@ -985,9 +997,7 @@ CONFIG_SENSORS_W83781D=y
985# CONFIG_SENSORS_W83627HF is not set 997# CONFIG_SENSORS_W83627HF is not set
986# CONFIG_SENSORS_W83627EHF is not set 998# CONFIG_SENSORS_W83627EHF is not set
987# CONFIG_SENSORS_LIS3_SPI is not set 999# CONFIG_SENSORS_LIS3_SPI is not set
988CONFIG_HWMON_DEBUG_CHIP=y
989# CONFIG_THERMAL is not set 1000# CONFIG_THERMAL is not set
990# CONFIG_THERMAL_HWMON is not set
991# CONFIG_WATCHDOG is not set 1001# CONFIG_WATCHDOG is not set
992CONFIG_SSB_POSSIBLE=y 1002CONFIG_SSB_POSSIBLE=y
993 1003
@@ -1006,8 +1016,10 @@ CONFIG_SSB_POSSIBLE=y
1006# CONFIG_MFD_TMIO is not set 1016# CONFIG_MFD_TMIO is not set
1007# CONFIG_PMIC_DA903X is not set 1017# CONFIG_PMIC_DA903X is not set
1008# CONFIG_MFD_WM8400 is not set 1018# CONFIG_MFD_WM8400 is not set
1019# CONFIG_MFD_WM831X is not set
1009# CONFIG_MFD_WM8350_I2C is not set 1020# CONFIG_MFD_WM8350_I2C is not set
1010# CONFIG_MFD_PCF50633 is not set 1021# CONFIG_MFD_PCF50633 is not set
1022# CONFIG_MFD_MC13783 is not set
1011# CONFIG_AB3100_CORE is not set 1023# CONFIG_AB3100_CORE is not set
1012# CONFIG_EZX_PCAP is not set 1024# CONFIG_EZX_PCAP is not set
1013# CONFIG_REGULATOR is not set 1025# CONFIG_REGULATOR is not set
@@ -1017,6 +1029,7 @@ CONFIG_SSB_POSSIBLE=y
1017# Graphics support 1029# Graphics support
1018# 1030#
1019# CONFIG_AGP is not set 1031# CONFIG_AGP is not set
1032CONFIG_VGA_ARB=y
1020# CONFIG_DRM is not set 1033# CONFIG_DRM is not set
1021# CONFIG_VGASTATE is not set 1034# CONFIG_VGASTATE is not set
1022# CONFIG_VIDEO_OUTPUT_CONTROL is not set 1035# CONFIG_VIDEO_OUTPUT_CONTROL is not set
@@ -1112,7 +1125,6 @@ CONFIG_FONT_8x16=y
1112# CONFIG_SOUND is not set 1125# CONFIG_SOUND is not set
1113CONFIG_HID_SUPPORT=y 1126CONFIG_HID_SUPPORT=y
1114CONFIG_HID=y 1127CONFIG_HID=y
1115# CONFIG_HID_DEBUG is not set
1116# CONFIG_HIDRAW is not set 1128# CONFIG_HIDRAW is not set
1117 1129
1118# 1130#
@@ -1135,6 +1147,7 @@ CONFIG_USB_HID=y
1135# CONFIG_HID_EZKEY is not set 1147# CONFIG_HID_EZKEY is not set
1136# CONFIG_HID_KYE is not set 1148# CONFIG_HID_KYE is not set
1137# CONFIG_HID_GYRATION is not set 1149# CONFIG_HID_GYRATION is not set
1150# CONFIG_HID_TWINHAN is not set
1138# CONFIG_HID_KENSINGTON is not set 1151# CONFIG_HID_KENSINGTON is not set
1139# CONFIG_HID_LOGITECH is not set 1152# CONFIG_HID_LOGITECH is not set
1140# CONFIG_HID_MICROSOFT is not set 1153# CONFIG_HID_MICROSOFT is not set
@@ -1184,6 +1197,7 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y
1184# CONFIG_USB_OXU210HP_HCD is not set 1197# CONFIG_USB_OXU210HP_HCD is not set
1185# CONFIG_USB_ISP116X_HCD is not set 1198# CONFIG_USB_ISP116X_HCD is not set
1186# CONFIG_USB_ISP1760_HCD is not set 1199# CONFIG_USB_ISP1760_HCD is not set
1200# CONFIG_USB_ISP1362_HCD is not set
1187CONFIG_USB_OHCI_HCD=y 1201CONFIG_USB_OHCI_HCD=y
1188CONFIG_USB_OHCI_HCD_PPC_OF_BE=y 1202CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
1189# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set 1203# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set
@@ -1319,6 +1333,7 @@ CONFIG_RTC_INTF_DEV=y
1319# CONFIG_RTC_DRV_R9701 is not set 1333# CONFIG_RTC_DRV_R9701 is not set
1320# CONFIG_RTC_DRV_RS5C348 is not set 1334# CONFIG_RTC_DRV_RS5C348 is not set
1321# CONFIG_RTC_DRV_DS3234 is not set 1335# CONFIG_RTC_DRV_DS3234 is not set
1336# CONFIG_RTC_DRV_PCF2123 is not set
1322 1337
1323# 1338#
1324# Platform RTC drivers 1339# Platform RTC drivers
@@ -1369,6 +1384,7 @@ CONFIG_FS_MBCACHE=y
1369# CONFIG_GFS2_FS is not set 1384# CONFIG_GFS2_FS is not set
1370# CONFIG_OCFS2_FS is not set 1385# CONFIG_OCFS2_FS is not set
1371# CONFIG_BTRFS_FS is not set 1386# CONFIG_BTRFS_FS is not set
1387# CONFIG_NILFS2_FS is not set
1372CONFIG_FILE_LOCKING=y 1388CONFIG_FILE_LOCKING=y
1373CONFIG_FSNOTIFY=y 1389CONFIG_FSNOTIFY=y
1374CONFIG_DNOTIFY=y 1390CONFIG_DNOTIFY=y
@@ -1438,7 +1454,6 @@ CONFIG_CRAMFS=y
1438# CONFIG_ROMFS_FS is not set 1454# CONFIG_ROMFS_FS is not set
1439# CONFIG_SYSV_FS is not set 1455# CONFIG_SYSV_FS is not set
1440# CONFIG_UFS_FS is not set 1456# CONFIG_UFS_FS is not set
1441# CONFIG_NILFS2_FS is not set
1442CONFIG_NETWORK_FILESYSTEMS=y 1457CONFIG_NETWORK_FILESYSTEMS=y
1443CONFIG_NFS_FS=y 1458CONFIG_NFS_FS=y
1444CONFIG_NFS_V3=y 1459CONFIG_NFS_V3=y
@@ -1552,6 +1567,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
1552CONFIG_ENABLE_MUST_CHECK=y 1567CONFIG_ENABLE_MUST_CHECK=y
1553CONFIG_FRAME_WARN=1024 1568CONFIG_FRAME_WARN=1024
1554# CONFIG_MAGIC_SYSRQ is not set 1569# CONFIG_MAGIC_SYSRQ is not set
1570# CONFIG_STRIP_ASM_SYMS is not set
1555# CONFIG_UNUSED_SYMBOLS is not set 1571# CONFIG_UNUSED_SYMBOLS is not set
1556# CONFIG_DEBUG_FS is not set 1572# CONFIG_DEBUG_FS is not set
1557# CONFIG_HEADERS_CHECK is not set 1573# CONFIG_HEADERS_CHECK is not set
@@ -1569,6 +1585,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
1569CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1585CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1570CONFIG_TRACING_SUPPORT=y 1586CONFIG_TRACING_SUPPORT=y
1571# CONFIG_FTRACE is not set 1587# CONFIG_FTRACE is not set
1588# CONFIG_DMA_API_DEBUG is not set
1572# CONFIG_SAMPLES is not set 1589# CONFIG_SAMPLES is not set
1573CONFIG_HAVE_ARCH_KGDB=y 1590CONFIG_HAVE_ARCH_KGDB=y
1574# CONFIG_PPC_DISABLE_WERROR is not set 1591# CONFIG_PPC_DISABLE_WERROR is not set
@@ -1589,7 +1606,6 @@ CONFIG_CRYPTO=y
1589# 1606#
1590# Crypto core or helper 1607# Crypto core or helper
1591# 1608#
1592# CONFIG_CRYPTO_FIPS is not set
1593# CONFIG_CRYPTO_MANAGER is not set 1609# CONFIG_CRYPTO_MANAGER is not set
1594# CONFIG_CRYPTO_MANAGER2 is not set 1610# CONFIG_CRYPTO_MANAGER2 is not set
1595# CONFIG_CRYPTO_GF128MUL is not set 1611# CONFIG_CRYPTO_GF128MUL is not set
@@ -1621,11 +1637,13 @@ CONFIG_CRYPTO=y
1621# 1637#
1622# CONFIG_CRYPTO_HMAC is not set 1638# CONFIG_CRYPTO_HMAC is not set
1623# CONFIG_CRYPTO_XCBC is not set 1639# CONFIG_CRYPTO_XCBC is not set
1640# CONFIG_CRYPTO_VMAC is not set
1624 1641
1625# 1642#
1626# Digest 1643# Digest
1627# 1644#
1628# CONFIG_CRYPTO_CRC32C is not set 1645# CONFIG_CRYPTO_CRC32C is not set
1646# CONFIG_CRYPTO_GHASH is not set
1629# CONFIG_CRYPTO_MD4 is not set 1647# CONFIG_CRYPTO_MD4 is not set
1630# CONFIG_CRYPTO_MD5 is not set 1648# CONFIG_CRYPTO_MD5 is not set
1631# CONFIG_CRYPTO_MICHAEL_MIC is not set 1649# CONFIG_CRYPTO_MICHAEL_MIC is not set
diff --git a/arch/powerpc/configs/85xx/stx_gp3_defconfig b/arch/powerpc/configs/85xx/stx_gp3_defconfig
index e7e81d6769fe..c8327e88a987 100644
--- a/arch/powerpc/configs/85xx/stx_gp3_defconfig
+++ b/arch/powerpc/configs/85xx/stx_gp3_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.31-rc4 3# Linux kernel version: 2.6.32-rc5
4# Wed Jul 29 23:32:20 2009 4# Thu Nov 5 08:20:38 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -22,6 +22,7 @@ CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set 22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y 23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y 24CONFIG_PPC_MMU_NOHASH=y
25CONFIG_PPC_MMU_NOHASH_32=y
25CONFIG_PPC_BOOK3E_MMU=y 26CONFIG_PPC_BOOK3E_MMU=y
26# CONFIG_PPC_MM_SLICES is not set 27# CONFIG_PPC_MM_SLICES is not set
27# CONFIG_SMP is not set 28# CONFIG_SMP is not set
@@ -36,6 +37,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
36CONFIG_GENERIC_HARDIRQS=y 37CONFIG_GENERIC_HARDIRQS=y
37CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 38CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
38# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
39CONFIG_IRQ_PER_CPU=y 41CONFIG_IRQ_PER_CPU=y
40CONFIG_STACKTRACE_SUPPORT=y 42CONFIG_STACKTRACE_SUPPORT=y
41CONFIG_HAVE_LATENCYTOP_SUPPORT=y 43CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -85,11 +87,12 @@ CONFIG_SYSVIPC_SYSCTL=y
85# 87#
86# RCU Subsystem 88# RCU Subsystem
87# 89#
88CONFIG_CLASSIC_RCU=y 90CONFIG_TREE_RCU=y
89# CONFIG_TREE_RCU is not set 91# CONFIG_TREE_PREEMPT_RCU is not set
90# CONFIG_PREEMPT_RCU is not set 92# CONFIG_RCU_TRACE is not set
93CONFIG_RCU_FANOUT=32
94# CONFIG_RCU_FANOUT_EXACT is not set
91# CONFIG_TREE_RCU_TRACE is not set 95# CONFIG_TREE_RCU_TRACE is not set
92# CONFIG_PREEMPT_RCU_TRACE is not set
93# CONFIG_IKCONFIG is not set 96# CONFIG_IKCONFIG is not set
94CONFIG_LOG_BUF_SHIFT=14 97CONFIG_LOG_BUF_SHIFT=14
95CONFIG_GROUP_SCHED=y 98CONFIG_GROUP_SCHED=y
@@ -127,22 +130,21 @@ CONFIG_TIMERFD=y
127CONFIG_EVENTFD=y 130CONFIG_EVENTFD=y
128CONFIG_SHMEM=y 131CONFIG_SHMEM=y
129CONFIG_AIO=y 132CONFIG_AIO=y
130CONFIG_HAVE_PERF_COUNTERS=y 133CONFIG_HAVE_PERF_EVENTS=y
131 134
132# 135#
133# Performance Counters 136# Kernel Performance Events And Counters
134# 137#
138# CONFIG_PERF_EVENTS is not set
135# CONFIG_PERF_COUNTERS is not set 139# CONFIG_PERF_COUNTERS is not set
136CONFIG_VM_EVENT_COUNTERS=y 140CONFIG_VM_EVENT_COUNTERS=y
137CONFIG_PCI_QUIRKS=y 141CONFIG_PCI_QUIRKS=y
138CONFIG_SLUB_DEBUG=y 142CONFIG_SLUB_DEBUG=y
139# CONFIG_STRIP_ASM_SYMS is not set
140CONFIG_COMPAT_BRK=y 143CONFIG_COMPAT_BRK=y
141# CONFIG_SLAB is not set 144# CONFIG_SLAB is not set
142CONFIG_SLUB=y 145CONFIG_SLUB=y
143# CONFIG_SLOB is not set 146# CONFIG_SLOB is not set
144# CONFIG_PROFILING is not set 147# CONFIG_PROFILING is not set
145# CONFIG_MARKERS is not set
146CONFIG_HAVE_OPROFILE=y 148CONFIG_HAVE_OPROFILE=y
147# CONFIG_KPROBES is not set 149# CONFIG_KPROBES is not set
148CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 150CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -150,7 +152,9 @@ CONFIG_HAVE_IOREMAP_PROT=y
150CONFIG_HAVE_KPROBES=y 152CONFIG_HAVE_KPROBES=y
151CONFIG_HAVE_KRETPROBES=y 153CONFIG_HAVE_KRETPROBES=y
152CONFIG_HAVE_ARCH_TRACEHOOK=y 154CONFIG_HAVE_ARCH_TRACEHOOK=y
155CONFIG_HAVE_DMA_ATTRS=y
153CONFIG_HAVE_CLK=y 156CONFIG_HAVE_CLK=y
157CONFIG_HAVE_DMA_API_DEBUG=y
154 158
155# 159#
156# GCOV-based kernel profiling 160# GCOV-based kernel profiling
@@ -197,6 +201,7 @@ CONFIG_MPC85xx=y
197# CONFIG_MPC85xx_MDS is not set 201# CONFIG_MPC85xx_MDS is not set
198# CONFIG_MPC8536_DS is not set 202# CONFIG_MPC8536_DS is not set
199# CONFIG_MPC85xx_DS is not set 203# CONFIG_MPC85xx_DS is not set
204# CONFIG_MPC85xx_RDB is not set
200# CONFIG_SOCRATES is not set 205# CONFIG_SOCRATES is not set
201# CONFIG_KSI8560 is not set 206# CONFIG_KSI8560 is not set
202# CONFIG_XES_MPC85xx is not set 207# CONFIG_XES_MPC85xx is not set
@@ -252,6 +257,7 @@ CONFIG_MATH_EMULATION=y
252CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 257CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
253CONFIG_ARCH_HAS_WALK_MEMORY=y 258CONFIG_ARCH_HAS_WALK_MEMORY=y
254CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 259CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
260CONFIG_MAX_ACTIVE_REGIONS=32
255CONFIG_ARCH_FLATMEM_ENABLE=y 261CONFIG_ARCH_FLATMEM_ENABLE=y
256CONFIG_ARCH_POPULATES_NODE_MAP=y 262CONFIG_ARCH_POPULATES_NODE_MAP=y
257CONFIG_SELECT_MEMORY_MODEL=y 263CONFIG_SELECT_MEMORY_MODEL=y
@@ -269,6 +275,7 @@ CONFIG_BOUNCE=y
269CONFIG_VIRT_TO_BUS=y 275CONFIG_VIRT_TO_BUS=y
270CONFIG_HAVE_MLOCK=y 276CONFIG_HAVE_MLOCK=y
271CONFIG_HAVE_MLOCKED_PAGE_BIT=y 277CONFIG_HAVE_MLOCKED_PAGE_BIT=y
278# CONFIG_KSM is not set
272CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 279CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
273CONFIG_PPC_4K_PAGES=y 280CONFIG_PPC_4K_PAGES=y
274# CONFIG_PPC_16K_PAGES is not set 281# CONFIG_PPC_16K_PAGES is not set
@@ -426,6 +433,7 @@ CONFIG_IP_NF_FILTER=m
426# CONFIG_IP_NF_ARPTABLES is not set 433# CONFIG_IP_NF_ARPTABLES is not set
427# CONFIG_IP_DCCP is not set 434# CONFIG_IP_DCCP is not set
428# CONFIG_IP_SCTP is not set 435# CONFIG_IP_SCTP is not set
436# CONFIG_RDS is not set
429# CONFIG_TIPC is not set 437# CONFIG_TIPC is not set
430# CONFIG_ATM is not set 438# CONFIG_ATM is not set
431# CONFIG_BRIDGE is not set 439# CONFIG_BRIDGE is not set
@@ -455,6 +463,7 @@ CONFIG_NET_PKTGEN=y
455# CONFIG_AF_RXRPC is not set 463# CONFIG_AF_RXRPC is not set
456CONFIG_WIRELESS=y 464CONFIG_WIRELESS=y
457# CONFIG_CFG80211 is not set 465# CONFIG_CFG80211 is not set
466CONFIG_CFG80211_DEFAULT_PS_VALUE=0
458CONFIG_WIRELESS_OLD_REGULATORY=y 467CONFIG_WIRELESS_OLD_REGULATORY=y
459# CONFIG_WIRELESS_EXT is not set 468# CONFIG_WIRELESS_EXT is not set
460# CONFIG_LIB80211 is not set 469# CONFIG_LIB80211 is not set
@@ -462,7 +471,6 @@ CONFIG_WIRELESS_OLD_REGULATORY=y
462# 471#
463# CFG80211 needs to be enabled for MAC80211 472# CFG80211 needs to be enabled for MAC80211
464# 473#
465CONFIG_MAC80211_DEFAULT_PS_VALUE=0
466# CONFIG_WIMAX is not set 474# CONFIG_WIMAX is not set
467# CONFIG_RFKILL is not set 475# CONFIG_RFKILL is not set
468# CONFIG_NET_9P is not set 476# CONFIG_NET_9P is not set
@@ -475,6 +483,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
475# Generic Driver Options 483# Generic Driver Options
476# 484#
477CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 485CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
486# CONFIG_DEVTMPFS is not set
478CONFIG_STANDALONE=y 487CONFIG_STANDALONE=y
479CONFIG_PREVENT_FIRMWARE_BUILD=y 488CONFIG_PREVENT_FIRMWARE_BUILD=y
480# CONFIG_FW_LOADER is not set 489# CONFIG_FW_LOADER is not set
@@ -622,6 +631,7 @@ CONFIG_SCSI_LOWLEVEL=y
622# CONFIG_ISCSI_TCP is not set 631# CONFIG_ISCSI_TCP is not set
623# CONFIG_SCSI_CXGB3_ISCSI is not set 632# CONFIG_SCSI_CXGB3_ISCSI is not set
624# CONFIG_SCSI_BNX2_ISCSI is not set 633# CONFIG_SCSI_BNX2_ISCSI is not set
634# CONFIG_BE2ISCSI is not set
625# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 635# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
626# CONFIG_SCSI_3W_9XXX is not set 636# CONFIG_SCSI_3W_9XXX is not set
627# CONFIG_SCSI_ACARD is not set 637# CONFIG_SCSI_ACARD is not set
@@ -662,7 +672,9 @@ CONFIG_SCSI_LOWLEVEL=y
662# CONFIG_SCSI_DC390T is not set 672# CONFIG_SCSI_DC390T is not set
663# CONFIG_SCSI_NSP32 is not set 673# CONFIG_SCSI_NSP32 is not set
664# CONFIG_SCSI_DEBUG is not set 674# CONFIG_SCSI_DEBUG is not set
675# CONFIG_SCSI_PMCRAID is not set
665# CONFIG_SCSI_SRP is not set 676# CONFIG_SCSI_SRP is not set
677# CONFIG_SCSI_BFA_FC is not set
666# CONFIG_SCSI_DH is not set 678# CONFIG_SCSI_DH is not set
667# CONFIG_SCSI_OSD_INITIATOR is not set 679# CONFIG_SCSI_OSD_INITIATOR is not set
668# CONFIG_ATA is not set 680# CONFIG_ATA is not set
@@ -732,8 +744,10 @@ CONFIG_NET_ETHERNET=y
732# CONFIG_NET_PCI is not set 744# CONFIG_NET_PCI is not set
733# CONFIG_B44 is not set 745# CONFIG_B44 is not set
734# CONFIG_KS8842 is not set 746# CONFIG_KS8842 is not set
747# CONFIG_KS8851_MLL is not set
735# CONFIG_NET_POCKET is not set 748# CONFIG_NET_POCKET is not set
736# CONFIG_ATL2 is not set 749# CONFIG_ATL2 is not set
750# CONFIG_XILINX_EMACLITE is not set
737# CONFIG_FS_ENET is not set 751# CONFIG_FS_ENET is not set
738CONFIG_NETDEV_1000=y 752CONFIG_NETDEV_1000=y
739# CONFIG_ACENIC is not set 753# CONFIG_ACENIC is not set
@@ -782,10 +796,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
782# CONFIG_SFC is not set 796# CONFIG_SFC is not set
783# CONFIG_BE2NET is not set 797# CONFIG_BE2NET is not set
784# CONFIG_TR is not set 798# CONFIG_TR is not set
785 799CONFIG_WLAN=y
786#
787# Wireless LAN
788#
789# CONFIG_WLAN_PRE80211 is not set 800# CONFIG_WLAN_PRE80211 is not set
790# CONFIG_WLAN_80211 is not set 801# CONFIG_WLAN_80211 is not set
791 802
@@ -827,11 +838,15 @@ CONFIG_INPUT_EVDEV=m
827# Input Device Drivers 838# Input Device Drivers
828# 839#
829CONFIG_INPUT_KEYBOARD=y 840CONFIG_INPUT_KEYBOARD=y
841# CONFIG_KEYBOARD_ADP5588 is not set
830CONFIG_KEYBOARD_ATKBD=y 842CONFIG_KEYBOARD_ATKBD=y
843# CONFIG_QT2160 is not set
831# CONFIG_KEYBOARD_LKKBD is not set 844# CONFIG_KEYBOARD_LKKBD is not set
832# CONFIG_KEYBOARD_GPIO is not set 845# CONFIG_KEYBOARD_GPIO is not set
833# CONFIG_KEYBOARD_MATRIX is not set 846# CONFIG_KEYBOARD_MATRIX is not set
847# CONFIG_KEYBOARD_MAX7359 is not set
834# CONFIG_KEYBOARD_NEWTON is not set 848# CONFIG_KEYBOARD_NEWTON is not set
849# CONFIG_KEYBOARD_OPENCORES is not set
835# CONFIG_KEYBOARD_STOWAWAY is not set 850# CONFIG_KEYBOARD_STOWAWAY is not set
836# CONFIG_KEYBOARD_SUNKBD is not set 851# CONFIG_KEYBOARD_SUNKBD is not set
837# CONFIG_KEYBOARD_XTKBD is not set 852# CONFIG_KEYBOARD_XTKBD is not set
@@ -842,6 +857,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y
842CONFIG_MOUSE_PS2_SYNAPTICS=y 857CONFIG_MOUSE_PS2_SYNAPTICS=y
843CONFIG_MOUSE_PS2_TRACKPOINT=y 858CONFIG_MOUSE_PS2_TRACKPOINT=y
844# CONFIG_MOUSE_PS2_ELANTECH is not set 859# CONFIG_MOUSE_PS2_ELANTECH is not set
860# CONFIG_MOUSE_PS2_SENTELIC is not set
845# CONFIG_MOUSE_PS2_TOUCHKIT is not set 861# CONFIG_MOUSE_PS2_TOUCHKIT is not set
846# CONFIG_MOUSE_SERIAL is not set 862# CONFIG_MOUSE_SERIAL is not set
847# CONFIG_MOUSE_APPLETOUCH is not set 863# CONFIG_MOUSE_APPLETOUCH is not set
@@ -909,6 +925,7 @@ CONFIG_HW_RANDOM=m
909CONFIG_DEVPORT=y 925CONFIG_DEVPORT=y
910CONFIG_I2C=m 926CONFIG_I2C=m
911CONFIG_I2C_BOARDINFO=y 927CONFIG_I2C_BOARDINFO=y
928CONFIG_I2C_COMPAT=y
912CONFIG_I2C_CHARDEV=m 929CONFIG_I2C_CHARDEV=m
913CONFIG_I2C_HELPER_AUTO=y 930CONFIG_I2C_HELPER_AUTO=y
914CONFIG_I2C_ALGOBIT=m 931CONFIG_I2C_ALGOBIT=m
@@ -967,9 +984,6 @@ CONFIG_I2C_ALGOBIT=m
967# Miscellaneous I2C Chip support 984# Miscellaneous I2C Chip support
968# 985#
969# CONFIG_DS1682 is not set 986# CONFIG_DS1682 is not set
970# CONFIG_SENSORS_PCF8574 is not set
971# CONFIG_PCF8575 is not set
972# CONFIG_SENSORS_PCA9539 is not set
973# CONFIG_SENSORS_TSL2550 is not set 987# CONFIG_SENSORS_TSL2550 is not set
974# CONFIG_I2C_DEBUG_CORE is not set 988# CONFIG_I2C_DEBUG_CORE is not set
975# CONFIG_I2C_DEBUG_ALGO is not set 989# CONFIG_I2C_DEBUG_ALGO is not set
@@ -1003,14 +1017,24 @@ CONFIG_GPIOLIB=y
1003# PCI GPIO expanders: 1017# PCI GPIO expanders:
1004# 1018#
1005# CONFIG_GPIO_BT8XX is not set 1019# CONFIG_GPIO_BT8XX is not set
1020# CONFIG_GPIO_LANGWELL is not set
1006 1021
1007# 1022#
1008# SPI GPIO expanders: 1023# SPI GPIO expanders:
1009# 1024#
1025
1026#
1027# AC97 GPIO expanders:
1028#
1010# CONFIG_W1 is not set 1029# CONFIG_W1 is not set
1011# CONFIG_POWER_SUPPLY is not set 1030# CONFIG_POWER_SUPPLY is not set
1012CONFIG_HWMON=y 1031CONFIG_HWMON=y
1013# CONFIG_HWMON_VID is not set 1032# CONFIG_HWMON_VID is not set
1033# CONFIG_HWMON_DEBUG_CHIP is not set
1034
1035#
1036# Native drivers
1037#
1014# CONFIG_SENSORS_AD7414 is not set 1038# CONFIG_SENSORS_AD7414 is not set
1015# CONFIG_SENSORS_AD7418 is not set 1039# CONFIG_SENSORS_AD7418 is not set
1016# CONFIG_SENSORS_ADM1021 is not set 1040# CONFIG_SENSORS_ADM1021 is not set
@@ -1061,6 +1085,7 @@ CONFIG_HWMON=y
1061# CONFIG_SENSORS_ADS7828 is not set 1085# CONFIG_SENSORS_ADS7828 is not set
1062# CONFIG_SENSORS_THMC50 is not set 1086# CONFIG_SENSORS_THMC50 is not set
1063# CONFIG_SENSORS_TMP401 is not set 1087# CONFIG_SENSORS_TMP401 is not set
1088# CONFIG_SENSORS_TMP421 is not set
1064# CONFIG_SENSORS_VIA686A is not set 1089# CONFIG_SENSORS_VIA686A is not set
1065# CONFIG_SENSORS_VT1211 is not set 1090# CONFIG_SENSORS_VT1211 is not set
1066# CONFIG_SENSORS_VT8231 is not set 1091# CONFIG_SENSORS_VT8231 is not set
@@ -1072,9 +1097,7 @@ CONFIG_HWMON=y
1072# CONFIG_SENSORS_W83L786NG is not set 1097# CONFIG_SENSORS_W83L786NG is not set
1073# CONFIG_SENSORS_W83627HF is not set 1098# CONFIG_SENSORS_W83627HF is not set
1074# CONFIG_SENSORS_W83627EHF is not set 1099# CONFIG_SENSORS_W83627EHF is not set
1075# CONFIG_HWMON_DEBUG_CHIP is not set
1076# CONFIG_THERMAL is not set 1100# CONFIG_THERMAL is not set
1077# CONFIG_THERMAL_HWMON is not set
1078# CONFIG_WATCHDOG is not set 1101# CONFIG_WATCHDOG is not set
1079CONFIG_SSB_POSSIBLE=y 1102CONFIG_SSB_POSSIBLE=y
1080 1103
@@ -1092,6 +1115,7 @@ CONFIG_SSB_POSSIBLE=y
1092# CONFIG_TPS65010 is not set 1115# CONFIG_TPS65010 is not set
1093# CONFIG_MFD_TMIO is not set 1116# CONFIG_MFD_TMIO is not set
1094# CONFIG_MFD_WM8400 is not set 1117# CONFIG_MFD_WM8400 is not set
1118# CONFIG_MFD_WM831X is not set
1095# CONFIG_MFD_WM8350_I2C is not set 1119# CONFIG_MFD_WM8350_I2C is not set
1096# CONFIG_MFD_PCF50633 is not set 1120# CONFIG_MFD_PCF50633 is not set
1097# CONFIG_AB3100_CORE is not set 1121# CONFIG_AB3100_CORE is not set
@@ -1102,6 +1126,7 @@ CONFIG_SSB_POSSIBLE=y
1102# Graphics support 1126# Graphics support
1103# 1127#
1104CONFIG_AGP=m 1128CONFIG_AGP=m
1129CONFIG_VGA_ARB=y
1105CONFIG_DRM=m 1130CONFIG_DRM=m
1106# CONFIG_DRM_TDFX is not set 1131# CONFIG_DRM_TDFX is not set
1107# CONFIG_DRM_R128 is not set 1132# CONFIG_DRM_R128 is not set
@@ -1125,7 +1150,6 @@ CONFIG_SOUND=m
1125# CONFIG_SOUND_PRIME is not set 1150# CONFIG_SOUND_PRIME is not set
1126CONFIG_HID_SUPPORT=y 1151CONFIG_HID_SUPPORT=y
1127CONFIG_HID=y 1152CONFIG_HID=y
1128# CONFIG_HID_DEBUG is not set
1129# CONFIG_HIDRAW is not set 1153# CONFIG_HIDRAW is not set
1130# CONFIG_HID_PID is not set 1154# CONFIG_HID_PID is not set
1131 1155
@@ -1190,6 +1214,7 @@ CONFIG_FS_MBCACHE=y
1190# CONFIG_GFS2_FS is not set 1214# CONFIG_GFS2_FS is not set
1191# CONFIG_OCFS2_FS is not set 1215# CONFIG_OCFS2_FS is not set
1192# CONFIG_BTRFS_FS is not set 1216# CONFIG_BTRFS_FS is not set
1217# CONFIG_NILFS2_FS is not set
1193CONFIG_FILE_LOCKING=y 1218CONFIG_FILE_LOCKING=y
1194CONFIG_FSNOTIFY=y 1219CONFIG_FSNOTIFY=y
1195CONFIG_DNOTIFY=y 1220CONFIG_DNOTIFY=y
@@ -1254,7 +1279,6 @@ CONFIG_CRAMFS=m
1254# CONFIG_ROMFS_FS is not set 1279# CONFIG_ROMFS_FS is not set
1255# CONFIG_SYSV_FS is not set 1280# CONFIG_SYSV_FS is not set
1256# CONFIG_UFS_FS is not set 1281# CONFIG_UFS_FS is not set
1257# CONFIG_NILFS2_FS is not set
1258CONFIG_NETWORK_FILESYSTEMS=y 1282CONFIG_NETWORK_FILESYSTEMS=y
1259CONFIG_NFS_FS=y 1283CONFIG_NFS_FS=y
1260CONFIG_NFS_V3=y 1284CONFIG_NFS_V3=y
@@ -1352,6 +1376,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
1352CONFIG_ENABLE_MUST_CHECK=y 1376CONFIG_ENABLE_MUST_CHECK=y
1353CONFIG_FRAME_WARN=1024 1377CONFIG_FRAME_WARN=1024
1354# CONFIG_MAGIC_SYSRQ is not set 1378# CONFIG_MAGIC_SYSRQ is not set
1379# CONFIG_STRIP_ASM_SYMS is not set
1355# CONFIG_UNUSED_SYMBOLS is not set 1380# CONFIG_UNUSED_SYMBOLS is not set
1356# CONFIG_DEBUG_FS is not set 1381# CONFIG_DEBUG_FS is not set
1357# CONFIG_HEADERS_CHECK is not set 1382# CONFIG_HEADERS_CHECK is not set
@@ -1369,6 +1394,7 @@ CONFIG_SCHED_DEBUG=y
1369# CONFIG_DEBUG_OBJECTS is not set 1394# CONFIG_DEBUG_OBJECTS is not set
1370# CONFIG_SLUB_DEBUG_ON is not set 1395# CONFIG_SLUB_DEBUG_ON is not set
1371# CONFIG_SLUB_STATS is not set 1396# CONFIG_SLUB_STATS is not set
1397# CONFIG_DEBUG_KMEMLEAK is not set
1372# CONFIG_DEBUG_RT_MUTEXES is not set 1398# CONFIG_DEBUG_RT_MUTEXES is not set
1373# CONFIG_RT_MUTEX_TESTER is not set 1399# CONFIG_RT_MUTEX_TESTER is not set
1374# CONFIG_DEBUG_SPINLOCK is not set 1400# CONFIG_DEBUG_SPINLOCK is not set
@@ -1388,10 +1414,12 @@ CONFIG_SCHED_DEBUG=y
1388# CONFIG_DEBUG_LIST is not set 1414# CONFIG_DEBUG_LIST is not set
1389# CONFIG_DEBUG_SG is not set 1415# CONFIG_DEBUG_SG is not set
1390# CONFIG_DEBUG_NOTIFIERS is not set 1416# CONFIG_DEBUG_NOTIFIERS is not set
1417# CONFIG_DEBUG_CREDENTIALS is not set
1391# CONFIG_RCU_TORTURE_TEST is not set 1418# CONFIG_RCU_TORTURE_TEST is not set
1392# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1419# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1393# CONFIG_BACKTRACE_SELF_TEST is not set 1420# CONFIG_BACKTRACE_SELF_TEST is not set
1394# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 1421# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1422# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
1395# CONFIG_FAULT_INJECTION is not set 1423# CONFIG_FAULT_INJECTION is not set
1396# CONFIG_LATENCYTOP is not set 1424# CONFIG_LATENCYTOP is not set
1397CONFIG_SYSCTL_SYSCALL_CHECK=y 1425CONFIG_SYSCTL_SYSCALL_CHECK=y
@@ -1414,10 +1442,10 @@ CONFIG_BRANCH_PROFILE_NONE=y
1414# CONFIG_KMEMTRACE is not set 1442# CONFIG_KMEMTRACE is not set
1415# CONFIG_WORKQUEUE_TRACER is not set 1443# CONFIG_WORKQUEUE_TRACER is not set
1416# CONFIG_BLK_DEV_IO_TRACE is not set 1444# CONFIG_BLK_DEV_IO_TRACE is not set
1445# CONFIG_DMA_API_DEBUG is not set
1417# CONFIG_SAMPLES is not set 1446# CONFIG_SAMPLES is not set
1418CONFIG_HAVE_ARCH_KGDB=y 1447CONFIG_HAVE_ARCH_KGDB=y
1419# CONFIG_KGDB is not set 1448# CONFIG_KGDB is not set
1420# CONFIG_KMEMCHECK is not set
1421# CONFIG_PPC_DISABLE_WERROR is not set 1449# CONFIG_PPC_DISABLE_WERROR is not set
1422CONFIG_PPC_WERROR=y 1450CONFIG_PPC_WERROR=y
1423CONFIG_PRINT_STACK_DEPTH=64 1451CONFIG_PRINT_STACK_DEPTH=64
@@ -1443,7 +1471,6 @@ CONFIG_CRYPTO=y
1443# 1471#
1444# Crypto core or helper 1472# Crypto core or helper
1445# 1473#
1446# CONFIG_CRYPTO_FIPS is not set
1447# CONFIG_CRYPTO_MANAGER is not set 1474# CONFIG_CRYPTO_MANAGER is not set
1448# CONFIG_CRYPTO_MANAGER2 is not set 1475# CONFIG_CRYPTO_MANAGER2 is not set
1449# CONFIG_CRYPTO_GF128MUL is not set 1476# CONFIG_CRYPTO_GF128MUL is not set
@@ -1475,11 +1502,13 @@ CONFIG_CRYPTO=y
1475# 1502#
1476# CONFIG_CRYPTO_HMAC is not set 1503# CONFIG_CRYPTO_HMAC is not set
1477# CONFIG_CRYPTO_XCBC is not set 1504# CONFIG_CRYPTO_XCBC is not set
1505# CONFIG_CRYPTO_VMAC is not set
1478 1506
1479# 1507#
1480# Digest 1508# Digest
1481# 1509#
1482# CONFIG_CRYPTO_CRC32C is not set 1510# CONFIG_CRYPTO_CRC32C is not set
1511# CONFIG_CRYPTO_GHASH is not set
1483# CONFIG_CRYPTO_MD4 is not set 1512# CONFIG_CRYPTO_MD4 is not set
1484# CONFIG_CRYPTO_MD5 is not set 1513# CONFIG_CRYPTO_MD5 is not set
1485# CONFIG_CRYPTO_MICHAEL_MIC is not set 1514# CONFIG_CRYPTO_MICHAEL_MIC is not set
diff --git a/arch/powerpc/configs/85xx/tqm8540_defconfig b/arch/powerpc/configs/85xx/tqm8540_defconfig
index 2c407523aad2..82563703d5e3 100644
--- a/arch/powerpc/configs/85xx/tqm8540_defconfig
+++ b/arch/powerpc/configs/85xx/tqm8540_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.31-rc4 3# Linux kernel version: 2.6.32-rc5
4# Wed Jul 29 23:32:21 2009 4# Thu Nov 5 08:20:39 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -22,6 +22,7 @@ CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set 22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y 23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y 24CONFIG_PPC_MMU_NOHASH=y
25CONFIG_PPC_MMU_NOHASH_32=y
25CONFIG_PPC_BOOK3E_MMU=y 26CONFIG_PPC_BOOK3E_MMU=y
26# CONFIG_PPC_MM_SLICES is not set 27# CONFIG_PPC_MM_SLICES is not set
27# CONFIG_SMP is not set 28# CONFIG_SMP is not set
@@ -36,6 +37,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
36CONFIG_GENERIC_HARDIRQS=y 37CONFIG_GENERIC_HARDIRQS=y
37CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 38CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
38# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
39CONFIG_IRQ_PER_CPU=y 41CONFIG_IRQ_PER_CPU=y
40CONFIG_STACKTRACE_SUPPORT=y 42CONFIG_STACKTRACE_SUPPORT=y
41CONFIG_HAVE_LATENCYTOP_SUPPORT=y 43CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -84,11 +86,12 @@ CONFIG_SYSVIPC_SYSCTL=y
84# 86#
85# RCU Subsystem 87# RCU Subsystem
86# 88#
87CONFIG_CLASSIC_RCU=y 89CONFIG_TREE_RCU=y
88# CONFIG_TREE_RCU is not set 90# CONFIG_TREE_PREEMPT_RCU is not set
89# CONFIG_PREEMPT_RCU is not set 91# CONFIG_RCU_TRACE is not set
92CONFIG_RCU_FANOUT=32
93# CONFIG_RCU_FANOUT_EXACT is not set
90# CONFIG_TREE_RCU_TRACE is not set 94# CONFIG_TREE_RCU_TRACE is not set
91# CONFIG_PREEMPT_RCU_TRACE is not set
92# CONFIG_IKCONFIG is not set 95# CONFIG_IKCONFIG is not set
93CONFIG_LOG_BUF_SHIFT=14 96CONFIG_LOG_BUF_SHIFT=14
94CONFIG_GROUP_SCHED=y 97CONFIG_GROUP_SCHED=y
@@ -124,28 +127,29 @@ CONFIG_TIMERFD=y
124CONFIG_EVENTFD=y 127CONFIG_EVENTFD=y
125CONFIG_SHMEM=y 128CONFIG_SHMEM=y
126CONFIG_AIO=y 129CONFIG_AIO=y
127CONFIG_HAVE_PERF_COUNTERS=y 130CONFIG_HAVE_PERF_EVENTS=y
128 131
129# 132#
130# Performance Counters 133# Kernel Performance Events And Counters
131# 134#
135# CONFIG_PERF_EVENTS is not set
132# CONFIG_PERF_COUNTERS is not set 136# CONFIG_PERF_COUNTERS is not set
133CONFIG_VM_EVENT_COUNTERS=y 137CONFIG_VM_EVENT_COUNTERS=y
134CONFIG_PCI_QUIRKS=y 138CONFIG_PCI_QUIRKS=y
135CONFIG_SLUB_DEBUG=y 139CONFIG_SLUB_DEBUG=y
136# CONFIG_STRIP_ASM_SYMS is not set
137CONFIG_COMPAT_BRK=y 140CONFIG_COMPAT_BRK=y
138# CONFIG_SLAB is not set 141# CONFIG_SLAB is not set
139CONFIG_SLUB=y 142CONFIG_SLUB=y
140# CONFIG_SLOB is not set 143# CONFIG_SLOB is not set
141# CONFIG_PROFILING is not set 144# CONFIG_PROFILING is not set
142# CONFIG_MARKERS is not set
143CONFIG_HAVE_OPROFILE=y 145CONFIG_HAVE_OPROFILE=y
144CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 146CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
145CONFIG_HAVE_IOREMAP_PROT=y 147CONFIG_HAVE_IOREMAP_PROT=y
146CONFIG_HAVE_KPROBES=y 148CONFIG_HAVE_KPROBES=y
147CONFIG_HAVE_KRETPROBES=y 149CONFIG_HAVE_KRETPROBES=y
148CONFIG_HAVE_ARCH_TRACEHOOK=y 150CONFIG_HAVE_ARCH_TRACEHOOK=y
151CONFIG_HAVE_DMA_ATTRS=y
152CONFIG_HAVE_DMA_API_DEBUG=y
149 153
150# 154#
151# GCOV-based kernel profiling 155# GCOV-based kernel profiling
@@ -188,6 +192,7 @@ CONFIG_MPC85xx=y
188# CONFIG_MPC85xx_MDS is not set 192# CONFIG_MPC85xx_MDS is not set
189# CONFIG_MPC8536_DS is not set 193# CONFIG_MPC8536_DS is not set
190# CONFIG_MPC85xx_DS is not set 194# CONFIG_MPC85xx_DS is not set
195# CONFIG_MPC85xx_RDB is not set
191# CONFIG_SOCRATES is not set 196# CONFIG_SOCRATES is not set
192# CONFIG_KSI8560 is not set 197# CONFIG_KSI8560 is not set
193# CONFIG_XES_MPC85xx is not set 198# CONFIG_XES_MPC85xx is not set
@@ -243,6 +248,7 @@ CONFIG_MATH_EMULATION=y
243CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 248CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
244CONFIG_ARCH_HAS_WALK_MEMORY=y 249CONFIG_ARCH_HAS_WALK_MEMORY=y
245CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 250CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
251CONFIG_MAX_ACTIVE_REGIONS=32
246CONFIG_ARCH_FLATMEM_ENABLE=y 252CONFIG_ARCH_FLATMEM_ENABLE=y
247CONFIG_ARCH_POPULATES_NODE_MAP=y 253CONFIG_ARCH_POPULATES_NODE_MAP=y
248CONFIG_SELECT_MEMORY_MODEL=y 254CONFIG_SELECT_MEMORY_MODEL=y
@@ -260,6 +266,7 @@ CONFIG_BOUNCE=y
260CONFIG_VIRT_TO_BUS=y 266CONFIG_VIRT_TO_BUS=y
261CONFIG_HAVE_MLOCK=y 267CONFIG_HAVE_MLOCK=y
262CONFIG_HAVE_MLOCKED_PAGE_BIT=y 268CONFIG_HAVE_MLOCKED_PAGE_BIT=y
269# CONFIG_KSM is not set
263CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 270CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
264CONFIG_PPC_4K_PAGES=y 271CONFIG_PPC_4K_PAGES=y
265# CONFIG_PPC_16K_PAGES is not set 272# CONFIG_PPC_16K_PAGES is not set
@@ -354,6 +361,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
354# CONFIG_NETFILTER is not set 361# CONFIG_NETFILTER is not set
355# CONFIG_IP_DCCP is not set 362# CONFIG_IP_DCCP is not set
356# CONFIG_IP_SCTP is not set 363# CONFIG_IP_SCTP is not set
364# CONFIG_RDS is not set
357# CONFIG_TIPC is not set 365# CONFIG_TIPC is not set
358# CONFIG_ATM is not set 366# CONFIG_ATM is not set
359# CONFIG_BRIDGE is not set 367# CONFIG_BRIDGE is not set
@@ -383,6 +391,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
383# CONFIG_AF_RXRPC is not set 391# CONFIG_AF_RXRPC is not set
384CONFIG_WIRELESS=y 392CONFIG_WIRELESS=y
385# CONFIG_CFG80211 is not set 393# CONFIG_CFG80211 is not set
394CONFIG_CFG80211_DEFAULT_PS_VALUE=0
386CONFIG_WIRELESS_OLD_REGULATORY=y 395CONFIG_WIRELESS_OLD_REGULATORY=y
387# CONFIG_WIRELESS_EXT is not set 396# CONFIG_WIRELESS_EXT is not set
388# CONFIG_LIB80211 is not set 397# CONFIG_LIB80211 is not set
@@ -390,7 +399,6 @@ CONFIG_WIRELESS_OLD_REGULATORY=y
390# 399#
391# CFG80211 needs to be enabled for MAC80211 400# CFG80211 needs to be enabled for MAC80211
392# 401#
393CONFIG_MAC80211_DEFAULT_PS_VALUE=0
394# CONFIG_WIMAX is not set 402# CONFIG_WIMAX is not set
395# CONFIG_RFKILL is not set 403# CONFIG_RFKILL is not set
396# CONFIG_NET_9P is not set 404# CONFIG_NET_9P is not set
@@ -677,9 +685,11 @@ CONFIG_E100=y
677# CONFIG_SUNDANCE is not set 685# CONFIG_SUNDANCE is not set
678# CONFIG_TLAN is not set 686# CONFIG_TLAN is not set
679# CONFIG_KS8842 is not set 687# CONFIG_KS8842 is not set
688# CONFIG_KS8851_MLL is not set
680# CONFIG_VIA_RHINE is not set 689# CONFIG_VIA_RHINE is not set
681# CONFIG_SC92031 is not set 690# CONFIG_SC92031 is not set
682# CONFIG_ATL2 is not set 691# CONFIG_ATL2 is not set
692# CONFIG_XILINX_EMACLITE is not set
683CONFIG_NETDEV_1000=y 693CONFIG_NETDEV_1000=y
684# CONFIG_ACENIC is not set 694# CONFIG_ACENIC is not set
685# CONFIG_DL2K is not set 695# CONFIG_DL2K is not set
@@ -727,10 +737,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
727# CONFIG_SFC is not set 737# CONFIG_SFC is not set
728# CONFIG_BE2NET is not set 738# CONFIG_BE2NET is not set
729# CONFIG_TR is not set 739# CONFIG_TR is not set
730 740CONFIG_WLAN=y
731#
732# Wireless LAN
733#
734# CONFIG_WLAN_PRE80211 is not set 741# CONFIG_WLAN_PRE80211 is not set
735# CONFIG_WLAN_80211 is not set 742# CONFIG_WLAN_80211 is not set
736 743
@@ -824,6 +831,7 @@ CONFIG_GEN_RTC=y
824CONFIG_DEVPORT=y 831CONFIG_DEVPORT=y
825CONFIG_I2C=y 832CONFIG_I2C=y
826CONFIG_I2C_BOARDINFO=y 833CONFIG_I2C_BOARDINFO=y
834CONFIG_I2C_COMPAT=y
827CONFIG_I2C_CHARDEV=y 835CONFIG_I2C_CHARDEV=y
828CONFIG_I2C_HELPER_AUTO=y 836CONFIG_I2C_HELPER_AUTO=y
829 837
@@ -876,9 +884,6 @@ CONFIG_I2C_MPC=y
876# Miscellaneous I2C Chip support 884# Miscellaneous I2C Chip support
877# 885#
878# CONFIG_DS1682 is not set 886# CONFIG_DS1682 is not set
879# CONFIG_SENSORS_PCF8574 is not set
880# CONFIG_PCF8575 is not set
881# CONFIG_SENSORS_PCA9539 is not set
882# CONFIG_SENSORS_TSL2550 is not set 887# CONFIG_SENSORS_TSL2550 is not set
883# CONFIG_I2C_DEBUG_CORE is not set 888# CONFIG_I2C_DEBUG_CORE is not set
884# CONFIG_I2C_DEBUG_ALGO is not set 889# CONFIG_I2C_DEBUG_ALGO is not set
@@ -896,6 +901,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
896# CONFIG_POWER_SUPPLY is not set 901# CONFIG_POWER_SUPPLY is not set
897CONFIG_HWMON=y 902CONFIG_HWMON=y
898# CONFIG_HWMON_VID is not set 903# CONFIG_HWMON_VID is not set
904CONFIG_HWMON_DEBUG_CHIP=y
905
906#
907# Native drivers
908#
899# CONFIG_SENSORS_AD7414 is not set 909# CONFIG_SENSORS_AD7414 is not set
900# CONFIG_SENSORS_AD7418 is not set 910# CONFIG_SENSORS_AD7418 is not set
901# CONFIG_SENSORS_ADM1021 is not set 911# CONFIG_SENSORS_ADM1021 is not set
@@ -945,6 +955,7 @@ CONFIG_SENSORS_LM75=y
945# CONFIG_SENSORS_ADS7828 is not set 955# CONFIG_SENSORS_ADS7828 is not set
946# CONFIG_SENSORS_THMC50 is not set 956# CONFIG_SENSORS_THMC50 is not set
947# CONFIG_SENSORS_TMP401 is not set 957# CONFIG_SENSORS_TMP401 is not set
958# CONFIG_SENSORS_TMP421 is not set
948# CONFIG_SENSORS_VIA686A is not set 959# CONFIG_SENSORS_VIA686A is not set
949# CONFIG_SENSORS_VT1211 is not set 960# CONFIG_SENSORS_VT1211 is not set
950# CONFIG_SENSORS_VT8231 is not set 961# CONFIG_SENSORS_VT8231 is not set
@@ -956,9 +967,7 @@ CONFIG_SENSORS_LM75=y
956# CONFIG_SENSORS_W83L786NG is not set 967# CONFIG_SENSORS_W83L786NG is not set
957# CONFIG_SENSORS_W83627HF is not set 968# CONFIG_SENSORS_W83627HF is not set
958# CONFIG_SENSORS_W83627EHF is not set 969# CONFIG_SENSORS_W83627EHF is not set
959CONFIG_HWMON_DEBUG_CHIP=y
960# CONFIG_THERMAL is not set 970# CONFIG_THERMAL is not set
961# CONFIG_THERMAL_HWMON is not set
962# CONFIG_WATCHDOG is not set 971# CONFIG_WATCHDOG is not set
963CONFIG_SSB_POSSIBLE=y 972CONFIG_SSB_POSSIBLE=y
964 973
@@ -977,6 +986,7 @@ CONFIG_SSB_POSSIBLE=y
977# CONFIG_MFD_TMIO is not set 986# CONFIG_MFD_TMIO is not set
978# CONFIG_PMIC_DA903X is not set 987# CONFIG_PMIC_DA903X is not set
979# CONFIG_MFD_WM8400 is not set 988# CONFIG_MFD_WM8400 is not set
989# CONFIG_MFD_WM831X is not set
980# CONFIG_MFD_WM8350_I2C is not set 990# CONFIG_MFD_WM8350_I2C is not set
981# CONFIG_MFD_PCF50633 is not set 991# CONFIG_MFD_PCF50633 is not set
982# CONFIG_AB3100_CORE is not set 992# CONFIG_AB3100_CORE is not set
@@ -987,6 +997,7 @@ CONFIG_SSB_POSSIBLE=y
987# Graphics support 997# Graphics support
988# 998#
989# CONFIG_AGP is not set 999# CONFIG_AGP is not set
1000CONFIG_VGA_ARB=y
990# CONFIG_DRM is not set 1001# CONFIG_DRM is not set
991# CONFIG_VGASTATE is not set 1002# CONFIG_VGASTATE is not set
992# CONFIG_VIDEO_OUTPUT_CONTROL is not set 1003# CONFIG_VIDEO_OUTPUT_CONTROL is not set
@@ -1000,7 +1011,6 @@ CONFIG_SSB_POSSIBLE=y
1000# CONFIG_SOUND is not set 1011# CONFIG_SOUND is not set
1001CONFIG_HID_SUPPORT=y 1012CONFIG_HID_SUPPORT=y
1002CONFIG_HID=y 1013CONFIG_HID=y
1003# CONFIG_HID_DEBUG is not set
1004# CONFIG_HIDRAW is not set 1014# CONFIG_HIDRAW is not set
1005# CONFIG_HID_PID is not set 1015# CONFIG_HID_PID is not set
1006 1016
@@ -1065,6 +1075,7 @@ CONFIG_FS_MBCACHE=y
1065# CONFIG_GFS2_FS is not set 1075# CONFIG_GFS2_FS is not set
1066# CONFIG_OCFS2_FS is not set 1076# CONFIG_OCFS2_FS is not set
1067# CONFIG_BTRFS_FS is not set 1077# CONFIG_BTRFS_FS is not set
1078# CONFIG_NILFS2_FS is not set
1068CONFIG_FILE_LOCKING=y 1079CONFIG_FILE_LOCKING=y
1069CONFIG_FSNOTIFY=y 1080CONFIG_FSNOTIFY=y
1070CONFIG_DNOTIFY=y 1081CONFIG_DNOTIFY=y
@@ -1134,7 +1145,6 @@ CONFIG_CRAMFS=y
1134# CONFIG_ROMFS_FS is not set 1145# CONFIG_ROMFS_FS is not set
1135# CONFIG_SYSV_FS is not set 1146# CONFIG_SYSV_FS is not set
1136# CONFIG_UFS_FS is not set 1147# CONFIG_UFS_FS is not set
1137# CONFIG_NILFS2_FS is not set
1138CONFIG_NETWORK_FILESYSTEMS=y 1148CONFIG_NETWORK_FILESYSTEMS=y
1139CONFIG_NFS_FS=y 1149CONFIG_NFS_FS=y
1140# CONFIG_NFS_V3 is not set 1150# CONFIG_NFS_V3 is not set
@@ -1203,6 +1213,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
1203CONFIG_ENABLE_MUST_CHECK=y 1213CONFIG_ENABLE_MUST_CHECK=y
1204CONFIG_FRAME_WARN=1024 1214CONFIG_FRAME_WARN=1024
1205# CONFIG_MAGIC_SYSRQ is not set 1215# CONFIG_MAGIC_SYSRQ is not set
1216# CONFIG_STRIP_ASM_SYMS is not set
1206# CONFIG_UNUSED_SYMBOLS is not set 1217# CONFIG_UNUSED_SYMBOLS is not set
1207# CONFIG_DEBUG_FS is not set 1218# CONFIG_DEBUG_FS is not set
1208# CONFIG_HEADERS_CHECK is not set 1219# CONFIG_HEADERS_CHECK is not set
@@ -1220,6 +1231,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
1220CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1231CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1221CONFIG_TRACING_SUPPORT=y 1232CONFIG_TRACING_SUPPORT=y
1222# CONFIG_FTRACE is not set 1233# CONFIG_FTRACE is not set
1234# CONFIG_DMA_API_DEBUG is not set
1223# CONFIG_SAMPLES is not set 1235# CONFIG_SAMPLES is not set
1224CONFIG_HAVE_ARCH_KGDB=y 1236CONFIG_HAVE_ARCH_KGDB=y
1225# CONFIG_PPC_DISABLE_WERROR is not set 1237# CONFIG_PPC_DISABLE_WERROR is not set
@@ -1240,7 +1252,6 @@ CONFIG_CRYPTO=y
1240# 1252#
1241# Crypto core or helper 1253# Crypto core or helper
1242# 1254#
1243# CONFIG_CRYPTO_FIPS is not set
1244# CONFIG_CRYPTO_MANAGER is not set 1255# CONFIG_CRYPTO_MANAGER is not set
1245# CONFIG_CRYPTO_MANAGER2 is not set 1256# CONFIG_CRYPTO_MANAGER2 is not set
1246# CONFIG_CRYPTO_GF128MUL is not set 1257# CONFIG_CRYPTO_GF128MUL is not set
@@ -1271,11 +1282,13 @@ CONFIG_CRYPTO=y
1271# 1282#
1272# CONFIG_CRYPTO_HMAC is not set 1283# CONFIG_CRYPTO_HMAC is not set
1273# CONFIG_CRYPTO_XCBC is not set 1284# CONFIG_CRYPTO_XCBC is not set
1285# CONFIG_CRYPTO_VMAC is not set
1274 1286
1275# 1287#
1276# Digest 1288# Digest
1277# 1289#
1278# CONFIG_CRYPTO_CRC32C is not set 1290# CONFIG_CRYPTO_CRC32C is not set
1291# CONFIG_CRYPTO_GHASH is not set
1279# CONFIG_CRYPTO_MD4 is not set 1292# CONFIG_CRYPTO_MD4 is not set
1280# CONFIG_CRYPTO_MD5 is not set 1293# CONFIG_CRYPTO_MD5 is not set
1281# CONFIG_CRYPTO_MICHAEL_MIC is not set 1294# CONFIG_CRYPTO_MICHAEL_MIC is not set
diff --git a/arch/powerpc/configs/85xx/tqm8541_defconfig b/arch/powerpc/configs/85xx/tqm8541_defconfig
index 845731dc51c6..91d85d733827 100644
--- a/arch/powerpc/configs/85xx/tqm8541_defconfig
+++ b/arch/powerpc/configs/85xx/tqm8541_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.31-rc4 3# Linux kernel version: 2.6.32-rc5
4# Wed Jul 29 23:32:22 2009 4# Thu Nov 5 08:20:40 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -22,6 +22,7 @@ CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set 22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y 23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y 24CONFIG_PPC_MMU_NOHASH=y
25CONFIG_PPC_MMU_NOHASH_32=y
25CONFIG_PPC_BOOK3E_MMU=y 26CONFIG_PPC_BOOK3E_MMU=y
26# CONFIG_PPC_MM_SLICES is not set 27# CONFIG_PPC_MM_SLICES is not set
27# CONFIG_SMP is not set 28# CONFIG_SMP is not set
@@ -36,6 +37,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
36CONFIG_GENERIC_HARDIRQS=y 37CONFIG_GENERIC_HARDIRQS=y
37CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 38CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
38# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
39CONFIG_IRQ_PER_CPU=y 41CONFIG_IRQ_PER_CPU=y
40CONFIG_STACKTRACE_SUPPORT=y 42CONFIG_STACKTRACE_SUPPORT=y
41CONFIG_HAVE_LATENCYTOP_SUPPORT=y 43CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -85,11 +87,12 @@ CONFIG_SYSVIPC_SYSCTL=y
85# 87#
86# RCU Subsystem 88# RCU Subsystem
87# 89#
88CONFIG_CLASSIC_RCU=y 90CONFIG_TREE_RCU=y
89# CONFIG_TREE_RCU is not set 91# CONFIG_TREE_PREEMPT_RCU is not set
90# CONFIG_PREEMPT_RCU is not set 92# CONFIG_RCU_TRACE is not set
93CONFIG_RCU_FANOUT=32
94# CONFIG_RCU_FANOUT_EXACT is not set
91# CONFIG_TREE_RCU_TRACE is not set 95# CONFIG_TREE_RCU_TRACE is not set
92# CONFIG_PREEMPT_RCU_TRACE is not set
93# CONFIG_IKCONFIG is not set 96# CONFIG_IKCONFIG is not set
94CONFIG_LOG_BUF_SHIFT=14 97CONFIG_LOG_BUF_SHIFT=14
95CONFIG_GROUP_SCHED=y 98CONFIG_GROUP_SCHED=y
@@ -125,29 +128,30 @@ CONFIG_TIMERFD=y
125CONFIG_EVENTFD=y 128CONFIG_EVENTFD=y
126CONFIG_SHMEM=y 129CONFIG_SHMEM=y
127CONFIG_AIO=y 130CONFIG_AIO=y
128CONFIG_HAVE_PERF_COUNTERS=y 131CONFIG_HAVE_PERF_EVENTS=y
129 132
130# 133#
131# Performance Counters 134# Kernel Performance Events And Counters
132# 135#
136# CONFIG_PERF_EVENTS is not set
133# CONFIG_PERF_COUNTERS is not set 137# CONFIG_PERF_COUNTERS is not set
134CONFIG_VM_EVENT_COUNTERS=y 138CONFIG_VM_EVENT_COUNTERS=y
135CONFIG_PCI_QUIRKS=y 139CONFIG_PCI_QUIRKS=y
136CONFIG_SLUB_DEBUG=y 140CONFIG_SLUB_DEBUG=y
137# CONFIG_STRIP_ASM_SYMS is not set
138CONFIG_COMPAT_BRK=y 141CONFIG_COMPAT_BRK=y
139# CONFIG_SLAB is not set 142# CONFIG_SLAB is not set
140CONFIG_SLUB=y 143CONFIG_SLUB=y
141# CONFIG_SLOB is not set 144# CONFIG_SLOB is not set
142# CONFIG_PROFILING is not set 145# CONFIG_PROFILING is not set
143# CONFIG_MARKERS is not set
144CONFIG_HAVE_OPROFILE=y 146CONFIG_HAVE_OPROFILE=y
145CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 147CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
146CONFIG_HAVE_IOREMAP_PROT=y 148CONFIG_HAVE_IOREMAP_PROT=y
147CONFIG_HAVE_KPROBES=y 149CONFIG_HAVE_KPROBES=y
148CONFIG_HAVE_KRETPROBES=y 150CONFIG_HAVE_KRETPROBES=y
149CONFIG_HAVE_ARCH_TRACEHOOK=y 151CONFIG_HAVE_ARCH_TRACEHOOK=y
152CONFIG_HAVE_DMA_ATTRS=y
150CONFIG_HAVE_CLK=y 153CONFIG_HAVE_CLK=y
154CONFIG_HAVE_DMA_API_DEBUG=y
151 155
152# 156#
153# GCOV-based kernel profiling 157# GCOV-based kernel profiling
@@ -190,6 +194,7 @@ CONFIG_MPC85xx=y
190# CONFIG_MPC85xx_MDS is not set 194# CONFIG_MPC85xx_MDS is not set
191# CONFIG_MPC8536_DS is not set 195# CONFIG_MPC8536_DS is not set
192# CONFIG_MPC85xx_DS is not set 196# CONFIG_MPC85xx_DS is not set
197# CONFIG_MPC85xx_RDB is not set
193# CONFIG_SOCRATES is not set 198# CONFIG_SOCRATES is not set
194# CONFIG_KSI8560 is not set 199# CONFIG_KSI8560 is not set
195# CONFIG_XES_MPC85xx is not set 200# CONFIG_XES_MPC85xx is not set
@@ -246,6 +251,7 @@ CONFIG_MATH_EMULATION=y
246CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 251CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
247CONFIG_ARCH_HAS_WALK_MEMORY=y 252CONFIG_ARCH_HAS_WALK_MEMORY=y
248CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 253CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
254CONFIG_MAX_ACTIVE_REGIONS=32
249CONFIG_ARCH_FLATMEM_ENABLE=y 255CONFIG_ARCH_FLATMEM_ENABLE=y
250CONFIG_ARCH_POPULATES_NODE_MAP=y 256CONFIG_ARCH_POPULATES_NODE_MAP=y
251CONFIG_SELECT_MEMORY_MODEL=y 257CONFIG_SELECT_MEMORY_MODEL=y
@@ -263,6 +269,7 @@ CONFIG_BOUNCE=y
263CONFIG_VIRT_TO_BUS=y 269CONFIG_VIRT_TO_BUS=y
264CONFIG_HAVE_MLOCK=y 270CONFIG_HAVE_MLOCK=y
265CONFIG_HAVE_MLOCKED_PAGE_BIT=y 271CONFIG_HAVE_MLOCKED_PAGE_BIT=y
272# CONFIG_KSM is not set
266CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 273CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
267CONFIG_PPC_4K_PAGES=y 274CONFIG_PPC_4K_PAGES=y
268# CONFIG_PPC_16K_PAGES is not set 275# CONFIG_PPC_16K_PAGES is not set
@@ -357,6 +364,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
357# CONFIG_NETFILTER is not set 364# CONFIG_NETFILTER is not set
358# CONFIG_IP_DCCP is not set 365# CONFIG_IP_DCCP is not set
359# CONFIG_IP_SCTP is not set 366# CONFIG_IP_SCTP is not set
367# CONFIG_RDS is not set
360# CONFIG_TIPC is not set 368# CONFIG_TIPC is not set
361# CONFIG_ATM is not set 369# CONFIG_ATM is not set
362# CONFIG_BRIDGE is not set 370# CONFIG_BRIDGE is not set
@@ -386,6 +394,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
386# CONFIG_AF_RXRPC is not set 394# CONFIG_AF_RXRPC is not set
387CONFIG_WIRELESS=y 395CONFIG_WIRELESS=y
388# CONFIG_CFG80211 is not set 396# CONFIG_CFG80211 is not set
397CONFIG_CFG80211_DEFAULT_PS_VALUE=0
389CONFIG_WIRELESS_OLD_REGULATORY=y 398CONFIG_WIRELESS_OLD_REGULATORY=y
390# CONFIG_WIRELESS_EXT is not set 399# CONFIG_WIRELESS_EXT is not set
391# CONFIG_LIB80211 is not set 400# CONFIG_LIB80211 is not set
@@ -393,7 +402,6 @@ CONFIG_WIRELESS_OLD_REGULATORY=y
393# 402#
394# CFG80211 needs to be enabled for MAC80211 403# CFG80211 needs to be enabled for MAC80211
395# 404#
396CONFIG_MAC80211_DEFAULT_PS_VALUE=0
397# CONFIG_WIMAX is not set 405# CONFIG_WIMAX is not set
398# CONFIG_RFKILL is not set 406# CONFIG_RFKILL is not set
399# CONFIG_NET_9P is not set 407# CONFIG_NET_9P is not set
@@ -681,9 +689,11 @@ CONFIG_E100=y
681# CONFIG_SUNDANCE is not set 689# CONFIG_SUNDANCE is not set
682# CONFIG_TLAN is not set 690# CONFIG_TLAN is not set
683# CONFIG_KS8842 is not set 691# CONFIG_KS8842 is not set
692# CONFIG_KS8851_MLL is not set
684# CONFIG_VIA_RHINE is not set 693# CONFIG_VIA_RHINE is not set
685# CONFIG_SC92031 is not set 694# CONFIG_SC92031 is not set
686# CONFIG_ATL2 is not set 695# CONFIG_ATL2 is not set
696# CONFIG_XILINX_EMACLITE is not set
687# CONFIG_FS_ENET is not set 697# CONFIG_FS_ENET is not set
688CONFIG_NETDEV_1000=y 698CONFIG_NETDEV_1000=y
689# CONFIG_ACENIC is not set 699# CONFIG_ACENIC is not set
@@ -732,10 +742,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
732# CONFIG_SFC is not set 742# CONFIG_SFC is not set
733# CONFIG_BE2NET is not set 743# CONFIG_BE2NET is not set
734# CONFIG_TR is not set 744# CONFIG_TR is not set
735 745CONFIG_WLAN=y
736#
737# Wireless LAN
738#
739# CONFIG_WLAN_PRE80211 is not set 746# CONFIG_WLAN_PRE80211 is not set
740# CONFIG_WLAN_80211 is not set 747# CONFIG_WLAN_80211 is not set
741 748
@@ -831,6 +838,7 @@ CONFIG_GEN_RTC=y
831CONFIG_DEVPORT=y 838CONFIG_DEVPORT=y
832CONFIG_I2C=y 839CONFIG_I2C=y
833CONFIG_I2C_BOARDINFO=y 840CONFIG_I2C_BOARDINFO=y
841CONFIG_I2C_COMPAT=y
834CONFIG_I2C_CHARDEV=y 842CONFIG_I2C_CHARDEV=y
835CONFIG_I2C_HELPER_AUTO=y 843CONFIG_I2C_HELPER_AUTO=y
836 844
@@ -886,9 +894,6 @@ CONFIG_I2C_MPC=y
886# Miscellaneous I2C Chip support 894# Miscellaneous I2C Chip support
887# 895#
888# CONFIG_DS1682 is not set 896# CONFIG_DS1682 is not set
889# CONFIG_SENSORS_PCF8574 is not set
890# CONFIG_PCF8575 is not set
891# CONFIG_SENSORS_PCA9539 is not set
892# CONFIG_SENSORS_TSL2550 is not set 897# CONFIG_SENSORS_TSL2550 is not set
893# CONFIG_I2C_DEBUG_CORE is not set 898# CONFIG_I2C_DEBUG_CORE is not set
894# CONFIG_I2C_DEBUG_ALGO is not set 899# CONFIG_I2C_DEBUG_ALGO is not set
@@ -921,14 +926,24 @@ CONFIG_GPIOLIB=y
921# PCI GPIO expanders: 926# PCI GPIO expanders:
922# 927#
923# CONFIG_GPIO_BT8XX is not set 928# CONFIG_GPIO_BT8XX is not set
929# CONFIG_GPIO_LANGWELL is not set
924 930
925# 931#
926# SPI GPIO expanders: 932# SPI GPIO expanders:
927# 933#
934
935#
936# AC97 GPIO expanders:
937#
928# CONFIG_W1 is not set 938# CONFIG_W1 is not set
929# CONFIG_POWER_SUPPLY is not set 939# CONFIG_POWER_SUPPLY is not set
930CONFIG_HWMON=y 940CONFIG_HWMON=y
931# CONFIG_HWMON_VID is not set 941# CONFIG_HWMON_VID is not set
942CONFIG_HWMON_DEBUG_CHIP=y
943
944#
945# Native drivers
946#
932# CONFIG_SENSORS_AD7414 is not set 947# CONFIG_SENSORS_AD7414 is not set
933# CONFIG_SENSORS_AD7418 is not set 948# CONFIG_SENSORS_AD7418 is not set
934# CONFIG_SENSORS_ADM1021 is not set 949# CONFIG_SENSORS_ADM1021 is not set
@@ -979,6 +994,7 @@ CONFIG_SENSORS_LM75=y
979# CONFIG_SENSORS_ADS7828 is not set 994# CONFIG_SENSORS_ADS7828 is not set
980# CONFIG_SENSORS_THMC50 is not set 995# CONFIG_SENSORS_THMC50 is not set
981# CONFIG_SENSORS_TMP401 is not set 996# CONFIG_SENSORS_TMP401 is not set
997# CONFIG_SENSORS_TMP421 is not set
982# CONFIG_SENSORS_VIA686A is not set 998# CONFIG_SENSORS_VIA686A is not set
983# CONFIG_SENSORS_VT1211 is not set 999# CONFIG_SENSORS_VT1211 is not set
984# CONFIG_SENSORS_VT8231 is not set 1000# CONFIG_SENSORS_VT8231 is not set
@@ -990,9 +1006,7 @@ CONFIG_SENSORS_LM75=y
990# CONFIG_SENSORS_W83L786NG is not set 1006# CONFIG_SENSORS_W83L786NG is not set
991# CONFIG_SENSORS_W83627HF is not set 1007# CONFIG_SENSORS_W83627HF is not set
992# CONFIG_SENSORS_W83627EHF is not set 1008# CONFIG_SENSORS_W83627EHF is not set
993CONFIG_HWMON_DEBUG_CHIP=y
994# CONFIG_THERMAL is not set 1009# CONFIG_THERMAL is not set
995# CONFIG_THERMAL_HWMON is not set
996# CONFIG_WATCHDOG is not set 1010# CONFIG_WATCHDOG is not set
997CONFIG_SSB_POSSIBLE=y 1011CONFIG_SSB_POSSIBLE=y
998 1012
@@ -1012,6 +1026,7 @@ CONFIG_SSB_POSSIBLE=y
1012# CONFIG_MFD_TMIO is not set 1026# CONFIG_MFD_TMIO is not set
1013# CONFIG_PMIC_DA903X is not set 1027# CONFIG_PMIC_DA903X is not set
1014# CONFIG_MFD_WM8400 is not set 1028# CONFIG_MFD_WM8400 is not set
1029# CONFIG_MFD_WM831X is not set
1015# CONFIG_MFD_WM8350_I2C is not set 1030# CONFIG_MFD_WM8350_I2C is not set
1016# CONFIG_MFD_PCF50633 is not set 1031# CONFIG_MFD_PCF50633 is not set
1017# CONFIG_AB3100_CORE is not set 1032# CONFIG_AB3100_CORE is not set
@@ -1022,6 +1037,7 @@ CONFIG_SSB_POSSIBLE=y
1022# Graphics support 1037# Graphics support
1023# 1038#
1024# CONFIG_AGP is not set 1039# CONFIG_AGP is not set
1040CONFIG_VGA_ARB=y
1025# CONFIG_DRM is not set 1041# CONFIG_DRM is not set
1026# CONFIG_VGASTATE is not set 1042# CONFIG_VGASTATE is not set
1027# CONFIG_VIDEO_OUTPUT_CONTROL is not set 1043# CONFIG_VIDEO_OUTPUT_CONTROL is not set
@@ -1035,7 +1051,6 @@ CONFIG_SSB_POSSIBLE=y
1035# CONFIG_SOUND is not set 1051# CONFIG_SOUND is not set
1036CONFIG_HID_SUPPORT=y 1052CONFIG_HID_SUPPORT=y
1037CONFIG_HID=y 1053CONFIG_HID=y
1038# CONFIG_HID_DEBUG is not set
1039# CONFIG_HIDRAW is not set 1054# CONFIG_HIDRAW is not set
1040# CONFIG_HID_PID is not set 1055# CONFIG_HID_PID is not set
1041 1056
@@ -1100,6 +1115,7 @@ CONFIG_FS_MBCACHE=y
1100# CONFIG_GFS2_FS is not set 1115# CONFIG_GFS2_FS is not set
1101# CONFIG_OCFS2_FS is not set 1116# CONFIG_OCFS2_FS is not set
1102# CONFIG_BTRFS_FS is not set 1117# CONFIG_BTRFS_FS is not set
1118# CONFIG_NILFS2_FS is not set
1103CONFIG_FILE_LOCKING=y 1119CONFIG_FILE_LOCKING=y
1104CONFIG_FSNOTIFY=y 1120CONFIG_FSNOTIFY=y
1105CONFIG_DNOTIFY=y 1121CONFIG_DNOTIFY=y
@@ -1169,7 +1185,6 @@ CONFIG_CRAMFS=y
1169# CONFIG_ROMFS_FS is not set 1185# CONFIG_ROMFS_FS is not set
1170# CONFIG_SYSV_FS is not set 1186# CONFIG_SYSV_FS is not set
1171# CONFIG_UFS_FS is not set 1187# CONFIG_UFS_FS is not set
1172# CONFIG_NILFS2_FS is not set
1173CONFIG_NETWORK_FILESYSTEMS=y 1188CONFIG_NETWORK_FILESYSTEMS=y
1174CONFIG_NFS_FS=y 1189CONFIG_NFS_FS=y
1175# CONFIG_NFS_V3 is not set 1190# CONFIG_NFS_V3 is not set
@@ -1238,6 +1253,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
1238CONFIG_ENABLE_MUST_CHECK=y 1253CONFIG_ENABLE_MUST_CHECK=y
1239CONFIG_FRAME_WARN=1024 1254CONFIG_FRAME_WARN=1024
1240# CONFIG_MAGIC_SYSRQ is not set 1255# CONFIG_MAGIC_SYSRQ is not set
1256# CONFIG_STRIP_ASM_SYMS is not set
1241# CONFIG_UNUSED_SYMBOLS is not set 1257# CONFIG_UNUSED_SYMBOLS is not set
1242# CONFIG_DEBUG_FS is not set 1258# CONFIG_DEBUG_FS is not set
1243# CONFIG_HEADERS_CHECK is not set 1259# CONFIG_HEADERS_CHECK is not set
@@ -1255,6 +1271,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
1255CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1271CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1256CONFIG_TRACING_SUPPORT=y 1272CONFIG_TRACING_SUPPORT=y
1257# CONFIG_FTRACE is not set 1273# CONFIG_FTRACE is not set
1274# CONFIG_DMA_API_DEBUG is not set
1258# CONFIG_SAMPLES is not set 1275# CONFIG_SAMPLES is not set
1259CONFIG_HAVE_ARCH_KGDB=y 1276CONFIG_HAVE_ARCH_KGDB=y
1260# CONFIG_PPC_DISABLE_WERROR is not set 1277# CONFIG_PPC_DISABLE_WERROR is not set
@@ -1275,7 +1292,6 @@ CONFIG_CRYPTO=y
1275# 1292#
1276# Crypto core or helper 1293# Crypto core or helper
1277# 1294#
1278# CONFIG_CRYPTO_FIPS is not set
1279# CONFIG_CRYPTO_MANAGER is not set 1295# CONFIG_CRYPTO_MANAGER is not set
1280# CONFIG_CRYPTO_MANAGER2 is not set 1296# CONFIG_CRYPTO_MANAGER2 is not set
1281# CONFIG_CRYPTO_GF128MUL is not set 1297# CONFIG_CRYPTO_GF128MUL is not set
@@ -1306,11 +1322,13 @@ CONFIG_CRYPTO=y
1306# 1322#
1307# CONFIG_CRYPTO_HMAC is not set 1323# CONFIG_CRYPTO_HMAC is not set
1308# CONFIG_CRYPTO_XCBC is not set 1324# CONFIG_CRYPTO_XCBC is not set
1325# CONFIG_CRYPTO_VMAC is not set
1309 1326
1310# 1327#
1311# Digest 1328# Digest
1312# 1329#
1313# CONFIG_CRYPTO_CRC32C is not set 1330# CONFIG_CRYPTO_CRC32C is not set
1331# CONFIG_CRYPTO_GHASH is not set
1314# CONFIG_CRYPTO_MD4 is not set 1332# CONFIG_CRYPTO_MD4 is not set
1315# CONFIG_CRYPTO_MD5 is not set 1333# CONFIG_CRYPTO_MD5 is not set
1316# CONFIG_CRYPTO_MICHAEL_MIC is not set 1334# CONFIG_CRYPTO_MICHAEL_MIC is not set
diff --git a/arch/powerpc/configs/85xx/tqm8548_defconfig b/arch/powerpc/configs/85xx/tqm8548_defconfig
index 4f228a905274..debe268f43d1 100644
--- a/arch/powerpc/configs/85xx/tqm8548_defconfig
+++ b/arch/powerpc/configs/85xx/tqm8548_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.31-rc4 3# Linux kernel version: 2.6.32-rc5
4# Wed Jul 29 23:32:23 2009 4# Thu Nov 5 08:20:41 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -22,6 +22,7 @@ CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set 22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y 23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y 24CONFIG_PPC_MMU_NOHASH=y
25CONFIG_PPC_MMU_NOHASH_32=y
25CONFIG_PPC_BOOK3E_MMU=y 26CONFIG_PPC_BOOK3E_MMU=y
26# CONFIG_PPC_MM_SLICES is not set 27# CONFIG_PPC_MM_SLICES is not set
27# CONFIG_SMP is not set 28# CONFIG_SMP is not set
@@ -36,6 +37,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
36CONFIG_GENERIC_HARDIRQS=y 37CONFIG_GENERIC_HARDIRQS=y
37CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 38CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
38# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
39CONFIG_IRQ_PER_CPU=y 41CONFIG_IRQ_PER_CPU=y
40CONFIG_STACKTRACE_SUPPORT=y 42CONFIG_STACKTRACE_SUPPORT=y
41CONFIG_HAVE_LATENCYTOP_SUPPORT=y 43CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -84,11 +86,12 @@ CONFIG_SYSVIPC_SYSCTL=y
84# 86#
85# RCU Subsystem 87# RCU Subsystem
86# 88#
87CONFIG_CLASSIC_RCU=y 89CONFIG_TREE_RCU=y
88# CONFIG_TREE_RCU is not set 90# CONFIG_TREE_PREEMPT_RCU is not set
89# CONFIG_PREEMPT_RCU is not set 91# CONFIG_RCU_TRACE is not set
92CONFIG_RCU_FANOUT=32
93# CONFIG_RCU_FANOUT_EXACT is not set
90# CONFIG_TREE_RCU_TRACE is not set 94# CONFIG_TREE_RCU_TRACE is not set
91# CONFIG_PREEMPT_RCU_TRACE is not set
92# CONFIG_IKCONFIG is not set 95# CONFIG_IKCONFIG is not set
93CONFIG_LOG_BUF_SHIFT=14 96CONFIG_LOG_BUF_SHIFT=14
94CONFIG_GROUP_SCHED=y 97CONFIG_GROUP_SCHED=y
@@ -126,22 +129,21 @@ CONFIG_TIMERFD=y
126CONFIG_EVENTFD=y 129CONFIG_EVENTFD=y
127CONFIG_SHMEM=y 130CONFIG_SHMEM=y
128CONFIG_AIO=y 131CONFIG_AIO=y
129CONFIG_HAVE_PERF_COUNTERS=y 132CONFIG_HAVE_PERF_EVENTS=y
130 133
131# 134#
132# Performance Counters 135# Kernel Performance Events And Counters
133# 136#
137# CONFIG_PERF_EVENTS is not set
134# CONFIG_PERF_COUNTERS is not set 138# CONFIG_PERF_COUNTERS is not set
135CONFIG_VM_EVENT_COUNTERS=y 139CONFIG_VM_EVENT_COUNTERS=y
136CONFIG_PCI_QUIRKS=y 140CONFIG_PCI_QUIRKS=y
137CONFIG_SLUB_DEBUG=y 141CONFIG_SLUB_DEBUG=y
138# CONFIG_STRIP_ASM_SYMS is not set
139CONFIG_COMPAT_BRK=y 142CONFIG_COMPAT_BRK=y
140# CONFIG_SLAB is not set 143# CONFIG_SLAB is not set
141CONFIG_SLUB=y 144CONFIG_SLUB=y
142# CONFIG_SLOB is not set 145# CONFIG_SLOB is not set
143# CONFIG_PROFILING is not set 146# CONFIG_PROFILING is not set
144# CONFIG_MARKERS is not set
145CONFIG_HAVE_OPROFILE=y 147CONFIG_HAVE_OPROFILE=y
146# CONFIG_KPROBES is not set 148# CONFIG_KPROBES is not set
147CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 149CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -149,6 +151,8 @@ CONFIG_HAVE_IOREMAP_PROT=y
149CONFIG_HAVE_KPROBES=y 151CONFIG_HAVE_KPROBES=y
150CONFIG_HAVE_KRETPROBES=y 152CONFIG_HAVE_KRETPROBES=y
151CONFIG_HAVE_ARCH_TRACEHOOK=y 153CONFIG_HAVE_ARCH_TRACEHOOK=y
154CONFIG_HAVE_DMA_ATTRS=y
155CONFIG_HAVE_DMA_API_DEBUG=y
152 156
153# 157#
154# GCOV-based kernel profiling 158# GCOV-based kernel profiling
@@ -196,6 +200,7 @@ CONFIG_MPC85xx=y
196# CONFIG_MPC85xx_MDS is not set 200# CONFIG_MPC85xx_MDS is not set
197# CONFIG_MPC8536_DS is not set 201# CONFIG_MPC8536_DS is not set
198# CONFIG_MPC85xx_DS is not set 202# CONFIG_MPC85xx_DS is not set
203# CONFIG_MPC85xx_RDB is not set
199# CONFIG_SOCRATES is not set 204# CONFIG_SOCRATES is not set
200# CONFIG_KSI8560 is not set 205# CONFIG_KSI8560 is not set
201# CONFIG_XES_MPC85xx is not set 206# CONFIG_XES_MPC85xx is not set
@@ -252,6 +257,7 @@ CONFIG_MATH_EMULATION=y
252CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 257CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
253CONFIG_ARCH_HAS_WALK_MEMORY=y 258CONFIG_ARCH_HAS_WALK_MEMORY=y
254CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 259CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
260CONFIG_MAX_ACTIVE_REGIONS=32
255CONFIG_ARCH_FLATMEM_ENABLE=y 261CONFIG_ARCH_FLATMEM_ENABLE=y
256CONFIG_ARCH_POPULATES_NODE_MAP=y 262CONFIG_ARCH_POPULATES_NODE_MAP=y
257CONFIG_SELECT_MEMORY_MODEL=y 263CONFIG_SELECT_MEMORY_MODEL=y
@@ -269,6 +275,7 @@ CONFIG_BOUNCE=y
269CONFIG_VIRT_TO_BUS=y 275CONFIG_VIRT_TO_BUS=y
270CONFIG_HAVE_MLOCK=y 276CONFIG_HAVE_MLOCK=y
271CONFIG_HAVE_MLOCKED_PAGE_BIT=y 277CONFIG_HAVE_MLOCKED_PAGE_BIT=y
278# CONFIG_KSM is not set
272CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 279CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
273CONFIG_PPC_4K_PAGES=y 280CONFIG_PPC_4K_PAGES=y
274# CONFIG_PPC_16K_PAGES is not set 281# CONFIG_PPC_16K_PAGES is not set
@@ -371,6 +378,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
371# CONFIG_NETFILTER is not set 378# CONFIG_NETFILTER is not set
372# CONFIG_IP_DCCP is not set 379# CONFIG_IP_DCCP is not set
373# CONFIG_IP_SCTP is not set 380# CONFIG_IP_SCTP is not set
381# CONFIG_RDS is not set
374# CONFIG_TIPC is not set 382# CONFIG_TIPC is not set
375# CONFIG_ATM is not set 383# CONFIG_ATM is not set
376# CONFIG_BRIDGE is not set 384# CONFIG_BRIDGE is not set
@@ -411,6 +419,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
411# Generic Driver Options 419# Generic Driver Options
412# 420#
413CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 421CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
422# CONFIG_DEVTMPFS is not set
414CONFIG_STANDALONE=y 423CONFIG_STANDALONE=y
415CONFIG_PREVENT_FIRMWARE_BUILD=y 424CONFIG_PREVENT_FIRMWARE_BUILD=y
416# CONFIG_FW_LOADER is not set 425# CONFIG_FW_LOADER is not set
@@ -420,9 +429,9 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
420# CONFIG_CONNECTOR is not set 429# CONFIG_CONNECTOR is not set
421CONFIG_MTD=y 430CONFIG_MTD=y
422# CONFIG_MTD_DEBUG is not set 431# CONFIG_MTD_DEBUG is not set
432# CONFIG_MTD_TESTS is not set
423# CONFIG_MTD_CONCAT is not set 433# CONFIG_MTD_CONCAT is not set
424CONFIG_MTD_PARTITIONS=y 434CONFIG_MTD_PARTITIONS=y
425# CONFIG_MTD_TESTS is not set
426# CONFIG_MTD_REDBOOT_PARTS is not set 435# CONFIG_MTD_REDBOOT_PARTS is not set
427# CONFIG_MTD_CMDLINE_PARTS is not set 436# CONFIG_MTD_CMDLINE_PARTS is not set
428CONFIG_MTD_OF_PARTS=y 437CONFIG_MTD_OF_PARTS=y
@@ -630,7 +639,9 @@ CONFIG_MII=y
630# CONFIG_NET_PCI is not set 639# CONFIG_NET_PCI is not set
631# CONFIG_B44 is not set 640# CONFIG_B44 is not set
632# CONFIG_KS8842 is not set 641# CONFIG_KS8842 is not set
642# CONFIG_KS8851_MLL is not set
633# CONFIG_ATL2 is not set 643# CONFIG_ATL2 is not set
644# CONFIG_XILINX_EMACLITE is not set
634CONFIG_NETDEV_1000=y 645CONFIG_NETDEV_1000=y
635# CONFIG_ACENIC is not set 646# CONFIG_ACENIC is not set
636# CONFIG_DL2K is not set 647# CONFIG_DL2K is not set
@@ -678,10 +689,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
678# CONFIG_SFC is not set 689# CONFIG_SFC is not set
679# CONFIG_BE2NET is not set 690# CONFIG_BE2NET is not set
680# CONFIG_TR is not set 691# CONFIG_TR is not set
681 692CONFIG_WLAN=y
682#
683# Wireless LAN
684#
685# CONFIG_WLAN_PRE80211 is not set 693# CONFIG_WLAN_PRE80211 is not set
686# CONFIG_WLAN_80211 is not set 694# CONFIG_WLAN_80211 is not set
687 695
@@ -772,6 +780,7 @@ CONFIG_LEGACY_PTY_COUNT=256
772CONFIG_DEVPORT=y 780CONFIG_DEVPORT=y
773CONFIG_I2C=y 781CONFIG_I2C=y
774CONFIG_I2C_BOARDINFO=y 782CONFIG_I2C_BOARDINFO=y
783CONFIG_I2C_COMPAT=y
775CONFIG_I2C_CHARDEV=y 784CONFIG_I2C_CHARDEV=y
776CONFIG_I2C_HELPER_AUTO=y 785CONFIG_I2C_HELPER_AUTO=y
777 786
@@ -825,9 +834,6 @@ CONFIG_I2C_MPC=y
825# Miscellaneous I2C Chip support 834# Miscellaneous I2C Chip support
826# 835#
827# CONFIG_DS1682 is not set 836# CONFIG_DS1682 is not set
828# CONFIG_SENSORS_PCF8574 is not set
829# CONFIG_PCF8575 is not set
830# CONFIG_SENSORS_PCA9539 is not set
831# CONFIG_SENSORS_TSL2550 is not set 837# CONFIG_SENSORS_TSL2550 is not set
832# CONFIG_I2C_DEBUG_CORE is not set 838# CONFIG_I2C_DEBUG_CORE is not set
833# CONFIG_I2C_DEBUG_ALGO is not set 839# CONFIG_I2C_DEBUG_ALGO is not set
@@ -845,6 +851,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
845# CONFIG_POWER_SUPPLY is not set 851# CONFIG_POWER_SUPPLY is not set
846CONFIG_HWMON=y 852CONFIG_HWMON=y
847# CONFIG_HWMON_VID is not set 853# CONFIG_HWMON_VID is not set
854# CONFIG_HWMON_DEBUG_CHIP is not set
855
856#
857# Native drivers
858#
848# CONFIG_SENSORS_AD7414 is not set 859# CONFIG_SENSORS_AD7414 is not set
849# CONFIG_SENSORS_AD7418 is not set 860# CONFIG_SENSORS_AD7418 is not set
850# CONFIG_SENSORS_ADM1021 is not set 861# CONFIG_SENSORS_ADM1021 is not set
@@ -894,6 +905,7 @@ CONFIG_SENSORS_LM75=y
894# CONFIG_SENSORS_ADS7828 is not set 905# CONFIG_SENSORS_ADS7828 is not set
895# CONFIG_SENSORS_THMC50 is not set 906# CONFIG_SENSORS_THMC50 is not set
896# CONFIG_SENSORS_TMP401 is not set 907# CONFIG_SENSORS_TMP401 is not set
908# CONFIG_SENSORS_TMP421 is not set
897# CONFIG_SENSORS_VIA686A is not set 909# CONFIG_SENSORS_VIA686A is not set
898# CONFIG_SENSORS_VT1211 is not set 910# CONFIG_SENSORS_VT1211 is not set
899# CONFIG_SENSORS_VT8231 is not set 911# CONFIG_SENSORS_VT8231 is not set
@@ -905,9 +917,7 @@ CONFIG_SENSORS_LM75=y
905# CONFIG_SENSORS_W83L786NG is not set 917# CONFIG_SENSORS_W83L786NG is not set
906# CONFIG_SENSORS_W83627HF is not set 918# CONFIG_SENSORS_W83627HF is not set
907# CONFIG_SENSORS_W83627EHF is not set 919# CONFIG_SENSORS_W83627EHF is not set
908# CONFIG_HWMON_DEBUG_CHIP is not set
909# CONFIG_THERMAL is not set 920# CONFIG_THERMAL is not set
910# CONFIG_THERMAL_HWMON is not set
911# CONFIG_WATCHDOG is not set 921# CONFIG_WATCHDOG is not set
912CONFIG_SSB_POSSIBLE=y 922CONFIG_SSB_POSSIBLE=y
913 923
@@ -926,6 +936,7 @@ CONFIG_SSB_POSSIBLE=y
926# CONFIG_MFD_TMIO is not set 936# CONFIG_MFD_TMIO is not set
927# CONFIG_PMIC_DA903X is not set 937# CONFIG_PMIC_DA903X is not set
928# CONFIG_MFD_WM8400 is not set 938# CONFIG_MFD_WM8400 is not set
939# CONFIG_MFD_WM831X is not set
929# CONFIG_MFD_WM8350_I2C is not set 940# CONFIG_MFD_WM8350_I2C is not set
930# CONFIG_MFD_PCF50633 is not set 941# CONFIG_MFD_PCF50633 is not set
931# CONFIG_AB3100_CORE is not set 942# CONFIG_AB3100_CORE is not set
@@ -936,6 +947,7 @@ CONFIG_SSB_POSSIBLE=y
936# Graphics support 947# Graphics support
937# 948#
938# CONFIG_AGP is not set 949# CONFIG_AGP is not set
950CONFIG_VGA_ARB=y
939# CONFIG_DRM is not set 951# CONFIG_DRM is not set
940# CONFIG_VGASTATE is not set 952# CONFIG_VGASTATE is not set
941CONFIG_VIDEO_OUTPUT_CONTROL=y 953CONFIG_VIDEO_OUTPUT_CONTROL=y
@@ -949,7 +961,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y
949# CONFIG_SOUND is not set 961# CONFIG_SOUND is not set
950CONFIG_HID_SUPPORT=y 962CONFIG_HID_SUPPORT=y
951CONFIG_HID=y 963CONFIG_HID=y
952# CONFIG_HID_DEBUG is not set
953# CONFIG_HIDRAW is not set 964# CONFIG_HIDRAW is not set
954# CONFIG_HID_PID is not set 965# CONFIG_HID_PID is not set
955 966
@@ -1042,6 +1053,7 @@ CONFIG_RTC_DRV_DS1307=y
1042# CONFIG_GFS2_FS is not set 1053# CONFIG_GFS2_FS is not set
1043# CONFIG_OCFS2_FS is not set 1054# CONFIG_OCFS2_FS is not set
1044# CONFIG_BTRFS_FS is not set 1055# CONFIG_BTRFS_FS is not set
1056# CONFIG_NILFS2_FS is not set
1045CONFIG_FILE_LOCKING=y 1057CONFIG_FILE_LOCKING=y
1046CONFIG_FSNOTIFY=y 1058CONFIG_FSNOTIFY=y
1047CONFIG_DNOTIFY=y 1059CONFIG_DNOTIFY=y
@@ -1111,7 +1123,6 @@ CONFIG_JFFS2_RTIME=y
1111# CONFIG_ROMFS_FS is not set 1123# CONFIG_ROMFS_FS is not set
1112# CONFIG_SYSV_FS is not set 1124# CONFIG_SYSV_FS is not set
1113# CONFIG_UFS_FS is not set 1125# CONFIG_UFS_FS is not set
1114# CONFIG_NILFS2_FS is not set
1115CONFIG_NETWORK_FILESYSTEMS=y 1126CONFIG_NETWORK_FILESYSTEMS=y
1116CONFIG_NFS_FS=y 1127CONFIG_NFS_FS=y
1117# CONFIG_NFS_V3 is not set 1128# CONFIG_NFS_V3 is not set
@@ -1180,6 +1191,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
1180CONFIG_ENABLE_MUST_CHECK=y 1191CONFIG_ENABLE_MUST_CHECK=y
1181CONFIG_FRAME_WARN=1024 1192CONFIG_FRAME_WARN=1024
1182# CONFIG_MAGIC_SYSRQ is not set 1193# CONFIG_MAGIC_SYSRQ is not set
1194# CONFIG_STRIP_ASM_SYMS is not set
1183# CONFIG_UNUSED_SYMBOLS is not set 1195# CONFIG_UNUSED_SYMBOLS is not set
1184# CONFIG_DEBUG_FS is not set 1196# CONFIG_DEBUG_FS is not set
1185# CONFIG_HEADERS_CHECK is not set 1197# CONFIG_HEADERS_CHECK is not set
@@ -1197,6 +1209,7 @@ CONFIG_SCHED_DEBUG=y
1197# CONFIG_DEBUG_OBJECTS is not set 1209# CONFIG_DEBUG_OBJECTS is not set
1198# CONFIG_SLUB_DEBUG_ON is not set 1210# CONFIG_SLUB_DEBUG_ON is not set
1199# CONFIG_SLUB_STATS is not set 1211# CONFIG_SLUB_STATS is not set
1212# CONFIG_DEBUG_KMEMLEAK is not set
1200# CONFIG_DEBUG_RT_MUTEXES is not set 1213# CONFIG_DEBUG_RT_MUTEXES is not set
1201# CONFIG_RT_MUTEX_TESTER is not set 1214# CONFIG_RT_MUTEX_TESTER is not set
1202# CONFIG_DEBUG_SPINLOCK is not set 1215# CONFIG_DEBUG_SPINLOCK is not set
@@ -1216,10 +1229,12 @@ CONFIG_DEBUG_MUTEXES=y
1216# CONFIG_DEBUG_LIST is not set 1229# CONFIG_DEBUG_LIST is not set
1217# CONFIG_DEBUG_SG is not set 1230# CONFIG_DEBUG_SG is not set
1218# CONFIG_DEBUG_NOTIFIERS is not set 1231# CONFIG_DEBUG_NOTIFIERS is not set
1232# CONFIG_DEBUG_CREDENTIALS is not set
1219# CONFIG_RCU_TORTURE_TEST is not set 1233# CONFIG_RCU_TORTURE_TEST is not set
1220# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1234# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1221# CONFIG_BACKTRACE_SELF_TEST is not set 1235# CONFIG_BACKTRACE_SELF_TEST is not set
1222# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 1236# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1237# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
1223# CONFIG_FAULT_INJECTION is not set 1238# CONFIG_FAULT_INJECTION is not set
1224# CONFIG_LATENCYTOP is not set 1239# CONFIG_LATENCYTOP is not set
1225CONFIG_SYSCTL_SYSCALL_CHECK=y 1240CONFIG_SYSCTL_SYSCALL_CHECK=y
@@ -1242,10 +1257,10 @@ CONFIG_BRANCH_PROFILE_NONE=y
1242# CONFIG_KMEMTRACE is not set 1257# CONFIG_KMEMTRACE is not set
1243# CONFIG_WORKQUEUE_TRACER is not set 1258# CONFIG_WORKQUEUE_TRACER is not set
1244# CONFIG_BLK_DEV_IO_TRACE is not set 1259# CONFIG_BLK_DEV_IO_TRACE is not set
1260# CONFIG_DMA_API_DEBUG is not set
1245# CONFIG_SAMPLES is not set 1261# CONFIG_SAMPLES is not set
1246CONFIG_HAVE_ARCH_KGDB=y 1262CONFIG_HAVE_ARCH_KGDB=y
1247# CONFIG_KGDB is not set 1263# CONFIG_KGDB is not set
1248# CONFIG_KMEMCHECK is not set
1249# CONFIG_PPC_DISABLE_WERROR is not set 1264# CONFIG_PPC_DISABLE_WERROR is not set
1250CONFIG_PPC_WERROR=y 1265CONFIG_PPC_WERROR=y
1251CONFIG_PRINT_STACK_DEPTH=64 1266CONFIG_PRINT_STACK_DEPTH=64
@@ -1271,7 +1286,6 @@ CONFIG_CRYPTO=y
1271# 1286#
1272# Crypto core or helper 1287# Crypto core or helper
1273# 1288#
1274# CONFIG_CRYPTO_FIPS is not set
1275# CONFIG_CRYPTO_MANAGER is not set 1289# CONFIG_CRYPTO_MANAGER is not set
1276# CONFIG_CRYPTO_MANAGER2 is not set 1290# CONFIG_CRYPTO_MANAGER2 is not set
1277# CONFIG_CRYPTO_GF128MUL is not set 1291# CONFIG_CRYPTO_GF128MUL is not set
@@ -1303,11 +1317,13 @@ CONFIG_CRYPTO=y
1303# 1317#
1304# CONFIG_CRYPTO_HMAC is not set 1318# CONFIG_CRYPTO_HMAC is not set
1305# CONFIG_CRYPTO_XCBC is not set 1319# CONFIG_CRYPTO_XCBC is not set
1320# CONFIG_CRYPTO_VMAC is not set
1306 1321
1307# 1322#
1308# Digest 1323# Digest
1309# 1324#
1310# CONFIG_CRYPTO_CRC32C is not set 1325# CONFIG_CRYPTO_CRC32C is not set
1326# CONFIG_CRYPTO_GHASH is not set
1311# CONFIG_CRYPTO_MD4 is not set 1327# CONFIG_CRYPTO_MD4 is not set
1312# CONFIG_CRYPTO_MD5 is not set 1328# CONFIG_CRYPTO_MD5 is not set
1313# CONFIG_CRYPTO_MICHAEL_MIC is not set 1329# CONFIG_CRYPTO_MICHAEL_MIC is not set
diff --git a/arch/powerpc/configs/85xx/tqm8555_defconfig b/arch/powerpc/configs/85xx/tqm8555_defconfig
index 9196724bebc7..74515501f5b7 100644
--- a/arch/powerpc/configs/85xx/tqm8555_defconfig
+++ b/arch/powerpc/configs/85xx/tqm8555_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.31-rc4 3# Linux kernel version: 2.6.32-rc5
4# Wed Jul 29 23:32:24 2009 4# Thu Nov 5 08:20:42 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -22,6 +22,7 @@ CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set 22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y 23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y 24CONFIG_PPC_MMU_NOHASH=y
25CONFIG_PPC_MMU_NOHASH_32=y
25CONFIG_PPC_BOOK3E_MMU=y 26CONFIG_PPC_BOOK3E_MMU=y
26# CONFIG_PPC_MM_SLICES is not set 27# CONFIG_PPC_MM_SLICES is not set
27# CONFIG_SMP is not set 28# CONFIG_SMP is not set
@@ -36,6 +37,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
36CONFIG_GENERIC_HARDIRQS=y 37CONFIG_GENERIC_HARDIRQS=y
37CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 38CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
38# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
39CONFIG_IRQ_PER_CPU=y 41CONFIG_IRQ_PER_CPU=y
40CONFIG_STACKTRACE_SUPPORT=y 42CONFIG_STACKTRACE_SUPPORT=y
41CONFIG_HAVE_LATENCYTOP_SUPPORT=y 43CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -85,11 +87,12 @@ CONFIG_SYSVIPC_SYSCTL=y
85# 87#
86# RCU Subsystem 88# RCU Subsystem
87# 89#
88CONFIG_CLASSIC_RCU=y 90CONFIG_TREE_RCU=y
89# CONFIG_TREE_RCU is not set 91# CONFIG_TREE_PREEMPT_RCU is not set
90# CONFIG_PREEMPT_RCU is not set 92# CONFIG_RCU_TRACE is not set
93CONFIG_RCU_FANOUT=32
94# CONFIG_RCU_FANOUT_EXACT is not set
91# CONFIG_TREE_RCU_TRACE is not set 95# CONFIG_TREE_RCU_TRACE is not set
92# CONFIG_PREEMPT_RCU_TRACE is not set
93# CONFIG_IKCONFIG is not set 96# CONFIG_IKCONFIG is not set
94CONFIG_LOG_BUF_SHIFT=14 97CONFIG_LOG_BUF_SHIFT=14
95CONFIG_GROUP_SCHED=y 98CONFIG_GROUP_SCHED=y
@@ -125,29 +128,30 @@ CONFIG_TIMERFD=y
125CONFIG_EVENTFD=y 128CONFIG_EVENTFD=y
126CONFIG_SHMEM=y 129CONFIG_SHMEM=y
127CONFIG_AIO=y 130CONFIG_AIO=y
128CONFIG_HAVE_PERF_COUNTERS=y 131CONFIG_HAVE_PERF_EVENTS=y
129 132
130# 133#
131# Performance Counters 134# Kernel Performance Events And Counters
132# 135#
136# CONFIG_PERF_EVENTS is not set
133# CONFIG_PERF_COUNTERS is not set 137# CONFIG_PERF_COUNTERS is not set
134CONFIG_VM_EVENT_COUNTERS=y 138CONFIG_VM_EVENT_COUNTERS=y
135CONFIG_PCI_QUIRKS=y 139CONFIG_PCI_QUIRKS=y
136CONFIG_SLUB_DEBUG=y 140CONFIG_SLUB_DEBUG=y
137# CONFIG_STRIP_ASM_SYMS is not set
138CONFIG_COMPAT_BRK=y 141CONFIG_COMPAT_BRK=y
139# CONFIG_SLAB is not set 142# CONFIG_SLAB is not set
140CONFIG_SLUB=y 143CONFIG_SLUB=y
141# CONFIG_SLOB is not set 144# CONFIG_SLOB is not set
142# CONFIG_PROFILING is not set 145# CONFIG_PROFILING is not set
143# CONFIG_MARKERS is not set
144CONFIG_HAVE_OPROFILE=y 146CONFIG_HAVE_OPROFILE=y
145CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 147CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
146CONFIG_HAVE_IOREMAP_PROT=y 148CONFIG_HAVE_IOREMAP_PROT=y
147CONFIG_HAVE_KPROBES=y 149CONFIG_HAVE_KPROBES=y
148CONFIG_HAVE_KRETPROBES=y 150CONFIG_HAVE_KRETPROBES=y
149CONFIG_HAVE_ARCH_TRACEHOOK=y 151CONFIG_HAVE_ARCH_TRACEHOOK=y
152CONFIG_HAVE_DMA_ATTRS=y
150CONFIG_HAVE_CLK=y 153CONFIG_HAVE_CLK=y
154CONFIG_HAVE_DMA_API_DEBUG=y
151 155
152# 156#
153# GCOV-based kernel profiling 157# GCOV-based kernel profiling
@@ -190,6 +194,7 @@ CONFIG_MPC85xx=y
190# CONFIG_MPC85xx_MDS is not set 194# CONFIG_MPC85xx_MDS is not set
191# CONFIG_MPC8536_DS is not set 195# CONFIG_MPC8536_DS is not set
192# CONFIG_MPC85xx_DS is not set 196# CONFIG_MPC85xx_DS is not set
197# CONFIG_MPC85xx_RDB is not set
193# CONFIG_SOCRATES is not set 198# CONFIG_SOCRATES is not set
194# CONFIG_KSI8560 is not set 199# CONFIG_KSI8560 is not set
195# CONFIG_XES_MPC85xx is not set 200# CONFIG_XES_MPC85xx is not set
@@ -246,6 +251,7 @@ CONFIG_MATH_EMULATION=y
246CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 251CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
247CONFIG_ARCH_HAS_WALK_MEMORY=y 252CONFIG_ARCH_HAS_WALK_MEMORY=y
248CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 253CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
254CONFIG_MAX_ACTIVE_REGIONS=32
249CONFIG_ARCH_FLATMEM_ENABLE=y 255CONFIG_ARCH_FLATMEM_ENABLE=y
250CONFIG_ARCH_POPULATES_NODE_MAP=y 256CONFIG_ARCH_POPULATES_NODE_MAP=y
251CONFIG_SELECT_MEMORY_MODEL=y 257CONFIG_SELECT_MEMORY_MODEL=y
@@ -263,6 +269,7 @@ CONFIG_BOUNCE=y
263CONFIG_VIRT_TO_BUS=y 269CONFIG_VIRT_TO_BUS=y
264CONFIG_HAVE_MLOCK=y 270CONFIG_HAVE_MLOCK=y
265CONFIG_HAVE_MLOCKED_PAGE_BIT=y 271CONFIG_HAVE_MLOCKED_PAGE_BIT=y
272# CONFIG_KSM is not set
266CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 273CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
267CONFIG_PPC_4K_PAGES=y 274CONFIG_PPC_4K_PAGES=y
268# CONFIG_PPC_16K_PAGES is not set 275# CONFIG_PPC_16K_PAGES is not set
@@ -357,6 +364,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
357# CONFIG_NETFILTER is not set 364# CONFIG_NETFILTER is not set
358# CONFIG_IP_DCCP is not set 365# CONFIG_IP_DCCP is not set
359# CONFIG_IP_SCTP is not set 366# CONFIG_IP_SCTP is not set
367# CONFIG_RDS is not set
360# CONFIG_TIPC is not set 368# CONFIG_TIPC is not set
361# CONFIG_ATM is not set 369# CONFIG_ATM is not set
362# CONFIG_BRIDGE is not set 370# CONFIG_BRIDGE is not set
@@ -386,6 +394,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
386# CONFIG_AF_RXRPC is not set 394# CONFIG_AF_RXRPC is not set
387CONFIG_WIRELESS=y 395CONFIG_WIRELESS=y
388# CONFIG_CFG80211 is not set 396# CONFIG_CFG80211 is not set
397CONFIG_CFG80211_DEFAULT_PS_VALUE=0
389CONFIG_WIRELESS_OLD_REGULATORY=y 398CONFIG_WIRELESS_OLD_REGULATORY=y
390# CONFIG_WIRELESS_EXT is not set 399# CONFIG_WIRELESS_EXT is not set
391# CONFIG_LIB80211 is not set 400# CONFIG_LIB80211 is not set
@@ -393,7 +402,6 @@ CONFIG_WIRELESS_OLD_REGULATORY=y
393# 402#
394# CFG80211 needs to be enabled for MAC80211 403# CFG80211 needs to be enabled for MAC80211
395# 404#
396CONFIG_MAC80211_DEFAULT_PS_VALUE=0
397# CONFIG_WIMAX is not set 405# CONFIG_WIMAX is not set
398# CONFIG_RFKILL is not set 406# CONFIG_RFKILL is not set
399# CONFIG_NET_9P is not set 407# CONFIG_NET_9P is not set
@@ -681,9 +689,11 @@ CONFIG_E100=y
681# CONFIG_SUNDANCE is not set 689# CONFIG_SUNDANCE is not set
682# CONFIG_TLAN is not set 690# CONFIG_TLAN is not set
683# CONFIG_KS8842 is not set 691# CONFIG_KS8842 is not set
692# CONFIG_KS8851_MLL is not set
684# CONFIG_VIA_RHINE is not set 693# CONFIG_VIA_RHINE is not set
685# CONFIG_SC92031 is not set 694# CONFIG_SC92031 is not set
686# CONFIG_ATL2 is not set 695# CONFIG_ATL2 is not set
696# CONFIG_XILINX_EMACLITE is not set
687# CONFIG_FS_ENET is not set 697# CONFIG_FS_ENET is not set
688CONFIG_NETDEV_1000=y 698CONFIG_NETDEV_1000=y
689# CONFIG_ACENIC is not set 699# CONFIG_ACENIC is not set
@@ -732,10 +742,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
732# CONFIG_SFC is not set 742# CONFIG_SFC is not set
733# CONFIG_BE2NET is not set 743# CONFIG_BE2NET is not set
734# CONFIG_TR is not set 744# CONFIG_TR is not set
735 745CONFIG_WLAN=y
736#
737# Wireless LAN
738#
739# CONFIG_WLAN_PRE80211 is not set 746# CONFIG_WLAN_PRE80211 is not set
740# CONFIG_WLAN_80211 is not set 747# CONFIG_WLAN_80211 is not set
741 748
@@ -831,6 +838,7 @@ CONFIG_GEN_RTC=y
831CONFIG_DEVPORT=y 838CONFIG_DEVPORT=y
832CONFIG_I2C=y 839CONFIG_I2C=y
833CONFIG_I2C_BOARDINFO=y 840CONFIG_I2C_BOARDINFO=y
841CONFIG_I2C_COMPAT=y
834CONFIG_I2C_CHARDEV=y 842CONFIG_I2C_CHARDEV=y
835CONFIG_I2C_HELPER_AUTO=y 843CONFIG_I2C_HELPER_AUTO=y
836 844
@@ -886,9 +894,6 @@ CONFIG_I2C_MPC=y
886# Miscellaneous I2C Chip support 894# Miscellaneous I2C Chip support
887# 895#
888# CONFIG_DS1682 is not set 896# CONFIG_DS1682 is not set
889# CONFIG_SENSORS_PCF8574 is not set
890# CONFIG_PCF8575 is not set
891# CONFIG_SENSORS_PCA9539 is not set
892# CONFIG_SENSORS_TSL2550 is not set 897# CONFIG_SENSORS_TSL2550 is not set
893# CONFIG_I2C_DEBUG_CORE is not set 898# CONFIG_I2C_DEBUG_CORE is not set
894# CONFIG_I2C_DEBUG_ALGO is not set 899# CONFIG_I2C_DEBUG_ALGO is not set
@@ -921,14 +926,24 @@ CONFIG_GPIOLIB=y
921# PCI GPIO expanders: 926# PCI GPIO expanders:
922# 927#
923# CONFIG_GPIO_BT8XX is not set 928# CONFIG_GPIO_BT8XX is not set
929# CONFIG_GPIO_LANGWELL is not set
924 930
925# 931#
926# SPI GPIO expanders: 932# SPI GPIO expanders:
927# 933#
934
935#
936# AC97 GPIO expanders:
937#
928# CONFIG_W1 is not set 938# CONFIG_W1 is not set
929# CONFIG_POWER_SUPPLY is not set 939# CONFIG_POWER_SUPPLY is not set
930CONFIG_HWMON=y 940CONFIG_HWMON=y
931# CONFIG_HWMON_VID is not set 941# CONFIG_HWMON_VID is not set
942CONFIG_HWMON_DEBUG_CHIP=y
943
944#
945# Native drivers
946#
932# CONFIG_SENSORS_AD7414 is not set 947# CONFIG_SENSORS_AD7414 is not set
933# CONFIG_SENSORS_AD7418 is not set 948# CONFIG_SENSORS_AD7418 is not set
934# CONFIG_SENSORS_ADM1021 is not set 949# CONFIG_SENSORS_ADM1021 is not set
@@ -979,6 +994,7 @@ CONFIG_SENSORS_LM75=y
979# CONFIG_SENSORS_ADS7828 is not set 994# CONFIG_SENSORS_ADS7828 is not set
980# CONFIG_SENSORS_THMC50 is not set 995# CONFIG_SENSORS_THMC50 is not set
981# CONFIG_SENSORS_TMP401 is not set 996# CONFIG_SENSORS_TMP401 is not set
997# CONFIG_SENSORS_TMP421 is not set
982# CONFIG_SENSORS_VIA686A is not set 998# CONFIG_SENSORS_VIA686A is not set
983# CONFIG_SENSORS_VT1211 is not set 999# CONFIG_SENSORS_VT1211 is not set
984# CONFIG_SENSORS_VT8231 is not set 1000# CONFIG_SENSORS_VT8231 is not set
@@ -990,9 +1006,7 @@ CONFIG_SENSORS_LM75=y
990# CONFIG_SENSORS_W83L786NG is not set 1006# CONFIG_SENSORS_W83L786NG is not set
991# CONFIG_SENSORS_W83627HF is not set 1007# CONFIG_SENSORS_W83627HF is not set
992# CONFIG_SENSORS_W83627EHF is not set 1008# CONFIG_SENSORS_W83627EHF is not set
993CONFIG_HWMON_DEBUG_CHIP=y
994# CONFIG_THERMAL is not set 1009# CONFIG_THERMAL is not set
995# CONFIG_THERMAL_HWMON is not set
996# CONFIG_WATCHDOG is not set 1010# CONFIG_WATCHDOG is not set
997CONFIG_SSB_POSSIBLE=y 1011CONFIG_SSB_POSSIBLE=y
998 1012
@@ -1012,6 +1026,7 @@ CONFIG_SSB_POSSIBLE=y
1012# CONFIG_MFD_TMIO is not set 1026# CONFIG_MFD_TMIO is not set
1013# CONFIG_PMIC_DA903X is not set 1027# CONFIG_PMIC_DA903X is not set
1014# CONFIG_MFD_WM8400 is not set 1028# CONFIG_MFD_WM8400 is not set
1029# CONFIG_MFD_WM831X is not set
1015# CONFIG_MFD_WM8350_I2C is not set 1030# CONFIG_MFD_WM8350_I2C is not set
1016# CONFIG_MFD_PCF50633 is not set 1031# CONFIG_MFD_PCF50633 is not set
1017# CONFIG_AB3100_CORE is not set 1032# CONFIG_AB3100_CORE is not set
@@ -1022,6 +1037,7 @@ CONFIG_SSB_POSSIBLE=y
1022# Graphics support 1037# Graphics support
1023# 1038#
1024# CONFIG_AGP is not set 1039# CONFIG_AGP is not set
1040CONFIG_VGA_ARB=y
1025# CONFIG_DRM is not set 1041# CONFIG_DRM is not set
1026# CONFIG_VGASTATE is not set 1042# CONFIG_VGASTATE is not set
1027# CONFIG_VIDEO_OUTPUT_CONTROL is not set 1043# CONFIG_VIDEO_OUTPUT_CONTROL is not set
@@ -1035,7 +1051,6 @@ CONFIG_SSB_POSSIBLE=y
1035# CONFIG_SOUND is not set 1051# CONFIG_SOUND is not set
1036CONFIG_HID_SUPPORT=y 1052CONFIG_HID_SUPPORT=y
1037CONFIG_HID=y 1053CONFIG_HID=y
1038# CONFIG_HID_DEBUG is not set
1039# CONFIG_HIDRAW is not set 1054# CONFIG_HIDRAW is not set
1040# CONFIG_HID_PID is not set 1055# CONFIG_HID_PID is not set
1041 1056
@@ -1100,6 +1115,7 @@ CONFIG_FS_MBCACHE=y
1100# CONFIG_GFS2_FS is not set 1115# CONFIG_GFS2_FS is not set
1101# CONFIG_OCFS2_FS is not set 1116# CONFIG_OCFS2_FS is not set
1102# CONFIG_BTRFS_FS is not set 1117# CONFIG_BTRFS_FS is not set
1118# CONFIG_NILFS2_FS is not set
1103CONFIG_FILE_LOCKING=y 1119CONFIG_FILE_LOCKING=y
1104CONFIG_FSNOTIFY=y 1120CONFIG_FSNOTIFY=y
1105CONFIG_DNOTIFY=y 1121CONFIG_DNOTIFY=y
@@ -1169,7 +1185,6 @@ CONFIG_CRAMFS=y
1169# CONFIG_ROMFS_FS is not set 1185# CONFIG_ROMFS_FS is not set
1170# CONFIG_SYSV_FS is not set 1186# CONFIG_SYSV_FS is not set
1171# CONFIG_UFS_FS is not set 1187# CONFIG_UFS_FS is not set
1172# CONFIG_NILFS2_FS is not set
1173CONFIG_NETWORK_FILESYSTEMS=y 1188CONFIG_NETWORK_FILESYSTEMS=y
1174CONFIG_NFS_FS=y 1189CONFIG_NFS_FS=y
1175# CONFIG_NFS_V3 is not set 1190# CONFIG_NFS_V3 is not set
@@ -1238,6 +1253,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
1238CONFIG_ENABLE_MUST_CHECK=y 1253CONFIG_ENABLE_MUST_CHECK=y
1239CONFIG_FRAME_WARN=1024 1254CONFIG_FRAME_WARN=1024
1240# CONFIG_MAGIC_SYSRQ is not set 1255# CONFIG_MAGIC_SYSRQ is not set
1256# CONFIG_STRIP_ASM_SYMS is not set
1241# CONFIG_UNUSED_SYMBOLS is not set 1257# CONFIG_UNUSED_SYMBOLS is not set
1242# CONFIG_DEBUG_FS is not set 1258# CONFIG_DEBUG_FS is not set
1243# CONFIG_HEADERS_CHECK is not set 1259# CONFIG_HEADERS_CHECK is not set
@@ -1255,6 +1271,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
1255CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1271CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1256CONFIG_TRACING_SUPPORT=y 1272CONFIG_TRACING_SUPPORT=y
1257# CONFIG_FTRACE is not set 1273# CONFIG_FTRACE is not set
1274# CONFIG_DMA_API_DEBUG is not set
1258# CONFIG_SAMPLES is not set 1275# CONFIG_SAMPLES is not set
1259CONFIG_HAVE_ARCH_KGDB=y 1276CONFIG_HAVE_ARCH_KGDB=y
1260# CONFIG_PPC_DISABLE_WERROR is not set 1277# CONFIG_PPC_DISABLE_WERROR is not set
@@ -1275,7 +1292,6 @@ CONFIG_CRYPTO=y
1275# 1292#
1276# Crypto core or helper 1293# Crypto core or helper
1277# 1294#
1278# CONFIG_CRYPTO_FIPS is not set
1279# CONFIG_CRYPTO_MANAGER is not set 1295# CONFIG_CRYPTO_MANAGER is not set
1280# CONFIG_CRYPTO_MANAGER2 is not set 1296# CONFIG_CRYPTO_MANAGER2 is not set
1281# CONFIG_CRYPTO_GF128MUL is not set 1297# CONFIG_CRYPTO_GF128MUL is not set
@@ -1306,11 +1322,13 @@ CONFIG_CRYPTO=y
1306# 1322#
1307# CONFIG_CRYPTO_HMAC is not set 1323# CONFIG_CRYPTO_HMAC is not set
1308# CONFIG_CRYPTO_XCBC is not set 1324# CONFIG_CRYPTO_XCBC is not set
1325# CONFIG_CRYPTO_VMAC is not set
1309 1326
1310# 1327#
1311# Digest 1328# Digest
1312# 1329#
1313# CONFIG_CRYPTO_CRC32C is not set 1330# CONFIG_CRYPTO_CRC32C is not set
1331# CONFIG_CRYPTO_GHASH is not set
1314# CONFIG_CRYPTO_MD4 is not set 1332# CONFIG_CRYPTO_MD4 is not set
1315# CONFIG_CRYPTO_MD5 is not set 1333# CONFIG_CRYPTO_MD5 is not set
1316# CONFIG_CRYPTO_MICHAEL_MIC is not set 1334# CONFIG_CRYPTO_MICHAEL_MIC is not set
diff --git a/arch/powerpc/configs/85xx/tqm8560_defconfig b/arch/powerpc/configs/85xx/tqm8560_defconfig
index 2e49a6e9faf2..631d92b4d4e6 100644
--- a/arch/powerpc/configs/85xx/tqm8560_defconfig
+++ b/arch/powerpc/configs/85xx/tqm8560_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.31-rc4 3# Linux kernel version: 2.6.32-rc5
4# Wed Jul 29 23:32:25 2009 4# Thu Nov 5 08:20:43 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -22,6 +22,7 @@ CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set 22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y 23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y 24CONFIG_PPC_MMU_NOHASH=y
25CONFIG_PPC_MMU_NOHASH_32=y
25CONFIG_PPC_BOOK3E_MMU=y 26CONFIG_PPC_BOOK3E_MMU=y
26# CONFIG_PPC_MM_SLICES is not set 27# CONFIG_PPC_MM_SLICES is not set
27# CONFIG_SMP is not set 28# CONFIG_SMP is not set
@@ -36,6 +37,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
36CONFIG_GENERIC_HARDIRQS=y 37CONFIG_GENERIC_HARDIRQS=y
37CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 38CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
38# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
39CONFIG_IRQ_PER_CPU=y 41CONFIG_IRQ_PER_CPU=y
40CONFIG_STACKTRACE_SUPPORT=y 42CONFIG_STACKTRACE_SUPPORT=y
41CONFIG_HAVE_LATENCYTOP_SUPPORT=y 43CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -85,11 +87,12 @@ CONFIG_SYSVIPC_SYSCTL=y
85# 87#
86# RCU Subsystem 88# RCU Subsystem
87# 89#
88CONFIG_CLASSIC_RCU=y 90CONFIG_TREE_RCU=y
89# CONFIG_TREE_RCU is not set 91# CONFIG_TREE_PREEMPT_RCU is not set
90# CONFIG_PREEMPT_RCU is not set 92# CONFIG_RCU_TRACE is not set
93CONFIG_RCU_FANOUT=32
94# CONFIG_RCU_FANOUT_EXACT is not set
91# CONFIG_TREE_RCU_TRACE is not set 95# CONFIG_TREE_RCU_TRACE is not set
92# CONFIG_PREEMPT_RCU_TRACE is not set
93# CONFIG_IKCONFIG is not set 96# CONFIG_IKCONFIG is not set
94CONFIG_LOG_BUF_SHIFT=14 97CONFIG_LOG_BUF_SHIFT=14
95CONFIG_GROUP_SCHED=y 98CONFIG_GROUP_SCHED=y
@@ -125,29 +128,30 @@ CONFIG_TIMERFD=y
125CONFIG_EVENTFD=y 128CONFIG_EVENTFD=y
126CONFIG_SHMEM=y 129CONFIG_SHMEM=y
127CONFIG_AIO=y 130CONFIG_AIO=y
128CONFIG_HAVE_PERF_COUNTERS=y 131CONFIG_HAVE_PERF_EVENTS=y
129 132
130# 133#
131# Performance Counters 134# Kernel Performance Events And Counters
132# 135#
136# CONFIG_PERF_EVENTS is not set
133# CONFIG_PERF_COUNTERS is not set 137# CONFIG_PERF_COUNTERS is not set
134CONFIG_VM_EVENT_COUNTERS=y 138CONFIG_VM_EVENT_COUNTERS=y
135CONFIG_PCI_QUIRKS=y 139CONFIG_PCI_QUIRKS=y
136CONFIG_SLUB_DEBUG=y 140CONFIG_SLUB_DEBUG=y
137# CONFIG_STRIP_ASM_SYMS is not set
138CONFIG_COMPAT_BRK=y 141CONFIG_COMPAT_BRK=y
139# CONFIG_SLAB is not set 142# CONFIG_SLAB is not set
140CONFIG_SLUB=y 143CONFIG_SLUB=y
141# CONFIG_SLOB is not set 144# CONFIG_SLOB is not set
142# CONFIG_PROFILING is not set 145# CONFIG_PROFILING is not set
143# CONFIG_MARKERS is not set
144CONFIG_HAVE_OPROFILE=y 146CONFIG_HAVE_OPROFILE=y
145CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 147CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
146CONFIG_HAVE_IOREMAP_PROT=y 148CONFIG_HAVE_IOREMAP_PROT=y
147CONFIG_HAVE_KPROBES=y 149CONFIG_HAVE_KPROBES=y
148CONFIG_HAVE_KRETPROBES=y 150CONFIG_HAVE_KRETPROBES=y
149CONFIG_HAVE_ARCH_TRACEHOOK=y 151CONFIG_HAVE_ARCH_TRACEHOOK=y
152CONFIG_HAVE_DMA_ATTRS=y
150CONFIG_HAVE_CLK=y 153CONFIG_HAVE_CLK=y
154CONFIG_HAVE_DMA_API_DEBUG=y
151 155
152# 156#
153# GCOV-based kernel profiling 157# GCOV-based kernel profiling
@@ -190,6 +194,7 @@ CONFIG_MPC85xx=y
190# CONFIG_MPC85xx_MDS is not set 194# CONFIG_MPC85xx_MDS is not set
191# CONFIG_MPC8536_DS is not set 195# CONFIG_MPC8536_DS is not set
192# CONFIG_MPC85xx_DS is not set 196# CONFIG_MPC85xx_DS is not set
197# CONFIG_MPC85xx_RDB is not set
193# CONFIG_SOCRATES is not set 198# CONFIG_SOCRATES is not set
194# CONFIG_KSI8560 is not set 199# CONFIG_KSI8560 is not set
195# CONFIG_XES_MPC85xx is not set 200# CONFIG_XES_MPC85xx is not set
@@ -246,6 +251,7 @@ CONFIG_MATH_EMULATION=y
246CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 251CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
247CONFIG_ARCH_HAS_WALK_MEMORY=y 252CONFIG_ARCH_HAS_WALK_MEMORY=y
248CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 253CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
254CONFIG_MAX_ACTIVE_REGIONS=32
249CONFIG_ARCH_FLATMEM_ENABLE=y 255CONFIG_ARCH_FLATMEM_ENABLE=y
250CONFIG_ARCH_POPULATES_NODE_MAP=y 256CONFIG_ARCH_POPULATES_NODE_MAP=y
251CONFIG_SELECT_MEMORY_MODEL=y 257CONFIG_SELECT_MEMORY_MODEL=y
@@ -263,6 +269,7 @@ CONFIG_BOUNCE=y
263CONFIG_VIRT_TO_BUS=y 269CONFIG_VIRT_TO_BUS=y
264CONFIG_HAVE_MLOCK=y 270CONFIG_HAVE_MLOCK=y
265CONFIG_HAVE_MLOCKED_PAGE_BIT=y 271CONFIG_HAVE_MLOCKED_PAGE_BIT=y
272# CONFIG_KSM is not set
266CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 273CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
267CONFIG_PPC_4K_PAGES=y 274CONFIG_PPC_4K_PAGES=y
268# CONFIG_PPC_16K_PAGES is not set 275# CONFIG_PPC_16K_PAGES is not set
@@ -357,6 +364,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
357# CONFIG_NETFILTER is not set 364# CONFIG_NETFILTER is not set
358# CONFIG_IP_DCCP is not set 365# CONFIG_IP_DCCP is not set
359# CONFIG_IP_SCTP is not set 366# CONFIG_IP_SCTP is not set
367# CONFIG_RDS is not set
360# CONFIG_TIPC is not set 368# CONFIG_TIPC is not set
361# CONFIG_ATM is not set 369# CONFIG_ATM is not set
362# CONFIG_BRIDGE is not set 370# CONFIG_BRIDGE is not set
@@ -386,6 +394,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
386# CONFIG_AF_RXRPC is not set 394# CONFIG_AF_RXRPC is not set
387CONFIG_WIRELESS=y 395CONFIG_WIRELESS=y
388# CONFIG_CFG80211 is not set 396# CONFIG_CFG80211 is not set
397CONFIG_CFG80211_DEFAULT_PS_VALUE=0
389CONFIG_WIRELESS_OLD_REGULATORY=y 398CONFIG_WIRELESS_OLD_REGULATORY=y
390# CONFIG_WIRELESS_EXT is not set 399# CONFIG_WIRELESS_EXT is not set
391# CONFIG_LIB80211 is not set 400# CONFIG_LIB80211 is not set
@@ -393,7 +402,6 @@ CONFIG_WIRELESS_OLD_REGULATORY=y
393# 402#
394# CFG80211 needs to be enabled for MAC80211 403# CFG80211 needs to be enabled for MAC80211
395# 404#
396CONFIG_MAC80211_DEFAULT_PS_VALUE=0
397# CONFIG_WIMAX is not set 405# CONFIG_WIMAX is not set
398# CONFIG_RFKILL is not set 406# CONFIG_RFKILL is not set
399# CONFIG_NET_9P is not set 407# CONFIG_NET_9P is not set
@@ -681,9 +689,11 @@ CONFIG_E100=y
681# CONFIG_SUNDANCE is not set 689# CONFIG_SUNDANCE is not set
682# CONFIG_TLAN is not set 690# CONFIG_TLAN is not set
683# CONFIG_KS8842 is not set 691# CONFIG_KS8842 is not set
692# CONFIG_KS8851_MLL is not set
684# CONFIG_VIA_RHINE is not set 693# CONFIG_VIA_RHINE is not set
685# CONFIG_SC92031 is not set 694# CONFIG_SC92031 is not set
686# CONFIG_ATL2 is not set 695# CONFIG_ATL2 is not set
696# CONFIG_XILINX_EMACLITE is not set
687# CONFIG_FS_ENET is not set 697# CONFIG_FS_ENET is not set
688CONFIG_NETDEV_1000=y 698CONFIG_NETDEV_1000=y
689# CONFIG_ACENIC is not set 699# CONFIG_ACENIC is not set
@@ -732,10 +742,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
732# CONFIG_SFC is not set 742# CONFIG_SFC is not set
733# CONFIG_BE2NET is not set 743# CONFIG_BE2NET is not set
734# CONFIG_TR is not set 744# CONFIG_TR is not set
735 745CONFIG_WLAN=y
736#
737# Wireless LAN
738#
739# CONFIG_WLAN_PRE80211 is not set 746# CONFIG_WLAN_PRE80211 is not set
740# CONFIG_WLAN_80211 is not set 747# CONFIG_WLAN_80211 is not set
741 748
@@ -831,6 +838,7 @@ CONFIG_GEN_RTC=y
831CONFIG_DEVPORT=y 838CONFIG_DEVPORT=y
832CONFIG_I2C=y 839CONFIG_I2C=y
833CONFIG_I2C_BOARDINFO=y 840CONFIG_I2C_BOARDINFO=y
841CONFIG_I2C_COMPAT=y
834CONFIG_I2C_CHARDEV=y 842CONFIG_I2C_CHARDEV=y
835CONFIG_I2C_HELPER_AUTO=y 843CONFIG_I2C_HELPER_AUTO=y
836 844
@@ -886,9 +894,6 @@ CONFIG_I2C_MPC=y
886# Miscellaneous I2C Chip support 894# Miscellaneous I2C Chip support
887# 895#
888# CONFIG_DS1682 is not set 896# CONFIG_DS1682 is not set
889# CONFIG_SENSORS_PCF8574 is not set
890# CONFIG_PCF8575 is not set
891# CONFIG_SENSORS_PCA9539 is not set
892# CONFIG_SENSORS_TSL2550 is not set 897# CONFIG_SENSORS_TSL2550 is not set
893# CONFIG_I2C_DEBUG_CORE is not set 898# CONFIG_I2C_DEBUG_CORE is not set
894# CONFIG_I2C_DEBUG_ALGO is not set 899# CONFIG_I2C_DEBUG_ALGO is not set
@@ -921,14 +926,24 @@ CONFIG_GPIOLIB=y
921# PCI GPIO expanders: 926# PCI GPIO expanders:
922# 927#
923# CONFIG_GPIO_BT8XX is not set 928# CONFIG_GPIO_BT8XX is not set
929# CONFIG_GPIO_LANGWELL is not set
924 930
925# 931#
926# SPI GPIO expanders: 932# SPI GPIO expanders:
927# 933#
934
935#
936# AC97 GPIO expanders:
937#
928# CONFIG_W1 is not set 938# CONFIG_W1 is not set
929# CONFIG_POWER_SUPPLY is not set 939# CONFIG_POWER_SUPPLY is not set
930CONFIG_HWMON=y 940CONFIG_HWMON=y
931# CONFIG_HWMON_VID is not set 941# CONFIG_HWMON_VID is not set
942CONFIG_HWMON_DEBUG_CHIP=y
943
944#
945# Native drivers
946#
932# CONFIG_SENSORS_AD7414 is not set 947# CONFIG_SENSORS_AD7414 is not set
933# CONFIG_SENSORS_AD7418 is not set 948# CONFIG_SENSORS_AD7418 is not set
934# CONFIG_SENSORS_ADM1021 is not set 949# CONFIG_SENSORS_ADM1021 is not set
@@ -979,6 +994,7 @@ CONFIG_SENSORS_LM75=y
979# CONFIG_SENSORS_ADS7828 is not set 994# CONFIG_SENSORS_ADS7828 is not set
980# CONFIG_SENSORS_THMC50 is not set 995# CONFIG_SENSORS_THMC50 is not set
981# CONFIG_SENSORS_TMP401 is not set 996# CONFIG_SENSORS_TMP401 is not set
997# CONFIG_SENSORS_TMP421 is not set
982# CONFIG_SENSORS_VIA686A is not set 998# CONFIG_SENSORS_VIA686A is not set
983# CONFIG_SENSORS_VT1211 is not set 999# CONFIG_SENSORS_VT1211 is not set
984# CONFIG_SENSORS_VT8231 is not set 1000# CONFIG_SENSORS_VT8231 is not set
@@ -990,9 +1006,7 @@ CONFIG_SENSORS_LM75=y
990# CONFIG_SENSORS_W83L786NG is not set 1006# CONFIG_SENSORS_W83L786NG is not set
991# CONFIG_SENSORS_W83627HF is not set 1007# CONFIG_SENSORS_W83627HF is not set
992# CONFIG_SENSORS_W83627EHF is not set 1008# CONFIG_SENSORS_W83627EHF is not set
993CONFIG_HWMON_DEBUG_CHIP=y
994# CONFIG_THERMAL is not set 1009# CONFIG_THERMAL is not set
995# CONFIG_THERMAL_HWMON is not set
996# CONFIG_WATCHDOG is not set 1010# CONFIG_WATCHDOG is not set
997CONFIG_SSB_POSSIBLE=y 1011CONFIG_SSB_POSSIBLE=y
998 1012
@@ -1012,6 +1026,7 @@ CONFIG_SSB_POSSIBLE=y
1012# CONFIG_MFD_TMIO is not set 1026# CONFIG_MFD_TMIO is not set
1013# CONFIG_PMIC_DA903X is not set 1027# CONFIG_PMIC_DA903X is not set
1014# CONFIG_MFD_WM8400 is not set 1028# CONFIG_MFD_WM8400 is not set
1029# CONFIG_MFD_WM831X is not set
1015# CONFIG_MFD_WM8350_I2C is not set 1030# CONFIG_MFD_WM8350_I2C is not set
1016# CONFIG_MFD_PCF50633 is not set 1031# CONFIG_MFD_PCF50633 is not set
1017# CONFIG_AB3100_CORE is not set 1032# CONFIG_AB3100_CORE is not set
@@ -1022,6 +1037,7 @@ CONFIG_SSB_POSSIBLE=y
1022# Graphics support 1037# Graphics support
1023# 1038#
1024# CONFIG_AGP is not set 1039# CONFIG_AGP is not set
1040CONFIG_VGA_ARB=y
1025# CONFIG_DRM is not set 1041# CONFIG_DRM is not set
1026# CONFIG_VGASTATE is not set 1042# CONFIG_VGASTATE is not set
1027# CONFIG_VIDEO_OUTPUT_CONTROL is not set 1043# CONFIG_VIDEO_OUTPUT_CONTROL is not set
@@ -1035,7 +1051,6 @@ CONFIG_SSB_POSSIBLE=y
1035# CONFIG_SOUND is not set 1051# CONFIG_SOUND is not set
1036CONFIG_HID_SUPPORT=y 1052CONFIG_HID_SUPPORT=y
1037CONFIG_HID=y 1053CONFIG_HID=y
1038# CONFIG_HID_DEBUG is not set
1039# CONFIG_HIDRAW is not set 1054# CONFIG_HIDRAW is not set
1040# CONFIG_HID_PID is not set 1055# CONFIG_HID_PID is not set
1041 1056
@@ -1100,6 +1115,7 @@ CONFIG_FS_MBCACHE=y
1100# CONFIG_GFS2_FS is not set 1115# CONFIG_GFS2_FS is not set
1101# CONFIG_OCFS2_FS is not set 1116# CONFIG_OCFS2_FS is not set
1102# CONFIG_BTRFS_FS is not set 1117# CONFIG_BTRFS_FS is not set
1118# CONFIG_NILFS2_FS is not set
1103CONFIG_FILE_LOCKING=y 1119CONFIG_FILE_LOCKING=y
1104CONFIG_FSNOTIFY=y 1120CONFIG_FSNOTIFY=y
1105CONFIG_DNOTIFY=y 1121CONFIG_DNOTIFY=y
@@ -1169,7 +1185,6 @@ CONFIG_CRAMFS=y
1169# CONFIG_ROMFS_FS is not set 1185# CONFIG_ROMFS_FS is not set
1170# CONFIG_SYSV_FS is not set 1186# CONFIG_SYSV_FS is not set
1171# CONFIG_UFS_FS is not set 1187# CONFIG_UFS_FS is not set
1172# CONFIG_NILFS2_FS is not set
1173CONFIG_NETWORK_FILESYSTEMS=y 1188CONFIG_NETWORK_FILESYSTEMS=y
1174CONFIG_NFS_FS=y 1189CONFIG_NFS_FS=y
1175# CONFIG_NFS_V3 is not set 1190# CONFIG_NFS_V3 is not set
@@ -1238,6 +1253,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
1238CONFIG_ENABLE_MUST_CHECK=y 1253CONFIG_ENABLE_MUST_CHECK=y
1239CONFIG_FRAME_WARN=1024 1254CONFIG_FRAME_WARN=1024
1240# CONFIG_MAGIC_SYSRQ is not set 1255# CONFIG_MAGIC_SYSRQ is not set
1256# CONFIG_STRIP_ASM_SYMS is not set
1241# CONFIG_UNUSED_SYMBOLS is not set 1257# CONFIG_UNUSED_SYMBOLS is not set
1242# CONFIG_DEBUG_FS is not set 1258# CONFIG_DEBUG_FS is not set
1243# CONFIG_HEADERS_CHECK is not set 1259# CONFIG_HEADERS_CHECK is not set
@@ -1255,6 +1271,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
1255CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1271CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1256CONFIG_TRACING_SUPPORT=y 1272CONFIG_TRACING_SUPPORT=y
1257# CONFIG_FTRACE is not set 1273# CONFIG_FTRACE is not set
1274# CONFIG_DMA_API_DEBUG is not set
1258# CONFIG_SAMPLES is not set 1275# CONFIG_SAMPLES is not set
1259CONFIG_HAVE_ARCH_KGDB=y 1276CONFIG_HAVE_ARCH_KGDB=y
1260# CONFIG_PPC_DISABLE_WERROR is not set 1277# CONFIG_PPC_DISABLE_WERROR is not set
@@ -1275,7 +1292,6 @@ CONFIG_CRYPTO=y
1275# 1292#
1276# Crypto core or helper 1293# Crypto core or helper
1277# 1294#
1278# CONFIG_CRYPTO_FIPS is not set
1279# CONFIG_CRYPTO_MANAGER is not set 1295# CONFIG_CRYPTO_MANAGER is not set
1280# CONFIG_CRYPTO_MANAGER2 is not set 1296# CONFIG_CRYPTO_MANAGER2 is not set
1281# CONFIG_CRYPTO_GF128MUL is not set 1297# CONFIG_CRYPTO_GF128MUL is not set
@@ -1306,11 +1322,13 @@ CONFIG_CRYPTO=y
1306# 1322#
1307# CONFIG_CRYPTO_HMAC is not set 1323# CONFIG_CRYPTO_HMAC is not set
1308# CONFIG_CRYPTO_XCBC is not set 1324# CONFIG_CRYPTO_XCBC is not set
1325# CONFIG_CRYPTO_VMAC is not set
1309 1326
1310# 1327#
1311# Digest 1328# Digest
1312# 1329#
1313# CONFIG_CRYPTO_CRC32C is not set 1330# CONFIG_CRYPTO_CRC32C is not set
1331# CONFIG_CRYPTO_GHASH is not set
1314# CONFIG_CRYPTO_MD4 is not set 1332# CONFIG_CRYPTO_MD4 is not set
1315# CONFIG_CRYPTO_MD5 is not set 1333# CONFIG_CRYPTO_MD5 is not set
1316# CONFIG_CRYPTO_MICHAEL_MIC is not set 1334# CONFIG_CRYPTO_MICHAEL_MIC is not set
diff --git a/arch/powerpc/configs/85xx/xes_mpc85xx_defconfig b/arch/powerpc/configs/85xx/xes_mpc85xx_defconfig
index 1025da2bf069..52acbac0c4fe 100644
--- a/arch/powerpc/configs/85xx/xes_mpc85xx_defconfig
+++ b/arch/powerpc/configs/85xx/xes_mpc85xx_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.31-rc4 3# Linux kernel version: 2.6.32-rc5
4# Wed Jul 29 23:32:25 2009 4# Thu Nov 5 08:20:44 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -22,6 +22,7 @@ CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set 22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y 23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y 24CONFIG_PPC_MMU_NOHASH=y
25CONFIG_PPC_MMU_NOHASH_32=y
25CONFIG_PPC_BOOK3E_MMU=y 26CONFIG_PPC_BOOK3E_MMU=y
26# CONFIG_PPC_MM_SLICES is not set 27# CONFIG_PPC_MM_SLICES is not set
27CONFIG_SMP=y 28CONFIG_SMP=y
@@ -37,6 +38,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
37CONFIG_GENERIC_HARDIRQS=y 38CONFIG_GENERIC_HARDIRQS=y
38CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 39CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 40# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
41# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
40CONFIG_IRQ_PER_CPU=y 42CONFIG_IRQ_PER_CPU=y
41CONFIG_STACKTRACE_SUPPORT=y 43CONFIG_STACKTRACE_SUPPORT=y
42CONFIG_HAVE_LATENCYTOP_SUPPORT=y 44CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -89,11 +91,12 @@ CONFIG_AUDIT=y
89# 91#
90# RCU Subsystem 92# RCU Subsystem
91# 93#
92CONFIG_CLASSIC_RCU=y 94CONFIG_TREE_RCU=y
93# CONFIG_TREE_RCU is not set 95# CONFIG_TREE_PREEMPT_RCU is not set
94# CONFIG_PREEMPT_RCU is not set 96# CONFIG_RCU_TRACE is not set
97CONFIG_RCU_FANOUT=32
98# CONFIG_RCU_FANOUT_EXACT is not set
95# CONFIG_TREE_RCU_TRACE is not set 99# CONFIG_TREE_RCU_TRACE is not set
96# CONFIG_PREEMPT_RCU_TRACE is not set
97CONFIG_IKCONFIG=y 100CONFIG_IKCONFIG=y
98CONFIG_IKCONFIG_PROC=y 101CONFIG_IKCONFIG_PROC=y
99CONFIG_LOG_BUF_SHIFT=14 102CONFIG_LOG_BUF_SHIFT=14
@@ -128,22 +131,21 @@ CONFIG_TIMERFD=y
128CONFIG_EVENTFD=y 131CONFIG_EVENTFD=y
129CONFIG_SHMEM=y 132CONFIG_SHMEM=y
130CONFIG_AIO=y 133CONFIG_AIO=y
131CONFIG_HAVE_PERF_COUNTERS=y 134CONFIG_HAVE_PERF_EVENTS=y
132 135
133# 136#
134# Performance Counters 137# Kernel Performance Events And Counters
135# 138#
139# CONFIG_PERF_EVENTS is not set
136# CONFIG_PERF_COUNTERS is not set 140# CONFIG_PERF_COUNTERS is not set
137CONFIG_VM_EVENT_COUNTERS=y 141CONFIG_VM_EVENT_COUNTERS=y
138CONFIG_PCI_QUIRKS=y 142CONFIG_PCI_QUIRKS=y
139CONFIG_SLUB_DEBUG=y 143CONFIG_SLUB_DEBUG=y
140# CONFIG_STRIP_ASM_SYMS is not set
141CONFIG_COMPAT_BRK=y 144CONFIG_COMPAT_BRK=y
142# CONFIG_SLAB is not set 145# CONFIG_SLAB is not set
143CONFIG_SLUB=y 146CONFIG_SLUB=y
144# CONFIG_SLOB is not set 147# CONFIG_SLOB is not set
145# CONFIG_PROFILING is not set 148# CONFIG_PROFILING is not set
146# CONFIG_MARKERS is not set
147CONFIG_HAVE_OPROFILE=y 149CONFIG_HAVE_OPROFILE=y
148# CONFIG_KPROBES is not set 150# CONFIG_KPROBES is not set
149CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 151CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -151,7 +153,9 @@ CONFIG_HAVE_IOREMAP_PROT=y
151CONFIG_HAVE_KPROBES=y 153CONFIG_HAVE_KPROBES=y
152CONFIG_HAVE_KRETPROBES=y 154CONFIG_HAVE_KRETPROBES=y
153CONFIG_HAVE_ARCH_TRACEHOOK=y 155CONFIG_HAVE_ARCH_TRACEHOOK=y
156CONFIG_HAVE_DMA_ATTRS=y
154CONFIG_USE_GENERIC_SMP_HELPERS=y 157CONFIG_USE_GENERIC_SMP_HELPERS=y
158CONFIG_HAVE_DMA_API_DEBUG=y
155 159
156# 160#
157# GCOV-based kernel profiling 161# GCOV-based kernel profiling
@@ -201,6 +205,7 @@ CONFIG_MPC85xx=y
201# CONFIG_MPC85xx_MDS is not set 205# CONFIG_MPC85xx_MDS is not set
202# CONFIG_MPC8536_DS is not set 206# CONFIG_MPC8536_DS is not set
203# CONFIG_MPC85xx_DS is not set 207# CONFIG_MPC85xx_DS is not set
208# CONFIG_MPC85xx_RDB is not set
204# CONFIG_SOCRATES is not set 209# CONFIG_SOCRATES is not set
205# CONFIG_KSI8560 is not set 210# CONFIG_KSI8560 is not set
206CONFIG_XES_MPC85xx=y 211CONFIG_XES_MPC85xx=y
@@ -256,6 +261,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
256CONFIG_ARCH_HAS_WALK_MEMORY=y 261CONFIG_ARCH_HAS_WALK_MEMORY=y
257CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 262CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
258# CONFIG_IRQ_ALL_CPUS is not set 263# CONFIG_IRQ_ALL_CPUS is not set
264CONFIG_MAX_ACTIVE_REGIONS=32
259CONFIG_ARCH_FLATMEM_ENABLE=y 265CONFIG_ARCH_FLATMEM_ENABLE=y
260CONFIG_ARCH_POPULATES_NODE_MAP=y 266CONFIG_ARCH_POPULATES_NODE_MAP=y
261CONFIG_SELECT_MEMORY_MODEL=y 267CONFIG_SELECT_MEMORY_MODEL=y
@@ -273,6 +279,7 @@ CONFIG_BOUNCE=y
273CONFIG_VIRT_TO_BUS=y 279CONFIG_VIRT_TO_BUS=y
274CONFIG_HAVE_MLOCK=y 280CONFIG_HAVE_MLOCK=y
275CONFIG_HAVE_MLOCKED_PAGE_BIT=y 281CONFIG_HAVE_MLOCKED_PAGE_BIT=y
282# CONFIG_KSM is not set
276CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 283CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
277CONFIG_PPC_4K_PAGES=y 284CONFIG_PPC_4K_PAGES=y
278# CONFIG_PPC_16K_PAGES is not set 285# CONFIG_PPC_16K_PAGES is not set
@@ -405,6 +412,7 @@ CONFIG_IPV6_NDISC_NODETYPE=y
405# CONFIG_NETFILTER is not set 412# CONFIG_NETFILTER is not set
406# CONFIG_IP_DCCP is not set 413# CONFIG_IP_DCCP is not set
407# CONFIG_IP_SCTP is not set 414# CONFIG_IP_SCTP is not set
415# CONFIG_RDS is not set
408# CONFIG_TIPC is not set 416# CONFIG_TIPC is not set
409# CONFIG_ATM is not set 417# CONFIG_ATM is not set
410# CONFIG_BRIDGE is not set 418# CONFIG_BRIDGE is not set
@@ -446,6 +454,7 @@ CONFIG_FIB_RULES=y
446# Generic Driver Options 454# Generic Driver Options
447# 455#
448CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 456CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
457# CONFIG_DEVTMPFS is not set
449CONFIG_STANDALONE=y 458CONFIG_STANDALONE=y
450CONFIG_PREVENT_FIRMWARE_BUILD=y 459CONFIG_PREVENT_FIRMWARE_BUILD=y
451CONFIG_FW_LOADER=y 460CONFIG_FW_LOADER=y
@@ -457,9 +466,9 @@ CONFIG_EXTRA_FIRMWARE=""
457# CONFIG_CONNECTOR is not set 466# CONFIG_CONNECTOR is not set
458CONFIG_MTD=y 467CONFIG_MTD=y
459# CONFIG_MTD_DEBUG is not set 468# CONFIG_MTD_DEBUG is not set
469# CONFIG_MTD_TESTS is not set
460# CONFIG_MTD_CONCAT is not set 470# CONFIG_MTD_CONCAT is not set
461CONFIG_MTD_PARTITIONS=y 471CONFIG_MTD_PARTITIONS=y
462# CONFIG_MTD_TESTS is not set
463CONFIG_MTD_REDBOOT_PARTS=y 472CONFIG_MTD_REDBOOT_PARTS=y
464CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 473CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
465# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set 474# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
@@ -635,6 +644,7 @@ CONFIG_SCSI_WAIT_SCAN=m
635CONFIG_SCSI_LOWLEVEL=y 644CONFIG_SCSI_LOWLEVEL=y
636# CONFIG_ISCSI_TCP is not set 645# CONFIG_ISCSI_TCP is not set
637# CONFIG_SCSI_BNX2_ISCSI is not set 646# CONFIG_SCSI_BNX2_ISCSI is not set
647# CONFIG_BE2ISCSI is not set
638# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 648# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
639# CONFIG_SCSI_3W_9XXX is not set 649# CONFIG_SCSI_3W_9XXX is not set
640# CONFIG_SCSI_ACARD is not set 650# CONFIG_SCSI_ACARD is not set
@@ -674,11 +684,14 @@ CONFIG_SCSI_LOWLEVEL=y
674# CONFIG_SCSI_DC390T is not set 684# CONFIG_SCSI_DC390T is not set
675# CONFIG_SCSI_NSP32 is not set 685# CONFIG_SCSI_NSP32 is not set
676# CONFIG_SCSI_DEBUG is not set 686# CONFIG_SCSI_DEBUG is not set
687# CONFIG_SCSI_PMCRAID is not set
677# CONFIG_SCSI_SRP is not set 688# CONFIG_SCSI_SRP is not set
689# CONFIG_SCSI_BFA_FC is not set
678# CONFIG_SCSI_DH is not set 690# CONFIG_SCSI_DH is not set
679# CONFIG_SCSI_OSD_INITIATOR is not set 691# CONFIG_SCSI_OSD_INITIATOR is not set
680CONFIG_ATA=y 692CONFIG_ATA=y
681# CONFIG_ATA_NONSTANDARD is not set 693# CONFIG_ATA_NONSTANDARD is not set
694CONFIG_ATA_VERBOSE_ERROR=y
682CONFIG_SATA_PMP=y 695CONFIG_SATA_PMP=y
683CONFIG_SATA_AHCI=y 696CONFIG_SATA_AHCI=y
684# CONFIG_SATA_SIL24 is not set 697# CONFIG_SATA_SIL24 is not set
@@ -701,6 +714,7 @@ CONFIG_ATA_SFF=y
701CONFIG_PATA_ALI=y 714CONFIG_PATA_ALI=y
702# CONFIG_PATA_AMD is not set 715# CONFIG_PATA_AMD is not set
703# CONFIG_PATA_ARTOP is not set 716# CONFIG_PATA_ARTOP is not set
717# CONFIG_PATA_ATP867X is not set
704# CONFIG_PATA_ATIIXP is not set 718# CONFIG_PATA_ATIIXP is not set
705# CONFIG_PATA_CMD640_PCI is not set 719# CONFIG_PATA_CMD640_PCI is not set
706# CONFIG_PATA_CMD64X is not set 720# CONFIG_PATA_CMD64X is not set
@@ -728,6 +742,7 @@ CONFIG_PATA_ALI=y
728# CONFIG_PATA_OPTIDMA is not set 742# CONFIG_PATA_OPTIDMA is not set
729# CONFIG_PATA_PDC_OLD is not set 743# CONFIG_PATA_PDC_OLD is not set
730# CONFIG_PATA_RADISYS is not set 744# CONFIG_PATA_RADISYS is not set
745# CONFIG_PATA_RDC is not set
731# CONFIG_PATA_RZ1000 is not set 746# CONFIG_PATA_RZ1000 is not set
732# CONFIG_PATA_SC1200 is not set 747# CONFIG_PATA_SC1200 is not set
733# CONFIG_PATA_SERVERWORKS is not set 748# CONFIG_PATA_SERVERWORKS is not set
@@ -804,7 +819,9 @@ CONFIG_MII=y
804# CONFIG_NET_PCI is not set 819# CONFIG_NET_PCI is not set
805# CONFIG_B44 is not set 820# CONFIG_B44 is not set
806# CONFIG_KS8842 is not set 821# CONFIG_KS8842 is not set
822# CONFIG_KS8851_MLL is not set
807# CONFIG_ATL2 is not set 823# CONFIG_ATL2 is not set
824# CONFIG_XILINX_EMACLITE is not set
808CONFIG_NETDEV_1000=y 825CONFIG_NETDEV_1000=y
809# CONFIG_ACENIC is not set 826# CONFIG_ACENIC is not set
810# CONFIG_DL2K is not set 827# CONFIG_DL2K is not set
@@ -834,10 +851,7 @@ CONFIG_GIANFAR=y
834# CONFIG_JME is not set 851# CONFIG_JME is not set
835# CONFIG_NETDEV_10000 is not set 852# CONFIG_NETDEV_10000 is not set
836# CONFIG_TR is not set 853# CONFIG_TR is not set
837 854CONFIG_WLAN=y
838#
839# Wireless LAN
840#
841# CONFIG_WLAN_PRE80211 is not set 855# CONFIG_WLAN_PRE80211 is not set
842# CONFIG_WLAN_80211 is not set 856# CONFIG_WLAN_80211 is not set
843 857
@@ -951,6 +965,7 @@ CONFIG_NVRAM=y
951CONFIG_DEVPORT=y 965CONFIG_DEVPORT=y
952CONFIG_I2C=y 966CONFIG_I2C=y
953CONFIG_I2C_BOARDINFO=y 967CONFIG_I2C_BOARDINFO=y
968CONFIG_I2C_COMPAT=y
954CONFIG_I2C_CHARDEV=y 969CONFIG_I2C_CHARDEV=y
955CONFIG_I2C_HELPER_AUTO=y 970CONFIG_I2C_HELPER_AUTO=y
956 971
@@ -1006,8 +1021,6 @@ CONFIG_I2C_MPC=y
1006# Miscellaneous I2C Chip support 1021# Miscellaneous I2C Chip support
1007# 1022#
1008# CONFIG_DS1682 is not set 1023# CONFIG_DS1682 is not set
1009# CONFIG_SENSORS_PCF8574 is not set
1010# CONFIG_PCF8575 is not set
1011# CONFIG_SENSORS_TSL2550 is not set 1024# CONFIG_SENSORS_TSL2550 is not set
1012# CONFIG_I2C_DEBUG_CORE is not set 1025# CONFIG_I2C_DEBUG_CORE is not set
1013# CONFIG_I2C_DEBUG_ALGO is not set 1026# CONFIG_I2C_DEBUG_ALGO is not set
@@ -1041,14 +1054,24 @@ CONFIG_GPIO_PCA953X=y
1041# PCI GPIO expanders: 1054# PCI GPIO expanders:
1042# 1055#
1043# CONFIG_GPIO_BT8XX is not set 1056# CONFIG_GPIO_BT8XX is not set
1057# CONFIG_GPIO_LANGWELL is not set
1044 1058
1045# 1059#
1046# SPI GPIO expanders: 1060# SPI GPIO expanders:
1047# 1061#
1062
1063#
1064# AC97 GPIO expanders:
1065#
1048# CONFIG_W1 is not set 1066# CONFIG_W1 is not set
1049# CONFIG_POWER_SUPPLY is not set 1067# CONFIG_POWER_SUPPLY is not set
1050CONFIG_HWMON=y 1068CONFIG_HWMON=y
1051# CONFIG_HWMON_VID is not set 1069# CONFIG_HWMON_VID is not set
1070# CONFIG_HWMON_DEBUG_CHIP is not set
1071
1072#
1073# Native drivers
1074#
1052# CONFIG_SENSORS_AD7414 is not set 1075# CONFIG_SENSORS_AD7414 is not set
1053# CONFIG_SENSORS_AD7418 is not set 1076# CONFIG_SENSORS_AD7418 is not set
1054# CONFIG_SENSORS_ADM1021 is not set 1077# CONFIG_SENSORS_ADM1021 is not set
@@ -1099,6 +1122,7 @@ CONFIG_SENSORS_LM90=y
1099# CONFIG_SENSORS_ADS7828 is not set 1122# CONFIG_SENSORS_ADS7828 is not set
1100# CONFIG_SENSORS_THMC50 is not set 1123# CONFIG_SENSORS_THMC50 is not set
1101# CONFIG_SENSORS_TMP401 is not set 1124# CONFIG_SENSORS_TMP401 is not set
1125# CONFIG_SENSORS_TMP421 is not set
1102# CONFIG_SENSORS_VIA686A is not set 1126# CONFIG_SENSORS_VIA686A is not set
1103# CONFIG_SENSORS_VT1211 is not set 1127# CONFIG_SENSORS_VT1211 is not set
1104# CONFIG_SENSORS_VT8231 is not set 1128# CONFIG_SENSORS_VT8231 is not set
@@ -1110,9 +1134,7 @@ CONFIG_SENSORS_LM90=y
1110# CONFIG_SENSORS_W83L786NG is not set 1134# CONFIG_SENSORS_W83L786NG is not set
1111# CONFIG_SENSORS_W83627HF is not set 1135# CONFIG_SENSORS_W83627HF is not set
1112# CONFIG_SENSORS_W83627EHF is not set 1136# CONFIG_SENSORS_W83627EHF is not set
1113# CONFIG_HWMON_DEBUG_CHIP is not set
1114# CONFIG_THERMAL is not set 1137# CONFIG_THERMAL is not set
1115# CONFIG_THERMAL_HWMON is not set
1116CONFIG_WATCHDOG=y 1138CONFIG_WATCHDOG=y
1117# CONFIG_WATCHDOG_NOWAYOUT is not set 1139# CONFIG_WATCHDOG_NOWAYOUT is not set
1118 1140
@@ -1151,6 +1173,7 @@ CONFIG_SSB_POSSIBLE=y
1151# CONFIG_MFD_TMIO is not set 1173# CONFIG_MFD_TMIO is not set
1152# CONFIG_PMIC_DA903X is not set 1174# CONFIG_PMIC_DA903X is not set
1153# CONFIG_MFD_WM8400 is not set 1175# CONFIG_MFD_WM8400 is not set
1176# CONFIG_MFD_WM831X is not set
1154# CONFIG_MFD_WM8350_I2C is not set 1177# CONFIG_MFD_WM8350_I2C is not set
1155# CONFIG_MFD_PCF50633 is not set 1178# CONFIG_MFD_PCF50633 is not set
1156# CONFIG_AB3100_CORE is not set 1179# CONFIG_AB3100_CORE is not set
@@ -1161,6 +1184,7 @@ CONFIG_SSB_POSSIBLE=y
1161# Graphics support 1184# Graphics support
1162# 1185#
1163# CONFIG_AGP is not set 1186# CONFIG_AGP is not set
1187CONFIG_VGA_ARB=y
1164# CONFIG_DRM is not set 1188# CONFIG_DRM is not set
1165# CONFIG_VGASTATE is not set 1189# CONFIG_VGASTATE is not set
1166CONFIG_VIDEO_OUTPUT_CONTROL=y 1190CONFIG_VIDEO_OUTPUT_CONTROL=y
@@ -1181,7 +1205,6 @@ CONFIG_DUMMY_CONSOLE=y
1181# CONFIG_SOUND is not set 1205# CONFIG_SOUND is not set
1182CONFIG_HID_SUPPORT=y 1206CONFIG_HID_SUPPORT=y
1183CONFIG_HID=y 1207CONFIG_HID=y
1184# CONFIG_HID_DEBUG is not set
1185# CONFIG_HIDRAW is not set 1208# CONFIG_HIDRAW is not set
1186 1209
1187# 1210#
@@ -1204,6 +1227,7 @@ CONFIG_USB_HID=y
1204# CONFIG_HID_EZKEY is not set 1227# CONFIG_HID_EZKEY is not set
1205# CONFIG_HID_KYE is not set 1228# CONFIG_HID_KYE is not set
1206# CONFIG_HID_GYRATION is not set 1229# CONFIG_HID_GYRATION is not set
1230# CONFIG_HID_TWINHAN is not set
1207# CONFIG_HID_KENSINGTON is not set 1231# CONFIG_HID_KENSINGTON is not set
1208# CONFIG_HID_LOGITECH is not set 1232# CONFIG_HID_LOGITECH is not set
1209# CONFIG_HID_MICROSOFT is not set 1233# CONFIG_HID_MICROSOFT is not set
@@ -1249,6 +1273,7 @@ CONFIG_USB_MON=y
1249# CONFIG_USB_OXU210HP_HCD is not set 1273# CONFIG_USB_OXU210HP_HCD is not set
1250# CONFIG_USB_ISP116X_HCD is not set 1274# CONFIG_USB_ISP116X_HCD is not set
1251CONFIG_USB_ISP1760_HCD=y 1275CONFIG_USB_ISP1760_HCD=y
1276# CONFIG_USB_ISP1362_HCD is not set
1252# CONFIG_USB_OHCI_HCD is not set 1277# CONFIG_USB_OHCI_HCD is not set
1253# CONFIG_USB_UHCI_HCD is not set 1278# CONFIG_USB_UHCI_HCD is not set
1254# CONFIG_USB_SL811_HCD is not set 1279# CONFIG_USB_SL811_HCD is not set
@@ -1466,6 +1491,7 @@ CONFIG_FS_MBCACHE=y
1466# CONFIG_GFS2_FS is not set 1491# CONFIG_GFS2_FS is not set
1467# CONFIG_OCFS2_FS is not set 1492# CONFIG_OCFS2_FS is not set
1468# CONFIG_BTRFS_FS is not set 1493# CONFIG_BTRFS_FS is not set
1494# CONFIG_NILFS2_FS is not set
1469CONFIG_FILE_LOCKING=y 1495CONFIG_FILE_LOCKING=y
1470CONFIG_FSNOTIFY=y 1496CONFIG_FSNOTIFY=y
1471CONFIG_DNOTIFY=y 1497CONFIG_DNOTIFY=y
@@ -1541,7 +1567,6 @@ CONFIG_JFFS2_RTIME=y
1541# CONFIG_ROMFS_FS is not set 1567# CONFIG_ROMFS_FS is not set
1542# CONFIG_SYSV_FS is not set 1568# CONFIG_SYSV_FS is not set
1543# CONFIG_UFS_FS is not set 1569# CONFIG_UFS_FS is not set
1544# CONFIG_NILFS2_FS is not set
1545CONFIG_NETWORK_FILESYSTEMS=y 1570CONFIG_NETWORK_FILESYSTEMS=y
1546CONFIG_NFS_FS=y 1571CONFIG_NFS_FS=y
1547CONFIG_NFS_V3=y 1572CONFIG_NFS_V3=y
@@ -1658,6 +1683,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
1658CONFIG_ENABLE_MUST_CHECK=y 1683CONFIG_ENABLE_MUST_CHECK=y
1659CONFIG_FRAME_WARN=1024 1684CONFIG_FRAME_WARN=1024
1660# CONFIG_MAGIC_SYSRQ is not set 1685# CONFIG_MAGIC_SYSRQ is not set
1686# CONFIG_STRIP_ASM_SYMS is not set
1661# CONFIG_UNUSED_SYMBOLS is not set 1687# CONFIG_UNUSED_SYMBOLS is not set
1662# CONFIG_DEBUG_FS is not set 1688# CONFIG_DEBUG_FS is not set
1663# CONFIG_HEADERS_CHECK is not set 1689# CONFIG_HEADERS_CHECK is not set
@@ -1675,6 +1701,7 @@ CONFIG_SCHED_DEBUG=y
1675# CONFIG_DEBUG_OBJECTS is not set 1701# CONFIG_DEBUG_OBJECTS is not set
1676# CONFIG_SLUB_DEBUG_ON is not set 1702# CONFIG_SLUB_DEBUG_ON is not set
1677# CONFIG_SLUB_STATS is not set 1703# CONFIG_SLUB_STATS is not set
1704# CONFIG_DEBUG_KMEMLEAK is not set
1678# CONFIG_DEBUG_RT_MUTEXES is not set 1705# CONFIG_DEBUG_RT_MUTEXES is not set
1679# CONFIG_RT_MUTEX_TESTER is not set 1706# CONFIG_RT_MUTEX_TESTER is not set
1680# CONFIG_DEBUG_SPINLOCK is not set 1707# CONFIG_DEBUG_SPINLOCK is not set
@@ -1694,10 +1721,12 @@ CONFIG_SCHED_DEBUG=y
1694# CONFIG_DEBUG_LIST is not set 1721# CONFIG_DEBUG_LIST is not set
1695# CONFIG_DEBUG_SG is not set 1722# CONFIG_DEBUG_SG is not set
1696# CONFIG_DEBUG_NOTIFIERS is not set 1723# CONFIG_DEBUG_NOTIFIERS is not set
1724# CONFIG_DEBUG_CREDENTIALS is not set
1697# CONFIG_RCU_TORTURE_TEST is not set 1725# CONFIG_RCU_TORTURE_TEST is not set
1698# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1726# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1699# CONFIG_BACKTRACE_SELF_TEST is not set 1727# CONFIG_BACKTRACE_SELF_TEST is not set
1700# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 1728# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1729# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
1701# CONFIG_FAULT_INJECTION is not set 1730# CONFIG_FAULT_INJECTION is not set
1702# CONFIG_LATENCYTOP is not set 1731# CONFIG_LATENCYTOP is not set
1703# CONFIG_SYSCTL_SYSCALL_CHECK is not set 1732# CONFIG_SYSCTL_SYSCALL_CHECK is not set
@@ -1720,10 +1749,10 @@ CONFIG_BRANCH_PROFILE_NONE=y
1720# CONFIG_KMEMTRACE is not set 1749# CONFIG_KMEMTRACE is not set
1721# CONFIG_WORKQUEUE_TRACER is not set 1750# CONFIG_WORKQUEUE_TRACER is not set
1722# CONFIG_BLK_DEV_IO_TRACE is not set 1751# CONFIG_BLK_DEV_IO_TRACE is not set
1752# CONFIG_DMA_API_DEBUG is not set
1723# CONFIG_SAMPLES is not set 1753# CONFIG_SAMPLES is not set
1724CONFIG_HAVE_ARCH_KGDB=y 1754CONFIG_HAVE_ARCH_KGDB=y
1725# CONFIG_KGDB is not set 1755# CONFIG_KGDB is not set
1726# CONFIG_KMEMCHECK is not set
1727# CONFIG_PPC_DISABLE_WERROR is not set 1756# CONFIG_PPC_DISABLE_WERROR is not set
1728CONFIG_PPC_WERROR=y 1757CONFIG_PPC_WERROR=y
1729CONFIG_PRINT_STACK_DEPTH=64 1758CONFIG_PRINT_STACK_DEPTH=64
@@ -1749,7 +1778,6 @@ CONFIG_CRYPTO=y
1749# 1778#
1750# Crypto core or helper 1779# Crypto core or helper
1751# 1780#
1752# CONFIG_CRYPTO_FIPS is not set
1753CONFIG_CRYPTO_ALGAPI=y 1781CONFIG_CRYPTO_ALGAPI=y
1754CONFIG_CRYPTO_ALGAPI2=y 1782CONFIG_CRYPTO_ALGAPI2=y
1755CONFIG_CRYPTO_AEAD2=y 1783CONFIG_CRYPTO_AEAD2=y
@@ -1790,11 +1818,13 @@ CONFIG_CRYPTO_WORKQUEUE=y
1790# 1818#
1791CONFIG_CRYPTO_HMAC=y 1819CONFIG_CRYPTO_HMAC=y
1792# CONFIG_CRYPTO_XCBC is not set 1820# CONFIG_CRYPTO_XCBC is not set
1821# CONFIG_CRYPTO_VMAC is not set
1793 1822
1794# 1823#
1795# Digest 1824# Digest
1796# 1825#
1797# CONFIG_CRYPTO_CRC32C is not set 1826# CONFIG_CRYPTO_CRC32C is not set
1827# CONFIG_CRYPTO_GHASH is not set
1798# CONFIG_CRYPTO_MD4 is not set 1828# CONFIG_CRYPTO_MD4 is not set
1799CONFIG_CRYPTO_MD5=y 1829CONFIG_CRYPTO_MD5=y
1800# CONFIG_CRYPTO_MICHAEL_MIC is not set 1830# CONFIG_CRYPTO_MICHAEL_MIC is not set
diff --git a/arch/powerpc/configs/86xx/gef_ppc9a_defconfig b/arch/powerpc/configs/86xx/gef_ppc9a_defconfig
index 527ad1a5e802..28980738776c 100644
--- a/arch/powerpc/configs/86xx/gef_ppc9a_defconfig
+++ b/arch/powerpc/configs/86xx/gef_ppc9a_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.31-rc4 3# Linux kernel version: 2.6.32-rc5
4# Wed Jul 29 23:32:31 2009 4# Thu Nov 5 08:20:49 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -36,6 +36,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
36CONFIG_GENERIC_HARDIRQS=y 36CONFIG_GENERIC_HARDIRQS=y
37CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 37CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
38# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 38# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
39# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
39CONFIG_IRQ_PER_CPU=y 40CONFIG_IRQ_PER_CPU=y
40CONFIG_STACKTRACE_SUPPORT=y 41CONFIG_STACKTRACE_SUPPORT=y
41CONFIG_HAVE_LATENCYTOP_SUPPORT=y 42CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -88,11 +89,12 @@ CONFIG_BSD_PROCESS_ACCT_V3=y
88# 89#
89# RCU Subsystem 90# RCU Subsystem
90# 91#
91CONFIG_CLASSIC_RCU=y 92CONFIG_TREE_RCU=y
92# CONFIG_TREE_RCU is not set 93# CONFIG_TREE_PREEMPT_RCU is not set
93# CONFIG_PREEMPT_RCU is not set 94# CONFIG_RCU_TRACE is not set
95CONFIG_RCU_FANOUT=32
96# CONFIG_RCU_FANOUT_EXACT is not set
94# CONFIG_TREE_RCU_TRACE is not set 97# CONFIG_TREE_RCU_TRACE is not set
95# CONFIG_PREEMPT_RCU_TRACE is not set
96CONFIG_IKCONFIG=y 98CONFIG_IKCONFIG=y
97CONFIG_IKCONFIG_PROC=y 99CONFIG_IKCONFIG_PROC=y
98CONFIG_LOG_BUF_SHIFT=14 100CONFIG_LOG_BUF_SHIFT=14
@@ -130,21 +132,20 @@ CONFIG_TIMERFD=y
130CONFIG_EVENTFD=y 132CONFIG_EVENTFD=y
131CONFIG_SHMEM=y 133CONFIG_SHMEM=y
132CONFIG_AIO=y 134CONFIG_AIO=y
133CONFIG_HAVE_PERF_COUNTERS=y 135CONFIG_HAVE_PERF_EVENTS=y
134 136
135# 137#
136# Performance Counters 138# Kernel Performance Events And Counters
137# 139#
140# CONFIG_PERF_EVENTS is not set
138# CONFIG_PERF_COUNTERS is not set 141# CONFIG_PERF_COUNTERS is not set
139CONFIG_VM_EVENT_COUNTERS=y 142CONFIG_VM_EVENT_COUNTERS=y
140CONFIG_PCI_QUIRKS=y 143CONFIG_PCI_QUIRKS=y
141# CONFIG_STRIP_ASM_SYMS is not set
142CONFIG_COMPAT_BRK=y 144CONFIG_COMPAT_BRK=y
143CONFIG_SLAB=y 145CONFIG_SLAB=y
144# CONFIG_SLUB is not set 146# CONFIG_SLUB is not set
145# CONFIG_SLOB is not set 147# CONFIG_SLOB is not set
146# CONFIG_PROFILING is not set 148# CONFIG_PROFILING is not set
147# CONFIG_MARKERS is not set
148CONFIG_HAVE_OPROFILE=y 149CONFIG_HAVE_OPROFILE=y
149# CONFIG_KPROBES is not set 150# CONFIG_KPROBES is not set
150CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 151CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -152,12 +153,14 @@ CONFIG_HAVE_IOREMAP_PROT=y
152CONFIG_HAVE_KPROBES=y 153CONFIG_HAVE_KPROBES=y
153CONFIG_HAVE_KRETPROBES=y 154CONFIG_HAVE_KRETPROBES=y
154CONFIG_HAVE_ARCH_TRACEHOOK=y 155CONFIG_HAVE_ARCH_TRACEHOOK=y
156CONFIG_HAVE_DMA_ATTRS=y
155CONFIG_USE_GENERIC_SMP_HELPERS=y 157CONFIG_USE_GENERIC_SMP_HELPERS=y
158CONFIG_HAVE_DMA_API_DEBUG=y
156 159
157# 160#
158# GCOV-based kernel profiling 161# GCOV-based kernel profiling
159# 162#
160# CONFIG_SLOW_WORK is not set 163CONFIG_SLOW_WORK=y
161# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 164# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
162CONFIG_SLABINFO=y 165CONFIG_SLABINFO=y
163CONFIG_RT_MUTEXES=y 166CONFIG_RT_MUTEXES=y
@@ -256,6 +259,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
256# CONFIG_KEXEC is not set 259# CONFIG_KEXEC is not set
257# CONFIG_CRASH_DUMP is not set 260# CONFIG_CRASH_DUMP is not set
258CONFIG_IRQ_ALL_CPUS=y 261CONFIG_IRQ_ALL_CPUS=y
262CONFIG_MAX_ACTIVE_REGIONS=32
259CONFIG_ARCH_FLATMEM_ENABLE=y 263CONFIG_ARCH_FLATMEM_ENABLE=y
260CONFIG_ARCH_POPULATES_NODE_MAP=y 264CONFIG_ARCH_POPULATES_NODE_MAP=y
261CONFIG_SELECT_MEMORY_MODEL=y 265CONFIG_SELECT_MEMORY_MODEL=y
@@ -273,6 +277,7 @@ CONFIG_BOUNCE=y
273CONFIG_VIRT_TO_BUS=y 277CONFIG_VIRT_TO_BUS=y
274CONFIG_HAVE_MLOCK=y 278CONFIG_HAVE_MLOCK=y
275CONFIG_HAVE_MLOCKED_PAGE_BIT=y 279CONFIG_HAVE_MLOCKED_PAGE_BIT=y
280# CONFIG_KSM is not set
276CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 281CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
277CONFIG_PPC_4K_PAGES=y 282CONFIG_PPC_4K_PAGES=y
278# CONFIG_PPC_16K_PAGES is not set 283# CONFIG_PPC_16K_PAGES is not set
@@ -417,6 +422,7 @@ CONFIG_IPV6_TUNNEL=m
417# CONFIG_NETFILTER is not set 422# CONFIG_NETFILTER is not set
418# CONFIG_IP_DCCP is not set 423# CONFIG_IP_DCCP is not set
419# CONFIG_IP_SCTP is not set 424# CONFIG_IP_SCTP is not set
425# CONFIG_RDS is not set
420# CONFIG_TIPC is not set 426# CONFIG_TIPC is not set
421# CONFIG_ATM is not set 427# CONFIG_ATM is not set
422# CONFIG_BRIDGE is not set 428# CONFIG_BRIDGE is not set
@@ -458,6 +464,7 @@ CONFIG_FIB_RULES=y
458# Generic Driver Options 464# Generic Driver Options
459# 465#
460CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 466CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
467# CONFIG_DEVTMPFS is not set
461CONFIG_STANDALONE=y 468CONFIG_STANDALONE=y
462CONFIG_PREVENT_FIRMWARE_BUILD=y 469CONFIG_PREVENT_FIRMWARE_BUILD=y
463CONFIG_FW_LOADER=y 470CONFIG_FW_LOADER=y
@@ -467,9 +474,9 @@ CONFIG_EXTRA_FIRMWARE=""
467# CONFIG_CONNECTOR is not set 474# CONFIG_CONNECTOR is not set
468CONFIG_MTD=y 475CONFIG_MTD=y
469# CONFIG_MTD_DEBUG is not set 476# CONFIG_MTD_DEBUG is not set
477# CONFIG_MTD_TESTS is not set
470CONFIG_MTD_CONCAT=y 478CONFIG_MTD_CONCAT=y
471CONFIG_MTD_PARTITIONS=y 479CONFIG_MTD_PARTITIONS=y
472# CONFIG_MTD_TESTS is not set
473# CONFIG_MTD_REDBOOT_PARTS is not set 480# CONFIG_MTD_REDBOOT_PARTS is not set
474# CONFIG_MTD_CMDLINE_PARTS is not set 481# CONFIG_MTD_CMDLINE_PARTS is not set
475CONFIG_MTD_OF_PARTS=y 482CONFIG_MTD_OF_PARTS=y
@@ -680,6 +687,7 @@ CONFIG_SCSI_WAIT_SCAN=m
680CONFIG_SCSI_LOWLEVEL=y 687CONFIG_SCSI_LOWLEVEL=y
681# CONFIG_ISCSI_TCP is not set 688# CONFIG_ISCSI_TCP is not set
682# CONFIG_SCSI_BNX2_ISCSI is not set 689# CONFIG_SCSI_BNX2_ISCSI is not set
690# CONFIG_BE2ISCSI is not set
683# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 691# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
684# CONFIG_SCSI_3W_9XXX is not set 692# CONFIG_SCSI_3W_9XXX is not set
685# CONFIG_SCSI_ACARD is not set 693# CONFIG_SCSI_ACARD is not set
@@ -719,12 +727,15 @@ CONFIG_SCSI_LOWLEVEL=y
719# CONFIG_SCSI_DC390T is not set 727# CONFIG_SCSI_DC390T is not set
720# CONFIG_SCSI_NSP32 is not set 728# CONFIG_SCSI_NSP32 is not set
721# CONFIG_SCSI_DEBUG is not set 729# CONFIG_SCSI_DEBUG is not set
730# CONFIG_SCSI_PMCRAID is not set
722# CONFIG_SCSI_SRP is not set 731# CONFIG_SCSI_SRP is not set
732# CONFIG_SCSI_BFA_FC is not set
723# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set 733# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
724# CONFIG_SCSI_DH is not set 734# CONFIG_SCSI_DH is not set
725# CONFIG_SCSI_OSD_INITIATOR is not set 735# CONFIG_SCSI_OSD_INITIATOR is not set
726CONFIG_ATA=y 736CONFIG_ATA=y
727# CONFIG_ATA_NONSTANDARD is not set 737# CONFIG_ATA_NONSTANDARD is not set
738CONFIG_ATA_VERBOSE_ERROR=y
728CONFIG_SATA_PMP=y 739CONFIG_SATA_PMP=y
729# CONFIG_SATA_AHCI is not set 740# CONFIG_SATA_AHCI is not set
730# CONFIG_SATA_SIL24 is not set 741# CONFIG_SATA_SIL24 is not set
@@ -747,6 +758,7 @@ CONFIG_SATA_SIL=y
747# CONFIG_PATA_ALI is not set 758# CONFIG_PATA_ALI is not set
748# CONFIG_PATA_AMD is not set 759# CONFIG_PATA_AMD is not set
749# CONFIG_PATA_ARTOP is not set 760# CONFIG_PATA_ARTOP is not set
761# CONFIG_PATA_ATP867X is not set
750# CONFIG_PATA_ATIIXP is not set 762# CONFIG_PATA_ATIIXP is not set
751# CONFIG_PATA_CMD640_PCI is not set 763# CONFIG_PATA_CMD640_PCI is not set
752# CONFIG_PATA_CMD64X is not set 764# CONFIG_PATA_CMD64X is not set
@@ -775,6 +787,7 @@ CONFIG_SATA_SIL=y
775# CONFIG_PATA_PCMCIA is not set 787# CONFIG_PATA_PCMCIA is not set
776# CONFIG_PATA_PDC_OLD is not set 788# CONFIG_PATA_PDC_OLD is not set
777# CONFIG_PATA_RADISYS is not set 789# CONFIG_PATA_RADISYS is not set
790# CONFIG_PATA_RDC is not set
778# CONFIG_PATA_RZ1000 is not set 791# CONFIG_PATA_RZ1000 is not set
779# CONFIG_PATA_SC1200 is not set 792# CONFIG_PATA_SC1200 is not set
780# CONFIG_PATA_SERVERWORKS is not set 793# CONFIG_PATA_SERVERWORKS is not set
@@ -851,7 +864,9 @@ CONFIG_MII=y
851# CONFIG_NET_PCI is not set 864# CONFIG_NET_PCI is not set
852# CONFIG_B44 is not set 865# CONFIG_B44 is not set
853# CONFIG_KS8842 is not set 866# CONFIG_KS8842 is not set
867# CONFIG_KS8851_MLL is not set
854# CONFIG_ATL2 is not set 868# CONFIG_ATL2 is not set
869# CONFIG_XILINX_EMACLITE is not set
855CONFIG_NETDEV_1000=y 870CONFIG_NETDEV_1000=y
856# CONFIG_ACENIC is not set 871# CONFIG_ACENIC is not set
857# CONFIG_DL2K is not set 872# CONFIG_DL2K is not set
@@ -881,10 +896,7 @@ CONFIG_GIANFAR=y
881# CONFIG_JME is not set 896# CONFIG_JME is not set
882# CONFIG_NETDEV_10000 is not set 897# CONFIG_NETDEV_10000 is not set
883# CONFIG_TR is not set 898# CONFIG_TR is not set
884 899CONFIG_WLAN=y
885#
886# Wireless LAN
887#
888# CONFIG_WLAN_PRE80211 is not set 900# CONFIG_WLAN_PRE80211 is not set
889# CONFIG_WLAN_80211 is not set 901# CONFIG_WLAN_80211 is not set
890 902
@@ -1016,6 +1028,7 @@ CONFIG_NVRAM=y
1016CONFIG_DEVPORT=y 1028CONFIG_DEVPORT=y
1017CONFIG_I2C=y 1029CONFIG_I2C=y
1018CONFIG_I2C_BOARDINFO=y 1030CONFIG_I2C_BOARDINFO=y
1031CONFIG_I2C_COMPAT=y
1019CONFIG_I2C_CHARDEV=y 1032CONFIG_I2C_CHARDEV=y
1020CONFIG_I2C_HELPER_AUTO=y 1033CONFIG_I2C_HELPER_AUTO=y
1021 1034
@@ -1071,9 +1084,6 @@ CONFIG_I2C_MPC=y
1071# Miscellaneous I2C Chip support 1084# Miscellaneous I2C Chip support
1072# 1085#
1073CONFIG_DS1682=y 1086CONFIG_DS1682=y
1074# CONFIG_SENSORS_PCF8574 is not set
1075# CONFIG_PCF8575 is not set
1076# CONFIG_SENSORS_PCA9539 is not set
1077# CONFIG_SENSORS_TSL2550 is not set 1087# CONFIG_SENSORS_TSL2550 is not set
1078# CONFIG_I2C_DEBUG_CORE is not set 1088# CONFIG_I2C_DEBUG_CORE is not set
1079# CONFIG_I2C_DEBUG_ALGO is not set 1089# CONFIG_I2C_DEBUG_ALGO is not set
@@ -1106,14 +1116,24 @@ CONFIG_GPIO_SYSFS=y
1106# PCI GPIO expanders: 1116# PCI GPIO expanders:
1107# 1117#
1108# CONFIG_GPIO_BT8XX is not set 1118# CONFIG_GPIO_BT8XX is not set
1119# CONFIG_GPIO_LANGWELL is not set
1109 1120
1110# 1121#
1111# SPI GPIO expanders: 1122# SPI GPIO expanders:
1112# 1123#
1124
1125#
1126# AC97 GPIO expanders:
1127#
1113# CONFIG_W1 is not set 1128# CONFIG_W1 is not set
1114# CONFIG_POWER_SUPPLY is not set 1129# CONFIG_POWER_SUPPLY is not set
1115CONFIG_HWMON=y 1130CONFIG_HWMON=y
1116# CONFIG_HWMON_VID is not set 1131# CONFIG_HWMON_VID is not set
1132# CONFIG_HWMON_DEBUG_CHIP is not set
1133
1134#
1135# Native drivers
1136#
1117# CONFIG_SENSORS_AD7414 is not set 1137# CONFIG_SENSORS_AD7414 is not set
1118# CONFIG_SENSORS_AD7418 is not set 1138# CONFIG_SENSORS_AD7418 is not set
1119# CONFIG_SENSORS_ADM1021 is not set 1139# CONFIG_SENSORS_ADM1021 is not set
@@ -1164,6 +1184,7 @@ CONFIG_SENSORS_LM92=y
1164# CONFIG_SENSORS_ADS7828 is not set 1184# CONFIG_SENSORS_ADS7828 is not set
1165# CONFIG_SENSORS_THMC50 is not set 1185# CONFIG_SENSORS_THMC50 is not set
1166# CONFIG_SENSORS_TMP401 is not set 1186# CONFIG_SENSORS_TMP401 is not set
1187# CONFIG_SENSORS_TMP421 is not set
1167# CONFIG_SENSORS_VIA686A is not set 1188# CONFIG_SENSORS_VIA686A is not set
1168# CONFIG_SENSORS_VT1211 is not set 1189# CONFIG_SENSORS_VT1211 is not set
1169# CONFIG_SENSORS_VT8231 is not set 1190# CONFIG_SENSORS_VT8231 is not set
@@ -1175,9 +1196,7 @@ CONFIG_SENSORS_LM92=y
1175# CONFIG_SENSORS_W83L786NG is not set 1196# CONFIG_SENSORS_W83L786NG is not set
1176# CONFIG_SENSORS_W83627HF is not set 1197# CONFIG_SENSORS_W83627HF is not set
1177# CONFIG_SENSORS_W83627EHF is not set 1198# CONFIG_SENSORS_W83627EHF is not set
1178# CONFIG_HWMON_DEBUG_CHIP is not set
1179# CONFIG_THERMAL is not set 1199# CONFIG_THERMAL is not set
1180# CONFIG_THERMAL_HWMON is not set
1181CONFIG_WATCHDOG=y 1200CONFIG_WATCHDOG=y
1182# CONFIG_WATCHDOG_NOWAYOUT is not set 1201# CONFIG_WATCHDOG_NOWAYOUT is not set
1183 1202
@@ -1217,6 +1236,7 @@ CONFIG_SSB_POSSIBLE=y
1217# CONFIG_MFD_TMIO is not set 1236# CONFIG_MFD_TMIO is not set
1218# CONFIG_PMIC_DA903X is not set 1237# CONFIG_PMIC_DA903X is not set
1219# CONFIG_MFD_WM8400 is not set 1238# CONFIG_MFD_WM8400 is not set
1239# CONFIG_MFD_WM831X is not set
1220# CONFIG_MFD_WM8350_I2C is not set 1240# CONFIG_MFD_WM8350_I2C is not set
1221# CONFIG_MFD_PCF50633 is not set 1241# CONFIG_MFD_PCF50633 is not set
1222# CONFIG_AB3100_CORE is not set 1242# CONFIG_AB3100_CORE is not set
@@ -1227,6 +1247,7 @@ CONFIG_SSB_POSSIBLE=y
1227# Graphics support 1247# Graphics support
1228# 1248#
1229# CONFIG_AGP is not set 1249# CONFIG_AGP is not set
1250CONFIG_VGA_ARB=y
1230# CONFIG_DRM is not set 1251# CONFIG_DRM is not set
1231# CONFIG_VGASTATE is not set 1252# CONFIG_VGASTATE is not set
1232CONFIG_VIDEO_OUTPUT_CONTROL=m 1253CONFIG_VIDEO_OUTPUT_CONTROL=m
@@ -1247,7 +1268,6 @@ CONFIG_DUMMY_CONSOLE=y
1247# CONFIG_SOUND is not set 1268# CONFIG_SOUND is not set
1248CONFIG_HID_SUPPORT=y 1269CONFIG_HID_SUPPORT=y
1249CONFIG_HID=y 1270CONFIG_HID=y
1250# CONFIG_HID_DEBUG is not set
1251# CONFIG_HIDRAW is not set 1271# CONFIG_HIDRAW is not set
1252 1272
1253# 1273#
@@ -1270,6 +1290,7 @@ CONFIG_HID_CYPRESS=y
1270CONFIG_HID_EZKEY=y 1290CONFIG_HID_EZKEY=y
1271# CONFIG_HID_KYE is not set 1291# CONFIG_HID_KYE is not set
1272CONFIG_HID_GYRATION=y 1292CONFIG_HID_GYRATION=y
1293# CONFIG_HID_TWINHAN is not set
1273# CONFIG_HID_KENSINGTON is not set 1294# CONFIG_HID_KENSINGTON is not set
1274CONFIG_HID_LOGITECH=y 1295CONFIG_HID_LOGITECH=y
1275# CONFIG_LOGITECH_FF is not set 1296# CONFIG_LOGITECH_FF is not set
@@ -1322,6 +1343,7 @@ CONFIG_USB_EHCI_HCD=y
1322# CONFIG_USB_OXU210HP_HCD is not set 1343# CONFIG_USB_OXU210HP_HCD is not set
1323# CONFIG_USB_ISP116X_HCD is not set 1344# CONFIG_USB_ISP116X_HCD is not set
1324# CONFIG_USB_ISP1760_HCD is not set 1345# CONFIG_USB_ISP1760_HCD is not set
1346# CONFIG_USB_ISP1362_HCD is not set
1325CONFIG_USB_OHCI_HCD=y 1347CONFIG_USB_OHCI_HCD=y
1326# CONFIG_USB_OHCI_HCD_PPC_OF_BE is not set 1348# CONFIG_USB_OHCI_HCD_PPC_OF_BE is not set
1327# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set 1349# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set
@@ -1397,6 +1419,7 @@ CONFIG_USB_STORAGE=y
1397# CONFIG_USB_LD is not set 1419# CONFIG_USB_LD is not set
1398# CONFIG_USB_TRANCEVIBRATOR is not set 1420# CONFIG_USB_TRANCEVIBRATOR is not set
1399# CONFIG_USB_IOWARRIOR is not set 1421# CONFIG_USB_IOWARRIOR is not set
1422# CONFIG_USB_TEST is not set
1400# CONFIG_USB_ISIGHTFW is not set 1423# CONFIG_USB_ISIGHTFW is not set
1401# CONFIG_USB_VST is not set 1424# CONFIG_USB_VST is not set
1402# CONFIG_USB_GADGET is not set 1425# CONFIG_USB_GADGET is not set
@@ -1501,6 +1524,7 @@ CONFIG_FS_POSIX_ACL=y
1501# CONFIG_GFS2_FS is not set 1524# CONFIG_GFS2_FS is not set
1502# CONFIG_OCFS2_FS is not set 1525# CONFIG_OCFS2_FS is not set
1503# CONFIG_BTRFS_FS is not set 1526# CONFIG_BTRFS_FS is not set
1527# CONFIG_NILFS2_FS is not set
1504CONFIG_FILE_LOCKING=y 1528CONFIG_FILE_LOCKING=y
1505CONFIG_FSNOTIFY=y 1529CONFIG_FSNOTIFY=y
1506CONFIG_DNOTIFY=y 1530CONFIG_DNOTIFY=y
@@ -1576,7 +1600,6 @@ CONFIG_JFFS2_RTIME=y
1576# CONFIG_ROMFS_FS is not set 1600# CONFIG_ROMFS_FS is not set
1577# CONFIG_SYSV_FS is not set 1601# CONFIG_SYSV_FS is not set
1578# CONFIG_UFS_FS is not set 1602# CONFIG_UFS_FS is not set
1579# CONFIG_NILFS2_FS is not set
1580CONFIG_NETWORK_FILESYSTEMS=y 1603CONFIG_NETWORK_FILESYSTEMS=y
1581CONFIG_NFS_FS=y 1604CONFIG_NFS_FS=y
1582CONFIG_NFS_V3=y 1605CONFIG_NFS_V3=y
@@ -1682,6 +1705,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
1682CONFIG_ENABLE_MUST_CHECK=y 1705CONFIG_ENABLE_MUST_CHECK=y
1683CONFIG_FRAME_WARN=1024 1706CONFIG_FRAME_WARN=1024
1684CONFIG_MAGIC_SYSRQ=y 1707CONFIG_MAGIC_SYSRQ=y
1708# CONFIG_STRIP_ASM_SYMS is not set
1685# CONFIG_UNUSED_SYMBOLS is not set 1709# CONFIG_UNUSED_SYMBOLS is not set
1686# CONFIG_DEBUG_FS is not set 1710# CONFIG_DEBUG_FS is not set
1687# CONFIG_HEADERS_CHECK is not set 1711# CONFIG_HEADERS_CHECK is not set
@@ -1697,6 +1721,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
1697CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1721CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1698CONFIG_TRACING_SUPPORT=y 1722CONFIG_TRACING_SUPPORT=y
1699# CONFIG_FTRACE is not set 1723# CONFIG_FTRACE is not set
1724# CONFIG_DMA_API_DEBUG is not set
1700# CONFIG_SAMPLES is not set 1725# CONFIG_SAMPLES is not set
1701CONFIG_HAVE_ARCH_KGDB=y 1726CONFIG_HAVE_ARCH_KGDB=y
1702# CONFIG_PPC_DISABLE_WERROR is not set 1727# CONFIG_PPC_DISABLE_WERROR is not set
@@ -1718,7 +1743,6 @@ CONFIG_CRYPTO=y
1718# 1743#
1719# Crypto core or helper 1744# Crypto core or helper
1720# 1745#
1721# CONFIG_CRYPTO_FIPS is not set
1722CONFIG_CRYPTO_ALGAPI=y 1746CONFIG_CRYPTO_ALGAPI=y
1723CONFIG_CRYPTO_ALGAPI2=y 1747CONFIG_CRYPTO_ALGAPI2=y
1724CONFIG_CRYPTO_AEAD=m 1748CONFIG_CRYPTO_AEAD=m
@@ -1761,11 +1785,13 @@ CONFIG_CRYPTO_CBC=y
1761# 1785#
1762CONFIG_CRYPTO_HMAC=m 1786CONFIG_CRYPTO_HMAC=m
1763# CONFIG_CRYPTO_XCBC is not set 1787# CONFIG_CRYPTO_XCBC is not set
1788# CONFIG_CRYPTO_VMAC is not set
1764 1789
1765# 1790#
1766# Digest 1791# Digest
1767# 1792#
1768CONFIG_CRYPTO_CRC32C=y 1793CONFIG_CRYPTO_CRC32C=y
1794# CONFIG_CRYPTO_GHASH is not set
1769# CONFIG_CRYPTO_MD4 is not set 1795# CONFIG_CRYPTO_MD4 is not set
1770CONFIG_CRYPTO_MD5=y 1796CONFIG_CRYPTO_MD5=y
1771# CONFIG_CRYPTO_MICHAEL_MIC is not set 1797# CONFIG_CRYPTO_MICHAEL_MIC is not set
diff --git a/arch/powerpc/configs/86xx/gef_sbc310_defconfig b/arch/powerpc/configs/86xx/gef_sbc310_defconfig
index cd338d493bed..e199d1cacbaf 100644
--- a/arch/powerpc/configs/86xx/gef_sbc310_defconfig
+++ b/arch/powerpc/configs/86xx/gef_sbc310_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.31-rc4 3# Linux kernel version: 2.6.32-rc5
4# Wed Jul 29 23:32:29 2009 4# Thu Nov 5 08:20:47 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -36,6 +36,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
36CONFIG_GENERIC_HARDIRQS=y 36CONFIG_GENERIC_HARDIRQS=y
37CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 37CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
38# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 38# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
39# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
39CONFIG_IRQ_PER_CPU=y 40CONFIG_IRQ_PER_CPU=y
40CONFIG_STACKTRACE_SUPPORT=y 41CONFIG_STACKTRACE_SUPPORT=y
41CONFIG_HAVE_LATENCYTOP_SUPPORT=y 42CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -88,11 +89,12 @@ CONFIG_BSD_PROCESS_ACCT_V3=y
88# 89#
89# RCU Subsystem 90# RCU Subsystem
90# 91#
91CONFIG_CLASSIC_RCU=y 92CONFIG_TREE_RCU=y
92# CONFIG_TREE_RCU is not set 93# CONFIG_TREE_PREEMPT_RCU is not set
93# CONFIG_PREEMPT_RCU is not set 94# CONFIG_RCU_TRACE is not set
95CONFIG_RCU_FANOUT=32
96# CONFIG_RCU_FANOUT_EXACT is not set
94# CONFIG_TREE_RCU_TRACE is not set 97# CONFIG_TREE_RCU_TRACE is not set
95# CONFIG_PREEMPT_RCU_TRACE is not set
96CONFIG_IKCONFIG=y 98CONFIG_IKCONFIG=y
97CONFIG_IKCONFIG_PROC=y 99CONFIG_IKCONFIG_PROC=y
98CONFIG_LOG_BUF_SHIFT=14 100CONFIG_LOG_BUF_SHIFT=14
@@ -130,21 +132,20 @@ CONFIG_TIMERFD=y
130CONFIG_EVENTFD=y 132CONFIG_EVENTFD=y
131CONFIG_SHMEM=y 133CONFIG_SHMEM=y
132CONFIG_AIO=y 134CONFIG_AIO=y
133CONFIG_HAVE_PERF_COUNTERS=y 135CONFIG_HAVE_PERF_EVENTS=y
134 136
135# 137#
136# Performance Counters 138# Kernel Performance Events And Counters
137# 139#
140# CONFIG_PERF_EVENTS is not set
138# CONFIG_PERF_COUNTERS is not set 141# CONFIG_PERF_COUNTERS is not set
139CONFIG_VM_EVENT_COUNTERS=y 142CONFIG_VM_EVENT_COUNTERS=y
140CONFIG_PCI_QUIRKS=y 143CONFIG_PCI_QUIRKS=y
141# CONFIG_STRIP_ASM_SYMS is not set
142CONFIG_COMPAT_BRK=y 144CONFIG_COMPAT_BRK=y
143CONFIG_SLAB=y 145CONFIG_SLAB=y
144# CONFIG_SLUB is not set 146# CONFIG_SLUB is not set
145# CONFIG_SLOB is not set 147# CONFIG_SLOB is not set
146# CONFIG_PROFILING is not set 148# CONFIG_PROFILING is not set
147# CONFIG_MARKERS is not set
148CONFIG_HAVE_OPROFILE=y 149CONFIG_HAVE_OPROFILE=y
149# CONFIG_KPROBES is not set 150# CONFIG_KPROBES is not set
150CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 151CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -152,12 +153,14 @@ CONFIG_HAVE_IOREMAP_PROT=y
152CONFIG_HAVE_KPROBES=y 153CONFIG_HAVE_KPROBES=y
153CONFIG_HAVE_KRETPROBES=y 154CONFIG_HAVE_KRETPROBES=y
154CONFIG_HAVE_ARCH_TRACEHOOK=y 155CONFIG_HAVE_ARCH_TRACEHOOK=y
156CONFIG_HAVE_DMA_ATTRS=y
155CONFIG_USE_GENERIC_SMP_HELPERS=y 157CONFIG_USE_GENERIC_SMP_HELPERS=y
158CONFIG_HAVE_DMA_API_DEBUG=y
156 159
157# 160#
158# GCOV-based kernel profiling 161# GCOV-based kernel profiling
159# 162#
160# CONFIG_SLOW_WORK is not set 163CONFIG_SLOW_WORK=y
161# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 164# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
162CONFIG_SLABINFO=y 165CONFIG_SLABINFO=y
163CONFIG_RT_MUTEXES=y 166CONFIG_RT_MUTEXES=y
@@ -256,6 +259,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
256# CONFIG_KEXEC is not set 259# CONFIG_KEXEC is not set
257# CONFIG_CRASH_DUMP is not set 260# CONFIG_CRASH_DUMP is not set
258CONFIG_IRQ_ALL_CPUS=y 261CONFIG_IRQ_ALL_CPUS=y
262CONFIG_MAX_ACTIVE_REGIONS=32
259CONFIG_ARCH_FLATMEM_ENABLE=y 263CONFIG_ARCH_FLATMEM_ENABLE=y
260CONFIG_ARCH_POPULATES_NODE_MAP=y 264CONFIG_ARCH_POPULATES_NODE_MAP=y
261CONFIG_SELECT_MEMORY_MODEL=y 265CONFIG_SELECT_MEMORY_MODEL=y
@@ -273,6 +277,7 @@ CONFIG_BOUNCE=y
273CONFIG_VIRT_TO_BUS=y 277CONFIG_VIRT_TO_BUS=y
274CONFIG_HAVE_MLOCK=y 278CONFIG_HAVE_MLOCK=y
275CONFIG_HAVE_MLOCKED_PAGE_BIT=y 279CONFIG_HAVE_MLOCKED_PAGE_BIT=y
280# CONFIG_KSM is not set
276CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 281CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
277CONFIG_PPC_4K_PAGES=y 282CONFIG_PPC_4K_PAGES=y
278# CONFIG_PPC_16K_PAGES is not set 283# CONFIG_PPC_16K_PAGES is not set
@@ -417,6 +422,7 @@ CONFIG_IPV6_TUNNEL=m
417# CONFIG_NETFILTER is not set 422# CONFIG_NETFILTER is not set
418# CONFIG_IP_DCCP is not set 423# CONFIG_IP_DCCP is not set
419# CONFIG_IP_SCTP is not set 424# CONFIG_IP_SCTP is not set
425# CONFIG_RDS is not set
420# CONFIG_TIPC is not set 426# CONFIG_TIPC is not set
421# CONFIG_ATM is not set 427# CONFIG_ATM is not set
422# CONFIG_BRIDGE is not set 428# CONFIG_BRIDGE is not set
@@ -458,6 +464,7 @@ CONFIG_FIB_RULES=y
458# Generic Driver Options 464# Generic Driver Options
459# 465#
460CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 466CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
467# CONFIG_DEVTMPFS is not set
461CONFIG_STANDALONE=y 468CONFIG_STANDALONE=y
462CONFIG_PREVENT_FIRMWARE_BUILD=y 469CONFIG_PREVENT_FIRMWARE_BUILD=y
463CONFIG_FW_LOADER=y 470CONFIG_FW_LOADER=y
@@ -467,9 +474,9 @@ CONFIG_EXTRA_FIRMWARE=""
467# CONFIG_CONNECTOR is not set 474# CONFIG_CONNECTOR is not set
468CONFIG_MTD=y 475CONFIG_MTD=y
469# CONFIG_MTD_DEBUG is not set 476# CONFIG_MTD_DEBUG is not set
477# CONFIG_MTD_TESTS is not set
470CONFIG_MTD_CONCAT=y 478CONFIG_MTD_CONCAT=y
471CONFIG_MTD_PARTITIONS=y 479CONFIG_MTD_PARTITIONS=y
472# CONFIG_MTD_TESTS is not set
473# CONFIG_MTD_REDBOOT_PARTS is not set 480# CONFIG_MTD_REDBOOT_PARTS is not set
474# CONFIG_MTD_CMDLINE_PARTS is not set 481# CONFIG_MTD_CMDLINE_PARTS is not set
475CONFIG_MTD_OF_PARTS=y 482CONFIG_MTD_OF_PARTS=y
@@ -680,6 +687,7 @@ CONFIG_SCSI_WAIT_SCAN=m
680CONFIG_SCSI_LOWLEVEL=y 687CONFIG_SCSI_LOWLEVEL=y
681# CONFIG_ISCSI_TCP is not set 688# CONFIG_ISCSI_TCP is not set
682# CONFIG_SCSI_BNX2_ISCSI is not set 689# CONFIG_SCSI_BNX2_ISCSI is not set
690# CONFIG_BE2ISCSI is not set
683# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 691# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
684# CONFIG_SCSI_3W_9XXX is not set 692# CONFIG_SCSI_3W_9XXX is not set
685# CONFIG_SCSI_ACARD is not set 693# CONFIG_SCSI_ACARD is not set
@@ -719,12 +727,15 @@ CONFIG_SCSI_LOWLEVEL=y
719# CONFIG_SCSI_DC390T is not set 727# CONFIG_SCSI_DC390T is not set
720# CONFIG_SCSI_NSP32 is not set 728# CONFIG_SCSI_NSP32 is not set
721# CONFIG_SCSI_DEBUG is not set 729# CONFIG_SCSI_DEBUG is not set
730# CONFIG_SCSI_PMCRAID is not set
722# CONFIG_SCSI_SRP is not set 731# CONFIG_SCSI_SRP is not set
732# CONFIG_SCSI_BFA_FC is not set
723# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set 733# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
724# CONFIG_SCSI_DH is not set 734# CONFIG_SCSI_DH is not set
725# CONFIG_SCSI_OSD_INITIATOR is not set 735# CONFIG_SCSI_OSD_INITIATOR is not set
726CONFIG_ATA=y 736CONFIG_ATA=y
727# CONFIG_ATA_NONSTANDARD is not set 737# CONFIG_ATA_NONSTANDARD is not set
738CONFIG_ATA_VERBOSE_ERROR=y
728CONFIG_SATA_PMP=y 739CONFIG_SATA_PMP=y
729# CONFIG_SATA_AHCI is not set 740# CONFIG_SATA_AHCI is not set
730CONFIG_SATA_SIL24=y 741CONFIG_SATA_SIL24=y
@@ -796,7 +807,9 @@ CONFIG_MII=y
796# CONFIG_NET_PCI is not set 807# CONFIG_NET_PCI is not set
797# CONFIG_B44 is not set 808# CONFIG_B44 is not set
798# CONFIG_KS8842 is not set 809# CONFIG_KS8842 is not set
810# CONFIG_KS8851_MLL is not set
799# CONFIG_ATL2 is not set 811# CONFIG_ATL2 is not set
812# CONFIG_XILINX_EMACLITE is not set
800CONFIG_NETDEV_1000=y 813CONFIG_NETDEV_1000=y
801# CONFIG_ACENIC is not set 814# CONFIG_ACENIC is not set
802# CONFIG_DL2K is not set 815# CONFIG_DL2K is not set
@@ -826,10 +839,7 @@ CONFIG_GIANFAR=y
826# CONFIG_JME is not set 839# CONFIG_JME is not set
827# CONFIG_NETDEV_10000 is not set 840# CONFIG_NETDEV_10000 is not set
828# CONFIG_TR is not set 841# CONFIG_TR is not set
829 842CONFIG_WLAN=y
830#
831# Wireless LAN
832#
833# CONFIG_WLAN_PRE80211 is not set 843# CONFIG_WLAN_PRE80211 is not set
834# CONFIG_WLAN_80211 is not set 844# CONFIG_WLAN_80211 is not set
835 845
@@ -961,6 +971,7 @@ CONFIG_NVRAM=y
961CONFIG_DEVPORT=y 971CONFIG_DEVPORT=y
962CONFIG_I2C=y 972CONFIG_I2C=y
963CONFIG_I2C_BOARDINFO=y 973CONFIG_I2C_BOARDINFO=y
974CONFIG_I2C_COMPAT=y
964CONFIG_I2C_CHARDEV=y 975CONFIG_I2C_CHARDEV=y
965CONFIG_I2C_HELPER_AUTO=y 976CONFIG_I2C_HELPER_AUTO=y
966 977
@@ -1016,9 +1027,6 @@ CONFIG_I2C_MPC=y
1016# Miscellaneous I2C Chip support 1027# Miscellaneous I2C Chip support
1017# 1028#
1018CONFIG_DS1682=y 1029CONFIG_DS1682=y
1019# CONFIG_SENSORS_PCF8574 is not set
1020# CONFIG_PCF8575 is not set
1021# CONFIG_SENSORS_PCA9539 is not set
1022# CONFIG_SENSORS_TSL2550 is not set 1030# CONFIG_SENSORS_TSL2550 is not set
1023# CONFIG_I2C_DEBUG_CORE is not set 1031# CONFIG_I2C_DEBUG_CORE is not set
1024# CONFIG_I2C_DEBUG_ALGO is not set 1032# CONFIG_I2C_DEBUG_ALGO is not set
@@ -1051,14 +1059,24 @@ CONFIG_GPIO_SYSFS=y
1051# PCI GPIO expanders: 1059# PCI GPIO expanders:
1052# 1060#
1053# CONFIG_GPIO_BT8XX is not set 1061# CONFIG_GPIO_BT8XX is not set
1062# CONFIG_GPIO_LANGWELL is not set
1054 1063
1055# 1064#
1056# SPI GPIO expanders: 1065# SPI GPIO expanders:
1057# 1066#
1067
1068#
1069# AC97 GPIO expanders:
1070#
1058# CONFIG_W1 is not set 1071# CONFIG_W1 is not set
1059# CONFIG_POWER_SUPPLY is not set 1072# CONFIG_POWER_SUPPLY is not set
1060CONFIG_HWMON=y 1073CONFIG_HWMON=y
1061# CONFIG_HWMON_VID is not set 1074# CONFIG_HWMON_VID is not set
1075# CONFIG_HWMON_DEBUG_CHIP is not set
1076
1077#
1078# Native drivers
1079#
1062# CONFIG_SENSORS_AD7414 is not set 1080# CONFIG_SENSORS_AD7414 is not set
1063# CONFIG_SENSORS_AD7418 is not set 1081# CONFIG_SENSORS_AD7418 is not set
1064# CONFIG_SENSORS_ADM1021 is not set 1082# CONFIG_SENSORS_ADM1021 is not set
@@ -1109,6 +1127,7 @@ CONFIG_SENSORS_LM92=y
1109# CONFIG_SENSORS_ADS7828 is not set 1127# CONFIG_SENSORS_ADS7828 is not set
1110# CONFIG_SENSORS_THMC50 is not set 1128# CONFIG_SENSORS_THMC50 is not set
1111# CONFIG_SENSORS_TMP401 is not set 1129# CONFIG_SENSORS_TMP401 is not set
1130# CONFIG_SENSORS_TMP421 is not set
1112# CONFIG_SENSORS_VIA686A is not set 1131# CONFIG_SENSORS_VIA686A is not set
1113# CONFIG_SENSORS_VT1211 is not set 1132# CONFIG_SENSORS_VT1211 is not set
1114# CONFIG_SENSORS_VT8231 is not set 1133# CONFIG_SENSORS_VT8231 is not set
@@ -1120,9 +1139,7 @@ CONFIG_SENSORS_LM92=y
1120# CONFIG_SENSORS_W83L786NG is not set 1139# CONFIG_SENSORS_W83L786NG is not set
1121# CONFIG_SENSORS_W83627HF is not set 1140# CONFIG_SENSORS_W83627HF is not set
1122# CONFIG_SENSORS_W83627EHF is not set 1141# CONFIG_SENSORS_W83627EHF is not set
1123# CONFIG_HWMON_DEBUG_CHIP is not set
1124# CONFIG_THERMAL is not set 1142# CONFIG_THERMAL is not set
1125# CONFIG_THERMAL_HWMON is not set
1126CONFIG_WATCHDOG=y 1143CONFIG_WATCHDOG=y
1127# CONFIG_WATCHDOG_NOWAYOUT is not set 1144# CONFIG_WATCHDOG_NOWAYOUT is not set
1128 1145
@@ -1162,6 +1179,7 @@ CONFIG_SSB_POSSIBLE=y
1162# CONFIG_MFD_TMIO is not set 1179# CONFIG_MFD_TMIO is not set
1163# CONFIG_PMIC_DA903X is not set 1180# CONFIG_PMIC_DA903X is not set
1164# CONFIG_MFD_WM8400 is not set 1181# CONFIG_MFD_WM8400 is not set
1182# CONFIG_MFD_WM831X is not set
1165# CONFIG_MFD_WM8350_I2C is not set 1183# CONFIG_MFD_WM8350_I2C is not set
1166# CONFIG_MFD_PCF50633 is not set 1184# CONFIG_MFD_PCF50633 is not set
1167# CONFIG_AB3100_CORE is not set 1185# CONFIG_AB3100_CORE is not set
@@ -1172,6 +1190,7 @@ CONFIG_SSB_POSSIBLE=y
1172# Graphics support 1190# Graphics support
1173# 1191#
1174# CONFIG_AGP is not set 1192# CONFIG_AGP is not set
1193CONFIG_VGA_ARB=y
1175# CONFIG_DRM is not set 1194# CONFIG_DRM is not set
1176# CONFIG_VGASTATE is not set 1195# CONFIG_VGASTATE is not set
1177CONFIG_VIDEO_OUTPUT_CONTROL=m 1196CONFIG_VIDEO_OUTPUT_CONTROL=m
@@ -1192,7 +1211,6 @@ CONFIG_DUMMY_CONSOLE=y
1192# CONFIG_SOUND is not set 1211# CONFIG_SOUND is not set
1193CONFIG_HID_SUPPORT=y 1212CONFIG_HID_SUPPORT=y
1194CONFIG_HID=y 1213CONFIG_HID=y
1195# CONFIG_HID_DEBUG is not set
1196# CONFIG_HIDRAW is not set 1214# CONFIG_HIDRAW is not set
1197 1215
1198# 1216#
@@ -1215,6 +1233,7 @@ CONFIG_HID_CYPRESS=y
1215CONFIG_HID_EZKEY=y 1233CONFIG_HID_EZKEY=y
1216# CONFIG_HID_KYE is not set 1234# CONFIG_HID_KYE is not set
1217CONFIG_HID_GYRATION=y 1235CONFIG_HID_GYRATION=y
1236# CONFIG_HID_TWINHAN is not set
1218# CONFIG_HID_KENSINGTON is not set 1237# CONFIG_HID_KENSINGTON is not set
1219CONFIG_HID_LOGITECH=y 1238CONFIG_HID_LOGITECH=y
1220# CONFIG_LOGITECH_FF is not set 1239# CONFIG_LOGITECH_FF is not set
@@ -1267,6 +1286,7 @@ CONFIG_USB_EHCI_HCD=y
1267# CONFIG_USB_OXU210HP_HCD is not set 1286# CONFIG_USB_OXU210HP_HCD is not set
1268# CONFIG_USB_ISP116X_HCD is not set 1287# CONFIG_USB_ISP116X_HCD is not set
1269# CONFIG_USB_ISP1760_HCD is not set 1288# CONFIG_USB_ISP1760_HCD is not set
1289# CONFIG_USB_ISP1362_HCD is not set
1270CONFIG_USB_OHCI_HCD=y 1290CONFIG_USB_OHCI_HCD=y
1271# CONFIG_USB_OHCI_HCD_PPC_OF_BE is not set 1291# CONFIG_USB_OHCI_HCD_PPC_OF_BE is not set
1272# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set 1292# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set
@@ -1342,6 +1362,7 @@ CONFIG_USB_STORAGE=y
1342# CONFIG_USB_LD is not set 1362# CONFIG_USB_LD is not set
1343# CONFIG_USB_TRANCEVIBRATOR is not set 1363# CONFIG_USB_TRANCEVIBRATOR is not set
1344# CONFIG_USB_IOWARRIOR is not set 1364# CONFIG_USB_IOWARRIOR is not set
1365# CONFIG_USB_TEST is not set
1345# CONFIG_USB_ISIGHTFW is not set 1366# CONFIG_USB_ISIGHTFW is not set
1346# CONFIG_USB_VST is not set 1367# CONFIG_USB_VST is not set
1347# CONFIG_USB_GADGET is not set 1368# CONFIG_USB_GADGET is not set
@@ -1446,6 +1467,7 @@ CONFIG_FS_POSIX_ACL=y
1446# CONFIG_GFS2_FS is not set 1467# CONFIG_GFS2_FS is not set
1447# CONFIG_OCFS2_FS is not set 1468# CONFIG_OCFS2_FS is not set
1448# CONFIG_BTRFS_FS is not set 1469# CONFIG_BTRFS_FS is not set
1470# CONFIG_NILFS2_FS is not set
1449CONFIG_FILE_LOCKING=y 1471CONFIG_FILE_LOCKING=y
1450CONFIG_FSNOTIFY=y 1472CONFIG_FSNOTIFY=y
1451CONFIG_DNOTIFY=y 1473CONFIG_DNOTIFY=y
@@ -1521,7 +1543,6 @@ CONFIG_JFFS2_RTIME=y
1521# CONFIG_ROMFS_FS is not set 1543# CONFIG_ROMFS_FS is not set
1522# CONFIG_SYSV_FS is not set 1544# CONFIG_SYSV_FS is not set
1523# CONFIG_UFS_FS is not set 1545# CONFIG_UFS_FS is not set
1524# CONFIG_NILFS2_FS is not set
1525CONFIG_NETWORK_FILESYSTEMS=y 1546CONFIG_NETWORK_FILESYSTEMS=y
1526CONFIG_NFS_FS=y 1547CONFIG_NFS_FS=y
1527CONFIG_NFS_V3=y 1548CONFIG_NFS_V3=y
@@ -1627,6 +1648,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
1627CONFIG_ENABLE_MUST_CHECK=y 1648CONFIG_ENABLE_MUST_CHECK=y
1628CONFIG_FRAME_WARN=1024 1649CONFIG_FRAME_WARN=1024
1629CONFIG_MAGIC_SYSRQ=y 1650CONFIG_MAGIC_SYSRQ=y
1651# CONFIG_STRIP_ASM_SYMS is not set
1630# CONFIG_UNUSED_SYMBOLS is not set 1652# CONFIG_UNUSED_SYMBOLS is not set
1631# CONFIG_DEBUG_FS is not set 1653# CONFIG_DEBUG_FS is not set
1632# CONFIG_HEADERS_CHECK is not set 1654# CONFIG_HEADERS_CHECK is not set
@@ -1642,6 +1664,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
1642CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1664CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1643CONFIG_TRACING_SUPPORT=y 1665CONFIG_TRACING_SUPPORT=y
1644# CONFIG_FTRACE is not set 1666# CONFIG_FTRACE is not set
1667# CONFIG_DMA_API_DEBUG is not set
1645# CONFIG_SAMPLES is not set 1668# CONFIG_SAMPLES is not set
1646CONFIG_HAVE_ARCH_KGDB=y 1669CONFIG_HAVE_ARCH_KGDB=y
1647# CONFIG_PPC_DISABLE_WERROR is not set 1670# CONFIG_PPC_DISABLE_WERROR is not set
@@ -1663,7 +1686,6 @@ CONFIG_CRYPTO=y
1663# 1686#
1664# Crypto core or helper 1687# Crypto core or helper
1665# 1688#
1666# CONFIG_CRYPTO_FIPS is not set
1667CONFIG_CRYPTO_ALGAPI=y 1689CONFIG_CRYPTO_ALGAPI=y
1668CONFIG_CRYPTO_ALGAPI2=y 1690CONFIG_CRYPTO_ALGAPI2=y
1669CONFIG_CRYPTO_AEAD=m 1691CONFIG_CRYPTO_AEAD=m
@@ -1706,11 +1728,13 @@ CONFIG_CRYPTO_CBC=y
1706# 1728#
1707CONFIG_CRYPTO_HMAC=m 1729CONFIG_CRYPTO_HMAC=m
1708# CONFIG_CRYPTO_XCBC is not set 1730# CONFIG_CRYPTO_XCBC is not set
1731# CONFIG_CRYPTO_VMAC is not set
1709 1732
1710# 1733#
1711# Digest 1734# Digest
1712# 1735#
1713CONFIG_CRYPTO_CRC32C=y 1736CONFIG_CRYPTO_CRC32C=y
1737# CONFIG_CRYPTO_GHASH is not set
1714# CONFIG_CRYPTO_MD4 is not set 1738# CONFIG_CRYPTO_MD4 is not set
1715CONFIG_CRYPTO_MD5=y 1739CONFIG_CRYPTO_MD5=y
1716# CONFIG_CRYPTO_MICHAEL_MIC is not set 1740# CONFIG_CRYPTO_MICHAEL_MIC is not set
diff --git a/arch/powerpc/configs/86xx/gef_sbc610_defconfig b/arch/powerpc/configs/86xx/gef_sbc610_defconfig
index ba47883f4aa0..3b0fbfb28efd 100644
--- a/arch/powerpc/configs/86xx/gef_sbc610_defconfig
+++ b/arch/powerpc/configs/86xx/gef_sbc610_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.31-rc4 3# Linux kernel version: 2.6.32-rc5
4# Wed Jul 29 23:32:30 2009 4# Thu Nov 5 08:20:48 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -36,6 +36,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
36CONFIG_GENERIC_HARDIRQS=y 36CONFIG_GENERIC_HARDIRQS=y
37CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 37CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
38# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 38# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
39# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
39CONFIG_IRQ_PER_CPU=y 40CONFIG_IRQ_PER_CPU=y
40CONFIG_STACKTRACE_SUPPORT=y 41CONFIG_STACKTRACE_SUPPORT=y
41CONFIG_HAVE_LATENCYTOP_SUPPORT=y 42CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -88,11 +89,12 @@ CONFIG_BSD_PROCESS_ACCT_V3=y
88# 89#
89# RCU Subsystem 90# RCU Subsystem
90# 91#
91CONFIG_CLASSIC_RCU=y 92CONFIG_TREE_RCU=y
92# CONFIG_TREE_RCU is not set 93# CONFIG_TREE_PREEMPT_RCU is not set
93# CONFIG_PREEMPT_RCU is not set 94# CONFIG_RCU_TRACE is not set
95CONFIG_RCU_FANOUT=32
96# CONFIG_RCU_FANOUT_EXACT is not set
94# CONFIG_TREE_RCU_TRACE is not set 97# CONFIG_TREE_RCU_TRACE is not set
95# CONFIG_PREEMPT_RCU_TRACE is not set
96CONFIG_IKCONFIG=y 98CONFIG_IKCONFIG=y
97CONFIG_IKCONFIG_PROC=y 99CONFIG_IKCONFIG_PROC=y
98CONFIG_LOG_BUF_SHIFT=14 100CONFIG_LOG_BUF_SHIFT=14
@@ -131,21 +133,20 @@ CONFIG_TIMERFD=y
131CONFIG_EVENTFD=y 133CONFIG_EVENTFD=y
132CONFIG_SHMEM=y 134CONFIG_SHMEM=y
133CONFIG_AIO=y 135CONFIG_AIO=y
134CONFIG_HAVE_PERF_COUNTERS=y 136CONFIG_HAVE_PERF_EVENTS=y
135 137
136# 138#
137# Performance Counters 139# Kernel Performance Events And Counters
138# 140#
141# CONFIG_PERF_EVENTS is not set
139# CONFIG_PERF_COUNTERS is not set 142# CONFIG_PERF_COUNTERS is not set
140CONFIG_VM_EVENT_COUNTERS=y 143CONFIG_VM_EVENT_COUNTERS=y
141CONFIG_PCI_QUIRKS=y 144CONFIG_PCI_QUIRKS=y
142# CONFIG_STRIP_ASM_SYMS is not set
143CONFIG_COMPAT_BRK=y 145CONFIG_COMPAT_BRK=y
144CONFIG_SLAB=y 146CONFIG_SLAB=y
145# CONFIG_SLUB is not set 147# CONFIG_SLUB is not set
146# CONFIG_SLOB is not set 148# CONFIG_SLOB is not set
147# CONFIG_PROFILING is not set 149# CONFIG_PROFILING is not set
148# CONFIG_MARKERS is not set
149CONFIG_HAVE_OPROFILE=y 150CONFIG_HAVE_OPROFILE=y
150# CONFIG_KPROBES is not set 151# CONFIG_KPROBES is not set
151CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 152CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -153,12 +154,14 @@ CONFIG_HAVE_IOREMAP_PROT=y
153CONFIG_HAVE_KPROBES=y 154CONFIG_HAVE_KPROBES=y
154CONFIG_HAVE_KRETPROBES=y 155CONFIG_HAVE_KRETPROBES=y
155CONFIG_HAVE_ARCH_TRACEHOOK=y 156CONFIG_HAVE_ARCH_TRACEHOOK=y
157CONFIG_HAVE_DMA_ATTRS=y
156CONFIG_USE_GENERIC_SMP_HELPERS=y 158CONFIG_USE_GENERIC_SMP_HELPERS=y
159CONFIG_HAVE_DMA_API_DEBUG=y
157 160
158# 161#
159# GCOV-based kernel profiling 162# GCOV-based kernel profiling
160# 163#
161# CONFIG_SLOW_WORK is not set 164CONFIG_SLOW_WORK=y
162# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 165# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
163CONFIG_SLABINFO=y 166CONFIG_SLABINFO=y
164CONFIG_RT_MUTEXES=y 167CONFIG_RT_MUTEXES=y
@@ -257,6 +260,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
257# CONFIG_KEXEC is not set 260# CONFIG_KEXEC is not set
258# CONFIG_CRASH_DUMP is not set 261# CONFIG_CRASH_DUMP is not set
259CONFIG_IRQ_ALL_CPUS=y 262CONFIG_IRQ_ALL_CPUS=y
263CONFIG_MAX_ACTIVE_REGIONS=32
260CONFIG_ARCH_FLATMEM_ENABLE=y 264CONFIG_ARCH_FLATMEM_ENABLE=y
261CONFIG_ARCH_POPULATES_NODE_MAP=y 265CONFIG_ARCH_POPULATES_NODE_MAP=y
262CONFIG_SELECT_MEMORY_MODEL=y 266CONFIG_SELECT_MEMORY_MODEL=y
@@ -274,6 +278,7 @@ CONFIG_BOUNCE=y
274CONFIG_VIRT_TO_BUS=y 278CONFIG_VIRT_TO_BUS=y
275CONFIG_HAVE_MLOCK=y 279CONFIG_HAVE_MLOCK=y
276CONFIG_HAVE_MLOCKED_PAGE_BIT=y 280CONFIG_HAVE_MLOCKED_PAGE_BIT=y
281# CONFIG_KSM is not set
277CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 282CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
278CONFIG_PPC_4K_PAGES=y 283CONFIG_PPC_4K_PAGES=y
279# CONFIG_PPC_16K_PAGES is not set 284# CONFIG_PPC_16K_PAGES is not set
@@ -503,6 +508,7 @@ CONFIG_IP_SCTP=m
503# CONFIG_SCTP_HMAC_NONE is not set 508# CONFIG_SCTP_HMAC_NONE is not set
504# CONFIG_SCTP_HMAC_SHA1 is not set 509# CONFIG_SCTP_HMAC_SHA1 is not set
505CONFIG_SCTP_HMAC_MD5=y 510CONFIG_SCTP_HMAC_MD5=y
511# CONFIG_RDS is not set
506CONFIG_TIPC=m 512CONFIG_TIPC=m
507# CONFIG_TIPC_ADVANCED is not set 513# CONFIG_TIPC_ADVANCED is not set
508# CONFIG_TIPC_DEBUG is not set 514# CONFIG_TIPC_DEBUG is not set
@@ -582,6 +588,7 @@ CONFIG_NET_PKTGEN=m
582CONFIG_FIB_RULES=y 588CONFIG_FIB_RULES=y
583CONFIG_WIRELESS=y 589CONFIG_WIRELESS=y
584# CONFIG_CFG80211 is not set 590# CONFIG_CFG80211 is not set
591CONFIG_CFG80211_DEFAULT_PS_VALUE=0
585CONFIG_WIRELESS_OLD_REGULATORY=y 592CONFIG_WIRELESS_OLD_REGULATORY=y
586# CONFIG_WIRELESS_EXT is not set 593# CONFIG_WIRELESS_EXT is not set
587# CONFIG_LIB80211 is not set 594# CONFIG_LIB80211 is not set
@@ -589,7 +596,6 @@ CONFIG_WIRELESS_OLD_REGULATORY=y
589# 596#
590# CFG80211 needs to be enabled for MAC80211 597# CFG80211 needs to be enabled for MAC80211
591# 598#
592CONFIG_MAC80211_DEFAULT_PS_VALUE=0
593# CONFIG_WIMAX is not set 599# CONFIG_WIMAX is not set
594# CONFIG_RFKILL is not set 600# CONFIG_RFKILL is not set
595# CONFIG_NET_9P is not set 601# CONFIG_NET_9P is not set
@@ -602,6 +608,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
602# Generic Driver Options 608# Generic Driver Options
603# 609#
604CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 610CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
611# CONFIG_DEVTMPFS is not set
605CONFIG_STANDALONE=y 612CONFIG_STANDALONE=y
606CONFIG_PREVENT_FIRMWARE_BUILD=y 613CONFIG_PREVENT_FIRMWARE_BUILD=y
607# CONFIG_FW_LOADER is not set 614# CONFIG_FW_LOADER is not set
@@ -611,9 +618,9 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
611# CONFIG_CONNECTOR is not set 618# CONFIG_CONNECTOR is not set
612CONFIG_MTD=y 619CONFIG_MTD=y
613# CONFIG_MTD_DEBUG is not set 620# CONFIG_MTD_DEBUG is not set
621# CONFIG_MTD_TESTS is not set
614CONFIG_MTD_CONCAT=y 622CONFIG_MTD_CONCAT=y
615CONFIG_MTD_PARTITIONS=y 623CONFIG_MTD_PARTITIONS=y
616# CONFIG_MTD_TESTS is not set
617# CONFIG_MTD_REDBOOT_PARTS is not set 624# CONFIG_MTD_REDBOOT_PARTS is not set
618# CONFIG_MTD_CMDLINE_PARTS is not set 625# CONFIG_MTD_CMDLINE_PARTS is not set
619# CONFIG_MTD_OF_PARTS is not set 626# CONFIG_MTD_OF_PARTS is not set
@@ -780,6 +787,7 @@ CONFIG_SCSI_WAIT_SCAN=m
780CONFIG_SCSI_LOWLEVEL=y 787CONFIG_SCSI_LOWLEVEL=y
781# CONFIG_ISCSI_TCP is not set 788# CONFIG_ISCSI_TCP is not set
782# CONFIG_SCSI_BNX2_ISCSI is not set 789# CONFIG_SCSI_BNX2_ISCSI is not set
790# CONFIG_BE2ISCSI is not set
783# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 791# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
784# CONFIG_SCSI_3W_9XXX is not set 792# CONFIG_SCSI_3W_9XXX is not set
785# CONFIG_SCSI_ACARD is not set 793# CONFIG_SCSI_ACARD is not set
@@ -819,11 +827,14 @@ CONFIG_SCSI_LOWLEVEL=y
819# CONFIG_SCSI_DC390T is not set 827# CONFIG_SCSI_DC390T is not set
820# CONFIG_SCSI_NSP32 is not set 828# CONFIG_SCSI_NSP32 is not set
821# CONFIG_SCSI_DEBUG is not set 829# CONFIG_SCSI_DEBUG is not set
830# CONFIG_SCSI_PMCRAID is not set
822# CONFIG_SCSI_SRP is not set 831# CONFIG_SCSI_SRP is not set
832# CONFIG_SCSI_BFA_FC is not set
823# CONFIG_SCSI_DH is not set 833# CONFIG_SCSI_DH is not set
824# CONFIG_SCSI_OSD_INITIATOR is not set 834# CONFIG_SCSI_OSD_INITIATOR is not set
825CONFIG_ATA=y 835CONFIG_ATA=y
826# CONFIG_ATA_NONSTANDARD is not set 836# CONFIG_ATA_NONSTANDARD is not set
837CONFIG_ATA_VERBOSE_ERROR=y
827CONFIG_SATA_PMP=y 838CONFIG_SATA_PMP=y
828# CONFIG_SATA_AHCI is not set 839# CONFIG_SATA_AHCI is not set
829# CONFIG_SATA_SIL24 is not set 840# CONFIG_SATA_SIL24 is not set
@@ -846,6 +857,7 @@ CONFIG_SATA_SIL=y
846# CONFIG_PATA_ALI is not set 857# CONFIG_PATA_ALI is not set
847# CONFIG_PATA_AMD is not set 858# CONFIG_PATA_AMD is not set
848# CONFIG_PATA_ARTOP is not set 859# CONFIG_PATA_ARTOP is not set
860# CONFIG_PATA_ATP867X is not set
849# CONFIG_PATA_ATIIXP is not set 861# CONFIG_PATA_ATIIXP is not set
850# CONFIG_PATA_CMD640_PCI is not set 862# CONFIG_PATA_CMD640_PCI is not set
851# CONFIG_PATA_CMD64X is not set 863# CONFIG_PATA_CMD64X is not set
@@ -873,6 +885,7 @@ CONFIG_SATA_SIL=y
873# CONFIG_PATA_OPTIDMA is not set 885# CONFIG_PATA_OPTIDMA is not set
874# CONFIG_PATA_PDC_OLD is not set 886# CONFIG_PATA_PDC_OLD is not set
875# CONFIG_PATA_RADISYS is not set 887# CONFIG_PATA_RADISYS is not set
888# CONFIG_PATA_RDC is not set
876# CONFIG_PATA_RZ1000 is not set 889# CONFIG_PATA_RZ1000 is not set
877# CONFIG_PATA_SC1200 is not set 890# CONFIG_PATA_SC1200 is not set
878# CONFIG_PATA_SERVERWORKS is not set 891# CONFIG_PATA_SERVERWORKS is not set
@@ -949,7 +962,9 @@ CONFIG_MII=y
949# CONFIG_NET_PCI is not set 962# CONFIG_NET_PCI is not set
950# CONFIG_B44 is not set 963# CONFIG_B44 is not set
951# CONFIG_KS8842 is not set 964# CONFIG_KS8842 is not set
965# CONFIG_KS8851_MLL is not set
952# CONFIG_ATL2 is not set 966# CONFIG_ATL2 is not set
967# CONFIG_XILINX_EMACLITE is not set
953CONFIG_NETDEV_1000=y 968CONFIG_NETDEV_1000=y
954# CONFIG_ACENIC is not set 969# CONFIG_ACENIC is not set
955# CONFIG_DL2K is not set 970# CONFIG_DL2K is not set
@@ -979,10 +994,7 @@ CONFIG_GIANFAR=y
979# CONFIG_JME is not set 994# CONFIG_JME is not set
980# CONFIG_NETDEV_10000 is not set 995# CONFIG_NETDEV_10000 is not set
981# CONFIG_TR is not set 996# CONFIG_TR is not set
982 997CONFIG_WLAN=y
983#
984# Wireless LAN
985#
986# CONFIG_WLAN_PRE80211 is not set 998# CONFIG_WLAN_PRE80211 is not set
987# CONFIG_WLAN_80211 is not set 999# CONFIG_WLAN_80211 is not set
988 1000
@@ -1120,6 +1132,7 @@ CONFIG_HW_RANDOM=y
1120CONFIG_DEVPORT=y 1132CONFIG_DEVPORT=y
1121CONFIG_I2C=y 1133CONFIG_I2C=y
1122CONFIG_I2C_BOARDINFO=y 1134CONFIG_I2C_BOARDINFO=y
1135CONFIG_I2C_COMPAT=y
1123CONFIG_I2C_CHARDEV=y 1136CONFIG_I2C_CHARDEV=y
1124CONFIG_I2C_HELPER_AUTO=y 1137CONFIG_I2C_HELPER_AUTO=y
1125 1138
@@ -1175,9 +1188,6 @@ CONFIG_I2C_MPC=y
1175# Miscellaneous I2C Chip support 1188# Miscellaneous I2C Chip support
1176# 1189#
1177CONFIG_DS1682=y 1190CONFIG_DS1682=y
1178# CONFIG_SENSORS_PCF8574 is not set
1179# CONFIG_PCF8575 is not set
1180# CONFIG_SENSORS_PCA9539 is not set
1181# CONFIG_SENSORS_TSL2550 is not set 1191# CONFIG_SENSORS_TSL2550 is not set
1182# CONFIG_I2C_DEBUG_CORE is not set 1192# CONFIG_I2C_DEBUG_CORE is not set
1183# CONFIG_I2C_DEBUG_ALGO is not set 1193# CONFIG_I2C_DEBUG_ALGO is not set
@@ -1211,14 +1221,24 @@ CONFIG_GPIOLIB=y
1211# PCI GPIO expanders: 1221# PCI GPIO expanders:
1212# 1222#
1213# CONFIG_GPIO_BT8XX is not set 1223# CONFIG_GPIO_BT8XX is not set
1224# CONFIG_GPIO_LANGWELL is not set
1214 1225
1215# 1226#
1216# SPI GPIO expanders: 1227# SPI GPIO expanders:
1217# 1228#
1229
1230#
1231# AC97 GPIO expanders:
1232#
1218# CONFIG_W1 is not set 1233# CONFIG_W1 is not set
1219# CONFIG_POWER_SUPPLY is not set 1234# CONFIG_POWER_SUPPLY is not set
1220CONFIG_HWMON=y 1235CONFIG_HWMON=y
1221# CONFIG_HWMON_VID is not set 1236# CONFIG_HWMON_VID is not set
1237# CONFIG_HWMON_DEBUG_CHIP is not set
1238
1239#
1240# Native drivers
1241#
1222# CONFIG_SENSORS_AD7414 is not set 1242# CONFIG_SENSORS_AD7414 is not set
1223# CONFIG_SENSORS_AD7418 is not set 1243# CONFIG_SENSORS_AD7418 is not set
1224# CONFIG_SENSORS_ADM1021 is not set 1244# CONFIG_SENSORS_ADM1021 is not set
@@ -1269,6 +1289,7 @@ CONFIG_SENSORS_LM92=y
1269# CONFIG_SENSORS_ADS7828 is not set 1289# CONFIG_SENSORS_ADS7828 is not set
1270# CONFIG_SENSORS_THMC50 is not set 1290# CONFIG_SENSORS_THMC50 is not set
1271# CONFIG_SENSORS_TMP401 is not set 1291# CONFIG_SENSORS_TMP401 is not set
1292# CONFIG_SENSORS_TMP421 is not set
1272# CONFIG_SENSORS_VIA686A is not set 1293# CONFIG_SENSORS_VIA686A is not set
1273# CONFIG_SENSORS_VT1211 is not set 1294# CONFIG_SENSORS_VT1211 is not set
1274# CONFIG_SENSORS_VT8231 is not set 1295# CONFIG_SENSORS_VT8231 is not set
@@ -1280,9 +1301,7 @@ CONFIG_SENSORS_LM92=y
1280# CONFIG_SENSORS_W83L786NG is not set 1301# CONFIG_SENSORS_W83L786NG is not set
1281# CONFIG_SENSORS_W83627HF is not set 1302# CONFIG_SENSORS_W83627HF is not set
1282# CONFIG_SENSORS_W83627EHF is not set 1303# CONFIG_SENSORS_W83627EHF is not set
1283# CONFIG_HWMON_DEBUG_CHIP is not set
1284# CONFIG_THERMAL is not set 1304# CONFIG_THERMAL is not set
1285# CONFIG_THERMAL_HWMON is not set
1286CONFIG_WATCHDOG=y 1305CONFIG_WATCHDOG=y
1287# CONFIG_WATCHDOG_NOWAYOUT is not set 1306# CONFIG_WATCHDOG_NOWAYOUT is not set
1288 1307
@@ -1322,6 +1341,7 @@ CONFIG_SSB_POSSIBLE=y
1322# CONFIG_MFD_TMIO is not set 1341# CONFIG_MFD_TMIO is not set
1323# CONFIG_PMIC_DA903X is not set 1342# CONFIG_PMIC_DA903X is not set
1324# CONFIG_MFD_WM8400 is not set 1343# CONFIG_MFD_WM8400 is not set
1344# CONFIG_MFD_WM831X is not set
1325# CONFIG_MFD_WM8350_I2C is not set 1345# CONFIG_MFD_WM8350_I2C is not set
1326# CONFIG_MFD_PCF50633 is not set 1346# CONFIG_MFD_PCF50633 is not set
1327# CONFIG_AB3100_CORE is not set 1347# CONFIG_AB3100_CORE is not set
@@ -1332,6 +1352,7 @@ CONFIG_SSB_POSSIBLE=y
1332# Graphics support 1352# Graphics support
1333# 1353#
1334# CONFIG_AGP is not set 1354# CONFIG_AGP is not set
1355CONFIG_VGA_ARB=y
1335# CONFIG_DRM is not set 1356# CONFIG_DRM is not set
1336# CONFIG_VGASTATE is not set 1357# CONFIG_VGASTATE is not set
1337CONFIG_VIDEO_OUTPUT_CONTROL=m 1358CONFIG_VIDEO_OUTPUT_CONTROL=m
@@ -1352,7 +1373,6 @@ CONFIG_DUMMY_CONSOLE=y
1352# CONFIG_SOUND is not set 1373# CONFIG_SOUND is not set
1353CONFIG_HID_SUPPORT=y 1374CONFIG_HID_SUPPORT=y
1354CONFIG_HID=y 1375CONFIG_HID=y
1355# CONFIG_HID_DEBUG is not set
1356# CONFIG_HIDRAW is not set 1376# CONFIG_HIDRAW is not set
1357 1377
1358# 1378#
@@ -1375,6 +1395,7 @@ CONFIG_HID_CYPRESS=y
1375CONFIG_HID_EZKEY=y 1395CONFIG_HID_EZKEY=y
1376# CONFIG_HID_KYE is not set 1396# CONFIG_HID_KYE is not set
1377CONFIG_HID_GYRATION=y 1397CONFIG_HID_GYRATION=y
1398# CONFIG_HID_TWINHAN is not set
1378# CONFIG_HID_KENSINGTON is not set 1399# CONFIG_HID_KENSINGTON is not set
1379CONFIG_HID_LOGITECH=y 1400CONFIG_HID_LOGITECH=y
1380# CONFIG_LOGITECH_FF is not set 1401# CONFIG_LOGITECH_FF is not set
@@ -1427,6 +1448,7 @@ CONFIG_USB_EHCI_HCD=y
1427# CONFIG_USB_OXU210HP_HCD is not set 1448# CONFIG_USB_OXU210HP_HCD is not set
1428# CONFIG_USB_ISP116X_HCD is not set 1449# CONFIG_USB_ISP116X_HCD is not set
1429# CONFIG_USB_ISP1760_HCD is not set 1450# CONFIG_USB_ISP1760_HCD is not set
1451# CONFIG_USB_ISP1362_HCD is not set
1430CONFIG_USB_OHCI_HCD=y 1452CONFIG_USB_OHCI_HCD=y
1431# CONFIG_USB_OHCI_HCD_PPC_OF_BE is not set 1453# CONFIG_USB_OHCI_HCD_PPC_OF_BE is not set
1432# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set 1454# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set
@@ -1502,6 +1524,7 @@ CONFIG_USB_STORAGE=y
1502# CONFIG_USB_LD is not set 1524# CONFIG_USB_LD is not set
1503# CONFIG_USB_TRANCEVIBRATOR is not set 1525# CONFIG_USB_TRANCEVIBRATOR is not set
1504# CONFIG_USB_IOWARRIOR is not set 1526# CONFIG_USB_IOWARRIOR is not set
1527# CONFIG_USB_TEST is not set
1505# CONFIG_USB_ISIGHTFW is not set 1528# CONFIG_USB_ISIGHTFW is not set
1506# CONFIG_USB_VST is not set 1529# CONFIG_USB_VST is not set
1507# CONFIG_USB_ATM is not set 1530# CONFIG_USB_ATM is not set
@@ -1607,6 +1630,7 @@ CONFIG_FS_POSIX_ACL=y
1607# CONFIG_GFS2_FS is not set 1630# CONFIG_GFS2_FS is not set
1608# CONFIG_OCFS2_FS is not set 1631# CONFIG_OCFS2_FS is not set
1609# CONFIG_BTRFS_FS is not set 1632# CONFIG_BTRFS_FS is not set
1633# CONFIG_NILFS2_FS is not set
1610CONFIG_FILE_LOCKING=y 1634CONFIG_FILE_LOCKING=y
1611CONFIG_FSNOTIFY=y 1635CONFIG_FSNOTIFY=y
1612CONFIG_DNOTIFY=y 1636CONFIG_DNOTIFY=y
@@ -1669,7 +1693,6 @@ CONFIG_MISC_FILESYSTEMS=y
1669# CONFIG_ROMFS_FS is not set 1693# CONFIG_ROMFS_FS is not set
1670# CONFIG_SYSV_FS is not set 1694# CONFIG_SYSV_FS is not set
1671# CONFIG_UFS_FS is not set 1695# CONFIG_UFS_FS is not set
1672# CONFIG_NILFS2_FS is not set
1673CONFIG_NETWORK_FILESYSTEMS=y 1696CONFIG_NETWORK_FILESYSTEMS=y
1674CONFIG_NFS_FS=y 1697CONFIG_NFS_FS=y
1675CONFIG_NFS_V3=y 1698CONFIG_NFS_V3=y
@@ -1775,6 +1798,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
1775CONFIG_ENABLE_MUST_CHECK=y 1798CONFIG_ENABLE_MUST_CHECK=y
1776CONFIG_FRAME_WARN=1024 1799CONFIG_FRAME_WARN=1024
1777CONFIG_MAGIC_SYSRQ=y 1800CONFIG_MAGIC_SYSRQ=y
1801# CONFIG_STRIP_ASM_SYMS is not set
1778# CONFIG_UNUSED_SYMBOLS is not set 1802# CONFIG_UNUSED_SYMBOLS is not set
1779# CONFIG_DEBUG_FS is not set 1803# CONFIG_DEBUG_FS is not set
1780# CONFIG_HEADERS_CHECK is not set 1804# CONFIG_HEADERS_CHECK is not set
@@ -1791,6 +1815,7 @@ CONFIG_SCHED_DEBUG=y
1791# CONFIG_TIMER_STATS is not set 1815# CONFIG_TIMER_STATS is not set
1792# CONFIG_DEBUG_OBJECTS is not set 1816# CONFIG_DEBUG_OBJECTS is not set
1793# CONFIG_DEBUG_SLAB is not set 1817# CONFIG_DEBUG_SLAB is not set
1818# CONFIG_DEBUG_KMEMLEAK is not set
1794CONFIG_DEBUG_PREEMPT=y 1819CONFIG_DEBUG_PREEMPT=y
1795# CONFIG_DEBUG_RT_MUTEXES is not set 1820# CONFIG_DEBUG_RT_MUTEXES is not set
1796# CONFIG_RT_MUTEX_TESTER is not set 1821# CONFIG_RT_MUTEX_TESTER is not set
@@ -1810,10 +1835,12 @@ CONFIG_DEBUG_INFO=y
1810# CONFIG_DEBUG_LIST is not set 1835# CONFIG_DEBUG_LIST is not set
1811# CONFIG_DEBUG_SG is not set 1836# CONFIG_DEBUG_SG is not set
1812# CONFIG_DEBUG_NOTIFIERS is not set 1837# CONFIG_DEBUG_NOTIFIERS is not set
1838# CONFIG_DEBUG_CREDENTIALS is not set
1813# CONFIG_RCU_TORTURE_TEST is not set 1839# CONFIG_RCU_TORTURE_TEST is not set
1814# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1840# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1815# CONFIG_BACKTRACE_SELF_TEST is not set 1841# CONFIG_BACKTRACE_SELF_TEST is not set
1816# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 1842# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1843# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
1817# CONFIG_FAULT_INJECTION is not set 1844# CONFIG_FAULT_INJECTION is not set
1818# CONFIG_LATENCYTOP is not set 1845# CONFIG_LATENCYTOP is not set
1819CONFIG_SYSCTL_SYSCALL_CHECK=y 1846CONFIG_SYSCTL_SYSCALL_CHECK=y
@@ -1837,10 +1864,10 @@ CONFIG_BRANCH_PROFILE_NONE=y
1837# CONFIG_KMEMTRACE is not set 1864# CONFIG_KMEMTRACE is not set
1838# CONFIG_WORKQUEUE_TRACER is not set 1865# CONFIG_WORKQUEUE_TRACER is not set
1839# CONFIG_BLK_DEV_IO_TRACE is not set 1866# CONFIG_BLK_DEV_IO_TRACE is not set
1867# CONFIG_DMA_API_DEBUG is not set
1840# CONFIG_SAMPLES is not set 1868# CONFIG_SAMPLES is not set
1841CONFIG_HAVE_ARCH_KGDB=y 1869CONFIG_HAVE_ARCH_KGDB=y
1842# CONFIG_KGDB is not set 1870# CONFIG_KGDB is not set
1843# CONFIG_KMEMCHECK is not set
1844# CONFIG_PPC_DISABLE_WERROR is not set 1871# CONFIG_PPC_DISABLE_WERROR is not set
1845CONFIG_PPC_WERROR=y 1872CONFIG_PPC_WERROR=y
1846CONFIG_PRINT_STACK_DEPTH=64 1873CONFIG_PRINT_STACK_DEPTH=64
@@ -1872,7 +1899,6 @@ CONFIG_CRYPTO=y
1872# 1899#
1873# Crypto core or helper 1900# Crypto core or helper
1874# 1901#
1875# CONFIG_CRYPTO_FIPS is not set
1876CONFIG_CRYPTO_ALGAPI=y 1902CONFIG_CRYPTO_ALGAPI=y
1877CONFIG_CRYPTO_ALGAPI2=y 1903CONFIG_CRYPTO_ALGAPI2=y
1878CONFIG_CRYPTO_AEAD=m 1904CONFIG_CRYPTO_AEAD=m
@@ -1915,11 +1941,13 @@ CONFIG_CRYPTO_PCBC=m
1915# 1941#
1916CONFIG_CRYPTO_HMAC=y 1942CONFIG_CRYPTO_HMAC=y
1917# CONFIG_CRYPTO_XCBC is not set 1943# CONFIG_CRYPTO_XCBC is not set
1944# CONFIG_CRYPTO_VMAC is not set
1918 1945
1919# 1946#
1920# Digest 1947# Digest
1921# 1948#
1922CONFIG_CRYPTO_CRC32C=m 1949CONFIG_CRYPTO_CRC32C=m
1950# CONFIG_CRYPTO_GHASH is not set
1923CONFIG_CRYPTO_MD4=m 1951CONFIG_CRYPTO_MD4=m
1924CONFIG_CRYPTO_MD5=y 1952CONFIG_CRYPTO_MD5=y
1925CONFIG_CRYPTO_MICHAEL_MIC=m 1953CONFIG_CRYPTO_MICHAEL_MIC=m
diff --git a/arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig b/arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig
index a61f183f7186..de4d52504fe4 100644
--- a/arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig
+++ b/arch/powerpc/configs/86xx/mpc8610_hpcd_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.31-rc4 3# Linux kernel version: 2.6.32-rc5
4# Wed Jul 29 23:32:27 2009 4# Thu Nov 5 08:20:45 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -35,6 +35,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
35CONFIG_GENERIC_HARDIRQS=y 35CONFIG_GENERIC_HARDIRQS=y
36CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 36CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
38CONFIG_IRQ_PER_CPU=y 39CONFIG_IRQ_PER_CPU=y
39CONFIG_STACKTRACE_SUPPORT=y 40CONFIG_STACKTRACE_SUPPORT=y
40CONFIG_HAVE_LATENCYTOP_SUPPORT=y 41CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -83,11 +84,12 @@ CONFIG_SYSVIPC_SYSCTL=y
83# 84#
84# RCU Subsystem 85# RCU Subsystem
85# 86#
86CONFIG_CLASSIC_RCU=y 87CONFIG_TREE_RCU=y
87# CONFIG_TREE_RCU is not set 88# CONFIG_TREE_PREEMPT_RCU is not set
88# CONFIG_PREEMPT_RCU is not set 89# CONFIG_RCU_TRACE is not set
90CONFIG_RCU_FANOUT=32
91# CONFIG_RCU_FANOUT_EXACT is not set
89# CONFIG_TREE_RCU_TRACE is not set 92# CONFIG_TREE_RCU_TRACE is not set
90# CONFIG_PREEMPT_RCU_TRACE is not set
91CONFIG_IKCONFIG=y 93CONFIG_IKCONFIG=y
92CONFIG_IKCONFIG_PROC=y 94CONFIG_IKCONFIG_PROC=y
93CONFIG_LOG_BUF_SHIFT=14 95CONFIG_LOG_BUF_SHIFT=14
@@ -126,22 +128,21 @@ CONFIG_TIMERFD=y
126CONFIG_EVENTFD=y 128CONFIG_EVENTFD=y
127CONFIG_SHMEM=y 129CONFIG_SHMEM=y
128CONFIG_AIO=y 130CONFIG_AIO=y
129CONFIG_HAVE_PERF_COUNTERS=y 131CONFIG_HAVE_PERF_EVENTS=y
130 132
131# 133#
132# Performance Counters 134# Kernel Performance Events And Counters
133# 135#
136# CONFIG_PERF_EVENTS is not set
134# CONFIG_PERF_COUNTERS is not set 137# CONFIG_PERF_COUNTERS is not set
135CONFIG_VM_EVENT_COUNTERS=y 138CONFIG_VM_EVENT_COUNTERS=y
136CONFIG_PCI_QUIRKS=y 139CONFIG_PCI_QUIRKS=y
137CONFIG_SLUB_DEBUG=y 140CONFIG_SLUB_DEBUG=y
138# CONFIG_STRIP_ASM_SYMS is not set
139CONFIG_COMPAT_BRK=y 141CONFIG_COMPAT_BRK=y
140# CONFIG_SLAB is not set 142# CONFIG_SLAB is not set
141CONFIG_SLUB=y 143CONFIG_SLUB=y
142# CONFIG_SLOB is not set 144# CONFIG_SLOB is not set
143# CONFIG_PROFILING is not set 145# CONFIG_PROFILING is not set
144# CONFIG_MARKERS is not set
145CONFIG_HAVE_OPROFILE=y 146CONFIG_HAVE_OPROFILE=y
146# CONFIG_KPROBES is not set 147# CONFIG_KPROBES is not set
147CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 148CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -149,6 +150,8 @@ CONFIG_HAVE_IOREMAP_PROT=y
149CONFIG_HAVE_KPROBES=y 150CONFIG_HAVE_KPROBES=y
150CONFIG_HAVE_KRETPROBES=y 151CONFIG_HAVE_KRETPROBES=y
151CONFIG_HAVE_ARCH_TRACEHOOK=y 152CONFIG_HAVE_ARCH_TRACEHOOK=y
153CONFIG_HAVE_DMA_ATTRS=y
154CONFIG_HAVE_DMA_API_DEBUG=y
152 155
153# 156#
154# GCOV-based kernel profiling 157# GCOV-based kernel profiling
@@ -251,6 +254,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
251CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 254CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
252# CONFIG_KEXEC is not set 255# CONFIG_KEXEC is not set
253# CONFIG_CRASH_DUMP is not set 256# CONFIG_CRASH_DUMP is not set
257CONFIG_MAX_ACTIVE_REGIONS=32
254CONFIG_ARCH_FLATMEM_ENABLE=y 258CONFIG_ARCH_FLATMEM_ENABLE=y
255CONFIG_ARCH_POPULATES_NODE_MAP=y 259CONFIG_ARCH_POPULATES_NODE_MAP=y
256CONFIG_SELECT_MEMORY_MODEL=y 260CONFIG_SELECT_MEMORY_MODEL=y
@@ -268,6 +272,7 @@ CONFIG_BOUNCE=y
268CONFIG_VIRT_TO_BUS=y 272CONFIG_VIRT_TO_BUS=y
269CONFIG_HAVE_MLOCK=y 273CONFIG_HAVE_MLOCK=y
270CONFIG_HAVE_MLOCKED_PAGE_BIT=y 274CONFIG_HAVE_MLOCKED_PAGE_BIT=y
275# CONFIG_KSM is not set
271CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 276CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
272CONFIG_PPC_4K_PAGES=y 277CONFIG_PPC_4K_PAGES=y
273# CONFIG_PPC_16K_PAGES is not set 278# CONFIG_PPC_16K_PAGES is not set
@@ -385,6 +390,7 @@ CONFIG_IPV6_NDISC_NODETYPE=y
385# CONFIG_NETFILTER is not set 390# CONFIG_NETFILTER is not set
386# CONFIG_IP_DCCP is not set 391# CONFIG_IP_DCCP is not set
387# CONFIG_IP_SCTP is not set 392# CONFIG_IP_SCTP is not set
393# CONFIG_RDS is not set
388# CONFIG_TIPC is not set 394# CONFIG_TIPC is not set
389# CONFIG_ATM is not set 395# CONFIG_ATM is not set
390# CONFIG_BRIDGE is not set 396# CONFIG_BRIDGE is not set
@@ -414,6 +420,7 @@ CONFIG_IPV6_NDISC_NODETYPE=y
414# CONFIG_AF_RXRPC is not set 420# CONFIG_AF_RXRPC is not set
415CONFIG_WIRELESS=y 421CONFIG_WIRELESS=y
416# CONFIG_CFG80211 is not set 422# CONFIG_CFG80211 is not set
423CONFIG_CFG80211_DEFAULT_PS_VALUE=0
417CONFIG_WIRELESS_OLD_REGULATORY=y 424CONFIG_WIRELESS_OLD_REGULATORY=y
418# CONFIG_WIRELESS_EXT is not set 425# CONFIG_WIRELESS_EXT is not set
419# CONFIG_LIB80211 is not set 426# CONFIG_LIB80211 is not set
@@ -421,7 +428,6 @@ CONFIG_WIRELESS_OLD_REGULATORY=y
421# 428#
422# CFG80211 needs to be enabled for MAC80211 429# CFG80211 needs to be enabled for MAC80211
423# 430#
424CONFIG_MAC80211_DEFAULT_PS_VALUE=0
425# CONFIG_WIMAX is not set 431# CONFIG_WIMAX is not set
426# CONFIG_RFKILL is not set 432# CONFIG_RFKILL is not set
427# CONFIG_NET_9P is not set 433# CONFIG_NET_9P is not set
@@ -434,6 +440,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
434# Generic Driver Options 440# Generic Driver Options
435# 441#
436CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 442CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
443# CONFIG_DEVTMPFS is not set
437CONFIG_STANDALONE=y 444CONFIG_STANDALONE=y
438CONFIG_PREVENT_FIRMWARE_BUILD=y 445CONFIG_PREVENT_FIRMWARE_BUILD=y
439CONFIG_FW_LOADER=y 446CONFIG_FW_LOADER=y
@@ -445,9 +452,9 @@ CONFIG_EXTRA_FIRMWARE=""
445# CONFIG_CONNECTOR is not set 452# CONFIG_CONNECTOR is not set
446CONFIG_MTD=y 453CONFIG_MTD=y
447# CONFIG_MTD_DEBUG is not set 454# CONFIG_MTD_DEBUG is not set
455# CONFIG_MTD_TESTS is not set
448# CONFIG_MTD_CONCAT is not set 456# CONFIG_MTD_CONCAT is not set
449CONFIG_MTD_PARTITIONS=y 457CONFIG_MTD_PARTITIONS=y
450# CONFIG_MTD_TESTS is not set
451# CONFIG_MTD_REDBOOT_PARTS is not set 458# CONFIG_MTD_REDBOOT_PARTS is not set
452CONFIG_MTD_CMDLINE_PARTS=y 459CONFIG_MTD_CMDLINE_PARTS=y
453# CONFIG_MTD_OF_PARTS is not set 460# CONFIG_MTD_OF_PARTS is not set
@@ -662,6 +669,7 @@ CONFIG_SCSI_WAIT_SCAN=m
662CONFIG_SCSI_LOWLEVEL=y 669CONFIG_SCSI_LOWLEVEL=y
663# CONFIG_ISCSI_TCP is not set 670# CONFIG_ISCSI_TCP is not set
664# CONFIG_SCSI_BNX2_ISCSI is not set 671# CONFIG_SCSI_BNX2_ISCSI is not set
672# CONFIG_BE2ISCSI is not set
665# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 673# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
666# CONFIG_SCSI_3W_9XXX is not set 674# CONFIG_SCSI_3W_9XXX is not set
667# CONFIG_SCSI_ACARD is not set 675# CONFIG_SCSI_ACARD is not set
@@ -701,11 +709,14 @@ CONFIG_SCSI_LOWLEVEL=y
701# CONFIG_SCSI_DC390T is not set 709# CONFIG_SCSI_DC390T is not set
702# CONFIG_SCSI_NSP32 is not set 710# CONFIG_SCSI_NSP32 is not set
703# CONFIG_SCSI_DEBUG is not set 711# CONFIG_SCSI_DEBUG is not set
712# CONFIG_SCSI_PMCRAID is not set
704# CONFIG_SCSI_SRP is not set 713# CONFIG_SCSI_SRP is not set
714# CONFIG_SCSI_BFA_FC is not set
705# CONFIG_SCSI_DH is not set 715# CONFIG_SCSI_DH is not set
706# CONFIG_SCSI_OSD_INITIATOR is not set 716# CONFIG_SCSI_OSD_INITIATOR is not set
707CONFIG_ATA=y 717CONFIG_ATA=y
708# CONFIG_ATA_NONSTANDARD is not set 718# CONFIG_ATA_NONSTANDARD is not set
719CONFIG_ATA_VERBOSE_ERROR=y
709CONFIG_SATA_PMP=y 720CONFIG_SATA_PMP=y
710CONFIG_SATA_AHCI=y 721CONFIG_SATA_AHCI=y
711# CONFIG_SATA_SIL24 is not set 722# CONFIG_SATA_SIL24 is not set
@@ -728,6 +739,7 @@ CONFIG_ATA_SFF=y
728CONFIG_PATA_ALI=y 739CONFIG_PATA_ALI=y
729# CONFIG_PATA_AMD is not set 740# CONFIG_PATA_AMD is not set
730# CONFIG_PATA_ARTOP is not set 741# CONFIG_PATA_ARTOP is not set
742# CONFIG_PATA_ATP867X is not set
731# CONFIG_PATA_ATIIXP is not set 743# CONFIG_PATA_ATIIXP is not set
732# CONFIG_PATA_CMD640_PCI is not set 744# CONFIG_PATA_CMD640_PCI is not set
733# CONFIG_PATA_CMD64X is not set 745# CONFIG_PATA_CMD64X is not set
@@ -755,6 +767,7 @@ CONFIG_PATA_ALI=y
755# CONFIG_PATA_OPTIDMA is not set 767# CONFIG_PATA_OPTIDMA is not set
756# CONFIG_PATA_PDC_OLD is not set 768# CONFIG_PATA_PDC_OLD is not set
757# CONFIG_PATA_RADISYS is not set 769# CONFIG_PATA_RADISYS is not set
770# CONFIG_PATA_RDC is not set
758# CONFIG_PATA_RZ1000 is not set 771# CONFIG_PATA_RZ1000 is not set
759# CONFIG_PATA_SC1200 is not set 772# CONFIG_PATA_SC1200 is not set
760# CONFIG_PATA_SERVERWORKS is not set 773# CONFIG_PATA_SERVERWORKS is not set
@@ -818,14 +831,13 @@ CONFIG_ULI526X=y
818# CONFIG_NET_PCI is not set 831# CONFIG_NET_PCI is not set
819# CONFIG_B44 is not set 832# CONFIG_B44 is not set
820# CONFIG_KS8842 is not set 833# CONFIG_KS8842 is not set
834# CONFIG_KS8851_MLL is not set
821# CONFIG_ATL2 is not set 835# CONFIG_ATL2 is not set
836# CONFIG_XILINX_EMACLITE is not set
822# CONFIG_NETDEV_1000 is not set 837# CONFIG_NETDEV_1000 is not set
823# CONFIG_NETDEV_10000 is not set 838# CONFIG_NETDEV_10000 is not set
824# CONFIG_TR is not set 839# CONFIG_TR is not set
825 840CONFIG_WLAN=y
826#
827# Wireless LAN
828#
829# CONFIG_WLAN_PRE80211 is not set 841# CONFIG_WLAN_PRE80211 is not set
830# CONFIG_WLAN_80211 is not set 842# CONFIG_WLAN_80211 is not set
831 843
@@ -929,6 +941,7 @@ CONFIG_UNIX98_PTYS=y
929CONFIG_DEVPORT=y 941CONFIG_DEVPORT=y
930CONFIG_I2C=y 942CONFIG_I2C=y
931CONFIG_I2C_BOARDINFO=y 943CONFIG_I2C_BOARDINFO=y
944CONFIG_I2C_COMPAT=y
932# CONFIG_I2C_CHARDEV is not set 945# CONFIG_I2C_CHARDEV is not set
933CONFIG_I2C_HELPER_AUTO=y 946CONFIG_I2C_HELPER_AUTO=y
934 947
@@ -982,9 +995,6 @@ CONFIG_I2C_MPC=y
982# Miscellaneous I2C Chip support 995# Miscellaneous I2C Chip support
983# 996#
984# CONFIG_DS1682 is not set 997# CONFIG_DS1682 is not set
985# CONFIG_SENSORS_PCF8574 is not set
986# CONFIG_PCF8575 is not set
987# CONFIG_SENSORS_PCA9539 is not set
988# CONFIG_SENSORS_TSL2550 is not set 998# CONFIG_SENSORS_TSL2550 is not set
989# CONFIG_I2C_DEBUG_CORE is not set 999# CONFIG_I2C_DEBUG_CORE is not set
990# CONFIG_I2C_DEBUG_ALGO is not set 1000# CONFIG_I2C_DEBUG_ALGO is not set
@@ -1002,7 +1012,6 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
1002# CONFIG_POWER_SUPPLY is not set 1012# CONFIG_POWER_SUPPLY is not set
1003# CONFIG_HWMON is not set 1013# CONFIG_HWMON is not set
1004# CONFIG_THERMAL is not set 1014# CONFIG_THERMAL is not set
1005# CONFIG_THERMAL_HWMON is not set
1006# CONFIG_WATCHDOG is not set 1015# CONFIG_WATCHDOG is not set
1007CONFIG_SSB_POSSIBLE=y 1016CONFIG_SSB_POSSIBLE=y
1008 1017
@@ -1021,6 +1030,7 @@ CONFIG_SSB_POSSIBLE=y
1021# CONFIG_MFD_TMIO is not set 1030# CONFIG_MFD_TMIO is not set
1022# CONFIG_PMIC_DA903X is not set 1031# CONFIG_PMIC_DA903X is not set
1023# CONFIG_MFD_WM8400 is not set 1032# CONFIG_MFD_WM8400 is not set
1033# CONFIG_MFD_WM831X is not set
1024# CONFIG_MFD_WM8350_I2C is not set 1034# CONFIG_MFD_WM8350_I2C is not set
1025# CONFIG_MFD_PCF50633 is not set 1035# CONFIG_MFD_PCF50633 is not set
1026# CONFIG_AB3100_CORE is not set 1036# CONFIG_AB3100_CORE is not set
@@ -1031,6 +1041,7 @@ CONFIG_SSB_POSSIBLE=y
1031# Graphics support 1041# Graphics support
1032# 1042#
1033# CONFIG_AGP is not set 1043# CONFIG_AGP is not set
1044CONFIG_VGA_ARB=y
1034# CONFIG_DRM is not set 1045# CONFIG_DRM is not set
1035# CONFIG_VGASTATE is not set 1046# CONFIG_VGASTATE is not set
1036CONFIG_VIDEO_OUTPUT_CONTROL=y 1047CONFIG_VIDEO_OUTPUT_CONTROL=y
@@ -1107,6 +1118,7 @@ CONFIG_DUMMY_CONSOLE=y
1107# CONFIG_LOGO is not set 1118# CONFIG_LOGO is not set
1108CONFIG_SOUND=y 1119CONFIG_SOUND=y
1109CONFIG_SOUND_OSS_CORE=y 1120CONFIG_SOUND_OSS_CORE=y
1121CONFIG_SOUND_OSS_CORE_PRECLAIM=y
1110CONFIG_SND=y 1122CONFIG_SND=y
1111CONFIG_SND_TIMER=y 1123CONFIG_SND_TIMER=y
1112CONFIG_SND_PCM=y 1124CONFIG_SND_PCM=y
@@ -1209,7 +1221,6 @@ CONFIG_SND_SOC_CS4270_VD33_ERRATA=y
1209# CONFIG_SOUND_PRIME is not set 1221# CONFIG_SOUND_PRIME is not set
1210CONFIG_HID_SUPPORT=y 1222CONFIG_HID_SUPPORT=y
1211CONFIG_HID=y 1223CONFIG_HID=y
1212# CONFIG_HID_DEBUG is not set
1213# CONFIG_HIDRAW is not set 1224# CONFIG_HIDRAW is not set
1214# CONFIG_HID_PID is not set 1225# CONFIG_HID_PID is not set
1215 1226
@@ -1329,6 +1340,7 @@ CONFIG_FS_MBCACHE=y
1329# CONFIG_GFS2_FS is not set 1340# CONFIG_GFS2_FS is not set
1330# CONFIG_OCFS2_FS is not set 1341# CONFIG_OCFS2_FS is not set
1331# CONFIG_BTRFS_FS is not set 1342# CONFIG_BTRFS_FS is not set
1343# CONFIG_NILFS2_FS is not set
1332CONFIG_FILE_LOCKING=y 1344CONFIG_FILE_LOCKING=y
1333CONFIG_FSNOTIFY=y 1345CONFIG_FSNOTIFY=y
1334# CONFIG_DNOTIFY is not set 1346# CONFIG_DNOTIFY is not set
@@ -1388,7 +1400,6 @@ CONFIG_MISC_FILESYSTEMS=y
1388# CONFIG_ROMFS_FS is not set 1400# CONFIG_ROMFS_FS is not set
1389# CONFIG_SYSV_FS is not set 1401# CONFIG_SYSV_FS is not set
1390# CONFIG_UFS_FS is not set 1402# CONFIG_UFS_FS is not set
1391# CONFIG_NILFS2_FS is not set
1392CONFIG_NETWORK_FILESYSTEMS=y 1403CONFIG_NETWORK_FILESYSTEMS=y
1393CONFIG_NFS_FS=y 1404CONFIG_NFS_FS=y
1394CONFIG_NFS_V3=y 1405CONFIG_NFS_V3=y
@@ -1505,6 +1516,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
1505CONFIG_ENABLE_MUST_CHECK=y 1516CONFIG_ENABLE_MUST_CHECK=y
1506CONFIG_FRAME_WARN=1024 1517CONFIG_FRAME_WARN=1024
1507# CONFIG_MAGIC_SYSRQ is not set 1518# CONFIG_MAGIC_SYSRQ is not set
1519# CONFIG_STRIP_ASM_SYMS is not set
1508# CONFIG_UNUSED_SYMBOLS is not set 1520# CONFIG_UNUSED_SYMBOLS is not set
1509# CONFIG_DEBUG_FS is not set 1521# CONFIG_DEBUG_FS is not set
1510# CONFIG_HEADERS_CHECK is not set 1522# CONFIG_HEADERS_CHECK is not set
@@ -1522,6 +1534,7 @@ CONFIG_SCHED_DEBUG=y
1522# CONFIG_DEBUG_OBJECTS is not set 1534# CONFIG_DEBUG_OBJECTS is not set
1523# CONFIG_SLUB_DEBUG_ON is not set 1535# CONFIG_SLUB_DEBUG_ON is not set
1524# CONFIG_SLUB_STATS is not set 1536# CONFIG_SLUB_STATS is not set
1537# CONFIG_DEBUG_KMEMLEAK is not set
1525# CONFIG_DEBUG_RT_MUTEXES is not set 1538# CONFIG_DEBUG_RT_MUTEXES is not set
1526# CONFIG_RT_MUTEX_TESTER is not set 1539# CONFIG_RT_MUTEX_TESTER is not set
1527# CONFIG_DEBUG_SPINLOCK is not set 1540# CONFIG_DEBUG_SPINLOCK is not set
@@ -1541,10 +1554,12 @@ CONFIG_DEBUG_INFO=y
1541# CONFIG_DEBUG_LIST is not set 1554# CONFIG_DEBUG_LIST is not set
1542# CONFIG_DEBUG_SG is not set 1555# CONFIG_DEBUG_SG is not set
1543# CONFIG_DEBUG_NOTIFIERS is not set 1556# CONFIG_DEBUG_NOTIFIERS is not set
1557# CONFIG_DEBUG_CREDENTIALS is not set
1544# CONFIG_RCU_TORTURE_TEST is not set 1558# CONFIG_RCU_TORTURE_TEST is not set
1545# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1559# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1546# CONFIG_BACKTRACE_SELF_TEST is not set 1560# CONFIG_BACKTRACE_SELF_TEST is not set
1547# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 1561# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1562# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
1548# CONFIG_FAULT_INJECTION is not set 1563# CONFIG_FAULT_INJECTION is not set
1549# CONFIG_LATENCYTOP is not set 1564# CONFIG_LATENCYTOP is not set
1550CONFIG_SYSCTL_SYSCALL_CHECK=y 1565CONFIG_SYSCTL_SYSCALL_CHECK=y
@@ -1567,10 +1582,10 @@ CONFIG_BRANCH_PROFILE_NONE=y
1567# CONFIG_KMEMTRACE is not set 1582# CONFIG_KMEMTRACE is not set
1568# CONFIG_WORKQUEUE_TRACER is not set 1583# CONFIG_WORKQUEUE_TRACER is not set
1569# CONFIG_BLK_DEV_IO_TRACE is not set 1584# CONFIG_BLK_DEV_IO_TRACE is not set
1585# CONFIG_DMA_API_DEBUG is not set
1570# CONFIG_SAMPLES is not set 1586# CONFIG_SAMPLES is not set
1571CONFIG_HAVE_ARCH_KGDB=y 1587CONFIG_HAVE_ARCH_KGDB=y
1572# CONFIG_KGDB is not set 1588# CONFIG_KGDB is not set
1573# CONFIG_KMEMCHECK is not set
1574# CONFIG_PPC_DISABLE_WERROR is not set 1589# CONFIG_PPC_DISABLE_WERROR is not set
1575CONFIG_PPC_WERROR=y 1590CONFIG_PPC_WERROR=y
1576CONFIG_PRINT_STACK_DEPTH=64 1591CONFIG_PRINT_STACK_DEPTH=64
@@ -1597,7 +1612,6 @@ CONFIG_CRYPTO=y
1597# 1612#
1598# Crypto core or helper 1613# Crypto core or helper
1599# 1614#
1600# CONFIG_CRYPTO_FIPS is not set
1601# CONFIG_CRYPTO_MANAGER is not set 1615# CONFIG_CRYPTO_MANAGER is not set
1602# CONFIG_CRYPTO_MANAGER2 is not set 1616# CONFIG_CRYPTO_MANAGER2 is not set
1603# CONFIG_CRYPTO_GF128MUL is not set 1617# CONFIG_CRYPTO_GF128MUL is not set
@@ -1629,11 +1643,13 @@ CONFIG_CRYPTO=y
1629# 1643#
1630# CONFIG_CRYPTO_HMAC is not set 1644# CONFIG_CRYPTO_HMAC is not set
1631# CONFIG_CRYPTO_XCBC is not set 1645# CONFIG_CRYPTO_XCBC is not set
1646# CONFIG_CRYPTO_VMAC is not set
1632 1647
1633# 1648#
1634# Digest 1649# Digest
1635# 1650#
1636# CONFIG_CRYPTO_CRC32C is not set 1651# CONFIG_CRYPTO_CRC32C is not set
1652# CONFIG_CRYPTO_GHASH is not set
1637# CONFIG_CRYPTO_MD4 is not set 1653# CONFIG_CRYPTO_MD4 is not set
1638# CONFIG_CRYPTO_MD5 is not set 1654# CONFIG_CRYPTO_MD5 is not set
1639# CONFIG_CRYPTO_MICHAEL_MIC is not set 1655# CONFIG_CRYPTO_MICHAEL_MIC is not set
diff --git a/arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig b/arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig
index 7016ce732605..754a79ba74a9 100644
--- a/arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig
+++ b/arch/powerpc/configs/86xx/mpc8641_hpcn_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.31-rc4 3# Linux kernel version: 2.6.32-rc5
4# Wed Jul 29 23:32:28 2009 4# Thu Nov 5 08:20:46 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -36,6 +36,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
36CONFIG_GENERIC_HARDIRQS=y 36CONFIG_GENERIC_HARDIRQS=y
37CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 37CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
38# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 38# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
39# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
39CONFIG_IRQ_PER_CPU=y 40CONFIG_IRQ_PER_CPU=y
40CONFIG_STACKTRACE_SUPPORT=y 41CONFIG_STACKTRACE_SUPPORT=y
41CONFIG_HAVE_LATENCYTOP_SUPPORT=y 42CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -87,11 +88,12 @@ CONFIG_AUDIT=y
87# 88#
88# RCU Subsystem 89# RCU Subsystem
89# 90#
90CONFIG_CLASSIC_RCU=y 91CONFIG_TREE_RCU=y
91# CONFIG_TREE_RCU is not set 92# CONFIG_TREE_PREEMPT_RCU is not set
92# CONFIG_PREEMPT_RCU is not set 93# CONFIG_RCU_TRACE is not set
94CONFIG_RCU_FANOUT=32
95# CONFIG_RCU_FANOUT_EXACT is not set
93# CONFIG_TREE_RCU_TRACE is not set 96# CONFIG_TREE_RCU_TRACE is not set
94# CONFIG_PREEMPT_RCU_TRACE is not set
95CONFIG_IKCONFIG=y 97CONFIG_IKCONFIG=y
96CONFIG_IKCONFIG_PROC=y 98CONFIG_IKCONFIG_PROC=y
97CONFIG_LOG_BUF_SHIFT=14 99CONFIG_LOG_BUF_SHIFT=14
@@ -130,22 +132,21 @@ CONFIG_TIMERFD=y
130CONFIG_EVENTFD=y 132CONFIG_EVENTFD=y
131CONFIG_SHMEM=y 133CONFIG_SHMEM=y
132CONFIG_AIO=y 134CONFIG_AIO=y
133CONFIG_HAVE_PERF_COUNTERS=y 135CONFIG_HAVE_PERF_EVENTS=y
134 136
135# 137#
136# Performance Counters 138# Kernel Performance Events And Counters
137# 139#
140# CONFIG_PERF_EVENTS is not set
138# CONFIG_PERF_COUNTERS is not set 141# CONFIG_PERF_COUNTERS is not set
139CONFIG_VM_EVENT_COUNTERS=y 142CONFIG_VM_EVENT_COUNTERS=y
140CONFIG_PCI_QUIRKS=y 143CONFIG_PCI_QUIRKS=y
141CONFIG_SLUB_DEBUG=y 144CONFIG_SLUB_DEBUG=y
142# CONFIG_STRIP_ASM_SYMS is not set
143CONFIG_COMPAT_BRK=y 145CONFIG_COMPAT_BRK=y
144# CONFIG_SLAB is not set 146# CONFIG_SLAB is not set
145CONFIG_SLUB=y 147CONFIG_SLUB=y
146# CONFIG_SLOB is not set 148# CONFIG_SLOB is not set
147# CONFIG_PROFILING is not set 149# CONFIG_PROFILING is not set
148# CONFIG_MARKERS is not set
149CONFIG_HAVE_OPROFILE=y 150CONFIG_HAVE_OPROFILE=y
150# CONFIG_KPROBES is not set 151# CONFIG_KPROBES is not set
151CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 152CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -153,7 +154,9 @@ CONFIG_HAVE_IOREMAP_PROT=y
153CONFIG_HAVE_KPROBES=y 154CONFIG_HAVE_KPROBES=y
154CONFIG_HAVE_KRETPROBES=y 155CONFIG_HAVE_KRETPROBES=y
155CONFIG_HAVE_ARCH_TRACEHOOK=y 156CONFIG_HAVE_ARCH_TRACEHOOK=y
157CONFIG_HAVE_DMA_ATTRS=y
156CONFIG_USE_GENERIC_SMP_HELPERS=y 158CONFIG_USE_GENERIC_SMP_HELPERS=y
159CONFIG_HAVE_DMA_API_DEBUG=y
157 160
158# 161#
159# GCOV-based kernel profiling 162# GCOV-based kernel profiling
@@ -251,13 +254,13 @@ CONFIG_BINFMT_ELF=y
251CONFIG_BINFMT_MISC=m 254CONFIG_BINFMT_MISC=m
252CONFIG_IOMMU_HELPER=y 255CONFIG_IOMMU_HELPER=y
253CONFIG_SWIOTLB=y 256CONFIG_SWIOTLB=y
254CONFIG_PPC_NEED_DMA_SYNC_OPS=y
255CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 257CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
256CONFIG_ARCH_HAS_WALK_MEMORY=y 258CONFIG_ARCH_HAS_WALK_MEMORY=y
257CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 259CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
258# CONFIG_KEXEC is not set 260# CONFIG_KEXEC is not set
259# CONFIG_CRASH_DUMP is not set 261# CONFIG_CRASH_DUMP is not set
260# CONFIG_IRQ_ALL_CPUS is not set 262# CONFIG_IRQ_ALL_CPUS is not set
263CONFIG_MAX_ACTIVE_REGIONS=32
261CONFIG_ARCH_FLATMEM_ENABLE=y 264CONFIG_ARCH_FLATMEM_ENABLE=y
262CONFIG_ARCH_POPULATES_NODE_MAP=y 265CONFIG_ARCH_POPULATES_NODE_MAP=y
263CONFIG_SELECT_MEMORY_MODEL=y 266CONFIG_SELECT_MEMORY_MODEL=y
@@ -275,6 +278,7 @@ CONFIG_BOUNCE=y
275CONFIG_VIRT_TO_BUS=y 278CONFIG_VIRT_TO_BUS=y
276CONFIG_HAVE_MLOCK=y 279CONFIG_HAVE_MLOCK=y
277CONFIG_HAVE_MLOCKED_PAGE_BIT=y 280CONFIG_HAVE_MLOCKED_PAGE_BIT=y
281# CONFIG_KSM is not set
278CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 282CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
279CONFIG_PPC_4K_PAGES=y 283CONFIG_PPC_4K_PAGES=y
280# CONFIG_PPC_16K_PAGES is not set 284# CONFIG_PPC_16K_PAGES is not set
@@ -404,6 +408,7 @@ CONFIG_IP_SCTP=m
404# CONFIG_SCTP_HMAC_NONE is not set 408# CONFIG_SCTP_HMAC_NONE is not set
405# CONFIG_SCTP_HMAC_SHA1 is not set 409# CONFIG_SCTP_HMAC_SHA1 is not set
406CONFIG_SCTP_HMAC_MD5=y 410CONFIG_SCTP_HMAC_MD5=y
411# CONFIG_RDS is not set
407# CONFIG_TIPC is not set 412# CONFIG_TIPC is not set
408# CONFIG_ATM is not set 413# CONFIG_ATM is not set
409# CONFIG_BRIDGE is not set 414# CONFIG_BRIDGE is not set
@@ -434,6 +439,7 @@ CONFIG_SCTP_HMAC_MD5=y
434CONFIG_FIB_RULES=y 439CONFIG_FIB_RULES=y
435CONFIG_WIRELESS=y 440CONFIG_WIRELESS=y
436# CONFIG_CFG80211 is not set 441# CONFIG_CFG80211 is not set
442CONFIG_CFG80211_DEFAULT_PS_VALUE=0
437CONFIG_WIRELESS_OLD_REGULATORY=y 443CONFIG_WIRELESS_OLD_REGULATORY=y
438# CONFIG_WIRELESS_EXT is not set 444# CONFIG_WIRELESS_EXT is not set
439# CONFIG_LIB80211 is not set 445# CONFIG_LIB80211 is not set
@@ -441,7 +447,6 @@ CONFIG_WIRELESS_OLD_REGULATORY=y
441# 447#
442# CFG80211 needs to be enabled for MAC80211 448# CFG80211 needs to be enabled for MAC80211
443# 449#
444CONFIG_MAC80211_DEFAULT_PS_VALUE=0
445# CONFIG_WIMAX is not set 450# CONFIG_WIMAX is not set
446# CONFIG_RFKILL is not set 451# CONFIG_RFKILL is not set
447# CONFIG_NET_9P is not set 452# CONFIG_NET_9P is not set
@@ -454,6 +459,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
454# Generic Driver Options 459# Generic Driver Options
455# 460#
456CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 461CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
462# CONFIG_DEVTMPFS is not set
457CONFIG_STANDALONE=y 463CONFIG_STANDALONE=y
458CONFIG_PREVENT_FIRMWARE_BUILD=y 464CONFIG_PREVENT_FIRMWARE_BUILD=y
459CONFIG_FW_LOADER=y 465CONFIG_FW_LOADER=y
@@ -546,6 +552,7 @@ CONFIG_SCSI_LOWLEVEL=y
546# CONFIG_ISCSI_TCP is not set 552# CONFIG_ISCSI_TCP is not set
547# CONFIG_SCSI_CXGB3_ISCSI is not set 553# CONFIG_SCSI_CXGB3_ISCSI is not set
548# CONFIG_SCSI_BNX2_ISCSI is not set 554# CONFIG_SCSI_BNX2_ISCSI is not set
555# CONFIG_BE2ISCSI is not set
549# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 556# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
550# CONFIG_SCSI_3W_9XXX is not set 557# CONFIG_SCSI_3W_9XXX is not set
551# CONFIG_SCSI_ACARD is not set 558# CONFIG_SCSI_ACARD is not set
@@ -585,11 +592,14 @@ CONFIG_SCSI_LOWLEVEL=y
585# CONFIG_SCSI_DC390T is not set 592# CONFIG_SCSI_DC390T is not set
586# CONFIG_SCSI_NSP32 is not set 593# CONFIG_SCSI_NSP32 is not set
587# CONFIG_SCSI_DEBUG is not set 594# CONFIG_SCSI_DEBUG is not set
595# CONFIG_SCSI_PMCRAID is not set
588# CONFIG_SCSI_SRP is not set 596# CONFIG_SCSI_SRP is not set
597# CONFIG_SCSI_BFA_FC is not set
589# CONFIG_SCSI_DH is not set 598# CONFIG_SCSI_DH is not set
590# CONFIG_SCSI_OSD_INITIATOR is not set 599# CONFIG_SCSI_OSD_INITIATOR is not set
591CONFIG_ATA=y 600CONFIG_ATA=y
592# CONFIG_ATA_NONSTANDARD is not set 601# CONFIG_ATA_NONSTANDARD is not set
602CONFIG_ATA_VERBOSE_ERROR=y
593CONFIG_SATA_PMP=y 603CONFIG_SATA_PMP=y
594CONFIG_SATA_AHCI=y 604CONFIG_SATA_AHCI=y
595# CONFIG_SATA_SIL24 is not set 605# CONFIG_SATA_SIL24 is not set
@@ -612,6 +622,7 @@ CONFIG_ATA_SFF=y
612CONFIG_PATA_ALI=y 622CONFIG_PATA_ALI=y
613# CONFIG_PATA_AMD is not set 623# CONFIG_PATA_AMD is not set
614# CONFIG_PATA_ARTOP is not set 624# CONFIG_PATA_ARTOP is not set
625# CONFIG_PATA_ATP867X is not set
615# CONFIG_PATA_ATIIXP is not set 626# CONFIG_PATA_ATIIXP is not set
616# CONFIG_PATA_CMD640_PCI is not set 627# CONFIG_PATA_CMD640_PCI is not set
617# CONFIG_PATA_CMD64X is not set 628# CONFIG_PATA_CMD64X is not set
@@ -639,6 +650,7 @@ CONFIG_PATA_ALI=y
639# CONFIG_PATA_OPTIDMA is not set 650# CONFIG_PATA_OPTIDMA is not set
640# CONFIG_PATA_PDC_OLD is not set 651# CONFIG_PATA_PDC_OLD is not set
641# CONFIG_PATA_RADISYS is not set 652# CONFIG_PATA_RADISYS is not set
653# CONFIG_PATA_RDC is not set
642# CONFIG_PATA_RZ1000 is not set 654# CONFIG_PATA_RZ1000 is not set
643# CONFIG_PATA_SC1200 is not set 655# CONFIG_PATA_SC1200 is not set
644# CONFIG_PATA_SERVERWORKS is not set 656# CONFIG_PATA_SERVERWORKS is not set
@@ -715,7 +727,9 @@ CONFIG_MII=y
715# CONFIG_NET_PCI is not set 727# CONFIG_NET_PCI is not set
716# CONFIG_B44 is not set 728# CONFIG_B44 is not set
717# CONFIG_KS8842 is not set 729# CONFIG_KS8842 is not set
730# CONFIG_KS8851_MLL is not set
718# CONFIG_ATL2 is not set 731# CONFIG_ATL2 is not set
732# CONFIG_XILINX_EMACLITE is not set
719CONFIG_NETDEV_1000=y 733CONFIG_NETDEV_1000=y
720# CONFIG_ACENIC is not set 734# CONFIG_ACENIC is not set
721# CONFIG_DL2K is not set 735# CONFIG_DL2K is not set
@@ -763,10 +777,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
763# CONFIG_SFC is not set 777# CONFIG_SFC is not set
764# CONFIG_BE2NET is not set 778# CONFIG_BE2NET is not set
765# CONFIG_TR is not set 779# CONFIG_TR is not set
766 780CONFIG_WLAN=y
767#
768# Wireless LAN
769#
770# CONFIG_WLAN_PRE80211 is not set 781# CONFIG_WLAN_PRE80211 is not set
771# CONFIG_WLAN_80211 is not set 782# CONFIG_WLAN_80211 is not set
772 783
@@ -880,6 +891,7 @@ CONFIG_NVRAM=y
880CONFIG_DEVPORT=y 891CONFIG_DEVPORT=y
881CONFIG_I2C=y 892CONFIG_I2C=y
882CONFIG_I2C_BOARDINFO=y 893CONFIG_I2C_BOARDINFO=y
894CONFIG_I2C_COMPAT=y
883# CONFIG_I2C_CHARDEV is not set 895# CONFIG_I2C_CHARDEV is not set
884CONFIG_I2C_HELPER_AUTO=y 896CONFIG_I2C_HELPER_AUTO=y
885 897
@@ -934,9 +946,6 @@ CONFIG_I2C_MPC=y
934# Miscellaneous I2C Chip support 946# Miscellaneous I2C Chip support
935# 947#
936# CONFIG_DS1682 is not set 948# CONFIG_DS1682 is not set
937# CONFIG_SENSORS_PCF8574 is not set
938# CONFIG_PCF8575 is not set
939# CONFIG_SENSORS_PCA9539 is not set
940# CONFIG_SENSORS_TSL2550 is not set 949# CONFIG_SENSORS_TSL2550 is not set
941# CONFIG_I2C_DEBUG_CORE is not set 950# CONFIG_I2C_DEBUG_CORE is not set
942# CONFIG_I2C_DEBUG_ALGO is not set 951# CONFIG_I2C_DEBUG_ALGO is not set
@@ -954,7 +963,6 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
954# CONFIG_POWER_SUPPLY is not set 963# CONFIG_POWER_SUPPLY is not set
955# CONFIG_HWMON is not set 964# CONFIG_HWMON is not set
956# CONFIG_THERMAL is not set 965# CONFIG_THERMAL is not set
957# CONFIG_THERMAL_HWMON is not set
958# CONFIG_WATCHDOG is not set 966# CONFIG_WATCHDOG is not set
959CONFIG_SSB_POSSIBLE=y 967CONFIG_SSB_POSSIBLE=y
960 968
@@ -973,6 +981,7 @@ CONFIG_SSB_POSSIBLE=y
973# CONFIG_MFD_TMIO is not set 981# CONFIG_MFD_TMIO is not set
974# CONFIG_PMIC_DA903X is not set 982# CONFIG_PMIC_DA903X is not set
975# CONFIG_MFD_WM8400 is not set 983# CONFIG_MFD_WM8400 is not set
984# CONFIG_MFD_WM831X is not set
976# CONFIG_MFD_WM8350_I2C is not set 985# CONFIG_MFD_WM8350_I2C is not set
977# CONFIG_MFD_PCF50633 is not set 986# CONFIG_MFD_PCF50633 is not set
978# CONFIG_AB3100_CORE is not set 987# CONFIG_AB3100_CORE is not set
@@ -983,6 +992,7 @@ CONFIG_SSB_POSSIBLE=y
983# Graphics support 992# Graphics support
984# 993#
985# CONFIG_AGP is not set 994# CONFIG_AGP is not set
995CONFIG_VGA_ARB=y
986# CONFIG_DRM is not set 996# CONFIG_DRM is not set
987# CONFIG_VGASTATE is not set 997# CONFIG_VGASTATE is not set
988CONFIG_VIDEO_OUTPUT_CONTROL=y 998CONFIG_VIDEO_OUTPUT_CONTROL=y
@@ -1002,6 +1012,7 @@ CONFIG_VGA_CONSOLE=y
1002CONFIG_DUMMY_CONSOLE=y 1012CONFIG_DUMMY_CONSOLE=y
1003CONFIG_SOUND=y 1013CONFIG_SOUND=y
1004CONFIG_SOUND_OSS_CORE=y 1014CONFIG_SOUND_OSS_CORE=y
1015CONFIG_SOUND_OSS_CORE_PRECLAIM=y
1005CONFIG_SND=y 1016CONFIG_SND=y
1006CONFIG_SND_TIMER=y 1017CONFIG_SND_TIMER=y
1007CONFIG_SND_PCM=y 1018CONFIG_SND_PCM=y
@@ -1105,7 +1116,6 @@ CONFIG_SND_USB=y
1105CONFIG_AC97_BUS=y 1116CONFIG_AC97_BUS=y
1106CONFIG_HID_SUPPORT=y 1117CONFIG_HID_SUPPORT=y
1107CONFIG_HID=y 1118CONFIG_HID=y
1108# CONFIG_HID_DEBUG is not set
1109# CONFIG_HIDRAW is not set 1119# CONFIG_HIDRAW is not set
1110 1120
1111# 1121#
@@ -1128,6 +1138,7 @@ CONFIG_HID_CYPRESS=y
1128CONFIG_HID_EZKEY=y 1138CONFIG_HID_EZKEY=y
1129# CONFIG_HID_KYE is not set 1139# CONFIG_HID_KYE is not set
1130CONFIG_HID_GYRATION=y 1140CONFIG_HID_GYRATION=y
1141# CONFIG_HID_TWINHAN is not set
1131# CONFIG_HID_KENSINGTON is not set 1142# CONFIG_HID_KENSINGTON is not set
1132CONFIG_HID_LOGITECH=y 1143CONFIG_HID_LOGITECH=y
1133# CONFIG_LOGITECH_FF is not set 1144# CONFIG_LOGITECH_FF is not set
@@ -1180,6 +1191,7 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y
1180# CONFIG_USB_OXU210HP_HCD is not set 1191# CONFIG_USB_OXU210HP_HCD is not set
1181# CONFIG_USB_ISP116X_HCD is not set 1192# CONFIG_USB_ISP116X_HCD is not set
1182# CONFIG_USB_ISP1760_HCD is not set 1193# CONFIG_USB_ISP1760_HCD is not set
1194# CONFIG_USB_ISP1362_HCD is not set
1183CONFIG_USB_OHCI_HCD=y 1195CONFIG_USB_OHCI_HCD=y
1184CONFIG_USB_OHCI_HCD_PPC_OF_BE=y 1196CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
1185CONFIG_USB_OHCI_HCD_PPC_OF_LE=y 1197CONFIG_USB_OHCI_HCD_PPC_OF_LE=y
@@ -1358,6 +1370,7 @@ CONFIG_FS_MBCACHE=y
1358# CONFIG_GFS2_FS is not set 1370# CONFIG_GFS2_FS is not set
1359# CONFIG_OCFS2_FS is not set 1371# CONFIG_OCFS2_FS is not set
1360# CONFIG_BTRFS_FS is not set 1372# CONFIG_BTRFS_FS is not set
1373# CONFIG_NILFS2_FS is not set
1361CONFIG_FILE_LOCKING=y 1374CONFIG_FILE_LOCKING=y
1362CONFIG_FSNOTIFY=y 1375CONFIG_FSNOTIFY=y
1363CONFIG_DNOTIFY=y 1376CONFIG_DNOTIFY=y
@@ -1428,7 +1441,6 @@ CONFIG_SYSV_FS=m
1428CONFIG_UFS_FS=m 1441CONFIG_UFS_FS=m
1429# CONFIG_UFS_FS_WRITE is not set 1442# CONFIG_UFS_FS_WRITE is not set
1430# CONFIG_UFS_DEBUG is not set 1443# CONFIG_UFS_DEBUG is not set
1431# CONFIG_NILFS2_FS is not set
1432CONFIG_NETWORK_FILESYSTEMS=y 1444CONFIG_NETWORK_FILESYSTEMS=y
1433CONFIG_NFS_FS=y 1445CONFIG_NFS_FS=y
1434CONFIG_NFS_V3=y 1446CONFIG_NFS_V3=y
@@ -1546,6 +1558,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
1546CONFIG_ENABLE_MUST_CHECK=y 1558CONFIG_ENABLE_MUST_CHECK=y
1547CONFIG_FRAME_WARN=1024 1559CONFIG_FRAME_WARN=1024
1548# CONFIG_MAGIC_SYSRQ is not set 1560# CONFIG_MAGIC_SYSRQ is not set
1561# CONFIG_STRIP_ASM_SYMS is not set
1549# CONFIG_UNUSED_SYMBOLS is not set 1562# CONFIG_UNUSED_SYMBOLS is not set
1550# CONFIG_DEBUG_FS is not set 1563# CONFIG_DEBUG_FS is not set
1551# CONFIG_HEADERS_CHECK is not set 1564# CONFIG_HEADERS_CHECK is not set
@@ -1563,6 +1576,7 @@ CONFIG_SCHED_DEBUG=y
1563# CONFIG_DEBUG_OBJECTS is not set 1576# CONFIG_DEBUG_OBJECTS is not set
1564# CONFIG_SLUB_DEBUG_ON is not set 1577# CONFIG_SLUB_DEBUG_ON is not set
1565# CONFIG_SLUB_STATS is not set 1578# CONFIG_SLUB_STATS is not set
1579# CONFIG_DEBUG_KMEMLEAK is not set
1566# CONFIG_DEBUG_RT_MUTEXES is not set 1580# CONFIG_DEBUG_RT_MUTEXES is not set
1567# CONFIG_RT_MUTEX_TESTER is not set 1581# CONFIG_RT_MUTEX_TESTER is not set
1568# CONFIG_DEBUG_SPINLOCK is not set 1582# CONFIG_DEBUG_SPINLOCK is not set
@@ -1582,10 +1596,12 @@ CONFIG_DEBUG_INFO=y
1582# CONFIG_DEBUG_LIST is not set 1596# CONFIG_DEBUG_LIST is not set
1583# CONFIG_DEBUG_SG is not set 1597# CONFIG_DEBUG_SG is not set
1584# CONFIG_DEBUG_NOTIFIERS is not set 1598# CONFIG_DEBUG_NOTIFIERS is not set
1599# CONFIG_DEBUG_CREDENTIALS is not set
1585# CONFIG_RCU_TORTURE_TEST is not set 1600# CONFIG_RCU_TORTURE_TEST is not set
1586# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1601# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1587# CONFIG_BACKTRACE_SELF_TEST is not set 1602# CONFIG_BACKTRACE_SELF_TEST is not set
1588# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 1603# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1604# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
1589# CONFIG_FAULT_INJECTION is not set 1605# CONFIG_FAULT_INJECTION is not set
1590# CONFIG_LATENCYTOP is not set 1606# CONFIG_LATENCYTOP is not set
1591CONFIG_SYSCTL_SYSCALL_CHECK=y 1607CONFIG_SYSCTL_SYSCALL_CHECK=y
@@ -1608,10 +1624,10 @@ CONFIG_BRANCH_PROFILE_NONE=y
1608# CONFIG_KMEMTRACE is not set 1624# CONFIG_KMEMTRACE is not set
1609# CONFIG_WORKQUEUE_TRACER is not set 1625# CONFIG_WORKQUEUE_TRACER is not set
1610# CONFIG_BLK_DEV_IO_TRACE is not set 1626# CONFIG_BLK_DEV_IO_TRACE is not set
1627# CONFIG_DMA_API_DEBUG is not set
1611# CONFIG_SAMPLES is not set 1628# CONFIG_SAMPLES is not set
1612CONFIG_HAVE_ARCH_KGDB=y 1629CONFIG_HAVE_ARCH_KGDB=y
1613# CONFIG_KGDB is not set 1630# CONFIG_KGDB is not set
1614# CONFIG_KMEMCHECK is not set
1615# CONFIG_PPC_DISABLE_WERROR is not set 1631# CONFIG_PPC_DISABLE_WERROR is not set
1616CONFIG_PPC_WERROR=y 1632CONFIG_PPC_WERROR=y
1617CONFIG_PRINT_STACK_DEPTH=64 1633CONFIG_PRINT_STACK_DEPTH=64
@@ -1638,7 +1654,6 @@ CONFIG_CRYPTO=y
1638# 1654#
1639# Crypto core or helper 1655# Crypto core or helper
1640# 1656#
1641# CONFIG_CRYPTO_FIPS is not set
1642CONFIG_CRYPTO_ALGAPI=y 1657CONFIG_CRYPTO_ALGAPI=y
1643CONFIG_CRYPTO_ALGAPI2=y 1658CONFIG_CRYPTO_ALGAPI2=y
1644CONFIG_CRYPTO_AEAD2=y 1659CONFIG_CRYPTO_AEAD2=y
@@ -1680,11 +1695,13 @@ CONFIG_CRYPTO_PCBC=m
1680# 1695#
1681CONFIG_CRYPTO_HMAC=y 1696CONFIG_CRYPTO_HMAC=y
1682# CONFIG_CRYPTO_XCBC is not set 1697# CONFIG_CRYPTO_XCBC is not set
1698# CONFIG_CRYPTO_VMAC is not set
1683 1699
1684# 1700#
1685# Digest 1701# Digest
1686# 1702#
1687CONFIG_CRYPTO_CRC32C=m 1703CONFIG_CRYPTO_CRC32C=m
1704# CONFIG_CRYPTO_GHASH is not set
1688# CONFIG_CRYPTO_MD4 is not set 1705# CONFIG_CRYPTO_MD4 is not set
1689CONFIG_CRYPTO_MD5=y 1706CONFIG_CRYPTO_MD5=y
1690# CONFIG_CRYPTO_MICHAEL_MIC is not set 1707# CONFIG_CRYPTO_MICHAEL_MIC is not set
diff --git a/arch/powerpc/configs/86xx/sbc8641d_defconfig b/arch/powerpc/configs/86xx/sbc8641d_defconfig
index f5ca2e0cd402..89991f157ae8 100644
--- a/arch/powerpc/configs/86xx/sbc8641d_defconfig
+++ b/arch/powerpc/configs/86xx/sbc8641d_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.31-rc4 3# Linux kernel version: 2.6.32-rc5
4# Wed Jul 29 23:32:26 2009 4# Thu Nov 5 08:20:45 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -36,6 +36,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
36CONFIG_GENERIC_HARDIRQS=y 36CONFIG_GENERIC_HARDIRQS=y
37CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 37CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
38# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 38# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
39# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
39CONFIG_IRQ_PER_CPU=y 40CONFIG_IRQ_PER_CPU=y
40CONFIG_STACKTRACE_SUPPORT=y 41CONFIG_STACKTRACE_SUPPORT=y
41CONFIG_HAVE_LATENCYTOP_SUPPORT=y 42CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -87,11 +88,12 @@ CONFIG_BSD_PROCESS_ACCT_V3=y
87# 88#
88# RCU Subsystem 89# RCU Subsystem
89# 90#
90CONFIG_CLASSIC_RCU=y 91CONFIG_TREE_RCU=y
91# CONFIG_TREE_RCU is not set 92# CONFIG_TREE_PREEMPT_RCU is not set
92# CONFIG_PREEMPT_RCU is not set 93# CONFIG_RCU_TRACE is not set
94CONFIG_RCU_FANOUT=32
95# CONFIG_RCU_FANOUT_EXACT is not set
93# CONFIG_TREE_RCU_TRACE is not set 96# CONFIG_TREE_RCU_TRACE is not set
94# CONFIG_PREEMPT_RCU_TRACE is not set
95CONFIG_IKCONFIG=y 97CONFIG_IKCONFIG=y
96CONFIG_IKCONFIG_PROC=y 98CONFIG_IKCONFIG_PROC=y
97CONFIG_LOG_BUF_SHIFT=14 99CONFIG_LOG_BUF_SHIFT=14
@@ -130,21 +132,20 @@ CONFIG_TIMERFD=y
130CONFIG_EVENTFD=y 132CONFIG_EVENTFD=y
131CONFIG_SHMEM=y 133CONFIG_SHMEM=y
132CONFIG_AIO=y 134CONFIG_AIO=y
133CONFIG_HAVE_PERF_COUNTERS=y 135CONFIG_HAVE_PERF_EVENTS=y
134 136
135# 137#
136# Performance Counters 138# Kernel Performance Events And Counters
137# 139#
140# CONFIG_PERF_EVENTS is not set
138# CONFIG_PERF_COUNTERS is not set 141# CONFIG_PERF_COUNTERS is not set
139CONFIG_VM_EVENT_COUNTERS=y 142CONFIG_VM_EVENT_COUNTERS=y
140CONFIG_PCI_QUIRKS=y 143CONFIG_PCI_QUIRKS=y
141# CONFIG_STRIP_ASM_SYMS is not set
142CONFIG_COMPAT_BRK=y 144CONFIG_COMPAT_BRK=y
143CONFIG_SLAB=y 145CONFIG_SLAB=y
144# CONFIG_SLUB is not set 146# CONFIG_SLUB is not set
145# CONFIG_SLOB is not set 147# CONFIG_SLOB is not set
146# CONFIG_PROFILING is not set 148# CONFIG_PROFILING is not set
147# CONFIG_MARKERS is not set
148CONFIG_HAVE_OPROFILE=y 149CONFIG_HAVE_OPROFILE=y
149# CONFIG_KPROBES is not set 150# CONFIG_KPROBES is not set
150CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 151CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -152,13 +153,15 @@ CONFIG_HAVE_IOREMAP_PROT=y
152CONFIG_HAVE_KPROBES=y 153CONFIG_HAVE_KPROBES=y
153CONFIG_HAVE_KRETPROBES=y 154CONFIG_HAVE_KRETPROBES=y
154CONFIG_HAVE_ARCH_TRACEHOOK=y 155CONFIG_HAVE_ARCH_TRACEHOOK=y
156CONFIG_HAVE_DMA_ATTRS=y
155CONFIG_USE_GENERIC_SMP_HELPERS=y 157CONFIG_USE_GENERIC_SMP_HELPERS=y
158CONFIG_HAVE_DMA_API_DEBUG=y
156 159
157# 160#
158# GCOV-based kernel profiling 161# GCOV-based kernel profiling
159# 162#
160# CONFIG_GCOV_KERNEL is not set 163# CONFIG_GCOV_KERNEL is not set
161# CONFIG_SLOW_WORK is not set 164CONFIG_SLOW_WORK=y
162# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 165# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
163CONFIG_SLABINFO=y 166CONFIG_SLABINFO=y
164CONFIG_RT_MUTEXES=y 167CONFIG_RT_MUTEXES=y
@@ -257,6 +260,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
257# CONFIG_KEXEC is not set 260# CONFIG_KEXEC is not set
258# CONFIG_CRASH_DUMP is not set 261# CONFIG_CRASH_DUMP is not set
259CONFIG_IRQ_ALL_CPUS=y 262CONFIG_IRQ_ALL_CPUS=y
263CONFIG_MAX_ACTIVE_REGIONS=32
260CONFIG_ARCH_FLATMEM_ENABLE=y 264CONFIG_ARCH_FLATMEM_ENABLE=y
261CONFIG_ARCH_POPULATES_NODE_MAP=y 265CONFIG_ARCH_POPULATES_NODE_MAP=y
262CONFIG_SELECT_MEMORY_MODEL=y 266CONFIG_SELECT_MEMORY_MODEL=y
@@ -274,6 +278,7 @@ CONFIG_BOUNCE=y
274CONFIG_VIRT_TO_BUS=y 278CONFIG_VIRT_TO_BUS=y
275CONFIG_HAVE_MLOCK=y 279CONFIG_HAVE_MLOCK=y
276CONFIG_HAVE_MLOCKED_PAGE_BIT=y 280CONFIG_HAVE_MLOCKED_PAGE_BIT=y
281# CONFIG_KSM is not set
277CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 282CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
278CONFIG_PPC_4K_PAGES=y 283CONFIG_PPC_4K_PAGES=y
279# CONFIG_PPC_16K_PAGES is not set 284# CONFIG_PPC_16K_PAGES is not set
@@ -502,6 +507,7 @@ CONFIG_IP_SCTP=m
502# CONFIG_SCTP_HMAC_NONE is not set 507# CONFIG_SCTP_HMAC_NONE is not set
503# CONFIG_SCTP_HMAC_SHA1 is not set 508# CONFIG_SCTP_HMAC_SHA1 is not set
504CONFIG_SCTP_HMAC_MD5=y 509CONFIG_SCTP_HMAC_MD5=y
510# CONFIG_RDS is not set
505CONFIG_TIPC=m 511CONFIG_TIPC=m
506# CONFIG_TIPC_ADVANCED is not set 512# CONFIG_TIPC_ADVANCED is not set
507# CONFIG_TIPC_DEBUG is not set 513# CONFIG_TIPC_DEBUG is not set
@@ -581,6 +587,7 @@ CONFIG_NET_PKTGEN=m
581CONFIG_FIB_RULES=y 587CONFIG_FIB_RULES=y
582CONFIG_WIRELESS=y 588CONFIG_WIRELESS=y
583# CONFIG_CFG80211 is not set 589# CONFIG_CFG80211 is not set
590CONFIG_CFG80211_DEFAULT_PS_VALUE=0
584CONFIG_WIRELESS_OLD_REGULATORY=y 591CONFIG_WIRELESS_OLD_REGULATORY=y
585# CONFIG_WIRELESS_EXT is not set 592# CONFIG_WIRELESS_EXT is not set
586# CONFIG_LIB80211 is not set 593# CONFIG_LIB80211 is not set
@@ -588,7 +595,6 @@ CONFIG_WIRELESS_OLD_REGULATORY=y
588# 595#
589# CFG80211 needs to be enabled for MAC80211 596# CFG80211 needs to be enabled for MAC80211
590# 597#
591CONFIG_MAC80211_DEFAULT_PS_VALUE=0
592# CONFIG_WIMAX is not set 598# CONFIG_WIMAX is not set
593# CONFIG_RFKILL is not set 599# CONFIG_RFKILL is not set
594# CONFIG_NET_9P is not set 600# CONFIG_NET_9P is not set
@@ -601,6 +607,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
601# Generic Driver Options 607# Generic Driver Options
602# 608#
603CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 609CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
610# CONFIG_DEVTMPFS is not set
604CONFIG_STANDALONE=y 611CONFIG_STANDALONE=y
605CONFIG_PREVENT_FIRMWARE_BUILD=y 612CONFIG_PREVENT_FIRMWARE_BUILD=y
606# CONFIG_FW_LOADER is not set 613# CONFIG_FW_LOADER is not set
@@ -610,9 +617,9 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
610# CONFIG_CONNECTOR is not set 617# CONFIG_CONNECTOR is not set
611CONFIG_MTD=y 618CONFIG_MTD=y
612# CONFIG_MTD_DEBUG is not set 619# CONFIG_MTD_DEBUG is not set
620# CONFIG_MTD_TESTS is not set
613CONFIG_MTD_CONCAT=y 621CONFIG_MTD_CONCAT=y
614CONFIG_MTD_PARTITIONS=y 622CONFIG_MTD_PARTITIONS=y
615# CONFIG_MTD_TESTS is not set
616# CONFIG_MTD_REDBOOT_PARTS is not set 623# CONFIG_MTD_REDBOOT_PARTS is not set
617# CONFIG_MTD_CMDLINE_PARTS is not set 624# CONFIG_MTD_CMDLINE_PARTS is not set
618# CONFIG_MTD_OF_PARTS is not set 625# CONFIG_MTD_OF_PARTS is not set
@@ -833,7 +840,9 @@ CONFIG_MII=y
833# CONFIG_NET_PCI is not set 840# CONFIG_NET_PCI is not set
834# CONFIG_B44 is not set 841# CONFIG_B44 is not set
835# CONFIG_KS8842 is not set 842# CONFIG_KS8842 is not set
843# CONFIG_KS8851_MLL is not set
836# CONFIG_ATL2 is not set 844# CONFIG_ATL2 is not set
845# CONFIG_XILINX_EMACLITE is not set
837CONFIG_NETDEV_1000=y 846CONFIG_NETDEV_1000=y
838# CONFIG_ACENIC is not set 847# CONFIG_ACENIC is not set
839# CONFIG_DL2K is not set 848# CONFIG_DL2K is not set
@@ -863,10 +872,7 @@ CONFIG_GIANFAR=y
863# CONFIG_JME is not set 872# CONFIG_JME is not set
864# CONFIG_NETDEV_10000 is not set 873# CONFIG_NETDEV_10000 is not set
865# CONFIG_TR is not set 874# CONFIG_TR is not set
866 875CONFIG_WLAN=y
867#
868# Wireless LAN
869#
870# CONFIG_WLAN_PRE80211 is not set 876# CONFIG_WLAN_PRE80211 is not set
871# CONFIG_WLAN_80211 is not set 877# CONFIG_WLAN_80211 is not set
872 878
@@ -996,6 +1002,7 @@ CONFIG_HW_RANDOM=m
996CONFIG_DEVPORT=y 1002CONFIG_DEVPORT=y
997CONFIG_I2C=y 1003CONFIG_I2C=y
998CONFIG_I2C_BOARDINFO=y 1004CONFIG_I2C_BOARDINFO=y
1005CONFIG_I2C_COMPAT=y
999CONFIG_I2C_CHARDEV=y 1006CONFIG_I2C_CHARDEV=y
1000CONFIG_I2C_HELPER_AUTO=y 1007CONFIG_I2C_HELPER_AUTO=y
1001 1008
@@ -1049,9 +1056,6 @@ CONFIG_I2C_MPC=y
1049# Miscellaneous I2C Chip support 1056# Miscellaneous I2C Chip support
1050# 1057#
1051# CONFIG_DS1682 is not set 1058# CONFIG_DS1682 is not set
1052# CONFIG_SENSORS_PCF8574 is not set
1053# CONFIG_PCF8575 is not set
1054# CONFIG_SENSORS_PCA9539 is not set
1055# CONFIG_SENSORS_TSL2550 is not set 1059# CONFIG_SENSORS_TSL2550 is not set
1056# CONFIG_I2C_DEBUG_CORE is not set 1060# CONFIG_I2C_DEBUG_CORE is not set
1057# CONFIG_I2C_DEBUG_ALGO is not set 1061# CONFIG_I2C_DEBUG_ALGO is not set
@@ -1069,6 +1073,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
1069# CONFIG_POWER_SUPPLY is not set 1073# CONFIG_POWER_SUPPLY is not set
1070CONFIG_HWMON=y 1074CONFIG_HWMON=y
1071# CONFIG_HWMON_VID is not set 1075# CONFIG_HWMON_VID is not set
1076# CONFIG_HWMON_DEBUG_CHIP is not set
1077
1078#
1079# Native drivers
1080#
1072# CONFIG_SENSORS_AD7414 is not set 1081# CONFIG_SENSORS_AD7414 is not set
1073# CONFIG_SENSORS_AD7418 is not set 1082# CONFIG_SENSORS_AD7418 is not set
1074# CONFIG_SENSORS_ADM1021 is not set 1083# CONFIG_SENSORS_ADM1021 is not set
@@ -1118,6 +1127,7 @@ CONFIG_HWMON=y
1118# CONFIG_SENSORS_ADS7828 is not set 1127# CONFIG_SENSORS_ADS7828 is not set
1119# CONFIG_SENSORS_THMC50 is not set 1128# CONFIG_SENSORS_THMC50 is not set
1120# CONFIG_SENSORS_TMP401 is not set 1129# CONFIG_SENSORS_TMP401 is not set
1130# CONFIG_SENSORS_TMP421 is not set
1121# CONFIG_SENSORS_VIA686A is not set 1131# CONFIG_SENSORS_VIA686A is not set
1122# CONFIG_SENSORS_VT1211 is not set 1132# CONFIG_SENSORS_VT1211 is not set
1123# CONFIG_SENSORS_VT8231 is not set 1133# CONFIG_SENSORS_VT8231 is not set
@@ -1129,9 +1139,7 @@ CONFIG_HWMON=y
1129# CONFIG_SENSORS_W83L786NG is not set 1139# CONFIG_SENSORS_W83L786NG is not set
1130# CONFIG_SENSORS_W83627HF is not set 1140# CONFIG_SENSORS_W83627HF is not set
1131# CONFIG_SENSORS_W83627EHF is not set 1141# CONFIG_SENSORS_W83627EHF is not set
1132# CONFIG_HWMON_DEBUG_CHIP is not set
1133# CONFIG_THERMAL is not set 1142# CONFIG_THERMAL is not set
1134# CONFIG_THERMAL_HWMON is not set
1135CONFIG_WATCHDOG=y 1143CONFIG_WATCHDOG=y
1136# CONFIG_WATCHDOG_NOWAYOUT is not set 1144# CONFIG_WATCHDOG_NOWAYOUT is not set
1137 1145
@@ -1164,6 +1172,7 @@ CONFIG_SSB_POSSIBLE=y
1164# CONFIG_MFD_TMIO is not set 1172# CONFIG_MFD_TMIO is not set
1165# CONFIG_PMIC_DA903X is not set 1173# CONFIG_PMIC_DA903X is not set
1166# CONFIG_MFD_WM8400 is not set 1174# CONFIG_MFD_WM8400 is not set
1175# CONFIG_MFD_WM831X is not set
1167# CONFIG_MFD_WM8350_I2C is not set 1176# CONFIG_MFD_WM8350_I2C is not set
1168# CONFIG_MFD_PCF50633 is not set 1177# CONFIG_MFD_PCF50633 is not set
1169# CONFIG_AB3100_CORE is not set 1178# CONFIG_AB3100_CORE is not set
@@ -1174,6 +1183,7 @@ CONFIG_SSB_POSSIBLE=y
1174# Graphics support 1183# Graphics support
1175# 1184#
1176# CONFIG_AGP is not set 1185# CONFIG_AGP is not set
1186CONFIG_VGA_ARB=y
1177# CONFIG_DRM is not set 1187# CONFIG_DRM is not set
1178# CONFIG_VGASTATE is not set 1188# CONFIG_VGASTATE is not set
1179CONFIG_VIDEO_OUTPUT_CONTROL=m 1189CONFIG_VIDEO_OUTPUT_CONTROL=m
@@ -1194,7 +1204,6 @@ CONFIG_DUMMY_CONSOLE=y
1194# CONFIG_SOUND is not set 1204# CONFIG_SOUND is not set
1195CONFIG_HID_SUPPORT=y 1205CONFIG_HID_SUPPORT=y
1196CONFIG_HID=y 1206CONFIG_HID=y
1197# CONFIG_HID_DEBUG is not set
1198# CONFIG_HIDRAW is not set 1207# CONFIG_HIDRAW is not set
1199# CONFIG_HID_PID is not set 1208# CONFIG_HID_PID is not set
1200 1209
@@ -1274,6 +1283,7 @@ CONFIG_OCFS2_DEBUG_MASKLOG=y
1274# CONFIG_OCFS2_DEBUG_FS is not set 1283# CONFIG_OCFS2_DEBUG_FS is not set
1275# CONFIG_OCFS2_FS_POSIX_ACL is not set 1284# CONFIG_OCFS2_FS_POSIX_ACL is not set
1276# CONFIG_BTRFS_FS is not set 1285# CONFIG_BTRFS_FS is not set
1286# CONFIG_NILFS2_FS is not set
1277CONFIG_FILE_LOCKING=y 1287CONFIG_FILE_LOCKING=y
1278CONFIG_FSNOTIFY=y 1288CONFIG_FSNOTIFY=y
1279CONFIG_DNOTIFY=y 1289CONFIG_DNOTIFY=y
@@ -1343,7 +1353,6 @@ CONFIG_ROMFS_BACKED_BY_BLOCK=y
1343CONFIG_ROMFS_ON_BLOCK=y 1353CONFIG_ROMFS_ON_BLOCK=y
1344# CONFIG_SYSV_FS is not set 1354# CONFIG_SYSV_FS is not set
1345# CONFIG_UFS_FS is not set 1355# CONFIG_UFS_FS is not set
1346# CONFIG_NILFS2_FS is not set
1347CONFIG_NETWORK_FILESYSTEMS=y 1356CONFIG_NETWORK_FILESYSTEMS=y
1348CONFIG_NFS_FS=y 1357CONFIG_NFS_FS=y
1349CONFIG_NFS_V3=y 1358CONFIG_NFS_V3=y
@@ -1451,6 +1460,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
1451CONFIG_ENABLE_MUST_CHECK=y 1460CONFIG_ENABLE_MUST_CHECK=y
1452CONFIG_FRAME_WARN=1024 1461CONFIG_FRAME_WARN=1024
1453CONFIG_MAGIC_SYSRQ=y 1462CONFIG_MAGIC_SYSRQ=y
1463# CONFIG_STRIP_ASM_SYMS is not set
1454# CONFIG_UNUSED_SYMBOLS is not set 1464# CONFIG_UNUSED_SYMBOLS is not set
1455CONFIG_DEBUG_FS=y 1465CONFIG_DEBUG_FS=y
1456# CONFIG_HEADERS_CHECK is not set 1466# CONFIG_HEADERS_CHECK is not set
@@ -1467,6 +1477,7 @@ CONFIG_SCHED_DEBUG=y
1467# CONFIG_TIMER_STATS is not set 1477# CONFIG_TIMER_STATS is not set
1468# CONFIG_DEBUG_OBJECTS is not set 1478# CONFIG_DEBUG_OBJECTS is not set
1469# CONFIG_DEBUG_SLAB is not set 1479# CONFIG_DEBUG_SLAB is not set
1480# CONFIG_DEBUG_KMEMLEAK is not set
1470CONFIG_DEBUG_PREEMPT=y 1481CONFIG_DEBUG_PREEMPT=y
1471# CONFIG_DEBUG_RT_MUTEXES is not set 1482# CONFIG_DEBUG_RT_MUTEXES is not set
1472# CONFIG_RT_MUTEX_TESTER is not set 1483# CONFIG_RT_MUTEX_TESTER is not set
@@ -1486,10 +1497,12 @@ CONFIG_DEBUG_INFO=y
1486# CONFIG_DEBUG_LIST is not set 1497# CONFIG_DEBUG_LIST is not set
1487# CONFIG_DEBUG_SG is not set 1498# CONFIG_DEBUG_SG is not set
1488# CONFIG_DEBUG_NOTIFIERS is not set 1499# CONFIG_DEBUG_NOTIFIERS is not set
1500# CONFIG_DEBUG_CREDENTIALS is not set
1489# CONFIG_RCU_TORTURE_TEST is not set 1501# CONFIG_RCU_TORTURE_TEST is not set
1490# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1502# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1491# CONFIG_BACKTRACE_SELF_TEST is not set 1503# CONFIG_BACKTRACE_SELF_TEST is not set
1492# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 1504# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1505# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
1493# CONFIG_FAULT_INJECTION is not set 1506# CONFIG_FAULT_INJECTION is not set
1494# CONFIG_LATENCYTOP is not set 1507# CONFIG_LATENCYTOP is not set
1495CONFIG_SYSCTL_SYSCALL_CHECK=y 1508CONFIG_SYSCTL_SYSCALL_CHECK=y
@@ -1514,10 +1527,10 @@ CONFIG_BRANCH_PROFILE_NONE=y
1514# CONFIG_WORKQUEUE_TRACER is not set 1527# CONFIG_WORKQUEUE_TRACER is not set
1515# CONFIG_BLK_DEV_IO_TRACE is not set 1528# CONFIG_BLK_DEV_IO_TRACE is not set
1516# CONFIG_DYNAMIC_DEBUG is not set 1529# CONFIG_DYNAMIC_DEBUG is not set
1530# CONFIG_DMA_API_DEBUG is not set
1517# CONFIG_SAMPLES is not set 1531# CONFIG_SAMPLES is not set
1518CONFIG_HAVE_ARCH_KGDB=y 1532CONFIG_HAVE_ARCH_KGDB=y
1519# CONFIG_KGDB is not set 1533# CONFIG_KGDB is not set
1520# CONFIG_KMEMCHECK is not set
1521# CONFIG_PPC_DISABLE_WERROR is not set 1534# CONFIG_PPC_DISABLE_WERROR is not set
1522CONFIG_PPC_WERROR=y 1535CONFIG_PPC_WERROR=y
1523CONFIG_PRINT_STACK_DEPTH=64 1536CONFIG_PRINT_STACK_DEPTH=64
@@ -1550,7 +1563,6 @@ CONFIG_CRYPTO=y
1550# 1563#
1551# Crypto core or helper 1564# Crypto core or helper
1552# 1565#
1553# CONFIG_CRYPTO_FIPS is not set
1554CONFIG_CRYPTO_ALGAPI=y 1566CONFIG_CRYPTO_ALGAPI=y
1555CONFIG_CRYPTO_ALGAPI2=y 1567CONFIG_CRYPTO_ALGAPI2=y
1556CONFIG_CRYPTO_AEAD=m 1568CONFIG_CRYPTO_AEAD=m
@@ -1593,11 +1605,13 @@ CONFIG_CRYPTO_PCBC=m
1593# 1605#
1594CONFIG_CRYPTO_HMAC=y 1606CONFIG_CRYPTO_HMAC=y
1595# CONFIG_CRYPTO_XCBC is not set 1607# CONFIG_CRYPTO_XCBC is not set
1608# CONFIG_CRYPTO_VMAC is not set
1596 1609
1597# 1610#
1598# Digest 1611# Digest
1599# 1612#
1600CONFIG_CRYPTO_CRC32C=m 1613CONFIG_CRYPTO_CRC32C=m
1614# CONFIG_CRYPTO_GHASH is not set
1601CONFIG_CRYPTO_MD4=m 1615CONFIG_CRYPTO_MD4=m
1602CONFIG_CRYPTO_MD5=y 1616CONFIG_CRYPTO_MD5=y
1603CONFIG_CRYPTO_MICHAEL_MIC=m 1617CONFIG_CRYPTO_MICHAEL_MIC=m
diff --git a/arch/powerpc/configs/adder875_defconfig b/arch/powerpc/configs/adder875_defconfig
index aece6bb5f733..052cf134e018 100644
--- a/arch/powerpc/configs/adder875_defconfig
+++ b/arch/powerpc/configs/adder875_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.31-rc4 3# Linux kernel version: 2.6.32-rc5
4# Wed Jul 29 23:31:47 2009 4# Thu Nov 5 08:20:04 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -16,6 +16,7 @@ CONFIG_PPC_8xx=y
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_8xx=y 17CONFIG_8xx=y
18CONFIG_PPC_MMU_NOHASH=y 18CONFIG_PPC_MMU_NOHASH=y
19CONFIG_PPC_MMU_NOHASH_32=y
19# CONFIG_PPC_MM_SLICES is not set 20# CONFIG_PPC_MM_SLICES is not set
20CONFIG_NOT_COHERENT_CACHE=y 21CONFIG_NOT_COHERENT_CACHE=y
21CONFIG_PPC32=y 22CONFIG_PPC32=y
@@ -29,6 +30,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
29CONFIG_GENERIC_HARDIRQS=y 30CONFIG_GENERIC_HARDIRQS=y
30CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 31CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
31# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 32# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
33# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
32CONFIG_IRQ_PER_CPU=y 34CONFIG_IRQ_PER_CPU=y
33CONFIG_STACKTRACE_SUPPORT=y 35CONFIG_STACKTRACE_SUPPORT=y
34CONFIG_HAVE_LATENCYTOP_SUPPORT=y 36CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -78,11 +80,12 @@ CONFIG_SYSVIPC_SYSCTL=y
78# 80#
79# RCU Subsystem 81# RCU Subsystem
80# 82#
81CONFIG_CLASSIC_RCU=y 83CONFIG_TREE_RCU=y
82# CONFIG_TREE_RCU is not set 84# CONFIG_TREE_PREEMPT_RCU is not set
83# CONFIG_PREEMPT_RCU is not set 85# CONFIG_RCU_TRACE is not set
86CONFIG_RCU_FANOUT=32
87# CONFIG_RCU_FANOUT_EXACT is not set
84# CONFIG_TREE_RCU_TRACE is not set 88# CONFIG_TREE_RCU_TRACE is not set
85# CONFIG_PREEMPT_RCU_TRACE is not set
86# CONFIG_IKCONFIG is not set 89# CONFIG_IKCONFIG is not set
87CONFIG_LOG_BUF_SHIFT=14 90CONFIG_LOG_BUF_SHIFT=14
88CONFIG_GROUP_SCHED=y 91CONFIG_GROUP_SCHED=y
@@ -116,28 +119,29 @@ CONFIG_TIMERFD=y
116CONFIG_EVENTFD=y 119CONFIG_EVENTFD=y
117CONFIG_SHMEM=y 120CONFIG_SHMEM=y
118CONFIG_AIO=y 121CONFIG_AIO=y
119CONFIG_HAVE_PERF_COUNTERS=y 122CONFIG_HAVE_PERF_EVENTS=y
120 123
121# 124#
122# Performance Counters 125# Kernel Performance Events And Counters
123# 126#
127# CONFIG_PERF_EVENTS is not set
124# CONFIG_PERF_COUNTERS is not set 128# CONFIG_PERF_COUNTERS is not set
125# CONFIG_VM_EVENT_COUNTERS is not set 129# CONFIG_VM_EVENT_COUNTERS is not set
126CONFIG_SLUB_DEBUG=y 130CONFIG_SLUB_DEBUG=y
127# CONFIG_STRIP_ASM_SYMS is not set
128CONFIG_COMPAT_BRK=y 131CONFIG_COMPAT_BRK=y
129# CONFIG_SLAB is not set 132# CONFIG_SLAB is not set
130CONFIG_SLUB=y 133CONFIG_SLUB=y
131# CONFIG_SLOB is not set 134# CONFIG_SLOB is not set
132# CONFIG_PROFILING is not set 135# CONFIG_PROFILING is not set
133# CONFIG_MARKERS is not set
134CONFIG_HAVE_OPROFILE=y 136CONFIG_HAVE_OPROFILE=y
135CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 137CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
136CONFIG_HAVE_IOREMAP_PROT=y 138CONFIG_HAVE_IOREMAP_PROT=y
137CONFIG_HAVE_KPROBES=y 139CONFIG_HAVE_KPROBES=y
138CONFIG_HAVE_KRETPROBES=y 140CONFIG_HAVE_KRETPROBES=y
139CONFIG_HAVE_ARCH_TRACEHOOK=y 141CONFIG_HAVE_ARCH_TRACEHOOK=y
142CONFIG_HAVE_DMA_ATTRS=y
140CONFIG_HAVE_CLK=y 143CONFIG_HAVE_CLK=y
144CONFIG_HAVE_DMA_API_DEBUG=y
141 145
142# 146#
143# GCOV-based kernel profiling 147# GCOV-based kernel profiling
@@ -235,10 +239,10 @@ CONFIG_BINFMT_ELF=y
235# CONFIG_8XX_MINIMAL_FPEMU is not set 239# CONFIG_8XX_MINIMAL_FPEMU is not set
236# CONFIG_IOMMU_HELPER is not set 240# CONFIG_IOMMU_HELPER is not set
237# CONFIG_SWIOTLB is not set 241# CONFIG_SWIOTLB is not set
238CONFIG_PPC_NEED_DMA_SYNC_OPS=y
239CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 242CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
240CONFIG_ARCH_HAS_WALK_MEMORY=y 243CONFIG_ARCH_HAS_WALK_MEMORY=y
241CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 244CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
245CONFIG_MAX_ACTIVE_REGIONS=32
242CONFIG_ARCH_FLATMEM_ENABLE=y 246CONFIG_ARCH_FLATMEM_ENABLE=y
243CONFIG_ARCH_POPULATES_NODE_MAP=y 247CONFIG_ARCH_POPULATES_NODE_MAP=y
244CONFIG_SELECT_MEMORY_MODEL=y 248CONFIG_SELECT_MEMORY_MODEL=y
@@ -256,6 +260,7 @@ CONFIG_BOUNCE=y
256CONFIG_VIRT_TO_BUS=y 260CONFIG_VIRT_TO_BUS=y
257CONFIG_HAVE_MLOCK=y 261CONFIG_HAVE_MLOCK=y
258CONFIG_HAVE_MLOCKED_PAGE_BIT=y 262CONFIG_HAVE_MLOCKED_PAGE_BIT=y
263# CONFIG_KSM is not set
259CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 264CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
260CONFIG_PPC_4K_PAGES=y 265CONFIG_PPC_4K_PAGES=y
261# CONFIG_PPC_16K_PAGES is not set 266# CONFIG_PPC_16K_PAGES is not set
@@ -338,6 +343,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
338# CONFIG_NETFILTER is not set 343# CONFIG_NETFILTER is not set
339# CONFIG_IP_DCCP is not set 344# CONFIG_IP_DCCP is not set
340# CONFIG_IP_SCTP is not set 345# CONFIG_IP_SCTP is not set
346# CONFIG_RDS is not set
341# CONFIG_TIPC is not set 347# CONFIG_TIPC is not set
342# CONFIG_ATM is not set 348# CONFIG_ATM is not set
343# CONFIG_BRIDGE is not set 349# CONFIG_BRIDGE is not set
@@ -367,6 +373,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
367# CONFIG_AF_RXRPC is not set 373# CONFIG_AF_RXRPC is not set
368CONFIG_WIRELESS=y 374CONFIG_WIRELESS=y
369# CONFIG_CFG80211 is not set 375# CONFIG_CFG80211 is not set
376CONFIG_CFG80211_DEFAULT_PS_VALUE=0
370CONFIG_WIRELESS_OLD_REGULATORY=y 377CONFIG_WIRELESS_OLD_REGULATORY=y
371# CONFIG_WIRELESS_EXT is not set 378# CONFIG_WIRELESS_EXT is not set
372# CONFIG_LIB80211 is not set 379# CONFIG_LIB80211 is not set
@@ -374,7 +381,6 @@ CONFIG_WIRELESS_OLD_REGULATORY=y
374# 381#
375# CFG80211 needs to be enabled for MAC80211 382# CFG80211 needs to be enabled for MAC80211
376# 383#
377CONFIG_MAC80211_DEFAULT_PS_VALUE=0
378# CONFIG_WIMAX is not set 384# CONFIG_WIMAX is not set
379# CONFIG_RFKILL is not set 385# CONFIG_RFKILL is not set
380# CONFIG_NET_9P is not set 386# CONFIG_NET_9P is not set
@@ -387,6 +393,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
387# Generic Driver Options 393# Generic Driver Options
388# 394#
389CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 395CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
396# CONFIG_DEVTMPFS is not set
390CONFIG_STANDALONE=y 397CONFIG_STANDALONE=y
391CONFIG_PREVENT_FIRMWARE_BUILD=y 398CONFIG_PREVENT_FIRMWARE_BUILD=y
392# CONFIG_FW_LOADER is not set 399# CONFIG_FW_LOADER is not set
@@ -530,16 +537,15 @@ CONFIG_MII=y
530# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set 537# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
531# CONFIG_B44 is not set 538# CONFIG_B44 is not set
532# CONFIG_KS8842 is not set 539# CONFIG_KS8842 is not set
540# CONFIG_KS8851_MLL is not set
541# CONFIG_XILINX_EMACLITE is not set
533CONFIG_FS_ENET=y 542CONFIG_FS_ENET=y
534# CONFIG_FS_ENET_HAS_SCC is not set 543# CONFIG_FS_ENET_HAS_SCC is not set
535CONFIG_FS_ENET_HAS_FEC=y 544CONFIG_FS_ENET_HAS_FEC=y
536CONFIG_FS_ENET_MDIO_FEC=y 545CONFIG_FS_ENET_MDIO_FEC=y
537# CONFIG_NETDEV_1000 is not set 546# CONFIG_NETDEV_1000 is not set
538# CONFIG_NETDEV_10000 is not set 547# CONFIG_NETDEV_10000 is not set
539 548CONFIG_WLAN=y
540#
541# Wireless LAN
542#
543# CONFIG_WLAN_PRE80211 is not set 549# CONFIG_WLAN_PRE80211 is not set
544# CONFIG_WLAN_80211 is not set 550# CONFIG_WLAN_80211 is not set
545 551
@@ -580,6 +586,7 @@ CONFIG_INPUT_KEYBOARD=y
580CONFIG_KEYBOARD_ATKBD=y 586CONFIG_KEYBOARD_ATKBD=y
581# CONFIG_KEYBOARD_LKKBD is not set 587# CONFIG_KEYBOARD_LKKBD is not set
582# CONFIG_KEYBOARD_NEWTON is not set 588# CONFIG_KEYBOARD_NEWTON is not set
589# CONFIG_KEYBOARD_OPENCORES is not set
583# CONFIG_KEYBOARD_STOWAWAY is not set 590# CONFIG_KEYBOARD_STOWAWAY is not set
584# CONFIG_KEYBOARD_SUNKBD is not set 591# CONFIG_KEYBOARD_SUNKBD is not set
585# CONFIG_KEYBOARD_XTKBD is not set 592# CONFIG_KEYBOARD_XTKBD is not set
@@ -590,6 +597,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y
590CONFIG_MOUSE_PS2_SYNAPTICS=y 597CONFIG_MOUSE_PS2_SYNAPTICS=y
591CONFIG_MOUSE_PS2_TRACKPOINT=y 598CONFIG_MOUSE_PS2_TRACKPOINT=y
592# CONFIG_MOUSE_PS2_ELANTECH is not set 599# CONFIG_MOUSE_PS2_ELANTECH is not set
600# CONFIG_MOUSE_PS2_SENTELIC is not set
593# CONFIG_MOUSE_PS2_TOUCHKIT is not set 601# CONFIG_MOUSE_PS2_TOUCHKIT is not set
594# CONFIG_MOUSE_SERIAL is not set 602# CONFIG_MOUSE_SERIAL is not set
595# CONFIG_MOUSE_VSXXXAA is not set 603# CONFIG_MOUSE_VSXXXAA is not set
@@ -716,6 +724,7 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y
716# CONFIG_GFS2_FS is not set 724# CONFIG_GFS2_FS is not set
717# CONFIG_OCFS2_FS is not set 725# CONFIG_OCFS2_FS is not set
718# CONFIG_BTRFS_FS is not set 726# CONFIG_BTRFS_FS is not set
727# CONFIG_NILFS2_FS is not set
719CONFIG_FILE_LOCKING=y 728CONFIG_FILE_LOCKING=y
720CONFIG_FSNOTIFY=y 729CONFIG_FSNOTIFY=y
721# CONFIG_DNOTIFY is not set 730# CONFIG_DNOTIFY is not set
@@ -775,7 +784,6 @@ CONFIG_CRAMFS=y
775# CONFIG_ROMFS_FS is not set 784# CONFIG_ROMFS_FS is not set
776# CONFIG_SYSV_FS is not set 785# CONFIG_SYSV_FS is not set
777# CONFIG_UFS_FS is not set 786# CONFIG_UFS_FS is not set
778# CONFIG_NILFS2_FS is not set
779CONFIG_NETWORK_FILESYSTEMS=y 787CONFIG_NETWORK_FILESYSTEMS=y
780CONFIG_NFS_FS=y 788CONFIG_NFS_FS=y
781CONFIG_NFS_V3=y 789CONFIG_NFS_V3=y
@@ -847,6 +855,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
847CONFIG_ENABLE_MUST_CHECK=y 855CONFIG_ENABLE_MUST_CHECK=y
848CONFIG_FRAME_WARN=1024 856CONFIG_FRAME_WARN=1024
849CONFIG_MAGIC_SYSRQ=y 857CONFIG_MAGIC_SYSRQ=y
858# CONFIG_STRIP_ASM_SYMS is not set
850# CONFIG_UNUSED_SYMBOLS is not set 859# CONFIG_UNUSED_SYMBOLS is not set
851CONFIG_DEBUG_FS=y 860CONFIG_DEBUG_FS=y
852# CONFIG_HEADERS_CHECK is not set 861# CONFIG_HEADERS_CHECK is not set
@@ -864,6 +873,7 @@ CONFIG_SCHED_DEBUG=y
864# CONFIG_DEBUG_OBJECTS is not set 873# CONFIG_DEBUG_OBJECTS is not set
865# CONFIG_SLUB_DEBUG_ON is not set 874# CONFIG_SLUB_DEBUG_ON is not set
866# CONFIG_SLUB_STATS is not set 875# CONFIG_SLUB_STATS is not set
876# CONFIG_DEBUG_KMEMLEAK is not set
867# CONFIG_DEBUG_SPINLOCK is not set 877# CONFIG_DEBUG_SPINLOCK is not set
868# CONFIG_DEBUG_MUTEXES is not set 878# CONFIG_DEBUG_MUTEXES is not set
869# CONFIG_DEBUG_LOCK_ALLOC is not set 879# CONFIG_DEBUG_LOCK_ALLOC is not set
@@ -880,10 +890,12 @@ CONFIG_DEBUG_INFO=y
880# CONFIG_DEBUG_LIST is not set 890# CONFIG_DEBUG_LIST is not set
881# CONFIG_DEBUG_SG is not set 891# CONFIG_DEBUG_SG is not set
882# CONFIG_DEBUG_NOTIFIERS is not set 892# CONFIG_DEBUG_NOTIFIERS is not set
893# CONFIG_DEBUG_CREDENTIALS is not set
883# CONFIG_RCU_TORTURE_TEST is not set 894# CONFIG_RCU_TORTURE_TEST is not set
884# CONFIG_RCU_CPU_STALL_DETECTOR is not set 895# CONFIG_RCU_CPU_STALL_DETECTOR is not set
885# CONFIG_BACKTRACE_SELF_TEST is not set 896# CONFIG_BACKTRACE_SELF_TEST is not set
886# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 897# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
898# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
887# CONFIG_FAULT_INJECTION is not set 899# CONFIG_FAULT_INJECTION is not set
888# CONFIG_LATENCYTOP is not set 900# CONFIG_LATENCYTOP is not set
889# CONFIG_DEBUG_PAGEALLOC is not set 901# CONFIG_DEBUG_PAGEALLOC is not set
@@ -906,10 +918,10 @@ CONFIG_BRANCH_PROFILE_NONE=y
906# CONFIG_WORKQUEUE_TRACER is not set 918# CONFIG_WORKQUEUE_TRACER is not set
907# CONFIG_BLK_DEV_IO_TRACE is not set 919# CONFIG_BLK_DEV_IO_TRACE is not set
908# CONFIG_DYNAMIC_DEBUG is not set 920# CONFIG_DYNAMIC_DEBUG is not set
921# CONFIG_DMA_API_DEBUG is not set
909# CONFIG_SAMPLES is not set 922# CONFIG_SAMPLES is not set
910CONFIG_HAVE_ARCH_KGDB=y 923CONFIG_HAVE_ARCH_KGDB=y
911# CONFIG_KGDB is not set 924# CONFIG_KGDB is not set
912# CONFIG_KMEMCHECK is not set
913# CONFIG_PPC_DISABLE_WERROR is not set 925# CONFIG_PPC_DISABLE_WERROR is not set
914CONFIG_PPC_WERROR=y 926CONFIG_PPC_WERROR=y
915CONFIG_PRINT_STACK_DEPTH=64 927CONFIG_PRINT_STACK_DEPTH=64
diff --git a/arch/powerpc/configs/c2k_defconfig b/arch/powerpc/configs/c2k_defconfig
index 8105360d53f4..0fb65a85dfdf 100644
--- a/arch/powerpc/configs/c2k_defconfig
+++ b/arch/powerpc/configs/c2k_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.31-rc4 3# Linux kernel version: 2.6.32-rc5
4# Wed Jul 29 23:31:48 2009 4# Thu Nov 5 08:20:05 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -22,6 +22,7 @@ CONFIG_PPC_STD_MMU=y
22CONFIG_PPC_STD_MMU_32=y 22CONFIG_PPC_STD_MMU_32=y
23# CONFIG_PPC_MM_SLICES is not set 23# CONFIG_PPC_MM_SLICES is not set
24CONFIG_PPC_HAVE_PMU_SUPPORT=y 24CONFIG_PPC_HAVE_PMU_SUPPORT=y
25CONFIG_PPC_PERF_CTRS=y
25# CONFIG_SMP is not set 26# CONFIG_SMP is not set
26CONFIG_NOT_COHERENT_CACHE=y 27CONFIG_NOT_COHERENT_CACHE=y
27CONFIG_CHECK_CACHE_COHERENCY=y 28CONFIG_CHECK_CACHE_COHERENCY=y
@@ -36,6 +37,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
36CONFIG_GENERIC_HARDIRQS=y 37CONFIG_GENERIC_HARDIRQS=y
37CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 38CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
38# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
39CONFIG_IRQ_PER_CPU=y 41CONFIG_IRQ_PER_CPU=y
40CONFIG_STACKTRACE_SUPPORT=y 42CONFIG_STACKTRACE_SUPPORT=y
41CONFIG_HAVE_LATENCYTOP_SUPPORT=y 43CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -88,11 +90,12 @@ CONFIG_AUDIT_TREE=y
88# 90#
89# RCU Subsystem 91# RCU Subsystem
90# 92#
91CONFIG_CLASSIC_RCU=y 93CONFIG_TREE_RCU=y
92# CONFIG_TREE_RCU is not set 94# CONFIG_TREE_PREEMPT_RCU is not set
93# CONFIG_PREEMPT_RCU is not set 95# CONFIG_RCU_TRACE is not set
96CONFIG_RCU_FANOUT=32
97# CONFIG_RCU_FANOUT_EXACT is not set
94# CONFIG_TREE_RCU_TRACE is not set 98# CONFIG_TREE_RCU_TRACE is not set
95# CONFIG_PREEMPT_RCU_TRACE is not set
96# CONFIG_IKCONFIG is not set 99# CONFIG_IKCONFIG is not set
97CONFIG_LOG_BUF_SHIFT=17 100CONFIG_LOG_BUF_SHIFT=17
98CONFIG_GROUP_SCHED=y 101CONFIG_GROUP_SCHED=y
@@ -135,23 +138,24 @@ CONFIG_TIMERFD=y
135CONFIG_EVENTFD=y 138CONFIG_EVENTFD=y
136CONFIG_SHMEM=y 139CONFIG_SHMEM=y
137CONFIG_AIO=y 140CONFIG_AIO=y
138CONFIG_HAVE_PERF_COUNTERS=y 141CONFIG_HAVE_PERF_EVENTS=y
139 142
140# 143#
141# Performance Counters 144# Kernel Performance Events And Counters
142# 145#
146CONFIG_PERF_EVENTS=y
147CONFIG_EVENT_PROFILE=y
143# CONFIG_PERF_COUNTERS is not set 148# CONFIG_PERF_COUNTERS is not set
149# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
144CONFIG_VM_EVENT_COUNTERS=y 150CONFIG_VM_EVENT_COUNTERS=y
145CONFIG_PCI_QUIRKS=y 151CONFIG_PCI_QUIRKS=y
146CONFIG_SLUB_DEBUG=y 152CONFIG_SLUB_DEBUG=y
147# CONFIG_STRIP_ASM_SYMS is not set
148CONFIG_COMPAT_BRK=y 153CONFIG_COMPAT_BRK=y
149# CONFIG_SLAB is not set 154# CONFIG_SLAB is not set
150CONFIG_SLUB=y 155CONFIG_SLUB=y
151# CONFIG_SLOB is not set 156# CONFIG_SLOB is not set
152CONFIG_PROFILING=y 157CONFIG_PROFILING=y
153CONFIG_TRACEPOINTS=y 158CONFIG_TRACEPOINTS=y
154CONFIG_MARKERS=y
155CONFIG_OPROFILE=m 159CONFIG_OPROFILE=m
156CONFIG_HAVE_OPROFILE=y 160CONFIG_HAVE_OPROFILE=y
157CONFIG_KPROBES=y 161CONFIG_KPROBES=y
@@ -161,12 +165,14 @@ CONFIG_HAVE_IOREMAP_PROT=y
161CONFIG_HAVE_KPROBES=y 165CONFIG_HAVE_KPROBES=y
162CONFIG_HAVE_KRETPROBES=y 166CONFIG_HAVE_KRETPROBES=y
163CONFIG_HAVE_ARCH_TRACEHOOK=y 167CONFIG_HAVE_ARCH_TRACEHOOK=y
168CONFIG_HAVE_DMA_ATTRS=y
169CONFIG_HAVE_DMA_API_DEBUG=y
164 170
165# 171#
166# GCOV-based kernel profiling 172# GCOV-based kernel profiling
167# 173#
168# CONFIG_GCOV_KERNEL is not set 174# CONFIG_GCOV_KERNEL is not set
169# CONFIG_SLOW_WORK is not set 175CONFIG_SLOW_WORK=y
170# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 176# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
171CONFIG_SLABINFO=y 177CONFIG_SLABINFO=y
172CONFIG_RT_MUTEXES=y 178CONFIG_RT_MUTEXES=y
@@ -275,12 +281,12 @@ CONFIG_BINFMT_ELF=y
275CONFIG_BINFMT_MISC=y 281CONFIG_BINFMT_MISC=y
276# CONFIG_IOMMU_HELPER is not set 282# CONFIG_IOMMU_HELPER is not set
277# CONFIG_SWIOTLB is not set 283# CONFIG_SWIOTLB is not set
278CONFIG_PPC_NEED_DMA_SYNC_OPS=y
279CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 284CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
280CONFIG_ARCH_HAS_WALK_MEMORY=y 285CONFIG_ARCH_HAS_WALK_MEMORY=y
281CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 286CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
282# CONFIG_KEXEC is not set 287# CONFIG_KEXEC is not set
283# CONFIG_CRASH_DUMP is not set 288# CONFIG_CRASH_DUMP is not set
289CONFIG_MAX_ACTIVE_REGIONS=32
284CONFIG_ARCH_FLATMEM_ENABLE=y 290CONFIG_ARCH_FLATMEM_ENABLE=y
285CONFIG_ARCH_POPULATES_NODE_MAP=y 291CONFIG_ARCH_POPULATES_NODE_MAP=y
286CONFIG_SELECT_MEMORY_MODEL=y 292CONFIG_SELECT_MEMORY_MODEL=y
@@ -298,6 +304,7 @@ CONFIG_BOUNCE=y
298CONFIG_VIRT_TO_BUS=y 304CONFIG_VIRT_TO_BUS=y
299CONFIG_HAVE_MLOCK=y 305CONFIG_HAVE_MLOCK=y
300CONFIG_HAVE_MLOCKED_PAGE_BIT=y 306CONFIG_HAVE_MLOCKED_PAGE_BIT=y
307# CONFIG_KSM is not set
301CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 308CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
302CONFIG_PPC_4K_PAGES=y 309CONFIG_PPC_4K_PAGES=y
303# CONFIG_PPC_16K_PAGES is not set 310# CONFIG_PPC_16K_PAGES is not set
@@ -309,6 +316,7 @@ CONFIG_FORCE_MAX_ZONEORDER=11
309CONFIG_EXTRA_TARGETS="" 316CONFIG_EXTRA_TARGETS=""
310CONFIG_PM=y 317CONFIG_PM=y
311# CONFIG_PM_DEBUG is not set 318# CONFIG_PM_DEBUG is not set
319# CONFIG_PM_RUNTIME is not set
312CONFIG_SECCOMP=y 320CONFIG_SECCOMP=y
313CONFIG_ISA_DMA_API=y 321CONFIG_ISA_DMA_API=y
314 322
@@ -674,10 +682,12 @@ CONFIG_BT_HCIBCM203X=m
674# CONFIG_BT_HCIBPA10X is not set 682# CONFIG_BT_HCIBPA10X is not set
675CONFIG_BT_HCIBFUSB=m 683CONFIG_BT_HCIBFUSB=m
676CONFIG_BT_HCIVHCI=m 684CONFIG_BT_HCIVHCI=m
685# CONFIG_BT_MRVL is not set
677# CONFIG_AF_RXRPC is not set 686# CONFIG_AF_RXRPC is not set
678CONFIG_FIB_RULES=y 687CONFIG_FIB_RULES=y
679CONFIG_WIRELESS=y 688CONFIG_WIRELESS=y
680# CONFIG_CFG80211 is not set 689# CONFIG_CFG80211 is not set
690CONFIG_CFG80211_DEFAULT_PS_VALUE=0
681CONFIG_WIRELESS_OLD_REGULATORY=y 691CONFIG_WIRELESS_OLD_REGULATORY=y
682CONFIG_WIRELESS_EXT=y 692CONFIG_WIRELESS_EXT=y
683CONFIG_WIRELESS_EXT_SYSFS=y 693CONFIG_WIRELESS_EXT_SYSFS=y
@@ -686,7 +696,6 @@ CONFIG_WIRELESS_EXT_SYSFS=y
686# 696#
687# CFG80211 needs to be enabled for MAC80211 697# CFG80211 needs to be enabled for MAC80211
688# 698#
689CONFIG_MAC80211_DEFAULT_PS_VALUE=0
690# CONFIG_WIMAX is not set 699# CONFIG_WIMAX is not set
691# CONFIG_RFKILL is not set 700# CONFIG_RFKILL is not set
692# CONFIG_NET_9P is not set 701# CONFIG_NET_9P is not set
@@ -699,6 +708,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
699# Generic Driver Options 708# Generic Driver Options
700# 709#
701CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 710CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
711# CONFIG_DEVTMPFS is not set
702CONFIG_STANDALONE=y 712CONFIG_STANDALONE=y
703CONFIG_PREVENT_FIRMWARE_BUILD=y 713CONFIG_PREVENT_FIRMWARE_BUILD=y
704CONFIG_FW_LOADER=y 714CONFIG_FW_LOADER=y
@@ -710,9 +720,9 @@ CONFIG_EXTRA_FIRMWARE=""
710# CONFIG_CONNECTOR is not set 720# CONFIG_CONNECTOR is not set
711CONFIG_MTD=y 721CONFIG_MTD=y
712# CONFIG_MTD_DEBUG is not set 722# CONFIG_MTD_DEBUG is not set
723# CONFIG_MTD_TESTS is not set
713CONFIG_MTD_CONCAT=m 724CONFIG_MTD_CONCAT=m
714CONFIG_MTD_PARTITIONS=y 725CONFIG_MTD_PARTITIONS=y
715# CONFIG_MTD_TESTS is not set
716# CONFIG_MTD_REDBOOT_PARTS is not set 726# CONFIG_MTD_REDBOOT_PARTS is not set
717# CONFIG_MTD_CMDLINE_PARTS is not set 727# CONFIG_MTD_CMDLINE_PARTS is not set
718CONFIG_MTD_OF_PARTS=y 728CONFIG_MTD_OF_PARTS=y
@@ -763,6 +773,7 @@ CONFIG_MTD_COMPLEX_MAPPINGS=y
763# CONFIG_MTD_PHYSMAP is not set 773# CONFIG_MTD_PHYSMAP is not set
764CONFIG_MTD_PHYSMAP_OF=y 774CONFIG_MTD_PHYSMAP_OF=y
765# CONFIG_MTD_PCI is not set 775# CONFIG_MTD_PCI is not set
776# CONFIG_MTD_GPIO_ADDR is not set
766# CONFIG_MTD_INTEL_VR_NOR is not set 777# CONFIG_MTD_INTEL_VR_NOR is not set
767# CONFIG_MTD_PLATRAM is not set 778# CONFIG_MTD_PLATRAM is not set
768 779
@@ -857,6 +868,7 @@ CONFIG_SCSI_SRP_ATTRS=m
857CONFIG_SCSI_LOWLEVEL=y 868CONFIG_SCSI_LOWLEVEL=y
858# CONFIG_ISCSI_TCP is not set 869# CONFIG_ISCSI_TCP is not set
859# CONFIG_SCSI_BNX2_ISCSI is not set 870# CONFIG_SCSI_BNX2_ISCSI is not set
871# CONFIG_BE2ISCSI is not set
860CONFIG_BLK_DEV_3W_XXXX_RAID=m 872CONFIG_BLK_DEV_3W_XXXX_RAID=m
861CONFIG_SCSI_3W_9XXX=m 873CONFIG_SCSI_3W_9XXX=m
862CONFIG_SCSI_ACARD=m 874CONFIG_SCSI_ACARD=m
@@ -912,7 +924,9 @@ CONFIG_SCSI_LPFC=m
912# CONFIG_SCSI_DC390T is not set 924# CONFIG_SCSI_DC390T is not set
913# CONFIG_SCSI_NSP32 is not set 925# CONFIG_SCSI_NSP32 is not set
914# CONFIG_SCSI_DEBUG is not set 926# CONFIG_SCSI_DEBUG is not set
927# CONFIG_SCSI_PMCRAID is not set
915# CONFIG_SCSI_SRP is not set 928# CONFIG_SCSI_SRP is not set
929# CONFIG_SCSI_BFA_FC is not set
916# CONFIG_SCSI_DH is not set 930# CONFIG_SCSI_DH is not set
917# CONFIG_SCSI_OSD_INITIATOR is not set 931# CONFIG_SCSI_OSD_INITIATOR is not set
918# CONFIG_ATA is not set 932# CONFIG_ATA is not set
@@ -982,7 +996,9 @@ CONFIG_MII=y
982# CONFIG_NET_PCI is not set 996# CONFIG_NET_PCI is not set
983# CONFIG_B44 is not set 997# CONFIG_B44 is not set
984# CONFIG_KS8842 is not set 998# CONFIG_KS8842 is not set
999# CONFIG_KS8851_MLL is not set
985# CONFIG_ATL2 is not set 1000# CONFIG_ATL2 is not set
1001# CONFIG_XILINX_EMACLITE is not set
986CONFIG_NETDEV_1000=y 1002CONFIG_NETDEV_1000=y
987# CONFIG_ACENIC is not set 1003# CONFIG_ACENIC is not set
988# CONFIG_DL2K is not set 1004# CONFIG_DL2K is not set
@@ -1010,10 +1026,7 @@ CONFIG_MV643XX_ETH=y
1010# CONFIG_JME is not set 1026# CONFIG_JME is not set
1011# CONFIG_NETDEV_10000 is not set 1027# CONFIG_NETDEV_10000 is not set
1012# CONFIG_TR is not set 1028# CONFIG_TR is not set
1013 1029CONFIG_WLAN=y
1014#
1015# Wireless LAN
1016#
1017# CONFIG_WLAN_PRE80211 is not set 1030# CONFIG_WLAN_PRE80211 is not set
1018# CONFIG_WLAN_80211 is not set 1031# CONFIG_WLAN_80211 is not set
1019 1032
@@ -1145,6 +1158,7 @@ CONFIG_MAX_RAW_DEVS=8192
1145CONFIG_DEVPORT=y 1158CONFIG_DEVPORT=y
1146CONFIG_I2C=m 1159CONFIG_I2C=m
1147CONFIG_I2C_BOARDINFO=y 1160CONFIG_I2C_BOARDINFO=y
1161CONFIG_I2C_COMPAT=y
1148CONFIG_I2C_CHARDEV=m 1162CONFIG_I2C_CHARDEV=m
1149CONFIG_I2C_HELPER_AUTO=y 1163CONFIG_I2C_HELPER_AUTO=y
1150 1164
@@ -1200,9 +1214,6 @@ CONFIG_I2C_MV64XXX=m
1200# Miscellaneous I2C Chip support 1214# Miscellaneous I2C Chip support
1201# 1215#
1202# CONFIG_DS1682 is not set 1216# CONFIG_DS1682 is not set
1203CONFIG_SENSORS_PCF8574=m
1204# CONFIG_PCF8575 is not set
1205# CONFIG_SENSORS_PCA9539 is not set
1206# CONFIG_SENSORS_TSL2550 is not set 1217# CONFIG_SENSORS_TSL2550 is not set
1207# CONFIG_I2C_DEBUG_CORE is not set 1218# CONFIG_I2C_DEBUG_CORE is not set
1208# CONFIG_I2C_DEBUG_ALGO is not set 1219# CONFIG_I2C_DEBUG_ALGO is not set
@@ -1220,6 +1231,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
1220# CONFIG_POWER_SUPPLY is not set 1231# CONFIG_POWER_SUPPLY is not set
1221CONFIG_HWMON=m 1232CONFIG_HWMON=m
1222CONFIG_HWMON_VID=m 1233CONFIG_HWMON_VID=m
1234# CONFIG_HWMON_DEBUG_CHIP is not set
1235
1236#
1237# Native drivers
1238#
1223# CONFIG_SENSORS_AD7414 is not set 1239# CONFIG_SENSORS_AD7414 is not set
1224# CONFIG_SENSORS_AD7418 is not set 1240# CONFIG_SENSORS_AD7418 is not set
1225CONFIG_SENSORS_ADM1021=m 1241CONFIG_SENSORS_ADM1021=m
@@ -1269,6 +1285,7 @@ CONFIG_SENSORS_SMSC47B397=m
1269# CONFIG_SENSORS_ADS7828 is not set 1285# CONFIG_SENSORS_ADS7828 is not set
1270# CONFIG_SENSORS_THMC50 is not set 1286# CONFIG_SENSORS_THMC50 is not set
1271# CONFIG_SENSORS_TMP401 is not set 1287# CONFIG_SENSORS_TMP401 is not set
1288# CONFIG_SENSORS_TMP421 is not set
1272CONFIG_SENSORS_VIA686A=m 1289CONFIG_SENSORS_VIA686A=m
1273# CONFIG_SENSORS_VT1211 is not set 1290# CONFIG_SENSORS_VT1211 is not set
1274# CONFIG_SENSORS_VT8231 is not set 1291# CONFIG_SENSORS_VT8231 is not set
@@ -1280,7 +1297,6 @@ CONFIG_SENSORS_W83L785TS=m
1280# CONFIG_SENSORS_W83L786NG is not set 1297# CONFIG_SENSORS_W83L786NG is not set
1281CONFIG_SENSORS_W83627HF=m 1298CONFIG_SENSORS_W83627HF=m
1282# CONFIG_SENSORS_W83627EHF is not set 1299# CONFIG_SENSORS_W83627EHF is not set
1283# CONFIG_HWMON_DEBUG_CHIP is not set
1284# CONFIG_THERMAL is not set 1300# CONFIG_THERMAL is not set
1285CONFIG_WATCHDOG=y 1301CONFIG_WATCHDOG=y
1286# CONFIG_WATCHDOG_NOWAYOUT is not set 1302# CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -1317,6 +1333,7 @@ CONFIG_SSB_POSSIBLE=y
1317# CONFIG_HTC_PASIC3 is not set 1333# CONFIG_HTC_PASIC3 is not set
1318# CONFIG_MFD_TMIO is not set 1334# CONFIG_MFD_TMIO is not set
1319# CONFIG_MFD_WM8400 is not set 1335# CONFIG_MFD_WM8400 is not set
1336# CONFIG_MFD_WM831X is not set
1320# CONFIG_MFD_WM8350_I2C is not set 1337# CONFIG_MFD_WM8350_I2C is not set
1321# CONFIG_MFD_PCF50633 is not set 1338# CONFIG_MFD_PCF50633 is not set
1322# CONFIG_AB3100_CORE is not set 1339# CONFIG_AB3100_CORE is not set
@@ -1327,6 +1344,7 @@ CONFIG_SSB_POSSIBLE=y
1327# Graphics support 1344# Graphics support
1328# 1345#
1329# CONFIG_AGP is not set 1346# CONFIG_AGP is not set
1347CONFIG_VGA_ARB=y
1330# CONFIG_DRM is not set 1348# CONFIG_DRM is not set
1331# CONFIG_VGASTATE is not set 1349# CONFIG_VGASTATE is not set
1332# CONFIG_VIDEO_OUTPUT_CONTROL is not set 1350# CONFIG_VIDEO_OUTPUT_CONTROL is not set
@@ -1378,6 +1396,7 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y
1378# CONFIG_USB_OXU210HP_HCD is not set 1396# CONFIG_USB_OXU210HP_HCD is not set
1379# CONFIG_USB_ISP116X_HCD is not set 1397# CONFIG_USB_ISP116X_HCD is not set
1380# CONFIG_USB_ISP1760_HCD is not set 1398# CONFIG_USB_ISP1760_HCD is not set
1399# CONFIG_USB_ISP1362_HCD is not set
1381CONFIG_USB_OHCI_HCD=m 1400CONFIG_USB_OHCI_HCD=m
1382CONFIG_USB_OHCI_HCD_PPC_OF_BE=y 1401CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
1383# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set 1402# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set
@@ -1588,6 +1607,7 @@ CONFIG_FS_POSIX_ACL=y
1588# CONFIG_GFS2_FS is not set 1607# CONFIG_GFS2_FS is not set
1589# CONFIG_OCFS2_FS is not set 1608# CONFIG_OCFS2_FS is not set
1590# CONFIG_BTRFS_FS is not set 1609# CONFIG_BTRFS_FS is not set
1610# CONFIG_NILFS2_FS is not set
1591CONFIG_FILE_LOCKING=y 1611CONFIG_FILE_LOCKING=y
1592CONFIG_FSNOTIFY=y 1612CONFIG_FSNOTIFY=y
1593CONFIG_DNOTIFY=y 1613CONFIG_DNOTIFY=y
@@ -1668,7 +1688,6 @@ CONFIG_VXFS_FS=m
1668# CONFIG_ROMFS_FS is not set 1688# CONFIG_ROMFS_FS is not set
1669# CONFIG_SYSV_FS is not set 1689# CONFIG_SYSV_FS is not set
1670# CONFIG_UFS_FS is not set 1690# CONFIG_UFS_FS is not set
1671# CONFIG_NILFS2_FS is not set
1672CONFIG_NETWORK_FILESYSTEMS=y 1691CONFIG_NETWORK_FILESYSTEMS=y
1673CONFIG_NFS_FS=y 1692CONFIG_NFS_FS=y
1674CONFIG_NFS_V3=y 1693CONFIG_NFS_V3=y
@@ -1770,7 +1789,7 @@ CONFIG_BINARY_PRINTF=y
1770CONFIG_BITREVERSE=y 1789CONFIG_BITREVERSE=y
1771CONFIG_GENERIC_FIND_LAST_BIT=y 1790CONFIG_GENERIC_FIND_LAST_BIT=y
1772CONFIG_CRC_CCITT=m 1791CONFIG_CRC_CCITT=m
1773# CONFIG_CRC16 is not set 1792CONFIG_CRC16=m
1774CONFIG_CRC_T10DIF=m 1793CONFIG_CRC_T10DIF=m
1775CONFIG_CRC_ITU_T=m 1794CONFIG_CRC_ITU_T=m
1776CONFIG_CRC32=y 1795CONFIG_CRC32=y
@@ -1797,6 +1816,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
1797CONFIG_ENABLE_MUST_CHECK=y 1816CONFIG_ENABLE_MUST_CHECK=y
1798CONFIG_FRAME_WARN=1024 1817CONFIG_FRAME_WARN=1024
1799CONFIG_MAGIC_SYSRQ=y 1818CONFIG_MAGIC_SYSRQ=y
1819# CONFIG_STRIP_ASM_SYMS is not set
1800# CONFIG_UNUSED_SYMBOLS is not set 1820# CONFIG_UNUSED_SYMBOLS is not set
1801CONFIG_DEBUG_FS=y 1821CONFIG_DEBUG_FS=y
1802# CONFIG_HEADERS_CHECK is not set 1822# CONFIG_HEADERS_CHECK is not set
@@ -1814,6 +1834,7 @@ CONFIG_SCHED_DEBUG=y
1814# CONFIG_DEBUG_OBJECTS is not set 1834# CONFIG_DEBUG_OBJECTS is not set
1815# CONFIG_SLUB_DEBUG_ON is not set 1835# CONFIG_SLUB_DEBUG_ON is not set
1816# CONFIG_SLUB_STATS is not set 1836# CONFIG_SLUB_STATS is not set
1837# CONFIG_DEBUG_KMEMLEAK is not set
1817# CONFIG_DEBUG_RT_MUTEXES is not set 1838# CONFIG_DEBUG_RT_MUTEXES is not set
1818# CONFIG_RT_MUTEX_TESTER is not set 1839# CONFIG_RT_MUTEX_TESTER is not set
1819CONFIG_DEBUG_SPINLOCK=y 1840CONFIG_DEBUG_SPINLOCK=y
@@ -1834,11 +1855,13 @@ CONFIG_DEBUG_MEMORY_INIT=y
1834# CONFIG_DEBUG_LIST is not set 1855# CONFIG_DEBUG_LIST is not set
1835# CONFIG_DEBUG_SG is not set 1856# CONFIG_DEBUG_SG is not set
1836# CONFIG_DEBUG_NOTIFIERS is not set 1857# CONFIG_DEBUG_NOTIFIERS is not set
1858# CONFIG_DEBUG_CREDENTIALS is not set
1837# CONFIG_RCU_TORTURE_TEST is not set 1859# CONFIG_RCU_TORTURE_TEST is not set
1838# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1860# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1839# CONFIG_KPROBES_SANITY_TEST is not set 1861# CONFIG_KPROBES_SANITY_TEST is not set
1840# CONFIG_BACKTRACE_SELF_TEST is not set 1862# CONFIG_BACKTRACE_SELF_TEST is not set
1841# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 1863# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1864# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
1842# CONFIG_LKDTM is not set 1865# CONFIG_LKDTM is not set
1843# CONFIG_FAULT_INJECTION is not set 1866# CONFIG_FAULT_INJECTION is not set
1844# CONFIG_LATENCYTOP is not set 1867# CONFIG_LATENCYTOP is not set
@@ -1852,6 +1875,7 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1852CONFIG_RING_BUFFER=y 1875CONFIG_RING_BUFFER=y
1853CONFIG_EVENT_TRACING=y 1876CONFIG_EVENT_TRACING=y
1854CONFIG_CONTEXT_SWITCH_TRACER=y 1877CONFIG_CONTEXT_SWITCH_TRACER=y
1878CONFIG_RING_BUFFER_ALLOW_SWAP=y
1855CONFIG_TRACING=y 1879CONFIG_TRACING=y
1856CONFIG_TRACING_SUPPORT=y 1880CONFIG_TRACING_SUPPORT=y
1857CONFIG_FTRACE=y 1881CONFIG_FTRACE=y
@@ -1869,6 +1893,7 @@ CONFIG_BRANCH_PROFILE_NONE=y
1869# CONFIG_BLK_DEV_IO_TRACE is not set 1893# CONFIG_BLK_DEV_IO_TRACE is not set
1870# CONFIG_RING_BUFFER_BENCHMARK is not set 1894# CONFIG_RING_BUFFER_BENCHMARK is not set
1871# CONFIG_DYNAMIC_DEBUG is not set 1895# CONFIG_DYNAMIC_DEBUG is not set
1896# CONFIG_DMA_API_DEBUG is not set
1872# CONFIG_SAMPLES is not set 1897# CONFIG_SAMPLES is not set
1873CONFIG_HAVE_ARCH_KGDB=y 1898CONFIG_HAVE_ARCH_KGDB=y
1874# CONFIG_KGDB is not set 1899# CONFIG_KGDB is not set
@@ -1899,6 +1924,7 @@ CONFIG_SECURITY_NETWORK=y
1899# CONFIG_SECURITY_NETWORK_XFRM is not set 1924# CONFIG_SECURITY_NETWORK_XFRM is not set
1900# CONFIG_SECURITY_PATH is not set 1925# CONFIG_SECURITY_PATH is not set
1901# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1926# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1927CONFIG_LSM_MMAP_MIN_ADDR=65536
1902CONFIG_SECURITY_SELINUX=y 1928CONFIG_SECURITY_SELINUX=y
1903CONFIG_SECURITY_SELINUX_BOOTPARAM=y 1929CONFIG_SECURITY_SELINUX_BOOTPARAM=y
1904CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 1930CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1
@@ -1913,7 +1939,6 @@ CONFIG_CRYPTO=y
1913# 1939#
1914# Crypto core or helper 1940# Crypto core or helper
1915# 1941#
1916# CONFIG_CRYPTO_FIPS is not set
1917CONFIG_CRYPTO_ALGAPI=y 1942CONFIG_CRYPTO_ALGAPI=y
1918CONFIG_CRYPTO_ALGAPI2=y 1943CONFIG_CRYPTO_ALGAPI2=y
1919CONFIG_CRYPTO_AEAD=m 1944CONFIG_CRYPTO_AEAD=m
@@ -1956,11 +1981,13 @@ CONFIG_CRYPTO_ECB=m
1956# 1981#
1957CONFIG_CRYPTO_HMAC=y 1982CONFIG_CRYPTO_HMAC=y
1958# CONFIG_CRYPTO_XCBC is not set 1983# CONFIG_CRYPTO_XCBC is not set
1984# CONFIG_CRYPTO_VMAC is not set
1959 1985
1960# 1986#
1961# Digest 1987# Digest
1962# 1988#
1963CONFIG_CRYPTO_CRC32C=m 1989CONFIG_CRYPTO_CRC32C=m
1990# CONFIG_CRYPTO_GHASH is not set
1964CONFIG_CRYPTO_MD4=m 1991CONFIG_CRYPTO_MD4=m
1965CONFIG_CRYPTO_MD5=y 1992CONFIG_CRYPTO_MD5=y
1966CONFIG_CRYPTO_MICHAEL_MIC=m 1993CONFIG_CRYPTO_MICHAEL_MIC=m
diff --git a/arch/powerpc/configs/ep8248e_defconfig b/arch/powerpc/configs/ep8248e_defconfig
index 0aa5b43ffeb2..ef5edc7203f5 100644
--- a/arch/powerpc/configs/ep8248e_defconfig
+++ b/arch/powerpc/configs/ep8248e_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.31-rc4 3# Linux kernel version: 2.6.32-rc5
4# Wed Jul 29 23:31:49 2009 4# Thu Nov 5 08:20:06 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -34,6 +34,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
34CONFIG_GENERIC_HARDIRQS=y 34CONFIG_GENERIC_HARDIRQS=y
35CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 35CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
37# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
37CONFIG_IRQ_PER_CPU=y 38CONFIG_IRQ_PER_CPU=y
38CONFIG_STACKTRACE_SUPPORT=y 39CONFIG_STACKTRACE_SUPPORT=y
39CONFIG_HAVE_LATENCYTOP_SUPPORT=y 40CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -82,11 +83,12 @@ CONFIG_SYSVIPC_SYSCTL=y
82# 83#
83# RCU Subsystem 84# RCU Subsystem
84# 85#
85CONFIG_CLASSIC_RCU=y 86CONFIG_TREE_RCU=y
86# CONFIG_TREE_RCU is not set 87# CONFIG_TREE_PREEMPT_RCU is not set
87# CONFIG_PREEMPT_RCU is not set 88# CONFIG_RCU_TRACE is not set
89CONFIG_RCU_FANOUT=32
90# CONFIG_RCU_FANOUT_EXACT is not set
88# CONFIG_TREE_RCU_TRACE is not set 91# CONFIG_TREE_RCU_TRACE is not set
89# CONFIG_PREEMPT_RCU_TRACE is not set
90CONFIG_IKCONFIG=y 92CONFIG_IKCONFIG=y
91CONFIG_IKCONFIG_PROC=y 93CONFIG_IKCONFIG_PROC=y
92CONFIG_LOG_BUF_SHIFT=14 94CONFIG_LOG_BUF_SHIFT=14
@@ -116,28 +118,29 @@ CONFIG_TIMERFD=y
116CONFIG_EVENTFD=y 118CONFIG_EVENTFD=y
117CONFIG_SHMEM=y 119CONFIG_SHMEM=y
118CONFIG_AIO=y 120CONFIG_AIO=y
119CONFIG_HAVE_PERF_COUNTERS=y 121CONFIG_HAVE_PERF_EVENTS=y
120 122
121# 123#
122# Performance Counters 124# Kernel Performance Events And Counters
123# 125#
126# CONFIG_PERF_EVENTS is not set
124# CONFIG_PERF_COUNTERS is not set 127# CONFIG_PERF_COUNTERS is not set
125CONFIG_VM_EVENT_COUNTERS=y 128CONFIG_VM_EVENT_COUNTERS=y
126CONFIG_PCI_QUIRKS=y 129CONFIG_PCI_QUIRKS=y
127# CONFIG_STRIP_ASM_SYMS is not set
128CONFIG_COMPAT_BRK=y 130CONFIG_COMPAT_BRK=y
129CONFIG_SLAB=y 131CONFIG_SLAB=y
130# CONFIG_SLUB is not set 132# CONFIG_SLUB is not set
131# CONFIG_SLOB is not set 133# CONFIG_SLOB is not set
132# CONFIG_PROFILING is not set 134# CONFIG_PROFILING is not set
133# CONFIG_MARKERS is not set
134CONFIG_HAVE_OPROFILE=y 135CONFIG_HAVE_OPROFILE=y
135CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 136CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
136CONFIG_HAVE_IOREMAP_PROT=y 137CONFIG_HAVE_IOREMAP_PROT=y
137CONFIG_HAVE_KPROBES=y 138CONFIG_HAVE_KPROBES=y
138CONFIG_HAVE_KRETPROBES=y 139CONFIG_HAVE_KRETPROBES=y
139CONFIG_HAVE_ARCH_TRACEHOOK=y 140CONFIG_HAVE_ARCH_TRACEHOOK=y
141CONFIG_HAVE_DMA_ATTRS=y
140CONFIG_HAVE_CLK=y 142CONFIG_HAVE_CLK=y
143CONFIG_HAVE_DMA_API_DEBUG=y
141 144
142# 145#
143# GCOV-based kernel profiling 146# GCOV-based kernel profiling
@@ -150,6 +153,7 @@ CONFIG_BASE_SMALL=0
150# CONFIG_MODULES is not set 153# CONFIG_MODULES is not set
151CONFIG_BLOCK=y 154CONFIG_BLOCK=y
152CONFIG_LBDAF=y 155CONFIG_LBDAF=y
156CONFIG_BLK_DEV_BSG=y
153# CONFIG_BLK_DEV_INTEGRITY is not set 157# CONFIG_BLK_DEV_INTEGRITY is not set
154 158
155# 159#
@@ -233,6 +237,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
233CONFIG_ARCH_HAS_WALK_MEMORY=y 237CONFIG_ARCH_HAS_WALK_MEMORY=y
234CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 238CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
235# CONFIG_CRASH_DUMP is not set 239# CONFIG_CRASH_DUMP is not set
240CONFIG_MAX_ACTIVE_REGIONS=32
236CONFIG_ARCH_FLATMEM_ENABLE=y 241CONFIG_ARCH_FLATMEM_ENABLE=y
237CONFIG_ARCH_POPULATES_NODE_MAP=y 242CONFIG_ARCH_POPULATES_NODE_MAP=y
238CONFIG_FLATMEM=y 243CONFIG_FLATMEM=y
@@ -246,6 +251,7 @@ CONFIG_BOUNCE=y
246CONFIG_VIRT_TO_BUS=y 251CONFIG_VIRT_TO_BUS=y
247CONFIG_HAVE_MLOCK=y 252CONFIG_HAVE_MLOCK=y
248CONFIG_HAVE_MLOCKED_PAGE_BIT=y 253CONFIG_HAVE_MLOCKED_PAGE_BIT=y
254# CONFIG_KSM is not set
249CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 255CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
250CONFIG_PPC_4K_PAGES=y 256CONFIG_PPC_4K_PAGES=y
251# CONFIG_PPC_16K_PAGES is not set 257# CONFIG_PPC_16K_PAGES is not set
@@ -394,6 +400,7 @@ CONFIG_NETFILTER_ADVANCED=y
394# CONFIG_BT is not set 400# CONFIG_BT is not set
395CONFIG_WIRELESS=y 401CONFIG_WIRELESS=y
396# CONFIG_CFG80211 is not set 402# CONFIG_CFG80211 is not set
403CONFIG_CFG80211_DEFAULT_PS_VALUE=0
397CONFIG_WIRELESS_OLD_REGULATORY=y 404CONFIG_WIRELESS_OLD_REGULATORY=y
398# CONFIG_WIRELESS_EXT is not set 405# CONFIG_WIRELESS_EXT is not set
399# CONFIG_LIB80211 is not set 406# CONFIG_LIB80211 is not set
@@ -401,7 +408,6 @@ CONFIG_WIRELESS_OLD_REGULATORY=y
401# 408#
402# CFG80211 needs to be enabled for MAC80211 409# CFG80211 needs to be enabled for MAC80211
403# 410#
404CONFIG_MAC80211_DEFAULT_PS_VALUE=0
405# CONFIG_WIMAX is not set 411# CONFIG_WIMAX is not set
406# CONFIG_RFKILL is not set 412# CONFIG_RFKILL is not set
407 413
@@ -413,6 +419,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
413# Generic Driver Options 419# Generic Driver Options
414# 420#
415CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 421CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
422# CONFIG_DEVTMPFS is not set
416CONFIG_STANDALONE=y 423CONFIG_STANDALONE=y
417CONFIG_PREVENT_FIRMWARE_BUILD=y 424CONFIG_PREVENT_FIRMWARE_BUILD=y
418# CONFIG_FW_LOADER is not set 425# CONFIG_FW_LOADER is not set
@@ -600,7 +607,9 @@ CONFIG_MII=y
600# CONFIG_NET_PCI is not set 607# CONFIG_NET_PCI is not set
601# CONFIG_B44 is not set 608# CONFIG_B44 is not set
602# CONFIG_KS8842 is not set 609# CONFIG_KS8842 is not set
610# CONFIG_KS8851_MLL is not set
603# CONFIG_ATL2 is not set 611# CONFIG_ATL2 is not set
612# CONFIG_XILINX_EMACLITE is not set
604CONFIG_FS_ENET=y 613CONFIG_FS_ENET=y
605# CONFIG_FS_ENET_HAS_SCC is not set 614# CONFIG_FS_ENET_HAS_SCC is not set
606CONFIG_FS_ENET_HAS_FCC=y 615CONFIG_FS_ENET_HAS_FCC=y
@@ -648,10 +657,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
648# CONFIG_SFC is not set 657# CONFIG_SFC is not set
649# CONFIG_BE2NET is not set 658# CONFIG_BE2NET is not set
650# CONFIG_TR is not set 659# CONFIG_TR is not set
651 660CONFIG_WLAN=y
652#
653# Wireless LAN
654#
655# CONFIG_WLAN_PRE80211 is not set 661# CONFIG_WLAN_PRE80211 is not set
656# CONFIG_WLAN_80211 is not set 662# CONFIG_WLAN_80211 is not set
657 663
@@ -736,15 +742,19 @@ CONFIG_GPIOLIB=y
736# PCI GPIO expanders: 742# PCI GPIO expanders:
737# 743#
738# CONFIG_GPIO_BT8XX is not set 744# CONFIG_GPIO_BT8XX is not set
745# CONFIG_GPIO_LANGWELL is not set
739 746
740# 747#
741# SPI GPIO expanders: 748# SPI GPIO expanders:
742# 749#
750
751#
752# AC97 GPIO expanders:
753#
743# CONFIG_W1 is not set 754# CONFIG_W1 is not set
744# CONFIG_POWER_SUPPLY is not set 755# CONFIG_POWER_SUPPLY is not set
745# CONFIG_HWMON is not set 756# CONFIG_HWMON is not set
746# CONFIG_THERMAL is not set 757# CONFIG_THERMAL is not set
747# CONFIG_THERMAL_HWMON is not set
748# CONFIG_WATCHDOG is not set 758# CONFIG_WATCHDOG is not set
749CONFIG_SSB_POSSIBLE=y 759CONFIG_SSB_POSSIBLE=y
750 760
@@ -767,6 +777,7 @@ CONFIG_SSB_POSSIBLE=y
767# Graphics support 777# Graphics support
768# 778#
769# CONFIG_AGP is not set 779# CONFIG_AGP is not set
780CONFIG_VGA_ARB=y
770# CONFIG_DRM is not set 781# CONFIG_DRM is not set
771# CONFIG_VGASTATE is not set 782# CONFIG_VGASTATE is not set
772# CONFIG_VIDEO_OUTPUT_CONTROL is not set 783# CONFIG_VIDEO_OUTPUT_CONTROL is not set
@@ -968,6 +979,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
968CONFIG_ENABLE_MUST_CHECK=y 979CONFIG_ENABLE_MUST_CHECK=y
969CONFIG_FRAME_WARN=1024 980CONFIG_FRAME_WARN=1024
970CONFIG_MAGIC_SYSRQ=y 981CONFIG_MAGIC_SYSRQ=y
982# CONFIG_STRIP_ASM_SYMS is not set
971# CONFIG_UNUSED_SYMBOLS is not set 983# CONFIG_UNUSED_SYMBOLS is not set
972# CONFIG_DEBUG_FS is not set 984# CONFIG_DEBUG_FS is not set
973# CONFIG_HEADERS_CHECK is not set 985# CONFIG_HEADERS_CHECK is not set
@@ -998,10 +1010,12 @@ CONFIG_DEBUG_INFO=y
998# CONFIG_DEBUG_LIST is not set 1010# CONFIG_DEBUG_LIST is not set
999# CONFIG_DEBUG_SG is not set 1011# CONFIG_DEBUG_SG is not set
1000# CONFIG_DEBUG_NOTIFIERS is not set 1012# CONFIG_DEBUG_NOTIFIERS is not set
1013# CONFIG_DEBUG_CREDENTIALS is not set
1001# CONFIG_RCU_TORTURE_TEST is not set 1014# CONFIG_RCU_TORTURE_TEST is not set
1002# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1015# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1003# CONFIG_BACKTRACE_SELF_TEST is not set 1016# CONFIG_BACKTRACE_SELF_TEST is not set
1004# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 1017# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1018# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
1005# CONFIG_FAULT_INJECTION is not set 1019# CONFIG_FAULT_INJECTION is not set
1006# CONFIG_LATENCYTOP is not set 1020# CONFIG_LATENCYTOP is not set
1007CONFIG_SYSCTL_SYSCALL_CHECK=y 1021CONFIG_SYSCTL_SYSCALL_CHECK=y
@@ -1024,6 +1038,7 @@ CONFIG_BRANCH_PROFILE_NONE=y
1024# CONFIG_KMEMTRACE is not set 1038# CONFIG_KMEMTRACE is not set
1025# CONFIG_WORKQUEUE_TRACER is not set 1039# CONFIG_WORKQUEUE_TRACER is not set
1026# CONFIG_BLK_DEV_IO_TRACE is not set 1040# CONFIG_BLK_DEV_IO_TRACE is not set
1041# CONFIG_DMA_API_DEBUG is not set
1027# CONFIG_SAMPLES is not set 1042# CONFIG_SAMPLES is not set
1028CONFIG_HAVE_ARCH_KGDB=y 1043CONFIG_HAVE_ARCH_KGDB=y
1029# CONFIG_PPC_DISABLE_WERROR is not set 1044# CONFIG_PPC_DISABLE_WERROR is not set
@@ -1052,7 +1067,6 @@ CONFIG_CRYPTO=y
1052# 1067#
1053# Crypto core or helper 1068# Crypto core or helper
1054# 1069#
1055# CONFIG_CRYPTO_FIPS is not set
1056CONFIG_CRYPTO_ALGAPI=y 1070CONFIG_CRYPTO_ALGAPI=y
1057CONFIG_CRYPTO_ALGAPI2=y 1071CONFIG_CRYPTO_ALGAPI2=y
1058CONFIG_CRYPTO_AEAD2=y 1072CONFIG_CRYPTO_AEAD2=y
@@ -1094,6 +1108,7 @@ CONFIG_CRYPTO_PCBC=y
1094# Digest 1108# Digest
1095# 1109#
1096# CONFIG_CRYPTO_CRC32C is not set 1110# CONFIG_CRYPTO_CRC32C is not set
1111# CONFIG_CRYPTO_GHASH is not set
1097# CONFIG_CRYPTO_MD4 is not set 1112# CONFIG_CRYPTO_MD4 is not set
1098CONFIG_CRYPTO_MD5=y 1113CONFIG_CRYPTO_MD5=y
1099# CONFIG_CRYPTO_MICHAEL_MIC is not set 1114# CONFIG_CRYPTO_MICHAEL_MIC is not set
diff --git a/arch/powerpc/configs/ep88xc_defconfig b/arch/powerpc/configs/ep88xc_defconfig
index 2c292e25cc01..73ef9be41280 100644
--- a/arch/powerpc/configs/ep88xc_defconfig
+++ b/arch/powerpc/configs/ep88xc_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.31-rc4 3# Linux kernel version: 2.6.32-rc5
4# Wed Jul 29 23:31:49 2009 4# Thu Nov 5 08:20:07 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -16,6 +16,7 @@ CONFIG_PPC_8xx=y
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_8xx=y 17CONFIG_8xx=y
18CONFIG_PPC_MMU_NOHASH=y 18CONFIG_PPC_MMU_NOHASH=y
19CONFIG_PPC_MMU_NOHASH_32=y
19# CONFIG_PPC_MM_SLICES is not set 20# CONFIG_PPC_MM_SLICES is not set
20CONFIG_NOT_COHERENT_CACHE=y 21CONFIG_NOT_COHERENT_CACHE=y
21CONFIG_PPC32=y 22CONFIG_PPC32=y
@@ -29,6 +30,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
29CONFIG_GENERIC_HARDIRQS=y 30CONFIG_GENERIC_HARDIRQS=y
30CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 31CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
31# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 32# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
33# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
32CONFIG_IRQ_PER_CPU=y 34CONFIG_IRQ_PER_CPU=y
33CONFIG_STACKTRACE_SUPPORT=y 35CONFIG_STACKTRACE_SUPPORT=y
34CONFIG_HAVE_LATENCYTOP_SUPPORT=y 36CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -77,11 +79,12 @@ CONFIG_SYSVIPC_SYSCTL=y
77# 79#
78# RCU Subsystem 80# RCU Subsystem
79# 81#
80CONFIG_CLASSIC_RCU=y 82CONFIG_TREE_RCU=y
81# CONFIG_TREE_RCU is not set 83# CONFIG_TREE_PREEMPT_RCU is not set
82# CONFIG_PREEMPT_RCU is not set 84# CONFIG_RCU_TRACE is not set
85CONFIG_RCU_FANOUT=32
86# CONFIG_RCU_FANOUT_EXACT is not set
83# CONFIG_TREE_RCU_TRACE is not set 87# CONFIG_TREE_RCU_TRACE is not set
84# CONFIG_PREEMPT_RCU_TRACE is not set
85# CONFIG_IKCONFIG is not set 88# CONFIG_IKCONFIG is not set
86CONFIG_LOG_BUF_SHIFT=14 89CONFIG_LOG_BUF_SHIFT=14
87CONFIG_GROUP_SCHED=y 90CONFIG_GROUP_SCHED=y
@@ -115,28 +118,29 @@ CONFIG_TIMERFD=y
115CONFIG_EVENTFD=y 118CONFIG_EVENTFD=y
116CONFIG_SHMEM=y 119CONFIG_SHMEM=y
117CONFIG_AIO=y 120CONFIG_AIO=y
118CONFIG_HAVE_PERF_COUNTERS=y 121CONFIG_HAVE_PERF_EVENTS=y
119 122
120# 123#
121# Performance Counters 124# Kernel Performance Events And Counters
122# 125#
126# CONFIG_PERF_EVENTS is not set
123# CONFIG_PERF_COUNTERS is not set 127# CONFIG_PERF_COUNTERS is not set
124# CONFIG_VM_EVENT_COUNTERS is not set 128# CONFIG_VM_EVENT_COUNTERS is not set
125CONFIG_SLUB_DEBUG=y 129CONFIG_SLUB_DEBUG=y
126# CONFIG_STRIP_ASM_SYMS is not set
127CONFIG_COMPAT_BRK=y 130CONFIG_COMPAT_BRK=y
128# CONFIG_SLAB is not set 131# CONFIG_SLAB is not set
129CONFIG_SLUB=y 132CONFIG_SLUB=y
130# CONFIG_SLOB is not set 133# CONFIG_SLOB is not set
131# CONFIG_PROFILING is not set 134# CONFIG_PROFILING is not set
132# CONFIG_MARKERS is not set
133CONFIG_HAVE_OPROFILE=y 135CONFIG_HAVE_OPROFILE=y
134CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 136CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
135CONFIG_HAVE_IOREMAP_PROT=y 137CONFIG_HAVE_IOREMAP_PROT=y
136CONFIG_HAVE_KPROBES=y 138CONFIG_HAVE_KPROBES=y
137CONFIG_HAVE_KRETPROBES=y 139CONFIG_HAVE_KRETPROBES=y
138CONFIG_HAVE_ARCH_TRACEHOOK=y 140CONFIG_HAVE_ARCH_TRACEHOOK=y
141CONFIG_HAVE_DMA_ATTRS=y
139CONFIG_HAVE_CLK=y 142CONFIG_HAVE_CLK=y
143CONFIG_HAVE_DMA_API_DEBUG=y
140 144
141# 145#
142# GCOV-based kernel profiling 146# GCOV-based kernel profiling
@@ -234,10 +238,10 @@ CONFIG_BINFMT_ELF=y
234CONFIG_8XX_MINIMAL_FPEMU=y 238CONFIG_8XX_MINIMAL_FPEMU=y
235# CONFIG_IOMMU_HELPER is not set 239# CONFIG_IOMMU_HELPER is not set
236# CONFIG_SWIOTLB is not set 240# CONFIG_SWIOTLB is not set
237CONFIG_PPC_NEED_DMA_SYNC_OPS=y
238CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 241CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
239CONFIG_ARCH_HAS_WALK_MEMORY=y 242CONFIG_ARCH_HAS_WALK_MEMORY=y
240CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 243CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
244CONFIG_MAX_ACTIVE_REGIONS=32
241CONFIG_ARCH_FLATMEM_ENABLE=y 245CONFIG_ARCH_FLATMEM_ENABLE=y
242CONFIG_ARCH_POPULATES_NODE_MAP=y 246CONFIG_ARCH_POPULATES_NODE_MAP=y
243CONFIG_SELECT_MEMORY_MODEL=y 247CONFIG_SELECT_MEMORY_MODEL=y
@@ -255,6 +259,7 @@ CONFIG_BOUNCE=y
255CONFIG_VIRT_TO_BUS=y 259CONFIG_VIRT_TO_BUS=y
256CONFIG_HAVE_MLOCK=y 260CONFIG_HAVE_MLOCK=y
257CONFIG_HAVE_MLOCKED_PAGE_BIT=y 261CONFIG_HAVE_MLOCKED_PAGE_BIT=y
262# CONFIG_KSM is not set
258CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 263CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
259CONFIG_PPC_4K_PAGES=y 264CONFIG_PPC_4K_PAGES=y
260# CONFIG_PPC_16K_PAGES is not set 265# CONFIG_PPC_16K_PAGES is not set
@@ -337,6 +342,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
337# CONFIG_NETFILTER is not set 342# CONFIG_NETFILTER is not set
338# CONFIG_IP_DCCP is not set 343# CONFIG_IP_DCCP is not set
339# CONFIG_IP_SCTP is not set 344# CONFIG_IP_SCTP is not set
345# CONFIG_RDS is not set
340# CONFIG_TIPC is not set 346# CONFIG_TIPC is not set
341# CONFIG_ATM is not set 347# CONFIG_ATM is not set
342# CONFIG_BRIDGE is not set 348# CONFIG_BRIDGE is not set
@@ -366,6 +372,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
366# CONFIG_AF_RXRPC is not set 372# CONFIG_AF_RXRPC is not set
367CONFIG_WIRELESS=y 373CONFIG_WIRELESS=y
368# CONFIG_CFG80211 is not set 374# CONFIG_CFG80211 is not set
375CONFIG_CFG80211_DEFAULT_PS_VALUE=0
369CONFIG_WIRELESS_OLD_REGULATORY=y 376CONFIG_WIRELESS_OLD_REGULATORY=y
370# CONFIG_WIRELESS_EXT is not set 377# CONFIG_WIRELESS_EXT is not set
371# CONFIG_LIB80211 is not set 378# CONFIG_LIB80211 is not set
@@ -373,7 +380,6 @@ CONFIG_WIRELESS_OLD_REGULATORY=y
373# 380#
374# CFG80211 needs to be enabled for MAC80211 381# CFG80211 needs to be enabled for MAC80211
375# 382#
376CONFIG_MAC80211_DEFAULT_PS_VALUE=0
377# CONFIG_WIMAX is not set 383# CONFIG_WIMAX is not set
378# CONFIG_RFKILL is not set 384# CONFIG_RFKILL is not set
379# CONFIG_NET_9P is not set 385# CONFIG_NET_9P is not set
@@ -386,6 +392,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
386# Generic Driver Options 392# Generic Driver Options
387# 393#
388CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 394CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
395# CONFIG_DEVTMPFS is not set
389CONFIG_STANDALONE=y 396CONFIG_STANDALONE=y
390CONFIG_PREVENT_FIRMWARE_BUILD=y 397CONFIG_PREVENT_FIRMWARE_BUILD=y
391# CONFIG_FW_LOADER is not set 398# CONFIG_FW_LOADER is not set
@@ -529,16 +536,15 @@ CONFIG_MII=y
529# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set 536# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
530# CONFIG_B44 is not set 537# CONFIG_B44 is not set
531# CONFIG_KS8842 is not set 538# CONFIG_KS8842 is not set
539# CONFIG_KS8851_MLL is not set
540# CONFIG_XILINX_EMACLITE is not set
532CONFIG_FS_ENET=y 541CONFIG_FS_ENET=y
533# CONFIG_FS_ENET_HAS_SCC is not set 542# CONFIG_FS_ENET_HAS_SCC is not set
534CONFIG_FS_ENET_HAS_FEC=y 543CONFIG_FS_ENET_HAS_FEC=y
535CONFIG_FS_ENET_MDIO_FEC=y 544CONFIG_FS_ENET_MDIO_FEC=y
536# CONFIG_NETDEV_1000 is not set 545# CONFIG_NETDEV_1000 is not set
537# CONFIG_NETDEV_10000 is not set 546# CONFIG_NETDEV_10000 is not set
538 547CONFIG_WLAN=y
539#
540# Wireless LAN
541#
542# CONFIG_WLAN_PRE80211 is not set 548# CONFIG_WLAN_PRE80211 is not set
543# CONFIG_WLAN_80211 is not set 549# CONFIG_WLAN_80211 is not set
544 550
@@ -611,7 +617,6 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
611# CONFIG_POWER_SUPPLY is not set 617# CONFIG_POWER_SUPPLY is not set
612# CONFIG_HWMON is not set 618# CONFIG_HWMON is not set
613# CONFIG_THERMAL is not set 619# CONFIG_THERMAL is not set
614# CONFIG_THERMAL_HWMON is not set
615# CONFIG_WATCHDOG is not set 620# CONFIG_WATCHDOG is not set
616CONFIG_SSB_POSSIBLE=y 621CONFIG_SSB_POSSIBLE=y
617 622
@@ -672,6 +677,7 @@ CONFIG_SSB_POSSIBLE=y
672# CONFIG_GFS2_FS is not set 677# CONFIG_GFS2_FS is not set
673# CONFIG_OCFS2_FS is not set 678# CONFIG_OCFS2_FS is not set
674# CONFIG_BTRFS_FS is not set 679# CONFIG_BTRFS_FS is not set
680# CONFIG_NILFS2_FS is not set
675CONFIG_FILE_LOCKING=y 681CONFIG_FILE_LOCKING=y
676CONFIG_FSNOTIFY=y 682CONFIG_FSNOTIFY=y
677# CONFIG_DNOTIFY is not set 683# CONFIG_DNOTIFY is not set
@@ -731,7 +737,6 @@ CONFIG_CRAMFS=y
731# CONFIG_ROMFS_FS is not set 737# CONFIG_ROMFS_FS is not set
732# CONFIG_SYSV_FS is not set 738# CONFIG_SYSV_FS is not set
733# CONFIG_UFS_FS is not set 739# CONFIG_UFS_FS is not set
734# CONFIG_NILFS2_FS is not set
735CONFIG_NETWORK_FILESYSTEMS=y 740CONFIG_NETWORK_FILESYSTEMS=y
736CONFIG_NFS_FS=y 741CONFIG_NFS_FS=y
737CONFIG_NFS_V3=y 742CONFIG_NFS_V3=y
@@ -803,6 +808,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
803CONFIG_ENABLE_MUST_CHECK=y 808CONFIG_ENABLE_MUST_CHECK=y
804CONFIG_FRAME_WARN=1024 809CONFIG_FRAME_WARN=1024
805CONFIG_MAGIC_SYSRQ=y 810CONFIG_MAGIC_SYSRQ=y
811# CONFIG_STRIP_ASM_SYMS is not set
806# CONFIG_UNUSED_SYMBOLS is not set 812# CONFIG_UNUSED_SYMBOLS is not set
807# CONFIG_DEBUG_FS is not set 813# CONFIG_DEBUG_FS is not set
808# CONFIG_HEADERS_CHECK is not set 814# CONFIG_HEADERS_CHECK is not set
@@ -820,6 +826,7 @@ CONFIG_SCHED_DEBUG=y
820# CONFIG_DEBUG_OBJECTS is not set 826# CONFIG_DEBUG_OBJECTS is not set
821# CONFIG_SLUB_DEBUG_ON is not set 827# CONFIG_SLUB_DEBUG_ON is not set
822# CONFIG_SLUB_STATS is not set 828# CONFIG_SLUB_STATS is not set
829# CONFIG_DEBUG_KMEMLEAK is not set
823# CONFIG_DEBUG_SPINLOCK is not set 830# CONFIG_DEBUG_SPINLOCK is not set
824# CONFIG_DEBUG_MUTEXES is not set 831# CONFIG_DEBUG_MUTEXES is not set
825# CONFIG_DEBUG_LOCK_ALLOC is not set 832# CONFIG_DEBUG_LOCK_ALLOC is not set
@@ -836,10 +843,12 @@ CONFIG_DEBUG_INFO=y
836# CONFIG_DEBUG_LIST is not set 843# CONFIG_DEBUG_LIST is not set
837# CONFIG_DEBUG_SG is not set 844# CONFIG_DEBUG_SG is not set
838# CONFIG_DEBUG_NOTIFIERS is not set 845# CONFIG_DEBUG_NOTIFIERS is not set
846# CONFIG_DEBUG_CREDENTIALS is not set
839# CONFIG_RCU_TORTURE_TEST is not set 847# CONFIG_RCU_TORTURE_TEST is not set
840# CONFIG_RCU_CPU_STALL_DETECTOR is not set 848# CONFIG_RCU_CPU_STALL_DETECTOR is not set
841# CONFIG_BACKTRACE_SELF_TEST is not set 849# CONFIG_BACKTRACE_SELF_TEST is not set
842# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 850# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
851# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
843# CONFIG_FAULT_INJECTION is not set 852# CONFIG_FAULT_INJECTION is not set
844# CONFIG_LATENCYTOP is not set 853# CONFIG_LATENCYTOP is not set
845# CONFIG_DEBUG_PAGEALLOC is not set 854# CONFIG_DEBUG_PAGEALLOC is not set
@@ -861,10 +870,10 @@ CONFIG_BRANCH_PROFILE_NONE=y
861# CONFIG_KMEMTRACE is not set 870# CONFIG_KMEMTRACE is not set
862# CONFIG_WORKQUEUE_TRACER is not set 871# CONFIG_WORKQUEUE_TRACER is not set
863# CONFIG_BLK_DEV_IO_TRACE is not set 872# CONFIG_BLK_DEV_IO_TRACE is not set
873# CONFIG_DMA_API_DEBUG is not set
864# CONFIG_SAMPLES is not set 874# CONFIG_SAMPLES is not set
865CONFIG_HAVE_ARCH_KGDB=y 875CONFIG_HAVE_ARCH_KGDB=y
866# CONFIG_KGDB is not set 876# CONFIG_KGDB is not set
867# CONFIG_KMEMCHECK is not set
868# CONFIG_PPC_DISABLE_WERROR is not set 877# CONFIG_PPC_DISABLE_WERROR is not set
869CONFIG_PPC_WERROR=y 878CONFIG_PPC_WERROR=y
870CONFIG_PRINT_STACK_DEPTH=64 879CONFIG_PRINT_STACK_DEPTH=64
diff --git a/arch/powerpc/configs/linkstation_defconfig b/arch/powerpc/configs/linkstation_defconfig
index 45671e7dd2c7..63c3e8de8f16 100644
--- a/arch/powerpc/configs/linkstation_defconfig
+++ b/arch/powerpc/configs/linkstation_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.31-rc4 3# Linux kernel version: 2.6.32-rc5
4# Wed Jul 29 23:31:50 2009 4# Thu Nov 5 08:20:08 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -34,6 +34,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
34CONFIG_GENERIC_HARDIRQS=y 34CONFIG_GENERIC_HARDIRQS=y
35CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 35CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
37# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
37CONFIG_IRQ_PER_CPU=y 38CONFIG_IRQ_PER_CPU=y
38CONFIG_STACKTRACE_SUPPORT=y 39CONFIG_STACKTRACE_SUPPORT=y
39CONFIG_HAVE_LATENCYTOP_SUPPORT=y 40CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -83,11 +84,12 @@ CONFIG_POSIX_MQUEUE_SYSCTL=y
83# 84#
84# RCU Subsystem 85# RCU Subsystem
85# 86#
86CONFIG_CLASSIC_RCU=y 87CONFIG_TREE_RCU=y
87# CONFIG_TREE_RCU is not set 88# CONFIG_TREE_PREEMPT_RCU is not set
88# CONFIG_PREEMPT_RCU is not set 89# CONFIG_RCU_TRACE is not set
90CONFIG_RCU_FANOUT=32
91# CONFIG_RCU_FANOUT_EXACT is not set
89# CONFIG_TREE_RCU_TRACE is not set 92# CONFIG_TREE_RCU_TRACE is not set
90# CONFIG_PREEMPT_RCU_TRACE is not set
91CONFIG_IKCONFIG=y 93CONFIG_IKCONFIG=y
92CONFIG_IKCONFIG_PROC=y 94CONFIG_IKCONFIG_PROC=y
93CONFIG_LOG_BUF_SHIFT=14 95CONFIG_LOG_BUF_SHIFT=14
@@ -131,22 +133,21 @@ CONFIG_TIMERFD=y
131CONFIG_EVENTFD=y 133CONFIG_EVENTFD=y
132CONFIG_SHMEM=y 134CONFIG_SHMEM=y
133CONFIG_AIO=y 135CONFIG_AIO=y
134CONFIG_HAVE_PERF_COUNTERS=y 136CONFIG_HAVE_PERF_EVENTS=y
135 137
136# 138#
137# Performance Counters 139# Kernel Performance Events And Counters
138# 140#
141# CONFIG_PERF_EVENTS is not set
139# CONFIG_PERF_COUNTERS is not set 142# CONFIG_PERF_COUNTERS is not set
140CONFIG_VM_EVENT_COUNTERS=y 143CONFIG_VM_EVENT_COUNTERS=y
141CONFIG_PCI_QUIRKS=y 144CONFIG_PCI_QUIRKS=y
142CONFIG_SLUB_DEBUG=y 145CONFIG_SLUB_DEBUG=y
143# CONFIG_STRIP_ASM_SYMS is not set
144# CONFIG_COMPAT_BRK is not set 146# CONFIG_COMPAT_BRK is not set
145# CONFIG_SLAB is not set 147# CONFIG_SLAB is not set
146CONFIG_SLUB=y 148CONFIG_SLUB=y
147# CONFIG_SLOB is not set 149# CONFIG_SLOB is not set
148# CONFIG_PROFILING is not set 150# CONFIG_PROFILING is not set
149# CONFIG_MARKERS is not set
150CONFIG_HAVE_OPROFILE=y 151CONFIG_HAVE_OPROFILE=y
151# CONFIG_KPROBES is not set 152# CONFIG_KPROBES is not set
152CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 153CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -154,11 +155,13 @@ CONFIG_HAVE_IOREMAP_PROT=y
154CONFIG_HAVE_KPROBES=y 155CONFIG_HAVE_KPROBES=y
155CONFIG_HAVE_KRETPROBES=y 156CONFIG_HAVE_KRETPROBES=y
156CONFIG_HAVE_ARCH_TRACEHOOK=y 157CONFIG_HAVE_ARCH_TRACEHOOK=y
158CONFIG_HAVE_DMA_ATTRS=y
159CONFIG_HAVE_DMA_API_DEBUG=y
157 160
158# 161#
159# GCOV-based kernel profiling 162# GCOV-based kernel profiling
160# 163#
161# CONFIG_SLOW_WORK is not set 164CONFIG_SLOW_WORK=y
162# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 165# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
163CONFIG_SLABINFO=y 166CONFIG_SLABINFO=y
164CONFIG_RT_MUTEXES=y 167CONFIG_RT_MUTEXES=y
@@ -258,6 +261,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
258CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 261CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
259# CONFIG_KEXEC is not set 262# CONFIG_KEXEC is not set
260# CONFIG_CRASH_DUMP is not set 263# CONFIG_CRASH_DUMP is not set
264CONFIG_MAX_ACTIVE_REGIONS=32
261CONFIG_ARCH_FLATMEM_ENABLE=y 265CONFIG_ARCH_FLATMEM_ENABLE=y
262CONFIG_ARCH_POPULATES_NODE_MAP=y 266CONFIG_ARCH_POPULATES_NODE_MAP=y
263CONFIG_SELECT_MEMORY_MODEL=y 267CONFIG_SELECT_MEMORY_MODEL=y
@@ -275,6 +279,7 @@ CONFIG_BOUNCE=y
275CONFIG_VIRT_TO_BUS=y 279CONFIG_VIRT_TO_BUS=y
276CONFIG_HAVE_MLOCK=y 280CONFIG_HAVE_MLOCK=y
277CONFIG_HAVE_MLOCKED_PAGE_BIT=y 281CONFIG_HAVE_MLOCKED_PAGE_BIT=y
282# CONFIG_KSM is not set
278CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 283CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
279CONFIG_PPC_4K_PAGES=y 284CONFIG_PPC_4K_PAGES=y
280# CONFIG_PPC_16K_PAGES is not set 285# CONFIG_PPC_16K_PAGES is not set
@@ -482,6 +487,7 @@ CONFIG_IP_NF_ARPFILTER=m
482CONFIG_IP_NF_ARP_MANGLE=m 487CONFIG_IP_NF_ARP_MANGLE=m
483# CONFIG_IP_DCCP is not set 488# CONFIG_IP_DCCP is not set
484# CONFIG_IP_SCTP is not set 489# CONFIG_IP_SCTP is not set
490# CONFIG_RDS is not set
485# CONFIG_TIPC is not set 491# CONFIG_TIPC is not set
486# CONFIG_ATM is not set 492# CONFIG_ATM is not set
487# CONFIG_BRIDGE is not set 493# CONFIG_BRIDGE is not set
@@ -511,6 +517,7 @@ CONFIG_IP_NF_ARP_MANGLE=m
511# CONFIG_AF_RXRPC is not set 517# CONFIG_AF_RXRPC is not set
512CONFIG_WIRELESS=y 518CONFIG_WIRELESS=y
513# CONFIG_CFG80211 is not set 519# CONFIG_CFG80211 is not set
520CONFIG_CFG80211_DEFAULT_PS_VALUE=0
514CONFIG_WIRELESS_OLD_REGULATORY=y 521CONFIG_WIRELESS_OLD_REGULATORY=y
515CONFIG_WIRELESS_EXT=y 522CONFIG_WIRELESS_EXT=y
516CONFIG_WIRELESS_EXT_SYSFS=y 523CONFIG_WIRELESS_EXT_SYSFS=y
@@ -519,7 +526,6 @@ CONFIG_WIRELESS_EXT_SYSFS=y
519# 526#
520# CFG80211 needs to be enabled for MAC80211 527# CFG80211 needs to be enabled for MAC80211
521# 528#
522CONFIG_MAC80211_DEFAULT_PS_VALUE=0
523# CONFIG_WIMAX is not set 529# CONFIG_WIMAX is not set
524# CONFIG_RFKILL is not set 530# CONFIG_RFKILL is not set
525# CONFIG_NET_9P is not set 531# CONFIG_NET_9P is not set
@@ -532,6 +538,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
532# Generic Driver Options 538# Generic Driver Options
533# 539#
534CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 540CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
541# CONFIG_DEVTMPFS is not set
535CONFIG_STANDALONE=y 542CONFIG_STANDALONE=y
536CONFIG_PREVENT_FIRMWARE_BUILD=y 543CONFIG_PREVENT_FIRMWARE_BUILD=y
537CONFIG_FW_LOADER=y 544CONFIG_FW_LOADER=y
@@ -543,9 +550,9 @@ CONFIG_EXTRA_FIRMWARE=""
543# CONFIG_CONNECTOR is not set 550# CONFIG_CONNECTOR is not set
544CONFIG_MTD=y 551CONFIG_MTD=y
545# CONFIG_MTD_DEBUG is not set 552# CONFIG_MTD_DEBUG is not set
553# CONFIG_MTD_TESTS is not set
546CONFIG_MTD_CONCAT=y 554CONFIG_MTD_CONCAT=y
547CONFIG_MTD_PARTITIONS=y 555CONFIG_MTD_PARTITIONS=y
548# CONFIG_MTD_TESTS is not set
549# CONFIG_MTD_REDBOOT_PARTS is not set 556# CONFIG_MTD_REDBOOT_PARTS is not set
550CONFIG_MTD_CMDLINE_PARTS=y 557CONFIG_MTD_CMDLINE_PARTS=y
551CONFIG_MTD_OF_PARTS=y 558CONFIG_MTD_OF_PARTS=y
@@ -711,6 +718,7 @@ CONFIG_SCSI_LOWLEVEL=y
711# CONFIG_ISCSI_TCP is not set 718# CONFIG_ISCSI_TCP is not set
712# CONFIG_SCSI_CXGB3_ISCSI is not set 719# CONFIG_SCSI_CXGB3_ISCSI is not set
713# CONFIG_SCSI_BNX2_ISCSI is not set 720# CONFIG_SCSI_BNX2_ISCSI is not set
721# CONFIG_BE2ISCSI is not set
714# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 722# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
715# CONFIG_SCSI_3W_9XXX is not set 723# CONFIG_SCSI_3W_9XXX is not set
716# CONFIG_SCSI_ACARD is not set 724# CONFIG_SCSI_ACARD is not set
@@ -750,11 +758,14 @@ CONFIG_SCSI_LOWLEVEL=y
750# CONFIG_SCSI_DC390T is not set 758# CONFIG_SCSI_DC390T is not set
751# CONFIG_SCSI_NSP32 is not set 759# CONFIG_SCSI_NSP32 is not set
752# CONFIG_SCSI_DEBUG is not set 760# CONFIG_SCSI_DEBUG is not set
761# CONFIG_SCSI_PMCRAID is not set
753# CONFIG_SCSI_SRP is not set 762# CONFIG_SCSI_SRP is not set
763# CONFIG_SCSI_BFA_FC is not set
754# CONFIG_SCSI_DH is not set 764# CONFIG_SCSI_DH is not set
755# CONFIG_SCSI_OSD_INITIATOR is not set 765# CONFIG_SCSI_OSD_INITIATOR is not set
756CONFIG_ATA=y 766CONFIG_ATA=y
757# CONFIG_ATA_NONSTANDARD is not set 767# CONFIG_ATA_NONSTANDARD is not set
768CONFIG_ATA_VERBOSE_ERROR=y
758CONFIG_SATA_PMP=y 769CONFIG_SATA_PMP=y
759# CONFIG_SATA_AHCI is not set 770# CONFIG_SATA_AHCI is not set
760# CONFIG_SATA_SIL24 is not set 771# CONFIG_SATA_SIL24 is not set
@@ -777,6 +788,7 @@ CONFIG_ATA_SFF=y
777# CONFIG_PATA_ALI is not set 788# CONFIG_PATA_ALI is not set
778# CONFIG_PATA_AMD is not set 789# CONFIG_PATA_AMD is not set
779# CONFIG_PATA_ARTOP is not set 790# CONFIG_PATA_ARTOP is not set
791# CONFIG_PATA_ATP867X is not set
780# CONFIG_PATA_ATIIXP is not set 792# CONFIG_PATA_ATIIXP is not set
781# CONFIG_PATA_CMD640_PCI is not set 793# CONFIG_PATA_CMD640_PCI is not set
782# CONFIG_PATA_CMD64X is not set 794# CONFIG_PATA_CMD64X is not set
@@ -804,6 +816,7 @@ CONFIG_PATA_IT821X=y
804# CONFIG_PATA_OPTIDMA is not set 816# CONFIG_PATA_OPTIDMA is not set
805# CONFIG_PATA_PDC_OLD is not set 817# CONFIG_PATA_PDC_OLD is not set
806# CONFIG_PATA_RADISYS is not set 818# CONFIG_PATA_RADISYS is not set
819# CONFIG_PATA_RDC is not set
807# CONFIG_PATA_RZ1000 is not set 820# CONFIG_PATA_RZ1000 is not set
808# CONFIG_PATA_SC1200 is not set 821# CONFIG_PATA_SC1200 is not set
809# CONFIG_PATA_SERVERWORKS is not set 822# CONFIG_PATA_SERVERWORKS is not set
@@ -870,7 +883,9 @@ CONFIG_TULIP_MMIO=y
870# CONFIG_NET_PCI is not set 883# CONFIG_NET_PCI is not set
871# CONFIG_B44 is not set 884# CONFIG_B44 is not set
872# CONFIG_KS8842 is not set 885# CONFIG_KS8842 is not set
886# CONFIG_KS8851_MLL is not set
873# CONFIG_ATL2 is not set 887# CONFIG_ATL2 is not set
888# CONFIG_XILINX_EMACLITE is not set
874CONFIG_NETDEV_1000=y 889CONFIG_NETDEV_1000=y
875# CONFIG_ACENIC is not set 890# CONFIG_ACENIC is not set
876# CONFIG_DL2K is not set 891# CONFIG_DL2K is not set
@@ -918,10 +933,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
918# CONFIG_SFC is not set 933# CONFIG_SFC is not set
919# CONFIG_BE2NET is not set 934# CONFIG_BE2NET is not set
920# CONFIG_TR is not set 935# CONFIG_TR is not set
921 936CONFIG_WLAN=y
922#
923# Wireless LAN
924#
925# CONFIG_WLAN_PRE80211 is not set 937# CONFIG_WLAN_PRE80211 is not set
926# CONFIG_WLAN_80211 is not set 938# CONFIG_WLAN_80211 is not set
927 939
@@ -1043,6 +1055,7 @@ CONFIG_HW_RANDOM=y
1043CONFIG_DEVPORT=y 1055CONFIG_DEVPORT=y
1044CONFIG_I2C=y 1056CONFIG_I2C=y
1045CONFIG_I2C_BOARDINFO=y 1057CONFIG_I2C_BOARDINFO=y
1058CONFIG_I2C_COMPAT=y
1046CONFIG_I2C_CHARDEV=y 1059CONFIG_I2C_CHARDEV=y
1047CONFIG_I2C_HELPER_AUTO=y 1060CONFIG_I2C_HELPER_AUTO=y
1048 1061
@@ -1097,9 +1110,6 @@ CONFIG_I2C_MPC=y
1097# Miscellaneous I2C Chip support 1110# Miscellaneous I2C Chip support
1098# 1111#
1099# CONFIG_DS1682 is not set 1112# CONFIG_DS1682 is not set
1100# CONFIG_SENSORS_PCF8574 is not set
1101# CONFIG_PCF8575 is not set
1102# CONFIG_SENSORS_PCA9539 is not set
1103# CONFIG_SENSORS_TSL2550 is not set 1113# CONFIG_SENSORS_TSL2550 is not set
1104# CONFIG_I2C_DEBUG_CORE is not set 1114# CONFIG_I2C_DEBUG_CORE is not set
1105# CONFIG_I2C_DEBUG_ALGO is not set 1115# CONFIG_I2C_DEBUG_ALGO is not set
@@ -1117,6 +1127,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
1117# CONFIG_POWER_SUPPLY is not set 1127# CONFIG_POWER_SUPPLY is not set
1118CONFIG_HWMON=y 1128CONFIG_HWMON=y
1119# CONFIG_HWMON_VID is not set 1129# CONFIG_HWMON_VID is not set
1130# CONFIG_HWMON_DEBUG_CHIP is not set
1131
1132#
1133# Native drivers
1134#
1120# CONFIG_SENSORS_AD7414 is not set 1135# CONFIG_SENSORS_AD7414 is not set
1121# CONFIG_SENSORS_AD7418 is not set 1136# CONFIG_SENSORS_AD7418 is not set
1122# CONFIG_SENSORS_ADM1021 is not set 1137# CONFIG_SENSORS_ADM1021 is not set
@@ -1166,6 +1181,7 @@ CONFIG_HWMON=y
1166# CONFIG_SENSORS_ADS7828 is not set 1181# CONFIG_SENSORS_ADS7828 is not set
1167# CONFIG_SENSORS_THMC50 is not set 1182# CONFIG_SENSORS_THMC50 is not set
1168# CONFIG_SENSORS_TMP401 is not set 1183# CONFIG_SENSORS_TMP401 is not set
1184# CONFIG_SENSORS_TMP421 is not set
1169# CONFIG_SENSORS_VIA686A is not set 1185# CONFIG_SENSORS_VIA686A is not set
1170# CONFIG_SENSORS_VT1211 is not set 1186# CONFIG_SENSORS_VT1211 is not set
1171# CONFIG_SENSORS_VT8231 is not set 1187# CONFIG_SENSORS_VT8231 is not set
@@ -1177,9 +1193,7 @@ CONFIG_HWMON=y
1177# CONFIG_SENSORS_W83L786NG is not set 1193# CONFIG_SENSORS_W83L786NG is not set
1178# CONFIG_SENSORS_W83627HF is not set 1194# CONFIG_SENSORS_W83627HF is not set
1179# CONFIG_SENSORS_W83627EHF is not set 1195# CONFIG_SENSORS_W83627EHF is not set
1180# CONFIG_HWMON_DEBUG_CHIP is not set
1181# CONFIG_THERMAL is not set 1196# CONFIG_THERMAL is not set
1182# CONFIG_THERMAL_HWMON is not set
1183# CONFIG_WATCHDOG is not set 1197# CONFIG_WATCHDOG is not set
1184CONFIG_SSB_POSSIBLE=y 1198CONFIG_SSB_POSSIBLE=y
1185 1199
@@ -1198,6 +1212,7 @@ CONFIG_SSB_POSSIBLE=y
1198# CONFIG_MFD_TMIO is not set 1212# CONFIG_MFD_TMIO is not set
1199# CONFIG_PMIC_DA903X is not set 1213# CONFIG_PMIC_DA903X is not set
1200# CONFIG_MFD_WM8400 is not set 1214# CONFIG_MFD_WM8400 is not set
1215# CONFIG_MFD_WM831X is not set
1201# CONFIG_MFD_WM8350_I2C is not set 1216# CONFIG_MFD_WM8350_I2C is not set
1202# CONFIG_MFD_PCF50633 is not set 1217# CONFIG_MFD_PCF50633 is not set
1203# CONFIG_AB3100_CORE is not set 1218# CONFIG_AB3100_CORE is not set
@@ -1208,6 +1223,7 @@ CONFIG_SSB_POSSIBLE=y
1208# Graphics support 1223# Graphics support
1209# 1224#
1210# CONFIG_AGP is not set 1225# CONFIG_AGP is not set
1226CONFIG_VGA_ARB=y
1211# CONFIG_DRM is not set 1227# CONFIG_DRM is not set
1212# CONFIG_VGASTATE is not set 1228# CONFIG_VGASTATE is not set
1213CONFIG_VIDEO_OUTPUT_CONTROL=m 1229CONFIG_VIDEO_OUTPUT_CONTROL=m
@@ -1227,7 +1243,6 @@ CONFIG_DUMMY_CONSOLE=y
1227# CONFIG_SOUND is not set 1243# CONFIG_SOUND is not set
1228CONFIG_HID_SUPPORT=y 1244CONFIG_HID_SUPPORT=y
1229CONFIG_HID=m 1245CONFIG_HID=m
1230# CONFIG_HID_DEBUG is not set
1231# CONFIG_HIDRAW is not set 1246# CONFIG_HIDRAW is not set
1232 1247
1233# 1248#
@@ -1271,6 +1286,7 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y
1271# CONFIG_USB_OXU210HP_HCD is not set 1286# CONFIG_USB_OXU210HP_HCD is not set
1272# CONFIG_USB_ISP116X_HCD is not set 1287# CONFIG_USB_ISP116X_HCD is not set
1273# CONFIG_USB_ISP1760_HCD is not set 1288# CONFIG_USB_ISP1760_HCD is not set
1289# CONFIG_USB_ISP1362_HCD is not set
1274CONFIG_USB_OHCI_HCD=y 1290CONFIG_USB_OHCI_HCD=y
1275CONFIG_USB_OHCI_HCD_PPC_OF_BE=y 1291CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
1276# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set 1292# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set
@@ -1500,6 +1516,7 @@ CONFIG_XFS_FS=m
1500# CONFIG_GFS2_FS is not set 1516# CONFIG_GFS2_FS is not set
1501# CONFIG_OCFS2_FS is not set 1517# CONFIG_OCFS2_FS is not set
1502# CONFIG_BTRFS_FS is not set 1518# CONFIG_BTRFS_FS is not set
1519# CONFIG_NILFS2_FS is not set
1503CONFIG_FILE_LOCKING=y 1520CONFIG_FILE_LOCKING=y
1504CONFIG_FSNOTIFY=y 1521CONFIG_FSNOTIFY=y
1505CONFIG_DNOTIFY=y 1522CONFIG_DNOTIFY=y
@@ -1567,7 +1584,6 @@ CONFIG_MISC_FILESYSTEMS=y
1567# CONFIG_ROMFS_FS is not set 1584# CONFIG_ROMFS_FS is not set
1568# CONFIG_SYSV_FS is not set 1585# CONFIG_SYSV_FS is not set
1569# CONFIG_UFS_FS is not set 1586# CONFIG_UFS_FS is not set
1570# CONFIG_NILFS2_FS is not set
1571CONFIG_NETWORK_FILESYSTEMS=y 1587CONFIG_NETWORK_FILESYSTEMS=y
1572CONFIG_NFS_FS=y 1588CONFIG_NFS_FS=y
1573CONFIG_NFS_V3=y 1589CONFIG_NFS_V3=y
@@ -1681,6 +1697,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
1681CONFIG_ENABLE_MUST_CHECK=y 1697CONFIG_ENABLE_MUST_CHECK=y
1682CONFIG_FRAME_WARN=1024 1698CONFIG_FRAME_WARN=1024
1683CONFIG_MAGIC_SYSRQ=y 1699CONFIG_MAGIC_SYSRQ=y
1700# CONFIG_STRIP_ASM_SYMS is not set
1684# CONFIG_UNUSED_SYMBOLS is not set 1701# CONFIG_UNUSED_SYMBOLS is not set
1685# CONFIG_DEBUG_FS is not set 1702# CONFIG_DEBUG_FS is not set
1686# CONFIG_HEADERS_CHECK is not set 1703# CONFIG_HEADERS_CHECK is not set
@@ -1698,6 +1715,7 @@ CONFIG_SCHED_DEBUG=y
1698# CONFIG_DEBUG_OBJECTS is not set 1715# CONFIG_DEBUG_OBJECTS is not set
1699# CONFIG_SLUB_DEBUG_ON is not set 1716# CONFIG_SLUB_DEBUG_ON is not set
1700# CONFIG_SLUB_STATS is not set 1717# CONFIG_SLUB_STATS is not set
1718# CONFIG_DEBUG_KMEMLEAK is not set
1701# CONFIG_DEBUG_RT_MUTEXES is not set 1719# CONFIG_DEBUG_RT_MUTEXES is not set
1702# CONFIG_RT_MUTEX_TESTER is not set 1720# CONFIG_RT_MUTEX_TESTER is not set
1703# CONFIG_DEBUG_SPINLOCK is not set 1721# CONFIG_DEBUG_SPINLOCK is not set
@@ -1716,10 +1734,12 @@ CONFIG_DEBUG_MEMORY_INIT=y
1716# CONFIG_DEBUG_LIST is not set 1734# CONFIG_DEBUG_LIST is not set
1717# CONFIG_DEBUG_SG is not set 1735# CONFIG_DEBUG_SG is not set
1718# CONFIG_DEBUG_NOTIFIERS is not set 1736# CONFIG_DEBUG_NOTIFIERS is not set
1737# CONFIG_DEBUG_CREDENTIALS is not set
1719# CONFIG_RCU_TORTURE_TEST is not set 1738# CONFIG_RCU_TORTURE_TEST is not set
1720# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1739# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1721# CONFIG_BACKTRACE_SELF_TEST is not set 1740# CONFIG_BACKTRACE_SELF_TEST is not set
1722# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 1741# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1742# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
1723# CONFIG_FAULT_INJECTION is not set 1743# CONFIG_FAULT_INJECTION is not set
1724# CONFIG_LATENCYTOP is not set 1744# CONFIG_LATENCYTOP is not set
1725CONFIG_SYSCTL_SYSCALL_CHECK=y 1745CONFIG_SYSCTL_SYSCALL_CHECK=y
@@ -1742,6 +1762,7 @@ CONFIG_BRANCH_PROFILE_NONE=y
1742# CONFIG_KMEMTRACE is not set 1762# CONFIG_KMEMTRACE is not set
1743# CONFIG_WORKQUEUE_TRACER is not set 1763# CONFIG_WORKQUEUE_TRACER is not set
1744# CONFIG_BLK_DEV_IO_TRACE is not set 1764# CONFIG_BLK_DEV_IO_TRACE is not set
1765# CONFIG_DMA_API_DEBUG is not set
1745# CONFIG_SAMPLES is not set 1766# CONFIG_SAMPLES is not set
1746CONFIG_HAVE_ARCH_KGDB=y 1767CONFIG_HAVE_ARCH_KGDB=y
1747# CONFIG_KGDB is not set 1768# CONFIG_KGDB is not set
@@ -1771,7 +1792,6 @@ CONFIG_CRYPTO=y
1771# 1792#
1772# Crypto core or helper 1793# Crypto core or helper
1773# 1794#
1774# CONFIG_CRYPTO_FIPS is not set
1775CONFIG_CRYPTO_ALGAPI=y 1795CONFIG_CRYPTO_ALGAPI=y
1776CONFIG_CRYPTO_ALGAPI2=y 1796CONFIG_CRYPTO_ALGAPI2=y
1777CONFIG_CRYPTO_AEAD2=y 1797CONFIG_CRYPTO_AEAD2=y
@@ -1813,11 +1833,13 @@ CONFIG_CRYPTO_PCBC=m
1813# 1833#
1814# CONFIG_CRYPTO_HMAC is not set 1834# CONFIG_CRYPTO_HMAC is not set
1815# CONFIG_CRYPTO_XCBC is not set 1835# CONFIG_CRYPTO_XCBC is not set
1836# CONFIG_CRYPTO_VMAC is not set
1816 1837
1817# 1838#
1818# Digest 1839# Digest
1819# 1840#
1820CONFIG_CRYPTO_CRC32C=m 1841CONFIG_CRYPTO_CRC32C=m
1842# CONFIG_CRYPTO_GHASH is not set
1821CONFIG_CRYPTO_MD4=m 1843CONFIG_CRYPTO_MD4=m
1822CONFIG_CRYPTO_MD5=y 1844CONFIG_CRYPTO_MD5=y
1823CONFIG_CRYPTO_MICHAEL_MIC=m 1845CONFIG_CRYPTO_MICHAEL_MIC=m
diff --git a/arch/powerpc/configs/mgcoge_defconfig b/arch/powerpc/configs/mgcoge_defconfig
index 30b68bfacebf..520b04a0def9 100644
--- a/arch/powerpc/configs/mgcoge_defconfig
+++ b/arch/powerpc/configs/mgcoge_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.31-rc5 3# Linux kernel version: 2.6.32-rc5
4# Fri Aug 7 08:19:15 2009 4# Thu Nov 5 08:20:09 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -34,6 +34,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
34CONFIG_GENERIC_HARDIRQS=y 34CONFIG_GENERIC_HARDIRQS=y
35CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 35CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
37# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
37CONFIG_IRQ_PER_CPU=y 38CONFIG_IRQ_PER_CPU=y
38CONFIG_STACKTRACE_SUPPORT=y 39CONFIG_STACKTRACE_SUPPORT=y
39CONFIG_HAVE_LATENCYTOP_SUPPORT=y 40CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -84,11 +85,12 @@ CONFIG_SYSVIPC_SYSCTL=y
84# 85#
85# RCU Subsystem 86# RCU Subsystem
86# 87#
87CONFIG_CLASSIC_RCU=y 88CONFIG_TREE_RCU=y
88# CONFIG_TREE_RCU is not set 89# CONFIG_TREE_PREEMPT_RCU is not set
89# CONFIG_PREEMPT_RCU is not set 90# CONFIG_RCU_TRACE is not set
91CONFIG_RCU_FANOUT=32
92# CONFIG_RCU_FANOUT_EXACT is not set
90# CONFIG_TREE_RCU_TRACE is not set 93# CONFIG_TREE_RCU_TRACE is not set
91# CONFIG_PREEMPT_RCU_TRACE is not set
92CONFIG_IKCONFIG=y 94CONFIG_IKCONFIG=y
93CONFIG_IKCONFIG_PROC=y 95CONFIG_IKCONFIG_PROC=y
94CONFIG_LOG_BUF_SHIFT=14 96CONFIG_LOG_BUF_SHIFT=14
@@ -123,28 +125,29 @@ CONFIG_TIMERFD=y
123CONFIG_EVENTFD=y 125CONFIG_EVENTFD=y
124CONFIG_SHMEM=y 126CONFIG_SHMEM=y
125CONFIG_AIO=y 127CONFIG_AIO=y
126CONFIG_HAVE_PERF_COUNTERS=y 128CONFIG_HAVE_PERF_EVENTS=y
127 129
128# 130#
129# Performance Counters 131# Kernel Performance Events And Counters
130# 132#
133# CONFIG_PERF_EVENTS is not set
131# CONFIG_PERF_COUNTERS is not set 134# CONFIG_PERF_COUNTERS is not set
132CONFIG_VM_EVENT_COUNTERS=y 135CONFIG_VM_EVENT_COUNTERS=y
133CONFIG_PCI_QUIRKS=y 136CONFIG_PCI_QUIRKS=y
134# CONFIG_STRIP_ASM_SYMS is not set
135CONFIG_COMPAT_BRK=y 137CONFIG_COMPAT_BRK=y
136CONFIG_SLAB=y 138CONFIG_SLAB=y
137# CONFIG_SLUB is not set 139# CONFIG_SLUB is not set
138# CONFIG_SLOB is not set 140# CONFIG_SLOB is not set
139# CONFIG_PROFILING is not set 141# CONFIG_PROFILING is not set
140# CONFIG_MARKERS is not set
141CONFIG_HAVE_OPROFILE=y 142CONFIG_HAVE_OPROFILE=y
142CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 143CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
143CONFIG_HAVE_IOREMAP_PROT=y 144CONFIG_HAVE_IOREMAP_PROT=y
144CONFIG_HAVE_KPROBES=y 145CONFIG_HAVE_KPROBES=y
145CONFIG_HAVE_KRETPROBES=y 146CONFIG_HAVE_KRETPROBES=y
146CONFIG_HAVE_ARCH_TRACEHOOK=y 147CONFIG_HAVE_ARCH_TRACEHOOK=y
148CONFIG_HAVE_DMA_ATTRS=y
147CONFIG_HAVE_CLK=y 149CONFIG_HAVE_CLK=y
150CONFIG_HAVE_DMA_API_DEBUG=y
148 151
149# 152#
150# GCOV-based kernel profiling 153# GCOV-based kernel profiling
@@ -247,6 +250,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
247CONFIG_ARCH_HAS_WALK_MEMORY=y 250CONFIG_ARCH_HAS_WALK_MEMORY=y
248CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 251CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
249# CONFIG_CRASH_DUMP is not set 252# CONFIG_CRASH_DUMP is not set
253CONFIG_MAX_ACTIVE_REGIONS=32
250CONFIG_ARCH_FLATMEM_ENABLE=y 254CONFIG_ARCH_FLATMEM_ENABLE=y
251CONFIG_ARCH_POPULATES_NODE_MAP=y 255CONFIG_ARCH_POPULATES_NODE_MAP=y
252CONFIG_FLATMEM=y 256CONFIG_FLATMEM=y
@@ -260,6 +264,7 @@ CONFIG_BOUNCE=y
260CONFIG_VIRT_TO_BUS=y 264CONFIG_VIRT_TO_BUS=y
261CONFIG_HAVE_MLOCK=y 265CONFIG_HAVE_MLOCK=y
262CONFIG_HAVE_MLOCKED_PAGE_BIT=y 266CONFIG_HAVE_MLOCKED_PAGE_BIT=y
267# CONFIG_KSM is not set
263CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 268CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
264CONFIG_PPC_4K_PAGES=y 269CONFIG_PPC_4K_PAGES=y
265# CONFIG_PPC_16K_PAGES is not set 270# CONFIG_PPC_16K_PAGES is not set
@@ -390,6 +395,7 @@ CONFIG_NETFILTER_ADVANCED=y
390# CONFIG_BT is not set 395# CONFIG_BT is not set
391CONFIG_WIRELESS=y 396CONFIG_WIRELESS=y
392# CONFIG_CFG80211 is not set 397# CONFIG_CFG80211 is not set
398CONFIG_CFG80211_DEFAULT_PS_VALUE=0
393CONFIG_WIRELESS_OLD_REGULATORY=y 399CONFIG_WIRELESS_OLD_REGULATORY=y
394# CONFIG_WIRELESS_EXT is not set 400# CONFIG_WIRELESS_EXT is not set
395# CONFIG_LIB80211 is not set 401# CONFIG_LIB80211 is not set
@@ -397,7 +403,6 @@ CONFIG_WIRELESS_OLD_REGULATORY=y
397# 403#
398# CFG80211 needs to be enabled for MAC80211 404# CFG80211 needs to be enabled for MAC80211
399# 405#
400CONFIG_MAC80211_DEFAULT_PS_VALUE=0
401# CONFIG_WIMAX is not set 406# CONFIG_WIMAX is not set
402# CONFIG_RFKILL is not set 407# CONFIG_RFKILL is not set
403 408
@@ -409,6 +414,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
409# Generic Driver Options 414# Generic Driver Options
410# 415#
411CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 416CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
417# CONFIG_DEVTMPFS is not set
412CONFIG_STANDALONE=y 418CONFIG_STANDALONE=y
413CONFIG_PREVENT_FIRMWARE_BUILD=y 419CONFIG_PREVENT_FIRMWARE_BUILD=y
414# CONFIG_FW_LOADER is not set 420# CONFIG_FW_LOADER is not set
@@ -608,7 +614,9 @@ CONFIG_MII=y
608# CONFIG_NET_PCI is not set 614# CONFIG_NET_PCI is not set
609# CONFIG_B44 is not set 615# CONFIG_B44 is not set
610# CONFIG_KS8842 is not set 616# CONFIG_KS8842 is not set
617# CONFIG_KS8851_MLL is not set
611# CONFIG_ATL2 is not set 618# CONFIG_ATL2 is not set
619# CONFIG_XILINX_EMACLITE is not set
612CONFIG_FS_ENET=y 620CONFIG_FS_ENET=y
613CONFIG_FS_ENET_HAS_SCC=y 621CONFIG_FS_ENET_HAS_SCC=y
614CONFIG_FS_ENET_HAS_FCC=y 622CONFIG_FS_ENET_HAS_FCC=y
@@ -616,10 +624,7 @@ CONFIG_FS_ENET_MDIO_FCC=y
616# CONFIG_NETDEV_1000 is not set 624# CONFIG_NETDEV_1000 is not set
617# CONFIG_NETDEV_10000 is not set 625# CONFIG_NETDEV_10000 is not set
618# CONFIG_TR is not set 626# CONFIG_TR is not set
619 627CONFIG_WLAN=y
620#
621# Wireless LAN
622#
623# CONFIG_WLAN_PRE80211 is not set 628# CONFIG_WLAN_PRE80211 is not set
624# CONFIG_WLAN_80211 is not set 629# CONFIG_WLAN_80211 is not set
625 630
@@ -685,6 +690,7 @@ CONFIG_HW_RANDOM=y
685CONFIG_DEVPORT=y 690CONFIG_DEVPORT=y
686CONFIG_I2C=y 691CONFIG_I2C=y
687CONFIG_I2C_BOARDINFO=y 692CONFIG_I2C_BOARDINFO=y
693CONFIG_I2C_COMPAT=y
688CONFIG_I2C_CHARDEV=y 694CONFIG_I2C_CHARDEV=y
689CONFIG_I2C_HELPER_AUTO=y 695CONFIG_I2C_HELPER_AUTO=y
690 696
@@ -740,7 +746,6 @@ CONFIG_I2C_CPM=y
740# 746#
741# Miscellaneous I2C Chip support 747# Miscellaneous I2C Chip support
742# 748#
743# CONFIG_PCF8575 is not set
744# CONFIG_I2C_DEBUG_CORE is not set 749# CONFIG_I2C_DEBUG_CORE is not set
745# CONFIG_I2C_DEBUG_ALGO is not set 750# CONFIG_I2C_DEBUG_ALGO is not set
746# CONFIG_I2C_DEBUG_BUS is not set 751# CONFIG_I2C_DEBUG_BUS is not set
@@ -771,15 +776,19 @@ CONFIG_GPIOLIB=y
771# PCI GPIO expanders: 776# PCI GPIO expanders:
772# 777#
773# CONFIG_GPIO_BT8XX is not set 778# CONFIG_GPIO_BT8XX is not set
779# CONFIG_GPIO_LANGWELL is not set
774 780
775# 781#
776# SPI GPIO expanders: 782# SPI GPIO expanders:
777# 783#
784
785#
786# AC97 GPIO expanders:
787#
778# CONFIG_W1 is not set 788# CONFIG_W1 is not set
779# CONFIG_POWER_SUPPLY is not set 789# CONFIG_POWER_SUPPLY is not set
780# CONFIG_HWMON is not set 790# CONFIG_HWMON is not set
781# CONFIG_THERMAL is not set 791# CONFIG_THERMAL is not set
782# CONFIG_THERMAL_HWMON is not set
783# CONFIG_WATCHDOG is not set 792# CONFIG_WATCHDOG is not set
784CONFIG_SSB_POSSIBLE=y 793CONFIG_SSB_POSSIBLE=y
785 794
@@ -799,6 +808,7 @@ CONFIG_SSB_POSSIBLE=y
799# CONFIG_MFD_TMIO is not set 808# CONFIG_MFD_TMIO is not set
800# CONFIG_PMIC_DA903X is not set 809# CONFIG_PMIC_DA903X is not set
801# CONFIG_MFD_WM8400 is not set 810# CONFIG_MFD_WM8400 is not set
811# CONFIG_MFD_WM831X is not set
802# CONFIG_MFD_WM8350_I2C is not set 812# CONFIG_MFD_WM8350_I2C is not set
803# CONFIG_MFD_PCF50633 is not set 813# CONFIG_MFD_PCF50633 is not set
804# CONFIG_AB3100_CORE is not set 814# CONFIG_AB3100_CORE is not set
@@ -809,6 +819,7 @@ CONFIG_SSB_POSSIBLE=y
809# Graphics support 819# Graphics support
810# 820#
811# CONFIG_AGP is not set 821# CONFIG_AGP is not set
822CONFIG_VGA_ARB=y
812# CONFIG_DRM is not set 823# CONFIG_DRM is not set
813# CONFIG_VGASTATE is not set 824# CONFIG_VGASTATE is not set
814# CONFIG_VIDEO_OUTPUT_CONTROL is not set 825# CONFIG_VIDEO_OUTPUT_CONTROL is not set
@@ -1022,6 +1033,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
1022CONFIG_ENABLE_MUST_CHECK=y 1033CONFIG_ENABLE_MUST_CHECK=y
1023CONFIG_FRAME_WARN=1024 1034CONFIG_FRAME_WARN=1024
1024CONFIG_MAGIC_SYSRQ=y 1035CONFIG_MAGIC_SYSRQ=y
1036# CONFIG_STRIP_ASM_SYMS is not set
1025# CONFIG_UNUSED_SYMBOLS is not set 1037# CONFIG_UNUSED_SYMBOLS is not set
1026CONFIG_DEBUG_FS=y 1038CONFIG_DEBUG_FS=y
1027# CONFIG_HEADERS_CHECK is not set 1039# CONFIG_HEADERS_CHECK is not set
@@ -1052,10 +1064,12 @@ CONFIG_DEBUG_INFO=y
1052# CONFIG_DEBUG_LIST is not set 1064# CONFIG_DEBUG_LIST is not set
1053# CONFIG_DEBUG_SG is not set 1065# CONFIG_DEBUG_SG is not set
1054# CONFIG_DEBUG_NOTIFIERS is not set 1066# CONFIG_DEBUG_NOTIFIERS is not set
1067# CONFIG_DEBUG_CREDENTIALS is not set
1055# CONFIG_RCU_TORTURE_TEST is not set 1068# CONFIG_RCU_TORTURE_TEST is not set
1056# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1069# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1057# CONFIG_BACKTRACE_SELF_TEST is not set 1070# CONFIG_BACKTRACE_SELF_TEST is not set
1058# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 1071# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1072# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
1059# CONFIG_FAULT_INJECTION is not set 1073# CONFIG_FAULT_INJECTION is not set
1060# CONFIG_LATENCYTOP is not set 1074# CONFIG_LATENCYTOP is not set
1061CONFIG_SYSCTL_SYSCALL_CHECK=y 1075CONFIG_SYSCTL_SYSCALL_CHECK=y
@@ -1079,6 +1093,7 @@ CONFIG_BRANCH_PROFILE_NONE=y
1079# CONFIG_WORKQUEUE_TRACER is not set 1093# CONFIG_WORKQUEUE_TRACER is not set
1080# CONFIG_BLK_DEV_IO_TRACE is not set 1094# CONFIG_BLK_DEV_IO_TRACE is not set
1081# CONFIG_DYNAMIC_DEBUG is not set 1095# CONFIG_DYNAMIC_DEBUG is not set
1096# CONFIG_DMA_API_DEBUG is not set
1082# CONFIG_SAMPLES is not set 1097# CONFIG_SAMPLES is not set
1083CONFIG_HAVE_ARCH_KGDB=y 1098CONFIG_HAVE_ARCH_KGDB=y
1084# CONFIG_PPC_DISABLE_WERROR is not set 1099# CONFIG_PPC_DISABLE_WERROR is not set
@@ -1109,7 +1124,6 @@ CONFIG_CRYPTO=y
1109# 1124#
1110# Crypto core or helper 1125# Crypto core or helper
1111# 1126#
1112# CONFIG_CRYPTO_FIPS is not set
1113CONFIG_CRYPTO_ALGAPI=y 1127CONFIG_CRYPTO_ALGAPI=y
1114CONFIG_CRYPTO_ALGAPI2=y 1128CONFIG_CRYPTO_ALGAPI2=y
1115CONFIG_CRYPTO_AEAD2=y 1129CONFIG_CRYPTO_AEAD2=y
@@ -1151,6 +1165,7 @@ CONFIG_CRYPTO_PCBC=y
1151# Digest 1165# Digest
1152# 1166#
1153# CONFIG_CRYPTO_CRC32C is not set 1167# CONFIG_CRYPTO_CRC32C is not set
1168# CONFIG_CRYPTO_GHASH is not set
1154# CONFIG_CRYPTO_MD4 is not set 1169# CONFIG_CRYPTO_MD4 is not set
1155CONFIG_CRYPTO_MD5=y 1170CONFIG_CRYPTO_MD5=y
1156# CONFIG_CRYPTO_MICHAEL_MIC is not set 1171# CONFIG_CRYPTO_MICHAEL_MIC is not set
diff --git a/arch/powerpc/configs/mgsuvd_defconfig b/arch/powerpc/configs/mgsuvd_defconfig
index 1ae85a3b2942..43c3c4fcdce3 100644
--- a/arch/powerpc/configs/mgsuvd_defconfig
+++ b/arch/powerpc/configs/mgsuvd_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.31-rc4 3# Linux kernel version: 2.6.32-rc5
4# Wed Jul 29 23:31:52 2009 4# Thu Nov 5 08:20:10 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -16,6 +16,7 @@ CONFIG_PPC_8xx=y
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_8xx=y 17CONFIG_8xx=y
18CONFIG_PPC_MMU_NOHASH=y 18CONFIG_PPC_MMU_NOHASH=y
19CONFIG_PPC_MMU_NOHASH_32=y
19# CONFIG_PPC_MM_SLICES is not set 20# CONFIG_PPC_MM_SLICES is not set
20CONFIG_NOT_COHERENT_CACHE=y 21CONFIG_NOT_COHERENT_CACHE=y
21CONFIG_PPC32=y 22CONFIG_PPC32=y
@@ -29,6 +30,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
29CONFIG_GENERIC_HARDIRQS=y 30CONFIG_GENERIC_HARDIRQS=y
30CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 31CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
31# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 32# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
33# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
32CONFIG_IRQ_PER_CPU=y 34CONFIG_IRQ_PER_CPU=y
33CONFIG_STACKTRACE_SUPPORT=y 35CONFIG_STACKTRACE_SUPPORT=y
34CONFIG_HAVE_LATENCYTOP_SUPPORT=y 36CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -76,11 +78,12 @@ CONFIG_SYSVIPC_SYSCTL=y
76# 78#
77# RCU Subsystem 79# RCU Subsystem
78# 80#
79CONFIG_CLASSIC_RCU=y 81CONFIG_TREE_RCU=y
80# CONFIG_TREE_RCU is not set 82# CONFIG_TREE_PREEMPT_RCU is not set
81# CONFIG_PREEMPT_RCU is not set 83# CONFIG_RCU_TRACE is not set
84CONFIG_RCU_FANOUT=32
85# CONFIG_RCU_FANOUT_EXACT is not set
82# CONFIG_TREE_RCU_TRACE is not set 86# CONFIG_TREE_RCU_TRACE is not set
83# CONFIG_PREEMPT_RCU_TRACE is not set
84# CONFIG_IKCONFIG is not set 87# CONFIG_IKCONFIG is not set
85CONFIG_LOG_BUF_SHIFT=17 88CONFIG_LOG_BUF_SHIFT=17
86CONFIG_GROUP_SCHED=y 89CONFIG_GROUP_SCHED=y
@@ -117,27 +120,28 @@ CONFIG_TIMERFD=y
117CONFIG_EVENTFD=y 120CONFIG_EVENTFD=y
118CONFIG_SHMEM=y 121CONFIG_SHMEM=y
119CONFIG_AIO=y 122CONFIG_AIO=y
120CONFIG_HAVE_PERF_COUNTERS=y 123CONFIG_HAVE_PERF_EVENTS=y
121 124
122# 125#
123# Performance Counters 126# Kernel Performance Events And Counters
124# 127#
128# CONFIG_PERF_EVENTS is not set
125# CONFIG_PERF_COUNTERS is not set 129# CONFIG_PERF_COUNTERS is not set
126# CONFIG_VM_EVENT_COUNTERS is not set 130# CONFIG_VM_EVENT_COUNTERS is not set
127# CONFIG_STRIP_ASM_SYMS is not set
128CONFIG_COMPAT_BRK=y 131CONFIG_COMPAT_BRK=y
129CONFIG_SLAB=y 132CONFIG_SLAB=y
130# CONFIG_SLUB is not set 133# CONFIG_SLUB is not set
131# CONFIG_SLOB is not set 134# CONFIG_SLOB is not set
132# CONFIG_PROFILING is not set 135# CONFIG_PROFILING is not set
133# CONFIG_MARKERS is not set
134CONFIG_HAVE_OPROFILE=y 136CONFIG_HAVE_OPROFILE=y
135CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 137CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
136CONFIG_HAVE_IOREMAP_PROT=y 138CONFIG_HAVE_IOREMAP_PROT=y
137CONFIG_HAVE_KPROBES=y 139CONFIG_HAVE_KPROBES=y
138CONFIG_HAVE_KRETPROBES=y 140CONFIG_HAVE_KRETPROBES=y
139CONFIG_HAVE_ARCH_TRACEHOOK=y 141CONFIG_HAVE_ARCH_TRACEHOOK=y
142CONFIG_HAVE_DMA_ATTRS=y
140CONFIG_HAVE_CLK=y 143CONFIG_HAVE_CLK=y
144CONFIG_HAVE_DMA_API_DEBUG=y
141 145
142# 146#
143# GCOV-based kernel profiling 147# GCOV-based kernel profiling
@@ -237,10 +241,10 @@ CONFIG_BINFMT_ELF=y
237CONFIG_MATH_EMULATION=y 241CONFIG_MATH_EMULATION=y
238# CONFIG_IOMMU_HELPER is not set 242# CONFIG_IOMMU_HELPER is not set
239# CONFIG_SWIOTLB is not set 243# CONFIG_SWIOTLB is not set
240CONFIG_PPC_NEED_DMA_SYNC_OPS=y
241CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 244CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
242CONFIG_ARCH_HAS_WALK_MEMORY=y 245CONFIG_ARCH_HAS_WALK_MEMORY=y
243CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 246CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
247CONFIG_MAX_ACTIVE_REGIONS=32
244CONFIG_ARCH_FLATMEM_ENABLE=y 248CONFIG_ARCH_FLATMEM_ENABLE=y
245CONFIG_ARCH_POPULATES_NODE_MAP=y 249CONFIG_ARCH_POPULATES_NODE_MAP=y
246CONFIG_SELECT_MEMORY_MODEL=y 250CONFIG_SELECT_MEMORY_MODEL=y
@@ -258,6 +262,7 @@ CONFIG_BOUNCE=y
258CONFIG_VIRT_TO_BUS=y 262CONFIG_VIRT_TO_BUS=y
259CONFIG_HAVE_MLOCK=y 263CONFIG_HAVE_MLOCK=y
260CONFIG_HAVE_MLOCKED_PAGE_BIT=y 264CONFIG_HAVE_MLOCKED_PAGE_BIT=y
265# CONFIG_KSM is not set
261CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 266CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
262CONFIG_PPC_4K_PAGES=y 267CONFIG_PPC_4K_PAGES=y
263# CONFIG_PPC_16K_PAGES is not set 268# CONFIG_PPC_16K_PAGES is not set
@@ -344,6 +349,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
344# CONFIG_NETFILTER is not set 349# CONFIG_NETFILTER is not set
345# CONFIG_IP_DCCP is not set 350# CONFIG_IP_DCCP is not set
346# CONFIG_IP_SCTP is not set 351# CONFIG_IP_SCTP is not set
352# CONFIG_RDS is not set
347# CONFIG_TIPC is not set 353# CONFIG_TIPC is not set
348# CONFIG_ATM is not set 354# CONFIG_ATM is not set
349# CONFIG_BRIDGE is not set 355# CONFIG_BRIDGE is not set
@@ -373,6 +379,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
373# CONFIG_AF_RXRPC is not set 379# CONFIG_AF_RXRPC is not set
374CONFIG_WIRELESS=y 380CONFIG_WIRELESS=y
375# CONFIG_CFG80211 is not set 381# CONFIG_CFG80211 is not set
382CONFIG_CFG80211_DEFAULT_PS_VALUE=0
376CONFIG_WIRELESS_OLD_REGULATORY=y 383CONFIG_WIRELESS_OLD_REGULATORY=y
377# CONFIG_WIRELESS_EXT is not set 384# CONFIG_WIRELESS_EXT is not set
378# CONFIG_LIB80211 is not set 385# CONFIG_LIB80211 is not set
@@ -380,7 +387,6 @@ CONFIG_WIRELESS_OLD_REGULATORY=y
380# 387#
381# CFG80211 needs to be enabled for MAC80211 388# CFG80211 needs to be enabled for MAC80211
382# 389#
383CONFIG_MAC80211_DEFAULT_PS_VALUE=0
384# CONFIG_WIMAX is not set 390# CONFIG_WIMAX is not set
385# CONFIG_RFKILL is not set 391# CONFIG_RFKILL is not set
386# CONFIG_NET_9P is not set 392# CONFIG_NET_9P is not set
@@ -553,16 +559,15 @@ CONFIG_MII=y
553# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set 559# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
554# CONFIG_B44 is not set 560# CONFIG_B44 is not set
555# CONFIG_KS8842 is not set 561# CONFIG_KS8842 is not set
562# CONFIG_KS8851_MLL is not set
563# CONFIG_XILINX_EMACLITE is not set
556CONFIG_FS_ENET=y 564CONFIG_FS_ENET=y
557CONFIG_FS_ENET_HAS_SCC=y 565CONFIG_FS_ENET_HAS_SCC=y
558# CONFIG_FS_ENET_HAS_FEC is not set 566# CONFIG_FS_ENET_HAS_FEC is not set
559# CONFIG_FS_ENET_MDIO_FEC is not set 567# CONFIG_FS_ENET_MDIO_FEC is not set
560# CONFIG_NETDEV_1000 is not set 568# CONFIG_NETDEV_1000 is not set
561# CONFIG_NETDEV_10000 is not set 569# CONFIG_NETDEV_10000 is not set
562 570CONFIG_WLAN=y
563#
564# Wireless LAN
565#
566# CONFIG_WLAN_PRE80211 is not set 571# CONFIG_WLAN_PRE80211 is not set
567# CONFIG_WLAN_80211 is not set 572# CONFIG_WLAN_80211 is not set
568 573
@@ -635,7 +640,6 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
635# CONFIG_POWER_SUPPLY is not set 640# CONFIG_POWER_SUPPLY is not set
636# CONFIG_HWMON is not set 641# CONFIG_HWMON is not set
637# CONFIG_THERMAL is not set 642# CONFIG_THERMAL is not set
638# CONFIG_THERMAL_HWMON is not set
639# CONFIG_WATCHDOG is not set 643# CONFIG_WATCHDOG is not set
640CONFIG_SSB_POSSIBLE=y 644CONFIG_SSB_POSSIBLE=y
641 645
@@ -707,6 +711,7 @@ CONFIG_FS_MBCACHE=y
707# CONFIG_GFS2_FS is not set 711# CONFIG_GFS2_FS is not set
708# CONFIG_OCFS2_FS is not set 712# CONFIG_OCFS2_FS is not set
709# CONFIG_BTRFS_FS is not set 713# CONFIG_BTRFS_FS is not set
714# CONFIG_NILFS2_FS is not set
710CONFIG_FILE_LOCKING=y 715CONFIG_FILE_LOCKING=y
711CONFIG_FSNOTIFY=y 716CONFIG_FSNOTIFY=y
712CONFIG_DNOTIFY=y 717CONFIG_DNOTIFY=y
@@ -776,7 +781,6 @@ CONFIG_CRAMFS=y
776# CONFIG_ROMFS_FS is not set 781# CONFIG_ROMFS_FS is not set
777# CONFIG_SYSV_FS is not set 782# CONFIG_SYSV_FS is not set
778# CONFIG_UFS_FS is not set 783# CONFIG_UFS_FS is not set
779# CONFIG_NILFS2_FS is not set
780CONFIG_NETWORK_FILESYSTEMS=y 784CONFIG_NETWORK_FILESYSTEMS=y
781CONFIG_NFS_FS=y 785CONFIG_NFS_FS=y
782CONFIG_NFS_V3=y 786CONFIG_NFS_V3=y
@@ -851,6 +855,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
851CONFIG_ENABLE_MUST_CHECK=y 855CONFIG_ENABLE_MUST_CHECK=y
852CONFIG_FRAME_WARN=1024 856CONFIG_FRAME_WARN=1024
853# CONFIG_MAGIC_SYSRQ is not set 857# CONFIG_MAGIC_SYSRQ is not set
858# CONFIG_STRIP_ASM_SYMS is not set
854# CONFIG_UNUSED_SYMBOLS is not set 859# CONFIG_UNUSED_SYMBOLS is not set
855CONFIG_DEBUG_FS=y 860CONFIG_DEBUG_FS=y
856# CONFIG_HEADERS_CHECK is not set 861# CONFIG_HEADERS_CHECK is not set
@@ -865,6 +870,7 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
865CONFIG_TRACING_SUPPORT=y 870CONFIG_TRACING_SUPPORT=y
866# CONFIG_FTRACE is not set 871# CONFIG_FTRACE is not set
867# CONFIG_DYNAMIC_DEBUG is not set 872# CONFIG_DYNAMIC_DEBUG is not set
873# CONFIG_DMA_API_DEBUG is not set
868# CONFIG_SAMPLES is not set 874# CONFIG_SAMPLES is not set
869CONFIG_HAVE_ARCH_KGDB=y 875CONFIG_HAVE_ARCH_KGDB=y
870# CONFIG_PPC_DISABLE_WERROR is not set 876# CONFIG_PPC_DISABLE_WERROR is not set
@@ -887,7 +893,6 @@ CONFIG_CRYPTO=y
887# 893#
888# Crypto core or helper 894# Crypto core or helper
889# 895#
890# CONFIG_CRYPTO_FIPS is not set
891# CONFIG_CRYPTO_MANAGER is not set 896# CONFIG_CRYPTO_MANAGER is not set
892# CONFIG_CRYPTO_MANAGER2 is not set 897# CONFIG_CRYPTO_MANAGER2 is not set
893# CONFIG_CRYPTO_GF128MUL is not set 898# CONFIG_CRYPTO_GF128MUL is not set
@@ -918,11 +923,13 @@ CONFIG_CRYPTO=y
918# 923#
919# CONFIG_CRYPTO_HMAC is not set 924# CONFIG_CRYPTO_HMAC is not set
920# CONFIG_CRYPTO_XCBC is not set 925# CONFIG_CRYPTO_XCBC is not set
926# CONFIG_CRYPTO_VMAC is not set
921 927
922# 928#
923# Digest 929# Digest
924# 930#
925# CONFIG_CRYPTO_CRC32C is not set 931# CONFIG_CRYPTO_CRC32C is not set
932# CONFIG_CRYPTO_GHASH is not set
926# CONFIG_CRYPTO_MD4 is not set 933# CONFIG_CRYPTO_MD4 is not set
927# CONFIG_CRYPTO_MD5 is not set 934# CONFIG_CRYPTO_MD5 is not set
928# CONFIG_CRYPTO_MICHAEL_MIC is not set 935# CONFIG_CRYPTO_MICHAEL_MIC is not set
diff --git a/arch/powerpc/configs/mpc7448_hpc2_defconfig b/arch/powerpc/configs/mpc7448_hpc2_defconfig
index f23428c3b34e..d8b364a45944 100644
--- a/arch/powerpc/configs/mpc7448_hpc2_defconfig
+++ b/arch/powerpc/configs/mpc7448_hpc2_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.31-rc4 3# Linux kernel version: 2.6.32-rc5
4# Wed Jul 29 23:31:53 2009 4# Thu Nov 5 08:20:10 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -34,6 +34,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
34CONFIG_GENERIC_HARDIRQS=y 34CONFIG_GENERIC_HARDIRQS=y
35CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 35CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
37# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
37CONFIG_IRQ_PER_CPU=y 38CONFIG_IRQ_PER_CPU=y
38CONFIG_STACKTRACE_SUPPORT=y 39CONFIG_STACKTRACE_SUPPORT=y
39CONFIG_HAVE_LATENCYTOP_SUPPORT=y 40CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -82,11 +83,12 @@ CONFIG_SYSVIPC_SYSCTL=y
82# 83#
83# RCU Subsystem 84# RCU Subsystem
84# 85#
85CONFIG_CLASSIC_RCU=y 86CONFIG_TREE_RCU=y
86# CONFIG_TREE_RCU is not set 87# CONFIG_TREE_PREEMPT_RCU is not set
87# CONFIG_PREEMPT_RCU is not set 88# CONFIG_RCU_TRACE is not set
89CONFIG_RCU_FANOUT=32
90# CONFIG_RCU_FANOUT_EXACT is not set
88# CONFIG_TREE_RCU_TRACE is not set 91# CONFIG_TREE_RCU_TRACE is not set
89# CONFIG_PREEMPT_RCU_TRACE is not set
90# CONFIG_IKCONFIG is not set 92# CONFIG_IKCONFIG is not set
91CONFIG_LOG_BUF_SHIFT=14 93CONFIG_LOG_BUF_SHIFT=14
92CONFIG_GROUP_SCHED=y 94CONFIG_GROUP_SCHED=y
@@ -123,28 +125,29 @@ CONFIG_TIMERFD=y
123CONFIG_EVENTFD=y 125CONFIG_EVENTFD=y
124CONFIG_SHMEM=y 126CONFIG_SHMEM=y
125CONFIG_AIO=y 127CONFIG_AIO=y
126CONFIG_HAVE_PERF_COUNTERS=y 128CONFIG_HAVE_PERF_EVENTS=y
127 129
128# 130#
129# Performance Counters 131# Kernel Performance Events And Counters
130# 132#
133# CONFIG_PERF_EVENTS is not set
131# CONFIG_PERF_COUNTERS is not set 134# CONFIG_PERF_COUNTERS is not set
132CONFIG_VM_EVENT_COUNTERS=y 135CONFIG_VM_EVENT_COUNTERS=y
133CONFIG_PCI_QUIRKS=y 136CONFIG_PCI_QUIRKS=y
134CONFIG_SLUB_DEBUG=y 137CONFIG_SLUB_DEBUG=y
135# CONFIG_STRIP_ASM_SYMS is not set
136CONFIG_COMPAT_BRK=y 138CONFIG_COMPAT_BRK=y
137# CONFIG_SLAB is not set 139# CONFIG_SLAB is not set
138CONFIG_SLUB=y 140CONFIG_SLUB=y
139# CONFIG_SLOB is not set 141# CONFIG_SLOB is not set
140# CONFIG_PROFILING is not set 142# CONFIG_PROFILING is not set
141# CONFIG_MARKERS is not set
142CONFIG_HAVE_OPROFILE=y 143CONFIG_HAVE_OPROFILE=y
143CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 144CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
144CONFIG_HAVE_IOREMAP_PROT=y 145CONFIG_HAVE_IOREMAP_PROT=y
145CONFIG_HAVE_KPROBES=y 146CONFIG_HAVE_KPROBES=y
146CONFIG_HAVE_KRETPROBES=y 147CONFIG_HAVE_KRETPROBES=y
147CONFIG_HAVE_ARCH_TRACEHOOK=y 148CONFIG_HAVE_ARCH_TRACEHOOK=y
149CONFIG_HAVE_DMA_ATTRS=y
150CONFIG_HAVE_DMA_API_DEBUG=y
148 151
149# 152#
150# GCOV-based kernel profiling 153# GCOV-based kernel profiling
@@ -241,6 +244,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
241CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 244CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
242# CONFIG_KEXEC is not set 245# CONFIG_KEXEC is not set
243# CONFIG_CRASH_DUMP is not set 246# CONFIG_CRASH_DUMP is not set
247CONFIG_MAX_ACTIVE_REGIONS=32
244CONFIG_ARCH_FLATMEM_ENABLE=y 248CONFIG_ARCH_FLATMEM_ENABLE=y
245CONFIG_ARCH_POPULATES_NODE_MAP=y 249CONFIG_ARCH_POPULATES_NODE_MAP=y
246CONFIG_SELECT_MEMORY_MODEL=y 250CONFIG_SELECT_MEMORY_MODEL=y
@@ -258,6 +262,7 @@ CONFIG_BOUNCE=y
258CONFIG_VIRT_TO_BUS=y 262CONFIG_VIRT_TO_BUS=y
259CONFIG_HAVE_MLOCK=y 263CONFIG_HAVE_MLOCK=y
260CONFIG_HAVE_MLOCKED_PAGE_BIT=y 264CONFIG_HAVE_MLOCKED_PAGE_BIT=y
265# CONFIG_KSM is not set
261CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 266CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
262CONFIG_PPC_4K_PAGES=y 267CONFIG_PPC_4K_PAGES=y
263# CONFIG_PPC_16K_PAGES is not set 268# CONFIG_PPC_16K_PAGES is not set
@@ -350,6 +355,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
350# CONFIG_NETFILTER is not set 355# CONFIG_NETFILTER is not set
351# CONFIG_IP_DCCP is not set 356# CONFIG_IP_DCCP is not set
352# CONFIG_IP_SCTP is not set 357# CONFIG_IP_SCTP is not set
358# CONFIG_RDS is not set
353# CONFIG_TIPC is not set 359# CONFIG_TIPC is not set
354# CONFIG_ATM is not set 360# CONFIG_ATM is not set
355# CONFIG_BRIDGE is not set 361# CONFIG_BRIDGE is not set
@@ -379,6 +385,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
379# CONFIG_AF_RXRPC is not set 385# CONFIG_AF_RXRPC is not set
380CONFIG_WIRELESS=y 386CONFIG_WIRELESS=y
381# CONFIG_CFG80211 is not set 387# CONFIG_CFG80211 is not set
388CONFIG_CFG80211_DEFAULT_PS_VALUE=0
382CONFIG_WIRELESS_OLD_REGULATORY=y 389CONFIG_WIRELESS_OLD_REGULATORY=y
383# CONFIG_WIRELESS_EXT is not set 390# CONFIG_WIRELESS_EXT is not set
384# CONFIG_LIB80211 is not set 391# CONFIG_LIB80211 is not set
@@ -386,7 +393,6 @@ CONFIG_WIRELESS_OLD_REGULATORY=y
386# 393#
387# CFG80211 needs to be enabled for MAC80211 394# CFG80211 needs to be enabled for MAC80211
388# 395#
389CONFIG_MAC80211_DEFAULT_PS_VALUE=0
390# CONFIG_WIMAX is not set 396# CONFIG_WIMAX is not set
391# CONFIG_RFKILL is not set 397# CONFIG_RFKILL is not set
392# CONFIG_NET_9P is not set 398# CONFIG_NET_9P is not set
@@ -399,6 +405,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
399# Generic Driver Options 405# Generic Driver Options
400# 406#
401CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 407CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
408# CONFIG_DEVTMPFS is not set
402CONFIG_STANDALONE=y 409CONFIG_STANDALONE=y
403CONFIG_PREVENT_FIRMWARE_BUILD=y 410CONFIG_PREVENT_FIRMWARE_BUILD=y
404# CONFIG_FW_LOADER is not set 411# CONFIG_FW_LOADER is not set
@@ -478,6 +485,7 @@ CONFIG_SCSI_LOWLEVEL=y
478# CONFIG_ISCSI_TCP is not set 485# CONFIG_ISCSI_TCP is not set
479# CONFIG_SCSI_CXGB3_ISCSI is not set 486# CONFIG_SCSI_CXGB3_ISCSI is not set
480# CONFIG_SCSI_BNX2_ISCSI is not set 487# CONFIG_SCSI_BNX2_ISCSI is not set
488# CONFIG_BE2ISCSI is not set
481# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 489# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
482# CONFIG_SCSI_3W_9XXX is not set 490# CONFIG_SCSI_3W_9XXX is not set
483# CONFIG_SCSI_ACARD is not set 491# CONFIG_SCSI_ACARD is not set
@@ -517,11 +525,14 @@ CONFIG_SCSI_LOWLEVEL=y
517# CONFIG_SCSI_DC390T is not set 525# CONFIG_SCSI_DC390T is not set
518# CONFIG_SCSI_NSP32 is not set 526# CONFIG_SCSI_NSP32 is not set
519# CONFIG_SCSI_DEBUG is not set 527# CONFIG_SCSI_DEBUG is not set
528# CONFIG_SCSI_PMCRAID is not set
520# CONFIG_SCSI_SRP is not set 529# CONFIG_SCSI_SRP is not set
530# CONFIG_SCSI_BFA_FC is not set
521# CONFIG_SCSI_DH is not set 531# CONFIG_SCSI_DH is not set
522# CONFIG_SCSI_OSD_INITIATOR is not set 532# CONFIG_SCSI_OSD_INITIATOR is not set
523CONFIG_ATA=y 533CONFIG_ATA=y
524# CONFIG_ATA_NONSTANDARD is not set 534# CONFIG_ATA_NONSTANDARD is not set
535CONFIG_ATA_VERBOSE_ERROR=y
525CONFIG_SATA_PMP=y 536CONFIG_SATA_PMP=y
526# CONFIG_SATA_AHCI is not set 537# CONFIG_SATA_AHCI is not set
527# CONFIG_SATA_SIL24 is not set 538# CONFIG_SATA_SIL24 is not set
@@ -543,6 +554,7 @@ CONFIG_SATA_MV=y
543# CONFIG_PATA_ALI is not set 554# CONFIG_PATA_ALI is not set
544# CONFIG_PATA_AMD is not set 555# CONFIG_PATA_AMD is not set
545# CONFIG_PATA_ARTOP is not set 556# CONFIG_PATA_ARTOP is not set
557# CONFIG_PATA_ATP867X is not set
546# CONFIG_PATA_ATIIXP is not set 558# CONFIG_PATA_ATIIXP is not set
547# CONFIG_PATA_CMD640_PCI is not set 559# CONFIG_PATA_CMD640_PCI is not set
548# CONFIG_PATA_CMD64X is not set 560# CONFIG_PATA_CMD64X is not set
@@ -570,6 +582,7 @@ CONFIG_SATA_MV=y
570# CONFIG_PATA_OPTIDMA is not set 582# CONFIG_PATA_OPTIDMA is not set
571# CONFIG_PATA_PDC_OLD is not set 583# CONFIG_PATA_PDC_OLD is not set
572# CONFIG_PATA_RADISYS is not set 584# CONFIG_PATA_RADISYS is not set
585# CONFIG_PATA_RDC is not set
573# CONFIG_PATA_RZ1000 is not set 586# CONFIG_PATA_RZ1000 is not set
574# CONFIG_PATA_SC1200 is not set 587# CONFIG_PATA_SC1200 is not set
575# CONFIG_PATA_SERVERWORKS is not set 588# CONFIG_PATA_SERVERWORKS is not set
@@ -666,9 +679,11 @@ CONFIG_8139TOO=y
666# CONFIG_SUNDANCE is not set 679# CONFIG_SUNDANCE is not set
667# CONFIG_TLAN is not set 680# CONFIG_TLAN is not set
668# CONFIG_KS8842 is not set 681# CONFIG_KS8842 is not set
682# CONFIG_KS8851_MLL is not set
669# CONFIG_VIA_RHINE is not set 683# CONFIG_VIA_RHINE is not set
670# CONFIG_SC92031 is not set 684# CONFIG_SC92031 is not set
671# CONFIG_ATL2 is not set 685# CONFIG_ATL2 is not set
686# CONFIG_XILINX_EMACLITE is not set
672CONFIG_NETDEV_1000=y 687CONFIG_NETDEV_1000=y
673# CONFIG_ACENIC is not set 688# CONFIG_ACENIC is not set
674# CONFIG_DL2K is not set 689# CONFIG_DL2K is not set
@@ -715,10 +730,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
715# CONFIG_SFC is not set 730# CONFIG_SFC is not set
716# CONFIG_BE2NET is not set 731# CONFIG_BE2NET is not set
717# CONFIG_TR is not set 732# CONFIG_TR is not set
718 733CONFIG_WLAN=y
719#
720# Wireless LAN
721#
722# CONFIG_WLAN_PRE80211 is not set 734# CONFIG_WLAN_PRE80211 is not set
723# CONFIG_WLAN_80211 is not set 735# CONFIG_WLAN_80211 is not set
724 736
@@ -822,6 +834,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
822# CONFIG_POWER_SUPPLY is not set 834# CONFIG_POWER_SUPPLY is not set
823CONFIG_HWMON=y 835CONFIG_HWMON=y
824# CONFIG_HWMON_VID is not set 836# CONFIG_HWMON_VID is not set
837# CONFIG_HWMON_DEBUG_CHIP is not set
838
839#
840# Native drivers
841#
825# CONFIG_SENSORS_I5K_AMB is not set 842# CONFIG_SENSORS_I5K_AMB is not set
826# CONFIG_SENSORS_F71805F is not set 843# CONFIG_SENSORS_F71805F is not set
827# CONFIG_SENSORS_F71882FG is not set 844# CONFIG_SENSORS_F71882FG is not set
@@ -836,9 +853,7 @@ CONFIG_HWMON=y
836# CONFIG_SENSORS_VT8231 is not set 853# CONFIG_SENSORS_VT8231 is not set
837# CONFIG_SENSORS_W83627HF is not set 854# CONFIG_SENSORS_W83627HF is not set
838# CONFIG_SENSORS_W83627EHF is not set 855# CONFIG_SENSORS_W83627EHF is not set
839# CONFIG_HWMON_DEBUG_CHIP is not set
840# CONFIG_THERMAL is not set 856# CONFIG_THERMAL is not set
841# CONFIG_THERMAL_HWMON is not set
842# CONFIG_WATCHDOG is not set 857# CONFIG_WATCHDOG is not set
843CONFIG_SSB_POSSIBLE=y 858CONFIG_SSB_POSSIBLE=y
844 859
@@ -861,6 +876,7 @@ CONFIG_SSB_POSSIBLE=y
861# Graphics support 876# Graphics support
862# 877#
863# CONFIG_AGP is not set 878# CONFIG_AGP is not set
879CONFIG_VGA_ARB=y
864# CONFIG_DRM is not set 880# CONFIG_DRM is not set
865# CONFIG_VGASTATE is not set 881# CONFIG_VGASTATE is not set
866CONFIG_VIDEO_OUTPUT_CONTROL=y 882CONFIG_VIDEO_OUTPUT_CONTROL=y
@@ -874,7 +890,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y
874# CONFIG_SOUND is not set 890# CONFIG_SOUND is not set
875CONFIG_HID_SUPPORT=y 891CONFIG_HID_SUPPORT=y
876CONFIG_HID=y 892CONFIG_HID=y
877# CONFIG_HID_DEBUG is not set
878# CONFIG_HIDRAW is not set 893# CONFIG_HIDRAW is not set
879# CONFIG_HID_PID is not set 894# CONFIG_HID_PID is not set
880 895
@@ -939,6 +954,7 @@ CONFIG_FS_MBCACHE=y
939# CONFIG_GFS2_FS is not set 954# CONFIG_GFS2_FS is not set
940# CONFIG_OCFS2_FS is not set 955# CONFIG_OCFS2_FS is not set
941# CONFIG_BTRFS_FS is not set 956# CONFIG_BTRFS_FS is not set
957# CONFIG_NILFS2_FS is not set
942CONFIG_FILE_LOCKING=y 958CONFIG_FILE_LOCKING=y
943CONFIG_FSNOTIFY=y 959CONFIG_FSNOTIFY=y
944CONFIG_DNOTIFY=y 960CONFIG_DNOTIFY=y
@@ -997,7 +1013,6 @@ CONFIG_MISC_FILESYSTEMS=y
997# CONFIG_ROMFS_FS is not set 1013# CONFIG_ROMFS_FS is not set
998# CONFIG_SYSV_FS is not set 1014# CONFIG_SYSV_FS is not set
999# CONFIG_UFS_FS is not set 1015# CONFIG_UFS_FS is not set
1000# CONFIG_NILFS2_FS is not set
1001CONFIG_NETWORK_FILESYSTEMS=y 1016CONFIG_NETWORK_FILESYSTEMS=y
1002CONFIG_NFS_FS=y 1017CONFIG_NFS_FS=y
1003# CONFIG_NFS_V3 is not set 1018# CONFIG_NFS_V3 is not set
@@ -1069,6 +1084,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
1069CONFIG_ENABLE_MUST_CHECK=y 1084CONFIG_ENABLE_MUST_CHECK=y
1070CONFIG_FRAME_WARN=1024 1085CONFIG_FRAME_WARN=1024
1071# CONFIG_MAGIC_SYSRQ is not set 1086# CONFIG_MAGIC_SYSRQ is not set
1087# CONFIG_STRIP_ASM_SYMS is not set
1072# CONFIG_UNUSED_SYMBOLS is not set 1088# CONFIG_UNUSED_SYMBOLS is not set
1073# CONFIG_DEBUG_FS is not set 1089# CONFIG_DEBUG_FS is not set
1074# CONFIG_HEADERS_CHECK is not set 1090# CONFIG_HEADERS_CHECK is not set
@@ -1086,6 +1102,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
1086CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1102CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1087CONFIG_TRACING_SUPPORT=y 1103CONFIG_TRACING_SUPPORT=y
1088# CONFIG_FTRACE is not set 1104# CONFIG_FTRACE is not set
1105# CONFIG_DMA_API_DEBUG is not set
1089# CONFIG_SAMPLES is not set 1106# CONFIG_SAMPLES is not set
1090CONFIG_HAVE_ARCH_KGDB=y 1107CONFIG_HAVE_ARCH_KGDB=y
1091# CONFIG_PPC_DISABLE_WERROR is not set 1108# CONFIG_PPC_DISABLE_WERROR is not set
@@ -1107,7 +1124,6 @@ CONFIG_CRYPTO=y
1107# 1124#
1108# Crypto core or helper 1125# Crypto core or helper
1109# 1126#
1110# CONFIG_CRYPTO_FIPS is not set
1111# CONFIG_CRYPTO_MANAGER is not set 1127# CONFIG_CRYPTO_MANAGER is not set
1112# CONFIG_CRYPTO_MANAGER2 is not set 1128# CONFIG_CRYPTO_MANAGER2 is not set
1113# CONFIG_CRYPTO_GF128MUL is not set 1129# CONFIG_CRYPTO_GF128MUL is not set
@@ -1138,11 +1154,13 @@ CONFIG_CRYPTO=y
1138# 1154#
1139# CONFIG_CRYPTO_HMAC is not set 1155# CONFIG_CRYPTO_HMAC is not set
1140# CONFIG_CRYPTO_XCBC is not set 1156# CONFIG_CRYPTO_XCBC is not set
1157# CONFIG_CRYPTO_VMAC is not set
1141 1158
1142# 1159#
1143# Digest 1160# Digest
1144# 1161#
1145# CONFIG_CRYPTO_CRC32C is not set 1162# CONFIG_CRYPTO_CRC32C is not set
1163# CONFIG_CRYPTO_GHASH is not set
1146# CONFIG_CRYPTO_MD4 is not set 1164# CONFIG_CRYPTO_MD4 is not set
1147# CONFIG_CRYPTO_MD5 is not set 1165# CONFIG_CRYPTO_MD5 is not set
1148# CONFIG_CRYPTO_MICHAEL_MIC is not set 1166# CONFIG_CRYPTO_MICHAEL_MIC is not set
diff --git a/arch/powerpc/configs/mpc8272_ads_defconfig b/arch/powerpc/configs/mpc8272_ads_defconfig
index 02716f72db6f..00fad81b6fce 100644
--- a/arch/powerpc/configs/mpc8272_ads_defconfig
+++ b/arch/powerpc/configs/mpc8272_ads_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.31-rc4 3# Linux kernel version: 2.6.32-rc5
4# Wed Jul 29 23:31:54 2009 4# Thu Nov 5 08:20:11 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -34,6 +34,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
34CONFIG_GENERIC_HARDIRQS=y 34CONFIG_GENERIC_HARDIRQS=y
35CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 35CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
37# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
37CONFIG_IRQ_PER_CPU=y 38CONFIG_IRQ_PER_CPU=y
38CONFIG_STACKTRACE_SUPPORT=y 39CONFIG_STACKTRACE_SUPPORT=y
39CONFIG_HAVE_LATENCYTOP_SUPPORT=y 40CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -82,11 +83,12 @@ CONFIG_SYSVIPC_SYSCTL=y
82# 83#
83# RCU Subsystem 84# RCU Subsystem
84# 85#
85CONFIG_CLASSIC_RCU=y 86CONFIG_TREE_RCU=y
86# CONFIG_TREE_RCU is not set 87# CONFIG_TREE_PREEMPT_RCU is not set
87# CONFIG_PREEMPT_RCU is not set 88# CONFIG_RCU_TRACE is not set
89CONFIG_RCU_FANOUT=32
90# CONFIG_RCU_FANOUT_EXACT is not set
88# CONFIG_TREE_RCU_TRACE is not set 91# CONFIG_TREE_RCU_TRACE is not set
89# CONFIG_PREEMPT_RCU_TRACE is not set
90CONFIG_IKCONFIG=y 92CONFIG_IKCONFIG=y
91CONFIG_IKCONFIG_PROC=y 93CONFIG_IKCONFIG_PROC=y
92CONFIG_LOG_BUF_SHIFT=14 94CONFIG_LOG_BUF_SHIFT=14
@@ -116,29 +118,30 @@ CONFIG_TIMERFD=y
116CONFIG_EVENTFD=y 118CONFIG_EVENTFD=y
117CONFIG_SHMEM=y 119CONFIG_SHMEM=y
118CONFIG_AIO=y 120CONFIG_AIO=y
119CONFIG_HAVE_PERF_COUNTERS=y 121CONFIG_HAVE_PERF_EVENTS=y
120 122
121# 123#
122# Performance Counters 124# Kernel Performance Events And Counters
123# 125#
126# CONFIG_PERF_EVENTS is not set
124# CONFIG_PERF_COUNTERS is not set 127# CONFIG_PERF_COUNTERS is not set
125CONFIG_VM_EVENT_COUNTERS=y 128CONFIG_VM_EVENT_COUNTERS=y
126CONFIG_PCI_QUIRKS=y 129CONFIG_PCI_QUIRKS=y
127CONFIG_SLUB_DEBUG=y 130CONFIG_SLUB_DEBUG=y
128# CONFIG_STRIP_ASM_SYMS is not set
129CONFIG_COMPAT_BRK=y 131CONFIG_COMPAT_BRK=y
130# CONFIG_SLAB is not set 132# CONFIG_SLAB is not set
131CONFIG_SLUB=y 133CONFIG_SLUB=y
132# CONFIG_SLOB is not set 134# CONFIG_SLOB is not set
133# CONFIG_PROFILING is not set 135# CONFIG_PROFILING is not set
134# CONFIG_MARKERS is not set
135CONFIG_HAVE_OPROFILE=y 136CONFIG_HAVE_OPROFILE=y
136CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 137CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
137CONFIG_HAVE_IOREMAP_PROT=y 138CONFIG_HAVE_IOREMAP_PROT=y
138CONFIG_HAVE_KPROBES=y 139CONFIG_HAVE_KPROBES=y
139CONFIG_HAVE_KRETPROBES=y 140CONFIG_HAVE_KRETPROBES=y
140CONFIG_HAVE_ARCH_TRACEHOOK=y 141CONFIG_HAVE_ARCH_TRACEHOOK=y
142CONFIG_HAVE_DMA_ATTRS=y
141CONFIG_HAVE_CLK=y 143CONFIG_HAVE_CLK=y
144CONFIG_HAVE_DMA_API_DEBUG=y
142 145
143# 146#
144# GCOV-based kernel profiling 147# GCOV-based kernel profiling
@@ -151,6 +154,7 @@ CONFIG_BASE_SMALL=0
151# CONFIG_MODULES is not set 154# CONFIG_MODULES is not set
152CONFIG_BLOCK=y 155CONFIG_BLOCK=y
153CONFIG_LBDAF=y 156CONFIG_LBDAF=y
157CONFIG_BLK_DEV_BSG=y
154# CONFIG_BLK_DEV_INTEGRITY is not set 158# CONFIG_BLK_DEV_INTEGRITY is not set
155 159
156# 160#
@@ -236,6 +240,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
236CONFIG_ARCH_HAS_WALK_MEMORY=y 240CONFIG_ARCH_HAS_WALK_MEMORY=y
237CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 241CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
238# CONFIG_CRASH_DUMP is not set 242# CONFIG_CRASH_DUMP is not set
243CONFIG_MAX_ACTIVE_REGIONS=32
239CONFIG_ARCH_FLATMEM_ENABLE=y 244CONFIG_ARCH_FLATMEM_ENABLE=y
240CONFIG_ARCH_POPULATES_NODE_MAP=y 245CONFIG_ARCH_POPULATES_NODE_MAP=y
241CONFIG_FLATMEM=y 246CONFIG_FLATMEM=y
@@ -249,6 +254,7 @@ CONFIG_BOUNCE=y
249CONFIG_VIRT_TO_BUS=y 254CONFIG_VIRT_TO_BUS=y
250CONFIG_HAVE_MLOCK=y 255CONFIG_HAVE_MLOCK=y
251CONFIG_HAVE_MLOCKED_PAGE_BIT=y 256CONFIG_HAVE_MLOCKED_PAGE_BIT=y
257# CONFIG_KSM is not set
252CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 258CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
253CONFIG_PPC_4K_PAGES=y 259CONFIG_PPC_4K_PAGES=y
254# CONFIG_PPC_16K_PAGES is not set 260# CONFIG_PPC_16K_PAGES is not set
@@ -397,6 +403,7 @@ CONFIG_NETFILTER_ADVANCED=y
397# CONFIG_BT is not set 403# CONFIG_BT is not set
398CONFIG_WIRELESS=y 404CONFIG_WIRELESS=y
399# CONFIG_CFG80211 is not set 405# CONFIG_CFG80211 is not set
406CONFIG_CFG80211_DEFAULT_PS_VALUE=0
400CONFIG_WIRELESS_OLD_REGULATORY=y 407CONFIG_WIRELESS_OLD_REGULATORY=y
401# CONFIG_WIRELESS_EXT is not set 408# CONFIG_WIRELESS_EXT is not set
402# CONFIG_LIB80211 is not set 409# CONFIG_LIB80211 is not set
@@ -404,7 +411,6 @@ CONFIG_WIRELESS_OLD_REGULATORY=y
404# 411#
405# CFG80211 needs to be enabled for MAC80211 412# CFG80211 needs to be enabled for MAC80211
406# 413#
407CONFIG_MAC80211_DEFAULT_PS_VALUE=0
408# CONFIG_WIMAX is not set 414# CONFIG_WIMAX is not set
409# CONFIG_RFKILL is not set 415# CONFIG_RFKILL is not set
410 416
@@ -416,6 +422,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
416# Generic Driver Options 422# Generic Driver Options
417# 423#
418CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 424CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
425# CONFIG_DEVTMPFS is not set
419CONFIG_STANDALONE=y 426CONFIG_STANDALONE=y
420CONFIG_PREVENT_FIRMWARE_BUILD=y 427CONFIG_PREVENT_FIRMWARE_BUILD=y
421# CONFIG_FW_LOADER is not set 428# CONFIG_FW_LOADER is not set
@@ -477,7 +484,6 @@ CONFIG_MTD_CFI_UTIL=y
477# CONFIG_MTD_COMPLEX_MAPPINGS is not set 484# CONFIG_MTD_COMPLEX_MAPPINGS is not set
478# CONFIG_MTD_PHYSMAP is not set 485# CONFIG_MTD_PHYSMAP is not set
479CONFIG_MTD_PHYSMAP_OF=y 486CONFIG_MTD_PHYSMAP_OF=y
480# CONFIG_MTD_SBC8240 is not set
481# CONFIG_MTD_INTEL_VR_NOR is not set 487# CONFIG_MTD_INTEL_VR_NOR is not set
482# CONFIG_MTD_PLATRAM is not set 488# CONFIG_MTD_PLATRAM is not set
483 489
@@ -604,7 +610,9 @@ CONFIG_MII=y
604# CONFIG_NET_PCI is not set 610# CONFIG_NET_PCI is not set
605# CONFIG_B44 is not set 611# CONFIG_B44 is not set
606# CONFIG_KS8842 is not set 612# CONFIG_KS8842 is not set
613# CONFIG_KS8851_MLL is not set
607# CONFIG_ATL2 is not set 614# CONFIG_ATL2 is not set
615# CONFIG_XILINX_EMACLITE is not set
608CONFIG_FS_ENET=y 616CONFIG_FS_ENET=y
609# CONFIG_FS_ENET_HAS_SCC is not set 617# CONFIG_FS_ENET_HAS_SCC is not set
610CONFIG_FS_ENET_HAS_FCC=y 618CONFIG_FS_ENET_HAS_FCC=y
@@ -652,10 +660,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
652# CONFIG_SFC is not set 660# CONFIG_SFC is not set
653# CONFIG_BE2NET is not set 661# CONFIG_BE2NET is not set
654# CONFIG_TR is not set 662# CONFIG_TR is not set
655 663CONFIG_WLAN=y
656#
657# Wireless LAN
658#
659# CONFIG_WLAN_PRE80211 is not set 664# CONFIG_WLAN_PRE80211 is not set
660# CONFIG_WLAN_80211 is not set 665# CONFIG_WLAN_80211 is not set
661 666
@@ -704,6 +709,7 @@ CONFIG_KEYBOARD_ATKBD=y
704# CONFIG_KEYBOARD_GPIO is not set 709# CONFIG_KEYBOARD_GPIO is not set
705# CONFIG_KEYBOARD_MATRIX is not set 710# CONFIG_KEYBOARD_MATRIX is not set
706# CONFIG_KEYBOARD_NEWTON is not set 711# CONFIG_KEYBOARD_NEWTON is not set
712# CONFIG_KEYBOARD_OPENCORES is not set
707# CONFIG_KEYBOARD_STOWAWAY is not set 713# CONFIG_KEYBOARD_STOWAWAY is not set
708# CONFIG_KEYBOARD_SUNKBD is not set 714# CONFIG_KEYBOARD_SUNKBD is not set
709# CONFIG_KEYBOARD_XTKBD is not set 715# CONFIG_KEYBOARD_XTKBD is not set
@@ -714,6 +720,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y
714CONFIG_MOUSE_PS2_SYNAPTICS=y 720CONFIG_MOUSE_PS2_SYNAPTICS=y
715CONFIG_MOUSE_PS2_TRACKPOINT=y 721CONFIG_MOUSE_PS2_TRACKPOINT=y
716# CONFIG_MOUSE_PS2_ELANTECH is not set 722# CONFIG_MOUSE_PS2_ELANTECH is not set
723# CONFIG_MOUSE_PS2_SENTELIC is not set
717# CONFIG_MOUSE_PS2_TOUCHKIT is not set 724# CONFIG_MOUSE_PS2_TOUCHKIT is not set
718# CONFIG_MOUSE_SERIAL is not set 725# CONFIG_MOUSE_SERIAL is not set
719# CONFIG_MOUSE_VSXXXAA is not set 726# CONFIG_MOUSE_VSXXXAA is not set
@@ -793,15 +800,19 @@ CONFIG_GPIOLIB=y
793# PCI GPIO expanders: 800# PCI GPIO expanders:
794# 801#
795# CONFIG_GPIO_BT8XX is not set 802# CONFIG_GPIO_BT8XX is not set
803# CONFIG_GPIO_LANGWELL is not set
796 804
797# 805#
798# SPI GPIO expanders: 806# SPI GPIO expanders:
799# 807#
808
809#
810# AC97 GPIO expanders:
811#
800# CONFIG_W1 is not set 812# CONFIG_W1 is not set
801# CONFIG_POWER_SUPPLY is not set 813# CONFIG_POWER_SUPPLY is not set
802# CONFIG_HWMON is not set 814# CONFIG_HWMON is not set
803# CONFIG_THERMAL is not set 815# CONFIG_THERMAL is not set
804# CONFIG_THERMAL_HWMON is not set
805# CONFIG_WATCHDOG is not set 816# CONFIG_WATCHDOG is not set
806CONFIG_SSB_POSSIBLE=y 817CONFIG_SSB_POSSIBLE=y
807 818
@@ -824,6 +835,7 @@ CONFIG_SSB_POSSIBLE=y
824# Graphics support 835# Graphics support
825# 836#
826# CONFIG_AGP is not set 837# CONFIG_AGP is not set
838CONFIG_VGA_ARB=y
827# CONFIG_DRM is not set 839# CONFIG_DRM is not set
828# CONFIG_VGASTATE is not set 840# CONFIG_VGASTATE is not set
829# CONFIG_VIDEO_OUTPUT_CONTROL is not set 841# CONFIG_VIDEO_OUTPUT_CONTROL is not set
@@ -1032,6 +1044,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
1032CONFIG_ENABLE_MUST_CHECK=y 1044CONFIG_ENABLE_MUST_CHECK=y
1033CONFIG_FRAME_WARN=1024 1045CONFIG_FRAME_WARN=1024
1034CONFIG_MAGIC_SYSRQ=y 1046CONFIG_MAGIC_SYSRQ=y
1047# CONFIG_STRIP_ASM_SYMS is not set
1035# CONFIG_UNUSED_SYMBOLS is not set 1048# CONFIG_UNUSED_SYMBOLS is not set
1036# CONFIG_DEBUG_FS is not set 1049# CONFIG_DEBUG_FS is not set
1037# CONFIG_HEADERS_CHECK is not set 1050# CONFIG_HEADERS_CHECK is not set
@@ -1067,10 +1080,12 @@ CONFIG_DEBUG_INFO=y
1067# CONFIG_DEBUG_LIST is not set 1080# CONFIG_DEBUG_LIST is not set
1068# CONFIG_DEBUG_SG is not set 1081# CONFIG_DEBUG_SG is not set
1069# CONFIG_DEBUG_NOTIFIERS is not set 1082# CONFIG_DEBUG_NOTIFIERS is not set
1083# CONFIG_DEBUG_CREDENTIALS is not set
1070# CONFIG_RCU_TORTURE_TEST is not set 1084# CONFIG_RCU_TORTURE_TEST is not set
1071# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1085# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1072# CONFIG_BACKTRACE_SELF_TEST is not set 1086# CONFIG_BACKTRACE_SELF_TEST is not set
1073# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 1087# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1088# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
1074# CONFIG_FAULT_INJECTION is not set 1089# CONFIG_FAULT_INJECTION is not set
1075# CONFIG_LATENCYTOP is not set 1090# CONFIG_LATENCYTOP is not set
1076CONFIG_SYSCTL_SYSCALL_CHECK=y 1091CONFIG_SYSCTL_SYSCALL_CHECK=y
@@ -1093,6 +1108,7 @@ CONFIG_BRANCH_PROFILE_NONE=y
1093# CONFIG_KMEMTRACE is not set 1108# CONFIG_KMEMTRACE is not set
1094# CONFIG_WORKQUEUE_TRACER is not set 1109# CONFIG_WORKQUEUE_TRACER is not set
1095# CONFIG_BLK_DEV_IO_TRACE is not set 1110# CONFIG_BLK_DEV_IO_TRACE is not set
1111# CONFIG_DMA_API_DEBUG is not set
1096# CONFIG_SAMPLES is not set 1112# CONFIG_SAMPLES is not set
1097CONFIG_HAVE_ARCH_KGDB=y 1113CONFIG_HAVE_ARCH_KGDB=y
1098# CONFIG_PPC_DISABLE_WERROR is not set 1114# CONFIG_PPC_DISABLE_WERROR is not set
@@ -1121,7 +1137,6 @@ CONFIG_CRYPTO=y
1121# 1137#
1122# Crypto core or helper 1138# Crypto core or helper
1123# 1139#
1124# CONFIG_CRYPTO_FIPS is not set
1125CONFIG_CRYPTO_ALGAPI=y 1140CONFIG_CRYPTO_ALGAPI=y
1126CONFIG_CRYPTO_ALGAPI2=y 1141CONFIG_CRYPTO_ALGAPI2=y
1127CONFIG_CRYPTO_AEAD2=y 1142CONFIG_CRYPTO_AEAD2=y
@@ -1163,6 +1178,7 @@ CONFIG_CRYPTO_PCBC=y
1163# Digest 1178# Digest
1164# 1179#
1165# CONFIG_CRYPTO_CRC32C is not set 1180# CONFIG_CRYPTO_CRC32C is not set
1181# CONFIG_CRYPTO_GHASH is not set
1166# CONFIG_CRYPTO_MD4 is not set 1182# CONFIG_CRYPTO_MD4 is not set
1167CONFIG_CRYPTO_MD5=y 1183CONFIG_CRYPTO_MD5=y
1168# CONFIG_CRYPTO_MICHAEL_MIC is not set 1184# CONFIG_CRYPTO_MICHAEL_MIC is not set
diff --git a/arch/powerpc/configs/mpc83xx_defconfig b/arch/powerpc/configs/mpc83xx_defconfig
index 4a96cb6925b4..64dff21516cb 100644
--- a/arch/powerpc/configs/mpc83xx_defconfig
+++ b/arch/powerpc/configs/mpc83xx_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.31-rc4 3# Linux kernel version: 2.6.32-rc5
4# Wed Jul 29 23:31:55 2009 4# Thu Nov 5 08:20:12 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -35,6 +35,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
35CONFIG_GENERIC_HARDIRQS=y 35CONFIG_GENERIC_HARDIRQS=y
36CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 36CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
38CONFIG_IRQ_PER_CPU=y 39CONFIG_IRQ_PER_CPU=y
39CONFIG_STACKTRACE_SUPPORT=y 40CONFIG_STACKTRACE_SUPPORT=y
40CONFIG_HAVE_LATENCYTOP_SUPPORT=y 41CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -86,11 +87,12 @@ CONFIG_SYSVIPC_SYSCTL=y
86# 87#
87# RCU Subsystem 88# RCU Subsystem
88# 89#
89CONFIG_CLASSIC_RCU=y 90CONFIG_TREE_RCU=y
90# CONFIG_TREE_RCU is not set 91# CONFIG_TREE_PREEMPT_RCU is not set
91# CONFIG_PREEMPT_RCU is not set 92# CONFIG_RCU_TRACE is not set
93CONFIG_RCU_FANOUT=32
94# CONFIG_RCU_FANOUT_EXACT is not set
92# CONFIG_TREE_RCU_TRACE is not set 95# CONFIG_TREE_RCU_TRACE is not set
93# CONFIG_PREEMPT_RCU_TRACE is not set
94# CONFIG_IKCONFIG is not set 96# CONFIG_IKCONFIG is not set
95CONFIG_LOG_BUF_SHIFT=14 97CONFIG_LOG_BUF_SHIFT=14
96CONFIG_GROUP_SCHED=y 98CONFIG_GROUP_SCHED=y
@@ -127,21 +129,20 @@ CONFIG_TIMERFD=y
127CONFIG_EVENTFD=y 129CONFIG_EVENTFD=y
128CONFIG_SHMEM=y 130CONFIG_SHMEM=y
129CONFIG_AIO=y 131CONFIG_AIO=y
130CONFIG_HAVE_PERF_COUNTERS=y 132CONFIG_HAVE_PERF_EVENTS=y
131 133
132# 134#
133# Performance Counters 135# Kernel Performance Events And Counters
134# 136#
137# CONFIG_PERF_EVENTS is not set
135# CONFIG_PERF_COUNTERS is not set 138# CONFIG_PERF_COUNTERS is not set
136CONFIG_VM_EVENT_COUNTERS=y 139CONFIG_VM_EVENT_COUNTERS=y
137CONFIG_PCI_QUIRKS=y 140CONFIG_PCI_QUIRKS=y
138# CONFIG_STRIP_ASM_SYMS is not set
139CONFIG_COMPAT_BRK=y 141CONFIG_COMPAT_BRK=y
140CONFIG_SLAB=y 142CONFIG_SLAB=y
141# CONFIG_SLUB is not set 143# CONFIG_SLUB is not set
142# CONFIG_SLOB is not set 144# CONFIG_SLOB is not set
143# CONFIG_PROFILING is not set 145# CONFIG_PROFILING is not set
144# CONFIG_MARKERS is not set
145CONFIG_HAVE_OPROFILE=y 146CONFIG_HAVE_OPROFILE=y
146# CONFIG_KPROBES is not set 147# CONFIG_KPROBES is not set
147CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 148CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -149,6 +150,8 @@ CONFIG_HAVE_IOREMAP_PROT=y
149CONFIG_HAVE_KPROBES=y 150CONFIG_HAVE_KPROBES=y
150CONFIG_HAVE_KRETPROBES=y 151CONFIG_HAVE_KRETPROBES=y
151CONFIG_HAVE_ARCH_TRACEHOOK=y 152CONFIG_HAVE_ARCH_TRACEHOOK=y
153CONFIG_HAVE_DMA_ATTRS=y
154CONFIG_HAVE_DMA_API_DEBUG=y
152 155
153# 156#
154# GCOV-based kernel profiling 157# GCOV-based kernel profiling
@@ -263,6 +266,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
263CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 266CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
264# CONFIG_KEXEC is not set 267# CONFIG_KEXEC is not set
265# CONFIG_CRASH_DUMP is not set 268# CONFIG_CRASH_DUMP is not set
269CONFIG_MAX_ACTIVE_REGIONS=32
266CONFIG_ARCH_FLATMEM_ENABLE=y 270CONFIG_ARCH_FLATMEM_ENABLE=y
267CONFIG_ARCH_POPULATES_NODE_MAP=y 271CONFIG_ARCH_POPULATES_NODE_MAP=y
268CONFIG_SELECT_MEMORY_MODEL=y 272CONFIG_SELECT_MEMORY_MODEL=y
@@ -280,6 +284,7 @@ CONFIG_BOUNCE=y
280CONFIG_VIRT_TO_BUS=y 284CONFIG_VIRT_TO_BUS=y
281CONFIG_HAVE_MLOCK=y 285CONFIG_HAVE_MLOCK=y
282CONFIG_HAVE_MLOCKED_PAGE_BIT=y 286CONFIG_HAVE_MLOCKED_PAGE_BIT=y
287# CONFIG_KSM is not set
283CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 288CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
284CONFIG_PPC_4K_PAGES=y 289CONFIG_PPC_4K_PAGES=y
285# CONFIG_PPC_16K_PAGES is not set 290# CONFIG_PPC_16K_PAGES is not set
@@ -343,7 +348,8 @@ CONFIG_XFRM_USER=m
343# CONFIG_XFRM_SUB_POLICY is not set 348# CONFIG_XFRM_SUB_POLICY is not set
344# CONFIG_XFRM_MIGRATE is not set 349# CONFIG_XFRM_MIGRATE is not set
345# CONFIG_XFRM_STATISTICS is not set 350# CONFIG_XFRM_STATISTICS is not set
346# CONFIG_NET_KEY is not set 351CONFIG_NET_KEY=y
352# CONFIG_NET_KEY_MIGRATE is not set
347CONFIG_INET=y 353CONFIG_INET=y
348CONFIG_IP_MULTICAST=y 354CONFIG_IP_MULTICAST=y
349# CONFIG_IP_ADVANCED_ROUTER is not set 355# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -358,7 +364,7 @@ CONFIG_IP_PNP_BOOTP=y
358# CONFIG_ARPD is not set 364# CONFIG_ARPD is not set
359CONFIG_SYN_COOKIES=y 365CONFIG_SYN_COOKIES=y
360# CONFIG_INET_AH is not set 366# CONFIG_INET_AH is not set
361# CONFIG_INET_ESP is not set 367CONFIG_INET_ESP=y
362# CONFIG_INET_IPCOMP is not set 368# CONFIG_INET_IPCOMP is not set
363# CONFIG_INET_XFRM_TUNNEL is not set 369# CONFIG_INET_XFRM_TUNNEL is not set
364# CONFIG_INET_TUNNEL is not set 370# CONFIG_INET_TUNNEL is not set
@@ -377,6 +383,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
377# CONFIG_NETFILTER is not set 383# CONFIG_NETFILTER is not set
378# CONFIG_IP_DCCP is not set 384# CONFIG_IP_DCCP is not set
379# CONFIG_IP_SCTP is not set 385# CONFIG_IP_SCTP is not set
386# CONFIG_RDS is not set
380# CONFIG_TIPC is not set 387# CONFIG_TIPC is not set
381# CONFIG_ATM is not set 388# CONFIG_ATM is not set
382# CONFIG_BRIDGE is not set 389# CONFIG_BRIDGE is not set
@@ -406,6 +413,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
406# CONFIG_AF_RXRPC is not set 413# CONFIG_AF_RXRPC is not set
407CONFIG_WIRELESS=y 414CONFIG_WIRELESS=y
408# CONFIG_CFG80211 is not set 415# CONFIG_CFG80211 is not set
416CONFIG_CFG80211_DEFAULT_PS_VALUE=0
409CONFIG_WIRELESS_OLD_REGULATORY=y 417CONFIG_WIRELESS_OLD_REGULATORY=y
410# CONFIG_WIRELESS_EXT is not set 418# CONFIG_WIRELESS_EXT is not set
411# CONFIG_LIB80211 is not set 419# CONFIG_LIB80211 is not set
@@ -413,7 +421,6 @@ CONFIG_WIRELESS_OLD_REGULATORY=y
413# 421#
414# CFG80211 needs to be enabled for MAC80211 422# CFG80211 needs to be enabled for MAC80211
415# 423#
416CONFIG_MAC80211_DEFAULT_PS_VALUE=0
417# CONFIG_WIMAX is not set 424# CONFIG_WIMAX is not set
418# CONFIG_RFKILL is not set 425# CONFIG_RFKILL is not set
419# CONFIG_NET_9P is not set 426# CONFIG_NET_9P is not set
@@ -426,6 +433,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
426# Generic Driver Options 433# Generic Driver Options
427# 434#
428CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 435CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
436# CONFIG_DEVTMPFS is not set
429CONFIG_STANDALONE=y 437CONFIG_STANDALONE=y
430CONFIG_PREVENT_FIRMWARE_BUILD=y 438CONFIG_PREVENT_FIRMWARE_BUILD=y
431# CONFIG_FW_LOADER is not set 439# CONFIG_FW_LOADER is not set
@@ -433,9 +441,9 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
433# CONFIG_CONNECTOR is not set 441# CONFIG_CONNECTOR is not set
434CONFIG_MTD=y 442CONFIG_MTD=y
435# CONFIG_MTD_DEBUG is not set 443# CONFIG_MTD_DEBUG is not set
444# CONFIG_MTD_TESTS is not set
436# CONFIG_MTD_CONCAT is not set 445# CONFIG_MTD_CONCAT is not set
437CONFIG_MTD_PARTITIONS=y 446CONFIG_MTD_PARTITIONS=y
438# CONFIG_MTD_TESTS is not set
439# CONFIG_MTD_REDBOOT_PARTS is not set 447# CONFIG_MTD_REDBOOT_PARTS is not set
440# CONFIG_MTD_CMDLINE_PARTS is not set 448# CONFIG_MTD_CMDLINE_PARTS is not set
441CONFIG_MTD_OF_PARTS=y 449CONFIG_MTD_OF_PARTS=y
@@ -608,6 +616,7 @@ CONFIG_SCSI_LOWLEVEL=y
608# CONFIG_ISCSI_TCP is not set 616# CONFIG_ISCSI_TCP is not set
609# CONFIG_SCSI_CXGB3_ISCSI is not set 617# CONFIG_SCSI_CXGB3_ISCSI is not set
610# CONFIG_SCSI_BNX2_ISCSI is not set 618# CONFIG_SCSI_BNX2_ISCSI is not set
619# CONFIG_BE2ISCSI is not set
611# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 620# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
612# CONFIG_SCSI_3W_9XXX is not set 621# CONFIG_SCSI_3W_9XXX is not set
613# CONFIG_SCSI_ACARD is not set 622# CONFIG_SCSI_ACARD is not set
@@ -647,11 +656,14 @@ CONFIG_SCSI_LOWLEVEL=y
647# CONFIG_SCSI_DC390T is not set 656# CONFIG_SCSI_DC390T is not set
648# CONFIG_SCSI_NSP32 is not set 657# CONFIG_SCSI_NSP32 is not set
649# CONFIG_SCSI_DEBUG is not set 658# CONFIG_SCSI_DEBUG is not set
659# CONFIG_SCSI_PMCRAID is not set
650# CONFIG_SCSI_SRP is not set 660# CONFIG_SCSI_SRP is not set
661# CONFIG_SCSI_BFA_FC is not set
651# CONFIG_SCSI_DH is not set 662# CONFIG_SCSI_DH is not set
652# CONFIG_SCSI_OSD_INITIATOR is not set 663# CONFIG_SCSI_OSD_INITIATOR is not set
653CONFIG_ATA=y 664CONFIG_ATA=y
654# CONFIG_ATA_NONSTANDARD is not set 665# CONFIG_ATA_NONSTANDARD is not set
666CONFIG_ATA_VERBOSE_ERROR=y
655CONFIG_SATA_PMP=y 667CONFIG_SATA_PMP=y
656# CONFIG_SATA_AHCI is not set 668# CONFIG_SATA_AHCI is not set
657# CONFIG_SATA_SIL24 is not set 669# CONFIG_SATA_SIL24 is not set
@@ -674,6 +686,7 @@ CONFIG_ATA_SFF=y
674# CONFIG_PATA_ALI is not set 686# CONFIG_PATA_ALI is not set
675# CONFIG_PATA_AMD is not set 687# CONFIG_PATA_AMD is not set
676# CONFIG_PATA_ARTOP is not set 688# CONFIG_PATA_ARTOP is not set
689# CONFIG_PATA_ATP867X is not set
677# CONFIG_PATA_ATIIXP is not set 690# CONFIG_PATA_ATIIXP is not set
678# CONFIG_PATA_CMD640_PCI is not set 691# CONFIG_PATA_CMD640_PCI is not set
679# CONFIG_PATA_CMD64X is not set 692# CONFIG_PATA_CMD64X is not set
@@ -701,6 +714,7 @@ CONFIG_ATA_SFF=y
701# CONFIG_PATA_OPTIDMA is not set 714# CONFIG_PATA_OPTIDMA is not set
702# CONFIG_PATA_PDC_OLD is not set 715# CONFIG_PATA_PDC_OLD is not set
703# CONFIG_PATA_RADISYS is not set 716# CONFIG_PATA_RADISYS is not set
717# CONFIG_PATA_RDC is not set
704# CONFIG_PATA_RZ1000 is not set 718# CONFIG_PATA_RZ1000 is not set
705# CONFIG_PATA_SC1200 is not set 719# CONFIG_PATA_SC1200 is not set
706# CONFIG_PATA_SERVERWORKS is not set 720# CONFIG_PATA_SERVERWORKS is not set
@@ -777,7 +791,9 @@ CONFIG_MII=y
777# CONFIG_NET_PCI is not set 791# CONFIG_NET_PCI is not set
778# CONFIG_B44 is not set 792# CONFIG_B44 is not set
779# CONFIG_KS8842 is not set 793# CONFIG_KS8842 is not set
794# CONFIG_KS8851_MLL is not set
780# CONFIG_ATL2 is not set 795# CONFIG_ATL2 is not set
796# CONFIG_XILINX_EMACLITE is not set
781CONFIG_NETDEV_1000=y 797CONFIG_NETDEV_1000=y
782# CONFIG_ACENIC is not set 798# CONFIG_ACENIC is not set
783# CONFIG_DL2K is not set 799# CONFIG_DL2K is not set
@@ -800,7 +816,6 @@ CONFIG_NETDEV_1000=y
800CONFIG_FSL_PQ_MDIO=y 816CONFIG_FSL_PQ_MDIO=y
801CONFIG_GIANFAR=y 817CONFIG_GIANFAR=y
802CONFIG_UCC_GETH=y 818CONFIG_UCC_GETH=y
803# CONFIG_UGETH_MAGIC_PACKET is not set
804# CONFIG_UGETH_TX_ON_DEMAND is not set 819# CONFIG_UGETH_TX_ON_DEMAND is not set
805# CONFIG_MV643XX_ETH is not set 820# CONFIG_MV643XX_ETH is not set
806# CONFIG_QLA3XXX is not set 821# CONFIG_QLA3XXX is not set
@@ -828,10 +843,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
828# CONFIG_SFC is not set 843# CONFIG_SFC is not set
829# CONFIG_BE2NET is not set 844# CONFIG_BE2NET is not set
830# CONFIG_TR is not set 845# CONFIG_TR is not set
831 846CONFIG_WLAN=y
832#
833# Wireless LAN
834#
835# CONFIG_WLAN_PRE80211 is not set 847# CONFIG_WLAN_PRE80211 is not set
836# CONFIG_WLAN_80211 is not set 848# CONFIG_WLAN_80211 is not set
837 849
@@ -935,6 +947,7 @@ CONFIG_GEN_RTC=y
935CONFIG_DEVPORT=y 947CONFIG_DEVPORT=y
936CONFIG_I2C=y 948CONFIG_I2C=y
937CONFIG_I2C_BOARDINFO=y 949CONFIG_I2C_BOARDINFO=y
950CONFIG_I2C_COMPAT=y
938CONFIG_I2C_CHARDEV=y 951CONFIG_I2C_CHARDEV=y
939CONFIG_I2C_HELPER_AUTO=y 952CONFIG_I2C_HELPER_AUTO=y
940 953
@@ -990,9 +1003,6 @@ CONFIG_I2C_MPC=y
990# Miscellaneous I2C Chip support 1003# Miscellaneous I2C Chip support
991# 1004#
992# CONFIG_DS1682 is not set 1005# CONFIG_DS1682 is not set
993# CONFIG_SENSORS_PCF8574 is not set
994# CONFIG_PCF8575 is not set
995# CONFIG_SENSORS_PCA9539 is not set
996# CONFIG_SENSORS_TSL2550 is not set 1006# CONFIG_SENSORS_TSL2550 is not set
997# CONFIG_I2C_DEBUG_CORE is not set 1007# CONFIG_I2C_DEBUG_CORE is not set
998# CONFIG_I2C_DEBUG_ALGO is not set 1008# CONFIG_I2C_DEBUG_ALGO is not set
@@ -1025,14 +1035,24 @@ CONFIG_GPIOLIB=y
1025# PCI GPIO expanders: 1035# PCI GPIO expanders:
1026# 1036#
1027# CONFIG_GPIO_BT8XX is not set 1037# CONFIG_GPIO_BT8XX is not set
1038# CONFIG_GPIO_LANGWELL is not set
1028 1039
1029# 1040#
1030# SPI GPIO expanders: 1041# SPI GPIO expanders:
1031# 1042#
1043
1044#
1045# AC97 GPIO expanders:
1046#
1032# CONFIG_W1 is not set 1047# CONFIG_W1 is not set
1033# CONFIG_POWER_SUPPLY is not set 1048# CONFIG_POWER_SUPPLY is not set
1034CONFIG_HWMON=y 1049CONFIG_HWMON=y
1035# CONFIG_HWMON_VID is not set 1050# CONFIG_HWMON_VID is not set
1051# CONFIG_HWMON_DEBUG_CHIP is not set
1052
1053#
1054# Native drivers
1055#
1036# CONFIG_SENSORS_AD7414 is not set 1056# CONFIG_SENSORS_AD7414 is not set
1037# CONFIG_SENSORS_AD7418 is not set 1057# CONFIG_SENSORS_AD7418 is not set
1038# CONFIG_SENSORS_ADM1021 is not set 1058# CONFIG_SENSORS_ADM1021 is not set
@@ -1083,6 +1103,7 @@ CONFIG_HWMON=y
1083# CONFIG_SENSORS_ADS7828 is not set 1103# CONFIG_SENSORS_ADS7828 is not set
1084# CONFIG_SENSORS_THMC50 is not set 1104# CONFIG_SENSORS_THMC50 is not set
1085# CONFIG_SENSORS_TMP401 is not set 1105# CONFIG_SENSORS_TMP401 is not set
1106# CONFIG_SENSORS_TMP421 is not set
1086# CONFIG_SENSORS_VIA686A is not set 1107# CONFIG_SENSORS_VIA686A is not set
1087# CONFIG_SENSORS_VT1211 is not set 1108# CONFIG_SENSORS_VT1211 is not set
1088# CONFIG_SENSORS_VT8231 is not set 1109# CONFIG_SENSORS_VT8231 is not set
@@ -1094,9 +1115,7 @@ CONFIG_HWMON=y
1094# CONFIG_SENSORS_W83L786NG is not set 1115# CONFIG_SENSORS_W83L786NG is not set
1095# CONFIG_SENSORS_W83627HF is not set 1116# CONFIG_SENSORS_W83627HF is not set
1096# CONFIG_SENSORS_W83627EHF is not set 1117# CONFIG_SENSORS_W83627EHF is not set
1097# CONFIG_HWMON_DEBUG_CHIP is not set
1098# CONFIG_THERMAL is not set 1118# CONFIG_THERMAL is not set
1099# CONFIG_THERMAL_HWMON is not set
1100CONFIG_WATCHDOG=y 1119CONFIG_WATCHDOG=y
1101# CONFIG_WATCHDOG_NOWAYOUT is not set 1120# CONFIG_WATCHDOG_NOWAYOUT is not set
1102 1121
@@ -1135,6 +1154,7 @@ CONFIG_SSB_POSSIBLE=y
1135# CONFIG_MFD_TMIO is not set 1154# CONFIG_MFD_TMIO is not set
1136# CONFIG_PMIC_DA903X is not set 1155# CONFIG_PMIC_DA903X is not set
1137# CONFIG_MFD_WM8400 is not set 1156# CONFIG_MFD_WM8400 is not set
1157# CONFIG_MFD_WM831X is not set
1138# CONFIG_MFD_WM8350_I2C is not set 1158# CONFIG_MFD_WM8350_I2C is not set
1139# CONFIG_MFD_PCF50633 is not set 1159# CONFIG_MFD_PCF50633 is not set
1140# CONFIG_AB3100_CORE is not set 1160# CONFIG_AB3100_CORE is not set
@@ -1145,6 +1165,7 @@ CONFIG_SSB_POSSIBLE=y
1145# Graphics support 1165# Graphics support
1146# 1166#
1147# CONFIG_AGP is not set 1167# CONFIG_AGP is not set
1168CONFIG_VGA_ARB=y
1148# CONFIG_DRM is not set 1169# CONFIG_DRM is not set
1149# CONFIG_VGASTATE is not set 1170# CONFIG_VGASTATE is not set
1150CONFIG_VIDEO_OUTPUT_CONTROL=m 1171CONFIG_VIDEO_OUTPUT_CONTROL=m
@@ -1158,7 +1179,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m
1158# CONFIG_SOUND is not set 1179# CONFIG_SOUND is not set
1159CONFIG_HID_SUPPORT=y 1180CONFIG_HID_SUPPORT=y
1160CONFIG_HID=y 1181CONFIG_HID=y
1161# CONFIG_HID_DEBUG is not set
1162# CONFIG_HIDRAW is not set 1182# CONFIG_HIDRAW is not set
1163 1183
1164# 1184#
@@ -1181,6 +1201,7 @@ CONFIG_HID_CYPRESS=y
1181CONFIG_HID_EZKEY=y 1201CONFIG_HID_EZKEY=y
1182# CONFIG_HID_KYE is not set 1202# CONFIG_HID_KYE is not set
1183CONFIG_HID_GYRATION=y 1203CONFIG_HID_GYRATION=y
1204# CONFIG_HID_TWINHAN is not set
1184# CONFIG_HID_KENSINGTON is not set 1205# CONFIG_HID_KENSINGTON is not set
1185CONFIG_HID_LOGITECH=y 1206CONFIG_HID_LOGITECH=y
1186# CONFIG_LOGITECH_FF is not set 1207# CONFIG_LOGITECH_FF is not set
@@ -1233,6 +1254,7 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y
1233# CONFIG_USB_OXU210HP_HCD is not set 1254# CONFIG_USB_OXU210HP_HCD is not set
1234# CONFIG_USB_ISP116X_HCD is not set 1255# CONFIG_USB_ISP116X_HCD is not set
1235# CONFIG_USB_ISP1760_HCD is not set 1256# CONFIG_USB_ISP1760_HCD is not set
1257# CONFIG_USB_ISP1362_HCD is not set
1236# CONFIG_USB_OHCI_HCD is not set 1258# CONFIG_USB_OHCI_HCD is not set
1237# CONFIG_USB_UHCI_HCD is not set 1259# CONFIG_USB_UHCI_HCD is not set
1238# CONFIG_USB_FHCI_HCD is not set 1260# CONFIG_USB_FHCI_HCD is not set
@@ -1291,6 +1313,7 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y
1291# CONFIG_USB_LD is not set 1313# CONFIG_USB_LD is not set
1292# CONFIG_USB_TRANCEVIBRATOR is not set 1314# CONFIG_USB_TRANCEVIBRATOR is not set
1293# CONFIG_USB_IOWARRIOR is not set 1315# CONFIG_USB_IOWARRIOR is not set
1316# CONFIG_USB_TEST is not set
1294# CONFIG_USB_ISIGHTFW is not set 1317# CONFIG_USB_ISIGHTFW is not set
1295# CONFIG_USB_VST is not set 1318# CONFIG_USB_VST is not set
1296# CONFIG_USB_GADGET is not set 1319# CONFIG_USB_GADGET is not set
@@ -1338,6 +1361,7 @@ CONFIG_FS_MBCACHE=y
1338# CONFIG_GFS2_FS is not set 1361# CONFIG_GFS2_FS is not set
1339# CONFIG_OCFS2_FS is not set 1362# CONFIG_OCFS2_FS is not set
1340# CONFIG_BTRFS_FS is not set 1363# CONFIG_BTRFS_FS is not set
1364# CONFIG_NILFS2_FS is not set
1341CONFIG_FILE_LOCKING=y 1365CONFIG_FILE_LOCKING=y
1342CONFIG_FSNOTIFY=y 1366CONFIG_FSNOTIFY=y
1343CONFIG_DNOTIFY=y 1367CONFIG_DNOTIFY=y
@@ -1397,7 +1421,6 @@ CONFIG_MISC_FILESYSTEMS=y
1397# CONFIG_ROMFS_FS is not set 1421# CONFIG_ROMFS_FS is not set
1398# CONFIG_SYSV_FS is not set 1422# CONFIG_SYSV_FS is not set
1399# CONFIG_UFS_FS is not set 1423# CONFIG_UFS_FS is not set
1400# CONFIG_NILFS2_FS is not set
1401CONFIG_NETWORK_FILESYSTEMS=y 1424CONFIG_NETWORK_FILESYSTEMS=y
1402CONFIG_NFS_FS=y 1425CONFIG_NFS_FS=y
1403CONFIG_NFS_V3=y 1426CONFIG_NFS_V3=y
@@ -1514,6 +1537,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
1514CONFIG_ENABLE_MUST_CHECK=y 1537CONFIG_ENABLE_MUST_CHECK=y
1515CONFIG_FRAME_WARN=1024 1538CONFIG_FRAME_WARN=1024
1516# CONFIG_MAGIC_SYSRQ is not set 1539# CONFIG_MAGIC_SYSRQ is not set
1540# CONFIG_STRIP_ASM_SYMS is not set
1517# CONFIG_UNUSED_SYMBOLS is not set 1541# CONFIG_UNUSED_SYMBOLS is not set
1518# CONFIG_DEBUG_FS is not set 1542# CONFIG_DEBUG_FS is not set
1519# CONFIG_HEADERS_CHECK is not set 1543# CONFIG_HEADERS_CHECK is not set
@@ -1529,6 +1553,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
1529CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1553CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1530CONFIG_TRACING_SUPPORT=y 1554CONFIG_TRACING_SUPPORT=y
1531# CONFIG_FTRACE is not set 1555# CONFIG_FTRACE is not set
1556# CONFIG_DMA_API_DEBUG is not set
1532# CONFIG_SAMPLES is not set 1557# CONFIG_SAMPLES is not set
1533CONFIG_HAVE_ARCH_KGDB=y 1558CONFIG_HAVE_ARCH_KGDB=y
1534# CONFIG_PPC_DISABLE_WERROR is not set 1559# CONFIG_PPC_DISABLE_WERROR is not set
@@ -1550,7 +1575,6 @@ CONFIG_CRYPTO=y
1550# 1575#
1551# Crypto core or helper 1576# Crypto core or helper
1552# 1577#
1553# CONFIG_CRYPTO_FIPS is not set
1554CONFIG_CRYPTO_ALGAPI=y 1578CONFIG_CRYPTO_ALGAPI=y
1555CONFIG_CRYPTO_ALGAPI2=y 1579CONFIG_CRYPTO_ALGAPI2=y
1556CONFIG_CRYPTO_AEAD=y 1580CONFIG_CRYPTO_AEAD=y
@@ -1591,13 +1615,15 @@ CONFIG_CRYPTO_PCBC=m
1591# 1615#
1592# Hash modes 1616# Hash modes
1593# 1617#
1594# CONFIG_CRYPTO_HMAC is not set 1618CONFIG_CRYPTO_HMAC=y
1595# CONFIG_CRYPTO_XCBC is not set 1619# CONFIG_CRYPTO_XCBC is not set
1620# CONFIG_CRYPTO_VMAC is not set
1596 1621
1597# 1622#
1598# Digest 1623# Digest
1599# 1624#
1600# CONFIG_CRYPTO_CRC32C is not set 1625# CONFIG_CRYPTO_CRC32C is not set
1626# CONFIG_CRYPTO_GHASH is not set
1601# CONFIG_CRYPTO_MD4 is not set 1627# CONFIG_CRYPTO_MD4 is not set
1602CONFIG_CRYPTO_MD5=y 1628CONFIG_CRYPTO_MD5=y
1603# CONFIG_CRYPTO_MICHAEL_MIC is not set 1629# CONFIG_CRYPTO_MICHAEL_MIC is not set
@@ -1605,16 +1631,16 @@ CONFIG_CRYPTO_MD5=y
1605# CONFIG_CRYPTO_RMD160 is not set 1631# CONFIG_CRYPTO_RMD160 is not set
1606# CONFIG_CRYPTO_RMD256 is not set 1632# CONFIG_CRYPTO_RMD256 is not set
1607# CONFIG_CRYPTO_RMD320 is not set 1633# CONFIG_CRYPTO_RMD320 is not set
1608# CONFIG_CRYPTO_SHA1 is not set 1634CONFIG_CRYPTO_SHA1=y
1609# CONFIG_CRYPTO_SHA256 is not set 1635CONFIG_CRYPTO_SHA256=y
1610# CONFIG_CRYPTO_SHA512 is not set 1636CONFIG_CRYPTO_SHA512=y
1611# CONFIG_CRYPTO_TGR192 is not set 1637# CONFIG_CRYPTO_TGR192 is not set
1612# CONFIG_CRYPTO_WP512 is not set 1638# CONFIG_CRYPTO_WP512 is not set
1613 1639
1614# 1640#
1615# Ciphers 1641# Ciphers
1616# 1642#
1617# CONFIG_CRYPTO_AES is not set 1643CONFIG_CRYPTO_AES=y
1618# CONFIG_CRYPTO_ANUBIS is not set 1644# CONFIG_CRYPTO_ANUBIS is not set
1619# CONFIG_CRYPTO_ARC4 is not set 1645# CONFIG_CRYPTO_ARC4 is not set
1620# CONFIG_CRYPTO_BLOWFISH is not set 1646# CONFIG_CRYPTO_BLOWFISH is not set
diff --git a/arch/powerpc/configs/mpc85xx_defconfig b/arch/powerpc/configs/mpc85xx_defconfig
index ee6acc6557f8..a12e7ba87a43 100644
--- a/arch/powerpc/configs/mpc85xx_defconfig
+++ b/arch/powerpc/configs/mpc85xx_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.31-rc4 3# Linux kernel version: 2.6.32-rc5
4# Wed Jul 29 23:31:55 2009 4# Thu Nov 5 08:25:20 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -22,6 +22,7 @@ CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set 22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y 23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y 24CONFIG_PPC_MMU_NOHASH=y
25CONFIG_PPC_MMU_NOHASH_32=y
25CONFIG_PPC_BOOK3E_MMU=y 26CONFIG_PPC_BOOK3E_MMU=y
26# CONFIG_PPC_MM_SLICES is not set 27# CONFIG_PPC_MM_SLICES is not set
27# CONFIG_SMP is not set 28# CONFIG_SMP is not set
@@ -36,6 +37,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
36CONFIG_GENERIC_HARDIRQS=y 37CONFIG_GENERIC_HARDIRQS=y
37CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 38CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
38# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
39CONFIG_IRQ_PER_CPU=y 41CONFIG_IRQ_PER_CPU=y
40CONFIG_STACKTRACE_SUPPORT=y 42CONFIG_STACKTRACE_SUPPORT=y
41CONFIG_HAVE_LATENCYTOP_SUPPORT=y 43CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -88,11 +90,12 @@ CONFIG_AUDIT=y
88# 90#
89# RCU Subsystem 91# RCU Subsystem
90# 92#
91CONFIG_CLASSIC_RCU=y 93CONFIG_TREE_RCU=y
92# CONFIG_TREE_RCU is not set 94# CONFIG_TREE_PREEMPT_RCU is not set
93# CONFIG_PREEMPT_RCU is not set 95# CONFIG_RCU_TRACE is not set
96CONFIG_RCU_FANOUT=32
97# CONFIG_RCU_FANOUT_EXACT is not set
94# CONFIG_TREE_RCU_TRACE is not set 98# CONFIG_TREE_RCU_TRACE is not set
95# CONFIG_PREEMPT_RCU_TRACE is not set
96CONFIG_IKCONFIG=y 99CONFIG_IKCONFIG=y
97CONFIG_IKCONFIG_PROC=y 100CONFIG_IKCONFIG_PROC=y
98CONFIG_LOG_BUF_SHIFT=14 101CONFIG_LOG_BUF_SHIFT=14
@@ -131,22 +134,21 @@ CONFIG_TIMERFD=y
131CONFIG_EVENTFD=y 134CONFIG_EVENTFD=y
132CONFIG_SHMEM=y 135CONFIG_SHMEM=y
133CONFIG_AIO=y 136CONFIG_AIO=y
134CONFIG_HAVE_PERF_COUNTERS=y 137CONFIG_HAVE_PERF_EVENTS=y
135 138
136# 139#
137# Performance Counters 140# Kernel Performance Events And Counters
138# 141#
142# CONFIG_PERF_EVENTS is not set
139# CONFIG_PERF_COUNTERS is not set 143# CONFIG_PERF_COUNTERS is not set
140CONFIG_VM_EVENT_COUNTERS=y 144CONFIG_VM_EVENT_COUNTERS=y
141CONFIG_PCI_QUIRKS=y 145CONFIG_PCI_QUIRKS=y
142CONFIG_SLUB_DEBUG=y 146CONFIG_SLUB_DEBUG=y
143# CONFIG_STRIP_ASM_SYMS is not set
144CONFIG_COMPAT_BRK=y 147CONFIG_COMPAT_BRK=y
145# CONFIG_SLAB is not set 148# CONFIG_SLAB is not set
146CONFIG_SLUB=y 149CONFIG_SLUB=y
147# CONFIG_SLOB is not set 150# CONFIG_SLOB is not set
148# CONFIG_PROFILING is not set 151# CONFIG_PROFILING is not set
149# CONFIG_MARKERS is not set
150CONFIG_HAVE_OPROFILE=y 152CONFIG_HAVE_OPROFILE=y
151# CONFIG_KPROBES is not set 153# CONFIG_KPROBES is not set
152CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 154CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -154,7 +156,9 @@ CONFIG_HAVE_IOREMAP_PROT=y
154CONFIG_HAVE_KPROBES=y 156CONFIG_HAVE_KPROBES=y
155CONFIG_HAVE_KRETPROBES=y 157CONFIG_HAVE_KRETPROBES=y
156CONFIG_HAVE_ARCH_TRACEHOOK=y 158CONFIG_HAVE_ARCH_TRACEHOOK=y
159CONFIG_HAVE_DMA_ATTRS=y
157CONFIG_HAVE_CLK=y 160CONFIG_HAVE_CLK=y
161CONFIG_HAVE_DMA_API_DEBUG=y
158 162
159# 163#
160# GCOV-based kernel profiling 164# GCOV-based kernel profiling
@@ -189,6 +193,7 @@ CONFIG_DEFAULT_CFQ=y
189# CONFIG_DEFAULT_NOOP is not set 193# CONFIG_DEFAULT_NOOP is not set
190CONFIG_DEFAULT_IOSCHED="cfq" 194CONFIG_DEFAULT_IOSCHED="cfq"
191# CONFIG_FREEZER is not set 195# CONFIG_FREEZER is not set
196CONFIG_PPC_MSI_BITMAP=y
192 197
193# 198#
194# Platform support 199# Platform support
@@ -206,7 +211,7 @@ CONFIG_MPC85xx_DS=y
206CONFIG_MPC85xx_RDB=y 211CONFIG_MPC85xx_RDB=y
207CONFIG_SOCRATES=y 212CONFIG_SOCRATES=y
208CONFIG_KSI8560=y 213CONFIG_KSI8560=y
209# CONFIG_XES_MPC85xx is not set 214CONFIG_XES_MPC85xx=y
210CONFIG_STX_GP3=y 215CONFIG_STX_GP3=y
211CONFIG_TQM8540=y 216CONFIG_TQM8540=y
212CONFIG_TQM8541=y 217CONFIG_TQM8541=y
@@ -259,10 +264,10 @@ CONFIG_BINFMT_MISC=m
259CONFIG_MATH_EMULATION=y 264CONFIG_MATH_EMULATION=y
260CONFIG_IOMMU_HELPER=y 265CONFIG_IOMMU_HELPER=y
261CONFIG_SWIOTLB=y 266CONFIG_SWIOTLB=y
262CONFIG_PPC_NEED_DMA_SYNC_OPS=y
263CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 267CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
264CONFIG_ARCH_HAS_WALK_MEMORY=y 268CONFIG_ARCH_HAS_WALK_MEMORY=y
265CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 269CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
270CONFIG_MAX_ACTIVE_REGIONS=32
266CONFIG_ARCH_FLATMEM_ENABLE=y 271CONFIG_ARCH_FLATMEM_ENABLE=y
267CONFIG_ARCH_POPULATES_NODE_MAP=y 272CONFIG_ARCH_POPULATES_NODE_MAP=y
268CONFIG_SELECT_MEMORY_MODEL=y 273CONFIG_SELECT_MEMORY_MODEL=y
@@ -280,6 +285,7 @@ CONFIG_BOUNCE=y
280CONFIG_VIRT_TO_BUS=y 285CONFIG_VIRT_TO_BUS=y
281CONFIG_HAVE_MLOCK=y 286CONFIG_HAVE_MLOCK=y
282CONFIG_HAVE_MLOCKED_PAGE_BIT=y 287CONFIG_HAVE_MLOCKED_PAGE_BIT=y
288# CONFIG_KSM is not set
283CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 289CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
284CONFIG_PPC_4K_PAGES=y 290CONFIG_PPC_4K_PAGES=y
285# CONFIG_PPC_16K_PAGES is not set 291# CONFIG_PPC_16K_PAGES is not set
@@ -307,7 +313,7 @@ CONFIG_PCI_DOMAINS=y
307CONFIG_PCI_SYSCALL=y 313CONFIG_PCI_SYSCALL=y
308# CONFIG_PCIEPORTBUS is not set 314# CONFIG_PCIEPORTBUS is not set
309CONFIG_ARCH_SUPPORTS_MSI=y 315CONFIG_ARCH_SUPPORTS_MSI=y
310# CONFIG_PCI_MSI is not set 316CONFIG_PCI_MSI=y
311# CONFIG_PCI_LEGACY is not set 317# CONFIG_PCI_LEGACY is not set
312# CONFIG_PCI_DEBUG is not set 318# CONFIG_PCI_DEBUG is not set
313# CONFIG_PCI_STUB is not set 319# CONFIG_PCI_STUB is not set
@@ -315,7 +321,8 @@ CONFIG_ARCH_SUPPORTS_MSI=y
315# CONFIG_PCCARD is not set 321# CONFIG_PCCARD is not set
316# CONFIG_HOTPLUG_PCI is not set 322# CONFIG_HOTPLUG_PCI is not set
317CONFIG_HAS_RAPIDIO=y 323CONFIG_HAS_RAPIDIO=y
318# CONFIG_RAPIDIO is not set 324CONFIG_RAPIDIO=y
325CONFIG_RAPIDIO_DISC_TIMEOUT=30
319 326
320# 327#
321# Advanced setup 328# Advanced setup
@@ -345,7 +352,7 @@ CONFIG_XFRM_USER=y
345# CONFIG_XFRM_SUB_POLICY is not set 352# CONFIG_XFRM_SUB_POLICY is not set
346# CONFIG_XFRM_MIGRATE is not set 353# CONFIG_XFRM_MIGRATE is not set
347# CONFIG_XFRM_STATISTICS is not set 354# CONFIG_XFRM_STATISTICS is not set
348CONFIG_NET_KEY=m 355CONFIG_NET_KEY=y
349# CONFIG_NET_KEY_MIGRATE is not set 356# CONFIG_NET_KEY_MIGRATE is not set
350CONFIG_INET=y 357CONFIG_INET=y
351CONFIG_IP_MULTICAST=y 358CONFIG_IP_MULTICAST=y
@@ -369,12 +376,12 @@ CONFIG_IP_PIMSM_V2=y
369CONFIG_ARPD=y 376CONFIG_ARPD=y
370# CONFIG_SYN_COOKIES is not set 377# CONFIG_SYN_COOKIES is not set
371# CONFIG_INET_AH is not set 378# CONFIG_INET_AH is not set
372# CONFIG_INET_ESP is not set 379CONFIG_INET_ESP=y
373# CONFIG_INET_IPCOMP is not set 380# CONFIG_INET_IPCOMP is not set
374# CONFIG_INET_XFRM_TUNNEL is not set 381# CONFIG_INET_XFRM_TUNNEL is not set
375CONFIG_INET_TUNNEL=y 382CONFIG_INET_TUNNEL=y
376# CONFIG_INET_XFRM_MODE_TRANSPORT is not set 383CONFIG_INET_XFRM_MODE_TRANSPORT=y
377# CONFIG_INET_XFRM_MODE_TUNNEL is not set 384CONFIG_INET_XFRM_MODE_TUNNEL=y
378# CONFIG_INET_XFRM_MODE_BEET is not set 385# CONFIG_INET_XFRM_MODE_BEET is not set
379# CONFIG_INET_LRO is not set 386# CONFIG_INET_LRO is not set
380CONFIG_INET_DIAG=y 387CONFIG_INET_DIAG=y
@@ -411,6 +418,7 @@ CONFIG_IP_SCTP=m
411# CONFIG_SCTP_HMAC_NONE is not set 418# CONFIG_SCTP_HMAC_NONE is not set
412# CONFIG_SCTP_HMAC_SHA1 is not set 419# CONFIG_SCTP_HMAC_SHA1 is not set
413CONFIG_SCTP_HMAC_MD5=y 420CONFIG_SCTP_HMAC_MD5=y
421# CONFIG_RDS is not set
414# CONFIG_TIPC is not set 422# CONFIG_TIPC is not set
415# CONFIG_ATM is not set 423# CONFIG_ATM is not set
416# CONFIG_BRIDGE is not set 424# CONFIG_BRIDGE is not set
@@ -441,6 +449,7 @@ CONFIG_SCTP_HMAC_MD5=y
441CONFIG_FIB_RULES=y 449CONFIG_FIB_RULES=y
442CONFIG_WIRELESS=y 450CONFIG_WIRELESS=y
443# CONFIG_CFG80211 is not set 451# CONFIG_CFG80211 is not set
452CONFIG_CFG80211_DEFAULT_PS_VALUE=0
444CONFIG_WIRELESS_OLD_REGULATORY=y 453CONFIG_WIRELESS_OLD_REGULATORY=y
445# CONFIG_WIRELESS_EXT is not set 454# CONFIG_WIRELESS_EXT is not set
446# CONFIG_LIB80211 is not set 455# CONFIG_LIB80211 is not set
@@ -448,7 +457,6 @@ CONFIG_WIRELESS_OLD_REGULATORY=y
448# 457#
449# CFG80211 needs to be enabled for MAC80211 458# CFG80211 needs to be enabled for MAC80211
450# 459#
451CONFIG_MAC80211_DEFAULT_PS_VALUE=0
452# CONFIG_WIMAX is not set 460# CONFIG_WIMAX is not set
453# CONFIG_RFKILL is not set 461# CONFIG_RFKILL is not set
454# CONFIG_NET_9P is not set 462# CONFIG_NET_9P is not set
@@ -461,6 +469,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
461# Generic Driver Options 469# Generic Driver Options
462# 470#
463CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 471CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
472# CONFIG_DEVTMPFS is not set
464CONFIG_STANDALONE=y 473CONFIG_STANDALONE=y
465CONFIG_PREVENT_FIRMWARE_BUILD=y 474CONFIG_PREVENT_FIRMWARE_BUILD=y
466CONFIG_FW_LOADER=y 475CONFIG_FW_LOADER=y
@@ -554,6 +563,7 @@ CONFIG_SCSI_LOWLEVEL=y
554# CONFIG_ISCSI_TCP is not set 563# CONFIG_ISCSI_TCP is not set
555# CONFIG_SCSI_CXGB3_ISCSI is not set 564# CONFIG_SCSI_CXGB3_ISCSI is not set
556# CONFIG_SCSI_BNX2_ISCSI is not set 565# CONFIG_SCSI_BNX2_ISCSI is not set
566# CONFIG_BE2ISCSI is not set
557# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 567# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
558# CONFIG_SCSI_3W_9XXX is not set 568# CONFIG_SCSI_3W_9XXX is not set
559# CONFIG_SCSI_ACARD is not set 569# CONFIG_SCSI_ACARD is not set
@@ -593,11 +603,14 @@ CONFIG_SCSI_LOWLEVEL=y
593# CONFIG_SCSI_DC390T is not set 603# CONFIG_SCSI_DC390T is not set
594# CONFIG_SCSI_NSP32 is not set 604# CONFIG_SCSI_NSP32 is not set
595# CONFIG_SCSI_DEBUG is not set 605# CONFIG_SCSI_DEBUG is not set
606# CONFIG_SCSI_PMCRAID is not set
596# CONFIG_SCSI_SRP is not set 607# CONFIG_SCSI_SRP is not set
608# CONFIG_SCSI_BFA_FC is not set
597# CONFIG_SCSI_DH is not set 609# CONFIG_SCSI_DH is not set
598# CONFIG_SCSI_OSD_INITIATOR is not set 610# CONFIG_SCSI_OSD_INITIATOR is not set
599CONFIG_ATA=y 611CONFIG_ATA=y
600# CONFIG_ATA_NONSTANDARD is not set 612# CONFIG_ATA_NONSTANDARD is not set
613CONFIG_ATA_VERBOSE_ERROR=y
601CONFIG_SATA_PMP=y 614CONFIG_SATA_PMP=y
602CONFIG_SATA_AHCI=y 615CONFIG_SATA_AHCI=y
603# CONFIG_SATA_SIL24 is not set 616# CONFIG_SATA_SIL24 is not set
@@ -620,6 +633,7 @@ CONFIG_ATA_SFF=y
620CONFIG_PATA_ALI=y 633CONFIG_PATA_ALI=y
621# CONFIG_PATA_AMD is not set 634# CONFIG_PATA_AMD is not set
622# CONFIG_PATA_ARTOP is not set 635# CONFIG_PATA_ARTOP is not set
636# CONFIG_PATA_ATP867X is not set
623# CONFIG_PATA_ATIIXP is not set 637# CONFIG_PATA_ATIIXP is not set
624# CONFIG_PATA_CMD640_PCI is not set 638# CONFIG_PATA_CMD640_PCI is not set
625# CONFIG_PATA_CMD64X is not set 639# CONFIG_PATA_CMD64X is not set
@@ -647,6 +661,7 @@ CONFIG_PATA_ALI=y
647# CONFIG_PATA_OPTIDMA is not set 661# CONFIG_PATA_OPTIDMA is not set
648# CONFIG_PATA_PDC_OLD is not set 662# CONFIG_PATA_PDC_OLD is not set
649# CONFIG_PATA_RADISYS is not set 663# CONFIG_PATA_RADISYS is not set
664# CONFIG_PATA_RDC is not set
650# CONFIG_PATA_RZ1000 is not set 665# CONFIG_PATA_RZ1000 is not set
651# CONFIG_PATA_SC1200 is not set 666# CONFIG_PATA_SC1200 is not set
652# CONFIG_PATA_SERVERWORKS is not set 667# CONFIG_PATA_SERVERWORKS is not set
@@ -723,7 +738,9 @@ CONFIG_MII=y
723# CONFIG_NET_PCI is not set 738# CONFIG_NET_PCI is not set
724# CONFIG_B44 is not set 739# CONFIG_B44 is not set
725# CONFIG_KS8842 is not set 740# CONFIG_KS8842 is not set
741# CONFIG_KS8851_MLL is not set
726# CONFIG_ATL2 is not set 742# CONFIG_ATL2 is not set
743# CONFIG_XILINX_EMACLITE is not set
727CONFIG_FS_ENET=y 744CONFIG_FS_ENET=y
728CONFIG_FS_ENET_HAS_SCC=y 745CONFIG_FS_ENET_HAS_SCC=y
729CONFIG_FS_ENET_HAS_FCC=y 746CONFIG_FS_ENET_HAS_FCC=y
@@ -750,7 +767,6 @@ CONFIG_NETDEV_1000=y
750CONFIG_FSL_PQ_MDIO=y 767CONFIG_FSL_PQ_MDIO=y
751CONFIG_GIANFAR=y 768CONFIG_GIANFAR=y
752CONFIG_UCC_GETH=y 769CONFIG_UCC_GETH=y
753# CONFIG_UGETH_MAGIC_PACKET is not set
754# CONFIG_UGETH_TX_ON_DEMAND is not set 770# CONFIG_UGETH_TX_ON_DEMAND is not set
755# CONFIG_MV643XX_ETH is not set 771# CONFIG_MV643XX_ETH is not set
756# CONFIG_QLA3XXX is not set 772# CONFIG_QLA3XXX is not set
@@ -778,10 +794,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
778# CONFIG_SFC is not set 794# CONFIG_SFC is not set
779# CONFIG_BE2NET is not set 795# CONFIG_BE2NET is not set
780# CONFIG_TR is not set 796# CONFIG_TR is not set
781 797CONFIG_WLAN=y
782#
783# Wireless LAN
784#
785# CONFIG_WLAN_PRE80211 is not set 798# CONFIG_WLAN_PRE80211 is not set
786# CONFIG_WLAN_80211 is not set 799# CONFIG_WLAN_80211 is not set
787 800
@@ -798,6 +811,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
798# CONFIG_USB_RTL8150 is not set 811# CONFIG_USB_RTL8150 is not set
799# CONFIG_USB_USBNET is not set 812# CONFIG_USB_USBNET is not set
800# CONFIG_WAN is not set 813# CONFIG_WAN is not set
814# CONFIG_RIONET is not set
801# CONFIG_FDDI is not set 815# CONFIG_FDDI is not set
802# CONFIG_HIPPI is not set 816# CONFIG_HIPPI is not set
803# CONFIG_PPP is not set 817# CONFIG_PPP is not set
@@ -898,6 +912,7 @@ CONFIG_NVRAM=y
898CONFIG_DEVPORT=y 912CONFIG_DEVPORT=y
899CONFIG_I2C=y 913CONFIG_I2C=y
900CONFIG_I2C_BOARDINFO=y 914CONFIG_I2C_BOARDINFO=y
915CONFIG_I2C_COMPAT=y
901# CONFIG_I2C_CHARDEV is not set 916# CONFIG_I2C_CHARDEV is not set
902CONFIG_I2C_HELPER_AUTO=y 917CONFIG_I2C_HELPER_AUTO=y
903 918
@@ -955,9 +970,6 @@ CONFIG_I2C_MPC=y
955# Miscellaneous I2C Chip support 970# Miscellaneous I2C Chip support
956# 971#
957# CONFIG_DS1682 is not set 972# CONFIG_DS1682 is not set
958# CONFIG_SENSORS_PCF8574 is not set
959# CONFIG_PCF8575 is not set
960# CONFIG_SENSORS_PCA9539 is not set
961# CONFIG_SENSORS_TSL2550 is not set 973# CONFIG_SENSORS_TSL2550 is not set
962# CONFIG_I2C_DEBUG_CORE is not set 974# CONFIG_I2C_DEBUG_CORE is not set
963# CONFIG_I2C_DEBUG_ALGO is not set 975# CONFIG_I2C_DEBUG_ALGO is not set
@@ -991,15 +1003,19 @@ CONFIG_GPIOLIB=y
991# PCI GPIO expanders: 1003# PCI GPIO expanders:
992# 1004#
993# CONFIG_GPIO_BT8XX is not set 1005# CONFIG_GPIO_BT8XX is not set
1006# CONFIG_GPIO_LANGWELL is not set
994 1007
995# 1008#
996# SPI GPIO expanders: 1009# SPI GPIO expanders:
997# 1010#
1011
1012#
1013# AC97 GPIO expanders:
1014#
998# CONFIG_W1 is not set 1015# CONFIG_W1 is not set
999# CONFIG_POWER_SUPPLY is not set 1016# CONFIG_POWER_SUPPLY is not set
1000# CONFIG_HWMON is not set 1017# CONFIG_HWMON is not set
1001# CONFIG_THERMAL is not set 1018# CONFIG_THERMAL is not set
1002# CONFIG_THERMAL_HWMON is not set
1003# CONFIG_WATCHDOG is not set 1019# CONFIG_WATCHDOG is not set
1004CONFIG_SSB_POSSIBLE=y 1020CONFIG_SSB_POSSIBLE=y
1005 1021
@@ -1020,6 +1036,7 @@ CONFIG_SSB_POSSIBLE=y
1020# CONFIG_MFD_TMIO is not set 1036# CONFIG_MFD_TMIO is not set
1021# CONFIG_PMIC_DA903X is not set 1037# CONFIG_PMIC_DA903X is not set
1022# CONFIG_MFD_WM8400 is not set 1038# CONFIG_MFD_WM8400 is not set
1039# CONFIG_MFD_WM831X is not set
1023# CONFIG_MFD_WM8350_I2C is not set 1040# CONFIG_MFD_WM8350_I2C is not set
1024# CONFIG_MFD_PCF50633 is not set 1041# CONFIG_MFD_PCF50633 is not set
1025# CONFIG_AB3100_CORE is not set 1042# CONFIG_AB3100_CORE is not set
@@ -1030,6 +1047,7 @@ CONFIG_SSB_POSSIBLE=y
1030# Graphics support 1047# Graphics support
1031# 1048#
1032# CONFIG_AGP is not set 1049# CONFIG_AGP is not set
1050CONFIG_VGA_ARB=y
1033# CONFIG_DRM is not set 1051# CONFIG_DRM is not set
1034# CONFIG_VGASTATE is not set 1052# CONFIG_VGASTATE is not set
1035CONFIG_VIDEO_OUTPUT_CONTROL=y 1053CONFIG_VIDEO_OUTPUT_CONTROL=y
@@ -1049,6 +1067,7 @@ CONFIG_VGA_CONSOLE=y
1049CONFIG_DUMMY_CONSOLE=y 1067CONFIG_DUMMY_CONSOLE=y
1050CONFIG_SOUND=y 1068CONFIG_SOUND=y
1051CONFIG_SOUND_OSS_CORE=y 1069CONFIG_SOUND_OSS_CORE=y
1070CONFIG_SOUND_OSS_CORE_PRECLAIM=y
1052CONFIG_SND=y 1071CONFIG_SND=y
1053CONFIG_SND_TIMER=y 1072CONFIG_SND_TIMER=y
1054CONFIG_SND_PCM=y 1073CONFIG_SND_PCM=y
@@ -1152,7 +1171,6 @@ CONFIG_SND_USB=y
1152CONFIG_AC97_BUS=y 1171CONFIG_AC97_BUS=y
1153CONFIG_HID_SUPPORT=y 1172CONFIG_HID_SUPPORT=y
1154CONFIG_HID=y 1173CONFIG_HID=y
1155# CONFIG_HID_DEBUG is not set
1156# CONFIG_HIDRAW is not set 1174# CONFIG_HIDRAW is not set
1157 1175
1158# 1176#
@@ -1175,6 +1193,7 @@ CONFIG_HID_CYPRESS=y
1175CONFIG_HID_EZKEY=y 1193CONFIG_HID_EZKEY=y
1176# CONFIG_HID_KYE is not set 1194# CONFIG_HID_KYE is not set
1177CONFIG_HID_GYRATION=y 1195CONFIG_HID_GYRATION=y
1196# CONFIG_HID_TWINHAN is not set
1178# CONFIG_HID_KENSINGTON is not set 1197# CONFIG_HID_KENSINGTON is not set
1179CONFIG_HID_LOGITECH=y 1198CONFIG_HID_LOGITECH=y
1180# CONFIG_LOGITECH_FF is not set 1199# CONFIG_LOGITECH_FF is not set
@@ -1227,6 +1246,7 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y
1227# CONFIG_USB_OXU210HP_HCD is not set 1246# CONFIG_USB_OXU210HP_HCD is not set
1228# CONFIG_USB_ISP116X_HCD is not set 1247# CONFIG_USB_ISP116X_HCD is not set
1229# CONFIG_USB_ISP1760_HCD is not set 1248# CONFIG_USB_ISP1760_HCD is not set
1249# CONFIG_USB_ISP1362_HCD is not set
1230CONFIG_USB_OHCI_HCD=y 1250CONFIG_USB_OHCI_HCD=y
1231CONFIG_USB_OHCI_HCD_PPC_OF_BE=y 1251CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
1232CONFIG_USB_OHCI_HCD_PPC_OF_LE=y 1252CONFIG_USB_OHCI_HCD_PPC_OF_LE=y
@@ -1241,7 +1261,6 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1241# CONFIG_USB_R8A66597_HCD is not set 1261# CONFIG_USB_R8A66597_HCD is not set
1242# CONFIG_USB_WHCI_HCD is not set 1262# CONFIG_USB_WHCI_HCD is not set
1243# CONFIG_USB_HWA_HCD is not set 1263# CONFIG_USB_HWA_HCD is not set
1244# CONFIG_USB_MUSB_HDRC is not set
1245 1264
1246# 1265#
1247# USB Device Class drivers 1266# USB Device Class drivers
@@ -1429,6 +1448,7 @@ CONFIG_FS_MBCACHE=y
1429# CONFIG_GFS2_FS is not set 1448# CONFIG_GFS2_FS is not set
1430# CONFIG_OCFS2_FS is not set 1449# CONFIG_OCFS2_FS is not set
1431# CONFIG_BTRFS_FS is not set 1450# CONFIG_BTRFS_FS is not set
1451# CONFIG_NILFS2_FS is not set
1432CONFIG_FILE_LOCKING=y 1452CONFIG_FILE_LOCKING=y
1433CONFIG_FSNOTIFY=y 1453CONFIG_FSNOTIFY=y
1434CONFIG_DNOTIFY=y 1454CONFIG_DNOTIFY=y
@@ -1499,7 +1519,6 @@ CONFIG_SYSV_FS=m
1499CONFIG_UFS_FS=m 1519CONFIG_UFS_FS=m
1500# CONFIG_UFS_FS_WRITE is not set 1520# CONFIG_UFS_FS_WRITE is not set
1501# CONFIG_UFS_DEBUG is not set 1521# CONFIG_UFS_DEBUG is not set
1502# CONFIG_NILFS2_FS is not set
1503CONFIG_NETWORK_FILESYSTEMS=y 1522CONFIG_NETWORK_FILESYSTEMS=y
1504CONFIG_NFS_FS=y 1523CONFIG_NFS_FS=y
1505CONFIG_NFS_V3=y 1524CONFIG_NFS_V3=y
@@ -1620,6 +1639,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
1620CONFIG_ENABLE_MUST_CHECK=y 1639CONFIG_ENABLE_MUST_CHECK=y
1621CONFIG_FRAME_WARN=1024 1640CONFIG_FRAME_WARN=1024
1622# CONFIG_MAGIC_SYSRQ is not set 1641# CONFIG_MAGIC_SYSRQ is not set
1642# CONFIG_STRIP_ASM_SYMS is not set
1623# CONFIG_UNUSED_SYMBOLS is not set 1643# CONFIG_UNUSED_SYMBOLS is not set
1624CONFIG_DEBUG_FS=y 1644CONFIG_DEBUG_FS=y
1625# CONFIG_HEADERS_CHECK is not set 1645# CONFIG_HEADERS_CHECK is not set
@@ -1637,6 +1657,7 @@ CONFIG_SCHED_DEBUG=y
1637# CONFIG_DEBUG_OBJECTS is not set 1657# CONFIG_DEBUG_OBJECTS is not set
1638# CONFIG_SLUB_DEBUG_ON is not set 1658# CONFIG_SLUB_DEBUG_ON is not set
1639# CONFIG_SLUB_STATS is not set 1659# CONFIG_SLUB_STATS is not set
1660# CONFIG_DEBUG_KMEMLEAK is not set
1640# CONFIG_DEBUG_RT_MUTEXES is not set 1661# CONFIG_DEBUG_RT_MUTEXES is not set
1641# CONFIG_RT_MUTEX_TESTER is not set 1662# CONFIG_RT_MUTEX_TESTER is not set
1642# CONFIG_DEBUG_SPINLOCK is not set 1663# CONFIG_DEBUG_SPINLOCK is not set
@@ -1656,10 +1677,12 @@ CONFIG_DEBUG_INFO=y
1656# CONFIG_DEBUG_LIST is not set 1677# CONFIG_DEBUG_LIST is not set
1657# CONFIG_DEBUG_SG is not set 1678# CONFIG_DEBUG_SG is not set
1658# CONFIG_DEBUG_NOTIFIERS is not set 1679# CONFIG_DEBUG_NOTIFIERS is not set
1680# CONFIG_DEBUG_CREDENTIALS is not set
1659# CONFIG_RCU_TORTURE_TEST is not set 1681# CONFIG_RCU_TORTURE_TEST is not set
1660# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1682# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1661# CONFIG_BACKTRACE_SELF_TEST is not set 1683# CONFIG_BACKTRACE_SELF_TEST is not set
1662# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 1684# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1685# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
1663# CONFIG_FAULT_INJECTION is not set 1686# CONFIG_FAULT_INJECTION is not set
1664# CONFIG_LATENCYTOP is not set 1687# CONFIG_LATENCYTOP is not set
1665CONFIG_SYSCTL_SYSCALL_CHECK=y 1688CONFIG_SYSCTL_SYSCALL_CHECK=y
@@ -1683,10 +1706,10 @@ CONFIG_BRANCH_PROFILE_NONE=y
1683# CONFIG_WORKQUEUE_TRACER is not set 1706# CONFIG_WORKQUEUE_TRACER is not set
1684# CONFIG_BLK_DEV_IO_TRACE is not set 1707# CONFIG_BLK_DEV_IO_TRACE is not set
1685# CONFIG_DYNAMIC_DEBUG is not set 1708# CONFIG_DYNAMIC_DEBUG is not set
1709# CONFIG_DMA_API_DEBUG is not set
1686# CONFIG_SAMPLES is not set 1710# CONFIG_SAMPLES is not set
1687CONFIG_HAVE_ARCH_KGDB=y 1711CONFIG_HAVE_ARCH_KGDB=y
1688# CONFIG_KGDB is not set 1712# CONFIG_KGDB is not set
1689# CONFIG_KMEMCHECK is not set
1690# CONFIG_PPC_DISABLE_WERROR is not set 1713# CONFIG_PPC_DISABLE_WERROR is not set
1691CONFIG_PPC_WERROR=y 1714CONFIG_PPC_WERROR=y
1692CONFIG_PRINT_STACK_DEPTH=64 1715CONFIG_PRINT_STACK_DEPTH=64
@@ -1714,7 +1737,6 @@ CONFIG_CRYPTO=y
1714# 1737#
1715# Crypto core or helper 1738# Crypto core or helper
1716# 1739#
1717# CONFIG_CRYPTO_FIPS is not set
1718CONFIG_CRYPTO_ALGAPI=y 1740CONFIG_CRYPTO_ALGAPI=y
1719CONFIG_CRYPTO_ALGAPI2=y 1741CONFIG_CRYPTO_ALGAPI2=y
1720CONFIG_CRYPTO_AEAD=y 1742CONFIG_CRYPTO_AEAD=y
@@ -1757,11 +1779,13 @@ CONFIG_CRYPTO_PCBC=m
1757# 1779#
1758CONFIG_CRYPTO_HMAC=y 1780CONFIG_CRYPTO_HMAC=y
1759# CONFIG_CRYPTO_XCBC is not set 1781# CONFIG_CRYPTO_XCBC is not set
1782# CONFIG_CRYPTO_VMAC is not set
1760 1783
1761# 1784#
1762# Digest 1785# Digest
1763# 1786#
1764CONFIG_CRYPTO_CRC32C=m 1787CONFIG_CRYPTO_CRC32C=m
1788# CONFIG_CRYPTO_GHASH is not set
1765# CONFIG_CRYPTO_MD4 is not set 1789# CONFIG_CRYPTO_MD4 is not set
1766CONFIG_CRYPTO_MD5=y 1790CONFIG_CRYPTO_MD5=y
1767# CONFIG_CRYPTO_MICHAEL_MIC is not set 1791# CONFIG_CRYPTO_MICHAEL_MIC is not set
@@ -1769,16 +1793,16 @@ CONFIG_CRYPTO_MD5=y
1769# CONFIG_CRYPTO_RMD160 is not set 1793# CONFIG_CRYPTO_RMD160 is not set
1770# CONFIG_CRYPTO_RMD256 is not set 1794# CONFIG_CRYPTO_RMD256 is not set
1771# CONFIG_CRYPTO_RMD320 is not set 1795# CONFIG_CRYPTO_RMD320 is not set
1772CONFIG_CRYPTO_SHA1=m 1796CONFIG_CRYPTO_SHA1=y
1773# CONFIG_CRYPTO_SHA256 is not set 1797CONFIG_CRYPTO_SHA256=y
1774# CONFIG_CRYPTO_SHA512 is not set 1798CONFIG_CRYPTO_SHA512=y
1775# CONFIG_CRYPTO_TGR192 is not set 1799# CONFIG_CRYPTO_TGR192 is not set
1776# CONFIG_CRYPTO_WP512 is not set 1800# CONFIG_CRYPTO_WP512 is not set
1777 1801
1778# 1802#
1779# Ciphers 1803# Ciphers
1780# 1804#
1781# CONFIG_CRYPTO_AES is not set 1805CONFIG_CRYPTO_AES=y
1782# CONFIG_CRYPTO_ANUBIS is not set 1806# CONFIG_CRYPTO_ANUBIS is not set
1783# CONFIG_CRYPTO_ARC4 is not set 1807# CONFIG_CRYPTO_ARC4 is not set
1784# CONFIG_CRYPTO_BLOWFISH is not set 1808# CONFIG_CRYPTO_BLOWFISH is not set
diff --git a/arch/powerpc/configs/mpc85xx_smp_defconfig b/arch/powerpc/configs/mpc85xx_smp_defconfig
index db082ce5a1c5..cd70b4a4ce01 100644
--- a/arch/powerpc/configs/mpc85xx_smp_defconfig
+++ b/arch/powerpc/configs/mpc85xx_smp_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.31-rc4 3# Linux kernel version: 2.6.32-rc5
4# Wed Jul 29 23:31:56 2009 4# Thu Nov 5 08:26:01 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -22,6 +22,7 @@ CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set 22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y 23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y 24CONFIG_PPC_MMU_NOHASH=y
25CONFIG_PPC_MMU_NOHASH_32=y
25CONFIG_PPC_BOOK3E_MMU=y 26CONFIG_PPC_BOOK3E_MMU=y
26# CONFIG_PPC_MM_SLICES is not set 27# CONFIG_PPC_MM_SLICES is not set
27CONFIG_SMP=y 28CONFIG_SMP=y
@@ -37,6 +38,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
37CONFIG_GENERIC_HARDIRQS=y 38CONFIG_GENERIC_HARDIRQS=y
38CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 39CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 40# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
41# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
40CONFIG_IRQ_PER_CPU=y 42CONFIG_IRQ_PER_CPU=y
41CONFIG_STACKTRACE_SUPPORT=y 43CONFIG_STACKTRACE_SUPPORT=y
42CONFIG_HAVE_LATENCYTOP_SUPPORT=y 44CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -89,11 +91,12 @@ CONFIG_AUDIT=y
89# 91#
90# RCU Subsystem 92# RCU Subsystem
91# 93#
92CONFIG_CLASSIC_RCU=y 94CONFIG_TREE_RCU=y
93# CONFIG_TREE_RCU is not set 95# CONFIG_TREE_PREEMPT_RCU is not set
94# CONFIG_PREEMPT_RCU is not set 96# CONFIG_RCU_TRACE is not set
97CONFIG_RCU_FANOUT=32
98# CONFIG_RCU_FANOUT_EXACT is not set
95# CONFIG_TREE_RCU_TRACE is not set 99# CONFIG_TREE_RCU_TRACE is not set
96# CONFIG_PREEMPT_RCU_TRACE is not set
97CONFIG_IKCONFIG=y 100CONFIG_IKCONFIG=y
98CONFIG_IKCONFIG_PROC=y 101CONFIG_IKCONFIG_PROC=y
99CONFIG_LOG_BUF_SHIFT=14 102CONFIG_LOG_BUF_SHIFT=14
@@ -132,22 +135,21 @@ CONFIG_TIMERFD=y
132CONFIG_EVENTFD=y 135CONFIG_EVENTFD=y
133CONFIG_SHMEM=y 136CONFIG_SHMEM=y
134CONFIG_AIO=y 137CONFIG_AIO=y
135CONFIG_HAVE_PERF_COUNTERS=y 138CONFIG_HAVE_PERF_EVENTS=y
136 139
137# 140#
138# Performance Counters 141# Kernel Performance Events And Counters
139# 142#
143# CONFIG_PERF_EVENTS is not set
140# CONFIG_PERF_COUNTERS is not set 144# CONFIG_PERF_COUNTERS is not set
141CONFIG_VM_EVENT_COUNTERS=y 145CONFIG_VM_EVENT_COUNTERS=y
142CONFIG_PCI_QUIRKS=y 146CONFIG_PCI_QUIRKS=y
143CONFIG_SLUB_DEBUG=y 147CONFIG_SLUB_DEBUG=y
144# CONFIG_STRIP_ASM_SYMS is not set
145CONFIG_COMPAT_BRK=y 148CONFIG_COMPAT_BRK=y
146# CONFIG_SLAB is not set 149# CONFIG_SLAB is not set
147CONFIG_SLUB=y 150CONFIG_SLUB=y
148# CONFIG_SLOB is not set 151# CONFIG_SLOB is not set
149# CONFIG_PROFILING is not set 152# CONFIG_PROFILING is not set
150# CONFIG_MARKERS is not set
151CONFIG_HAVE_OPROFILE=y 153CONFIG_HAVE_OPROFILE=y
152# CONFIG_KPROBES is not set 154# CONFIG_KPROBES is not set
153CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 155CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -155,8 +157,10 @@ CONFIG_HAVE_IOREMAP_PROT=y
155CONFIG_HAVE_KPROBES=y 157CONFIG_HAVE_KPROBES=y
156CONFIG_HAVE_KRETPROBES=y 158CONFIG_HAVE_KRETPROBES=y
157CONFIG_HAVE_ARCH_TRACEHOOK=y 159CONFIG_HAVE_ARCH_TRACEHOOK=y
160CONFIG_HAVE_DMA_ATTRS=y
158CONFIG_USE_GENERIC_SMP_HELPERS=y 161CONFIG_USE_GENERIC_SMP_HELPERS=y
159CONFIG_HAVE_CLK=y 162CONFIG_HAVE_CLK=y
163CONFIG_HAVE_DMA_API_DEBUG=y
160 164
161# 165#
162# GCOV-based kernel profiling 166# GCOV-based kernel profiling
@@ -192,6 +196,7 @@ CONFIG_DEFAULT_CFQ=y
192# CONFIG_DEFAULT_NOOP is not set 196# CONFIG_DEFAULT_NOOP is not set
193CONFIG_DEFAULT_IOSCHED="cfq" 197CONFIG_DEFAULT_IOSCHED="cfq"
194# CONFIG_FREEZER is not set 198# CONFIG_FREEZER is not set
199CONFIG_PPC_MSI_BITMAP=y
195 200
196# 201#
197# Platform support 202# Platform support
@@ -206,9 +211,10 @@ CONFIG_MPC85xx_CDS=y
206CONFIG_MPC85xx_MDS=y 211CONFIG_MPC85xx_MDS=y
207CONFIG_MPC8536_DS=y 212CONFIG_MPC8536_DS=y
208CONFIG_MPC85xx_DS=y 213CONFIG_MPC85xx_DS=y
214CONFIG_MPC85xx_RDB=y
209CONFIG_SOCRATES=y 215CONFIG_SOCRATES=y
210CONFIG_KSI8560=y 216CONFIG_KSI8560=y
211# CONFIG_XES_MPC85xx is not set 217CONFIG_XES_MPC85xx=y
212CONFIG_STX_GP3=y 218CONFIG_STX_GP3=y
213CONFIG_TQM8540=y 219CONFIG_TQM8540=y
214CONFIG_TQM8541=y 220CONFIG_TQM8541=y
@@ -261,11 +267,11 @@ CONFIG_BINFMT_MISC=m
261CONFIG_MATH_EMULATION=y 267CONFIG_MATH_EMULATION=y
262CONFIG_IOMMU_HELPER=y 268CONFIG_IOMMU_HELPER=y
263CONFIG_SWIOTLB=y 269CONFIG_SWIOTLB=y
264CONFIG_PPC_NEED_DMA_SYNC_OPS=y
265CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 270CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
266CONFIG_ARCH_HAS_WALK_MEMORY=y 271CONFIG_ARCH_HAS_WALK_MEMORY=y
267CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 272CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
268# CONFIG_IRQ_ALL_CPUS is not set 273# CONFIG_IRQ_ALL_CPUS is not set
274CONFIG_MAX_ACTIVE_REGIONS=32
269CONFIG_ARCH_FLATMEM_ENABLE=y 275CONFIG_ARCH_FLATMEM_ENABLE=y
270CONFIG_ARCH_POPULATES_NODE_MAP=y 276CONFIG_ARCH_POPULATES_NODE_MAP=y
271CONFIG_SELECT_MEMORY_MODEL=y 277CONFIG_SELECT_MEMORY_MODEL=y
@@ -283,6 +289,7 @@ CONFIG_BOUNCE=y
283CONFIG_VIRT_TO_BUS=y 289CONFIG_VIRT_TO_BUS=y
284CONFIG_HAVE_MLOCK=y 290CONFIG_HAVE_MLOCK=y
285CONFIG_HAVE_MLOCKED_PAGE_BIT=y 291CONFIG_HAVE_MLOCKED_PAGE_BIT=y
292# CONFIG_KSM is not set
286CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 293CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
287CONFIG_PPC_4K_PAGES=y 294CONFIG_PPC_4K_PAGES=y
288# CONFIG_PPC_16K_PAGES is not set 295# CONFIG_PPC_16K_PAGES is not set
@@ -310,7 +317,7 @@ CONFIG_PCI_DOMAINS=y
310CONFIG_PCI_SYSCALL=y 317CONFIG_PCI_SYSCALL=y
311# CONFIG_PCIEPORTBUS is not set 318# CONFIG_PCIEPORTBUS is not set
312CONFIG_ARCH_SUPPORTS_MSI=y 319CONFIG_ARCH_SUPPORTS_MSI=y
313# CONFIG_PCI_MSI is not set 320CONFIG_PCI_MSI=y
314# CONFIG_PCI_LEGACY is not set 321# CONFIG_PCI_LEGACY is not set
315# CONFIG_PCI_DEBUG is not set 322# CONFIG_PCI_DEBUG is not set
316# CONFIG_PCI_STUB is not set 323# CONFIG_PCI_STUB is not set
@@ -318,7 +325,8 @@ CONFIG_ARCH_SUPPORTS_MSI=y
318# CONFIG_PCCARD is not set 325# CONFIG_PCCARD is not set
319# CONFIG_HOTPLUG_PCI is not set 326# CONFIG_HOTPLUG_PCI is not set
320CONFIG_HAS_RAPIDIO=y 327CONFIG_HAS_RAPIDIO=y
321# CONFIG_RAPIDIO is not set 328CONFIG_RAPIDIO=y
329CONFIG_RAPIDIO_DISC_TIMEOUT=30
322 330
323# 331#
324# Advanced setup 332# Advanced setup
@@ -348,7 +356,7 @@ CONFIG_XFRM_USER=y
348# CONFIG_XFRM_SUB_POLICY is not set 356# CONFIG_XFRM_SUB_POLICY is not set
349# CONFIG_XFRM_MIGRATE is not set 357# CONFIG_XFRM_MIGRATE is not set
350# CONFIG_XFRM_STATISTICS is not set 358# CONFIG_XFRM_STATISTICS is not set
351CONFIG_NET_KEY=m 359CONFIG_NET_KEY=y
352# CONFIG_NET_KEY_MIGRATE is not set 360# CONFIG_NET_KEY_MIGRATE is not set
353CONFIG_INET=y 361CONFIG_INET=y
354CONFIG_IP_MULTICAST=y 362CONFIG_IP_MULTICAST=y
@@ -372,12 +380,12 @@ CONFIG_IP_PIMSM_V2=y
372CONFIG_ARPD=y 380CONFIG_ARPD=y
373# CONFIG_SYN_COOKIES is not set 381# CONFIG_SYN_COOKIES is not set
374# CONFIG_INET_AH is not set 382# CONFIG_INET_AH is not set
375# CONFIG_INET_ESP is not set 383CONFIG_INET_ESP=y
376# CONFIG_INET_IPCOMP is not set 384# CONFIG_INET_IPCOMP is not set
377# CONFIG_INET_XFRM_TUNNEL is not set 385# CONFIG_INET_XFRM_TUNNEL is not set
378CONFIG_INET_TUNNEL=y 386CONFIG_INET_TUNNEL=y
379# CONFIG_INET_XFRM_MODE_TRANSPORT is not set 387CONFIG_INET_XFRM_MODE_TRANSPORT=y
380# CONFIG_INET_XFRM_MODE_TUNNEL is not set 388CONFIG_INET_XFRM_MODE_TUNNEL=y
381# CONFIG_INET_XFRM_MODE_BEET is not set 389# CONFIG_INET_XFRM_MODE_BEET is not set
382# CONFIG_INET_LRO is not set 390# CONFIG_INET_LRO is not set
383CONFIG_INET_DIAG=y 391CONFIG_INET_DIAG=y
@@ -414,6 +422,7 @@ CONFIG_IP_SCTP=m
414# CONFIG_SCTP_HMAC_NONE is not set 422# CONFIG_SCTP_HMAC_NONE is not set
415# CONFIG_SCTP_HMAC_SHA1 is not set 423# CONFIG_SCTP_HMAC_SHA1 is not set
416CONFIG_SCTP_HMAC_MD5=y 424CONFIG_SCTP_HMAC_MD5=y
425# CONFIG_RDS is not set
417# CONFIG_TIPC is not set 426# CONFIG_TIPC is not set
418# CONFIG_ATM is not set 427# CONFIG_ATM is not set
419# CONFIG_BRIDGE is not set 428# CONFIG_BRIDGE is not set
@@ -444,6 +453,7 @@ CONFIG_SCTP_HMAC_MD5=y
444CONFIG_FIB_RULES=y 453CONFIG_FIB_RULES=y
445CONFIG_WIRELESS=y 454CONFIG_WIRELESS=y
446# CONFIG_CFG80211 is not set 455# CONFIG_CFG80211 is not set
456CONFIG_CFG80211_DEFAULT_PS_VALUE=0
447CONFIG_WIRELESS_OLD_REGULATORY=y 457CONFIG_WIRELESS_OLD_REGULATORY=y
448# CONFIG_WIRELESS_EXT is not set 458# CONFIG_WIRELESS_EXT is not set
449# CONFIG_LIB80211 is not set 459# CONFIG_LIB80211 is not set
@@ -451,7 +461,6 @@ CONFIG_WIRELESS_OLD_REGULATORY=y
451# 461#
452# CFG80211 needs to be enabled for MAC80211 462# CFG80211 needs to be enabled for MAC80211
453# 463#
454CONFIG_MAC80211_DEFAULT_PS_VALUE=0
455# CONFIG_WIMAX is not set 464# CONFIG_WIMAX is not set
456# CONFIG_RFKILL is not set 465# CONFIG_RFKILL is not set
457# CONFIG_NET_9P is not set 466# CONFIG_NET_9P is not set
@@ -464,6 +473,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
464# Generic Driver Options 473# Generic Driver Options
465# 474#
466CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 475CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
476# CONFIG_DEVTMPFS is not set
467CONFIG_STANDALONE=y 477CONFIG_STANDALONE=y
468CONFIG_PREVENT_FIRMWARE_BUILD=y 478CONFIG_PREVENT_FIRMWARE_BUILD=y
469CONFIG_FW_LOADER=y 479CONFIG_FW_LOADER=y
@@ -557,6 +567,7 @@ CONFIG_SCSI_LOWLEVEL=y
557# CONFIG_ISCSI_TCP is not set 567# CONFIG_ISCSI_TCP is not set
558# CONFIG_SCSI_CXGB3_ISCSI is not set 568# CONFIG_SCSI_CXGB3_ISCSI is not set
559# CONFIG_SCSI_BNX2_ISCSI is not set 569# CONFIG_SCSI_BNX2_ISCSI is not set
570# CONFIG_BE2ISCSI is not set
560# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 571# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
561# CONFIG_SCSI_3W_9XXX is not set 572# CONFIG_SCSI_3W_9XXX is not set
562# CONFIG_SCSI_ACARD is not set 573# CONFIG_SCSI_ACARD is not set
@@ -596,11 +607,14 @@ CONFIG_SCSI_LOWLEVEL=y
596# CONFIG_SCSI_DC390T is not set 607# CONFIG_SCSI_DC390T is not set
597# CONFIG_SCSI_NSP32 is not set 608# CONFIG_SCSI_NSP32 is not set
598# CONFIG_SCSI_DEBUG is not set 609# CONFIG_SCSI_DEBUG is not set
610# CONFIG_SCSI_PMCRAID is not set
599# CONFIG_SCSI_SRP is not set 611# CONFIG_SCSI_SRP is not set
612# CONFIG_SCSI_BFA_FC is not set
600# CONFIG_SCSI_DH is not set 613# CONFIG_SCSI_DH is not set
601# CONFIG_SCSI_OSD_INITIATOR is not set 614# CONFIG_SCSI_OSD_INITIATOR is not set
602CONFIG_ATA=y 615CONFIG_ATA=y
603# CONFIG_ATA_NONSTANDARD is not set 616# CONFIG_ATA_NONSTANDARD is not set
617CONFIG_ATA_VERBOSE_ERROR=y
604CONFIG_SATA_PMP=y 618CONFIG_SATA_PMP=y
605CONFIG_SATA_AHCI=y 619CONFIG_SATA_AHCI=y
606# CONFIG_SATA_SIL24 is not set 620# CONFIG_SATA_SIL24 is not set
@@ -623,6 +637,7 @@ CONFIG_ATA_SFF=y
623CONFIG_PATA_ALI=y 637CONFIG_PATA_ALI=y
624# CONFIG_PATA_AMD is not set 638# CONFIG_PATA_AMD is not set
625# CONFIG_PATA_ARTOP is not set 639# CONFIG_PATA_ARTOP is not set
640# CONFIG_PATA_ATP867X is not set
626# CONFIG_PATA_ATIIXP is not set 641# CONFIG_PATA_ATIIXP is not set
627# CONFIG_PATA_CMD640_PCI is not set 642# CONFIG_PATA_CMD640_PCI is not set
628# CONFIG_PATA_CMD64X is not set 643# CONFIG_PATA_CMD64X is not set
@@ -650,6 +665,7 @@ CONFIG_PATA_ALI=y
650# CONFIG_PATA_OPTIDMA is not set 665# CONFIG_PATA_OPTIDMA is not set
651# CONFIG_PATA_PDC_OLD is not set 666# CONFIG_PATA_PDC_OLD is not set
652# CONFIG_PATA_RADISYS is not set 667# CONFIG_PATA_RADISYS is not set
668# CONFIG_PATA_RDC is not set
653# CONFIG_PATA_RZ1000 is not set 669# CONFIG_PATA_RZ1000 is not set
654# CONFIG_PATA_SC1200 is not set 670# CONFIG_PATA_SC1200 is not set
655# CONFIG_PATA_SERVERWORKS is not set 671# CONFIG_PATA_SERVERWORKS is not set
@@ -726,7 +742,9 @@ CONFIG_MII=y
726# CONFIG_NET_PCI is not set 742# CONFIG_NET_PCI is not set
727# CONFIG_B44 is not set 743# CONFIG_B44 is not set
728# CONFIG_KS8842 is not set 744# CONFIG_KS8842 is not set
745# CONFIG_KS8851_MLL is not set
729# CONFIG_ATL2 is not set 746# CONFIG_ATL2 is not set
747# CONFIG_XILINX_EMACLITE is not set
730CONFIG_FS_ENET=y 748CONFIG_FS_ENET=y
731CONFIG_FS_ENET_HAS_SCC=y 749CONFIG_FS_ENET_HAS_SCC=y
732CONFIG_FS_ENET_HAS_FCC=y 750CONFIG_FS_ENET_HAS_FCC=y
@@ -753,7 +771,6 @@ CONFIG_NETDEV_1000=y
753CONFIG_FSL_PQ_MDIO=y 771CONFIG_FSL_PQ_MDIO=y
754CONFIG_GIANFAR=y 772CONFIG_GIANFAR=y
755CONFIG_UCC_GETH=y 773CONFIG_UCC_GETH=y
756# CONFIG_UGETH_MAGIC_PACKET is not set
757# CONFIG_UGETH_TX_ON_DEMAND is not set 774# CONFIG_UGETH_TX_ON_DEMAND is not set
758# CONFIG_MV643XX_ETH is not set 775# CONFIG_MV643XX_ETH is not set
759# CONFIG_QLA3XXX is not set 776# CONFIG_QLA3XXX is not set
@@ -781,10 +798,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
781# CONFIG_SFC is not set 798# CONFIG_SFC is not set
782# CONFIG_BE2NET is not set 799# CONFIG_BE2NET is not set
783# CONFIG_TR is not set 800# CONFIG_TR is not set
784 801CONFIG_WLAN=y
785#
786# Wireless LAN
787#
788# CONFIG_WLAN_PRE80211 is not set 802# CONFIG_WLAN_PRE80211 is not set
789# CONFIG_WLAN_80211 is not set 803# CONFIG_WLAN_80211 is not set
790 804
@@ -801,6 +815,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
801# CONFIG_USB_RTL8150 is not set 815# CONFIG_USB_RTL8150 is not set
802# CONFIG_USB_USBNET is not set 816# CONFIG_USB_USBNET is not set
803# CONFIG_WAN is not set 817# CONFIG_WAN is not set
818# CONFIG_RIONET is not set
804# CONFIG_FDDI is not set 819# CONFIG_FDDI is not set
805# CONFIG_HIPPI is not set 820# CONFIG_HIPPI is not set
806# CONFIG_PPP is not set 821# CONFIG_PPP is not set
@@ -901,6 +916,7 @@ CONFIG_NVRAM=y
901CONFIG_DEVPORT=y 916CONFIG_DEVPORT=y
902CONFIG_I2C=y 917CONFIG_I2C=y
903CONFIG_I2C_BOARDINFO=y 918CONFIG_I2C_BOARDINFO=y
919CONFIG_I2C_COMPAT=y
904# CONFIG_I2C_CHARDEV is not set 920# CONFIG_I2C_CHARDEV is not set
905CONFIG_I2C_HELPER_AUTO=y 921CONFIG_I2C_HELPER_AUTO=y
906 922
@@ -958,9 +974,6 @@ CONFIG_I2C_MPC=y
958# Miscellaneous I2C Chip support 974# Miscellaneous I2C Chip support
959# 975#
960# CONFIG_DS1682 is not set 976# CONFIG_DS1682 is not set
961# CONFIG_SENSORS_PCF8574 is not set
962# CONFIG_PCF8575 is not set
963# CONFIG_SENSORS_PCA9539 is not set
964# CONFIG_SENSORS_TSL2550 is not set 977# CONFIG_SENSORS_TSL2550 is not set
965# CONFIG_I2C_DEBUG_CORE is not set 978# CONFIG_I2C_DEBUG_CORE is not set
966# CONFIG_I2C_DEBUG_ALGO is not set 979# CONFIG_I2C_DEBUG_ALGO is not set
@@ -994,15 +1007,19 @@ CONFIG_GPIOLIB=y
994# PCI GPIO expanders: 1007# PCI GPIO expanders:
995# 1008#
996# CONFIG_GPIO_BT8XX is not set 1009# CONFIG_GPIO_BT8XX is not set
1010# CONFIG_GPIO_LANGWELL is not set
997 1011
998# 1012#
999# SPI GPIO expanders: 1013# SPI GPIO expanders:
1000# 1014#
1015
1016#
1017# AC97 GPIO expanders:
1018#
1001# CONFIG_W1 is not set 1019# CONFIG_W1 is not set
1002# CONFIG_POWER_SUPPLY is not set 1020# CONFIG_POWER_SUPPLY is not set
1003# CONFIG_HWMON is not set 1021# CONFIG_HWMON is not set
1004# CONFIG_THERMAL is not set 1022# CONFIG_THERMAL is not set
1005# CONFIG_THERMAL_HWMON is not set
1006# CONFIG_WATCHDOG is not set 1023# CONFIG_WATCHDOG is not set
1007CONFIG_SSB_POSSIBLE=y 1024CONFIG_SSB_POSSIBLE=y
1008 1025
@@ -1023,6 +1040,7 @@ CONFIG_SSB_POSSIBLE=y
1023# CONFIG_MFD_TMIO is not set 1040# CONFIG_MFD_TMIO is not set
1024# CONFIG_PMIC_DA903X is not set 1041# CONFIG_PMIC_DA903X is not set
1025# CONFIG_MFD_WM8400 is not set 1042# CONFIG_MFD_WM8400 is not set
1043# CONFIG_MFD_WM831X is not set
1026# CONFIG_MFD_WM8350_I2C is not set 1044# CONFIG_MFD_WM8350_I2C is not set
1027# CONFIG_MFD_PCF50633 is not set 1045# CONFIG_MFD_PCF50633 is not set
1028# CONFIG_AB3100_CORE is not set 1046# CONFIG_AB3100_CORE is not set
@@ -1033,6 +1051,7 @@ CONFIG_SSB_POSSIBLE=y
1033# Graphics support 1051# Graphics support
1034# 1052#
1035# CONFIG_AGP is not set 1053# CONFIG_AGP is not set
1054CONFIG_VGA_ARB=y
1036# CONFIG_DRM is not set 1055# CONFIG_DRM is not set
1037# CONFIG_VGASTATE is not set 1056# CONFIG_VGASTATE is not set
1038CONFIG_VIDEO_OUTPUT_CONTROL=y 1057CONFIG_VIDEO_OUTPUT_CONTROL=y
@@ -1052,6 +1071,7 @@ CONFIG_VGA_CONSOLE=y
1052CONFIG_DUMMY_CONSOLE=y 1071CONFIG_DUMMY_CONSOLE=y
1053CONFIG_SOUND=y 1072CONFIG_SOUND=y
1054CONFIG_SOUND_OSS_CORE=y 1073CONFIG_SOUND_OSS_CORE=y
1074CONFIG_SOUND_OSS_CORE_PRECLAIM=y
1055CONFIG_SND=y 1075CONFIG_SND=y
1056CONFIG_SND_TIMER=y 1076CONFIG_SND_TIMER=y
1057CONFIG_SND_PCM=y 1077CONFIG_SND_PCM=y
@@ -1155,7 +1175,6 @@ CONFIG_SND_USB=y
1155CONFIG_AC97_BUS=y 1175CONFIG_AC97_BUS=y
1156CONFIG_HID_SUPPORT=y 1176CONFIG_HID_SUPPORT=y
1157CONFIG_HID=y 1177CONFIG_HID=y
1158# CONFIG_HID_DEBUG is not set
1159# CONFIG_HIDRAW is not set 1178# CONFIG_HIDRAW is not set
1160 1179
1161# 1180#
@@ -1178,6 +1197,7 @@ CONFIG_HID_CYPRESS=y
1178CONFIG_HID_EZKEY=y 1197CONFIG_HID_EZKEY=y
1179# CONFIG_HID_KYE is not set 1198# CONFIG_HID_KYE is not set
1180CONFIG_HID_GYRATION=y 1199CONFIG_HID_GYRATION=y
1200# CONFIG_HID_TWINHAN is not set
1181# CONFIG_HID_KENSINGTON is not set 1201# CONFIG_HID_KENSINGTON is not set
1182CONFIG_HID_LOGITECH=y 1202CONFIG_HID_LOGITECH=y
1183# CONFIG_LOGITECH_FF is not set 1203# CONFIG_LOGITECH_FF is not set
@@ -1230,6 +1250,7 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y
1230# CONFIG_USB_OXU210HP_HCD is not set 1250# CONFIG_USB_OXU210HP_HCD is not set
1231# CONFIG_USB_ISP116X_HCD is not set 1251# CONFIG_USB_ISP116X_HCD is not set
1232# CONFIG_USB_ISP1760_HCD is not set 1252# CONFIG_USB_ISP1760_HCD is not set
1253# CONFIG_USB_ISP1362_HCD is not set
1233CONFIG_USB_OHCI_HCD=y 1254CONFIG_USB_OHCI_HCD=y
1234CONFIG_USB_OHCI_HCD_PPC_OF_BE=y 1255CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
1235CONFIG_USB_OHCI_HCD_PPC_OF_LE=y 1256CONFIG_USB_OHCI_HCD_PPC_OF_LE=y
@@ -1244,7 +1265,6 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1244# CONFIG_USB_R8A66597_HCD is not set 1265# CONFIG_USB_R8A66597_HCD is not set
1245# CONFIG_USB_WHCI_HCD is not set 1266# CONFIG_USB_WHCI_HCD is not set
1246# CONFIG_USB_HWA_HCD is not set 1267# CONFIG_USB_HWA_HCD is not set
1247# CONFIG_USB_MUSB_HDRC is not set
1248 1268
1249# 1269#
1250# USB Device Class drivers 1270# USB Device Class drivers
@@ -1432,6 +1452,7 @@ CONFIG_FS_MBCACHE=y
1432# CONFIG_GFS2_FS is not set 1452# CONFIG_GFS2_FS is not set
1433# CONFIG_OCFS2_FS is not set 1453# CONFIG_OCFS2_FS is not set
1434# CONFIG_BTRFS_FS is not set 1454# CONFIG_BTRFS_FS is not set
1455# CONFIG_NILFS2_FS is not set
1435CONFIG_FILE_LOCKING=y 1456CONFIG_FILE_LOCKING=y
1436CONFIG_FSNOTIFY=y 1457CONFIG_FSNOTIFY=y
1437CONFIG_DNOTIFY=y 1458CONFIG_DNOTIFY=y
@@ -1502,7 +1523,6 @@ CONFIG_SYSV_FS=m
1502CONFIG_UFS_FS=m 1523CONFIG_UFS_FS=m
1503# CONFIG_UFS_FS_WRITE is not set 1524# CONFIG_UFS_FS_WRITE is not set
1504# CONFIG_UFS_DEBUG is not set 1525# CONFIG_UFS_DEBUG is not set
1505# CONFIG_NILFS2_FS is not set
1506CONFIG_NETWORK_FILESYSTEMS=y 1526CONFIG_NETWORK_FILESYSTEMS=y
1507CONFIG_NFS_FS=y 1527CONFIG_NFS_FS=y
1508CONFIG_NFS_V3=y 1528CONFIG_NFS_V3=y
@@ -1623,6 +1643,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
1623CONFIG_ENABLE_MUST_CHECK=y 1643CONFIG_ENABLE_MUST_CHECK=y
1624CONFIG_FRAME_WARN=1024 1644CONFIG_FRAME_WARN=1024
1625# CONFIG_MAGIC_SYSRQ is not set 1645# CONFIG_MAGIC_SYSRQ is not set
1646# CONFIG_STRIP_ASM_SYMS is not set
1626# CONFIG_UNUSED_SYMBOLS is not set 1647# CONFIG_UNUSED_SYMBOLS is not set
1627CONFIG_DEBUG_FS=y 1648CONFIG_DEBUG_FS=y
1628# CONFIG_HEADERS_CHECK is not set 1649# CONFIG_HEADERS_CHECK is not set
@@ -1640,6 +1661,7 @@ CONFIG_SCHED_DEBUG=y
1640# CONFIG_DEBUG_OBJECTS is not set 1661# CONFIG_DEBUG_OBJECTS is not set
1641# CONFIG_SLUB_DEBUG_ON is not set 1662# CONFIG_SLUB_DEBUG_ON is not set
1642# CONFIG_SLUB_STATS is not set 1663# CONFIG_SLUB_STATS is not set
1664# CONFIG_DEBUG_KMEMLEAK is not set
1643# CONFIG_DEBUG_RT_MUTEXES is not set 1665# CONFIG_DEBUG_RT_MUTEXES is not set
1644# CONFIG_RT_MUTEX_TESTER is not set 1666# CONFIG_RT_MUTEX_TESTER is not set
1645# CONFIG_DEBUG_SPINLOCK is not set 1667# CONFIG_DEBUG_SPINLOCK is not set
@@ -1659,10 +1681,12 @@ CONFIG_DEBUG_INFO=y
1659# CONFIG_DEBUG_LIST is not set 1681# CONFIG_DEBUG_LIST is not set
1660# CONFIG_DEBUG_SG is not set 1682# CONFIG_DEBUG_SG is not set
1661# CONFIG_DEBUG_NOTIFIERS is not set 1683# CONFIG_DEBUG_NOTIFIERS is not set
1684# CONFIG_DEBUG_CREDENTIALS is not set
1662# CONFIG_RCU_TORTURE_TEST is not set 1685# CONFIG_RCU_TORTURE_TEST is not set
1663# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1686# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1664# CONFIG_BACKTRACE_SELF_TEST is not set 1687# CONFIG_BACKTRACE_SELF_TEST is not set
1665# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 1688# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1689# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
1666# CONFIG_FAULT_INJECTION is not set 1690# CONFIG_FAULT_INJECTION is not set
1667# CONFIG_LATENCYTOP is not set 1691# CONFIG_LATENCYTOP is not set
1668CONFIG_SYSCTL_SYSCALL_CHECK=y 1692CONFIG_SYSCTL_SYSCALL_CHECK=y
@@ -1686,10 +1710,10 @@ CONFIG_BRANCH_PROFILE_NONE=y
1686# CONFIG_WORKQUEUE_TRACER is not set 1710# CONFIG_WORKQUEUE_TRACER is not set
1687# CONFIG_BLK_DEV_IO_TRACE is not set 1711# CONFIG_BLK_DEV_IO_TRACE is not set
1688# CONFIG_DYNAMIC_DEBUG is not set 1712# CONFIG_DYNAMIC_DEBUG is not set
1713# CONFIG_DMA_API_DEBUG is not set
1689# CONFIG_SAMPLES is not set 1714# CONFIG_SAMPLES is not set
1690CONFIG_HAVE_ARCH_KGDB=y 1715CONFIG_HAVE_ARCH_KGDB=y
1691# CONFIG_KGDB is not set 1716# CONFIG_KGDB is not set
1692# CONFIG_KMEMCHECK is not set
1693# CONFIG_PPC_DISABLE_WERROR is not set 1717# CONFIG_PPC_DISABLE_WERROR is not set
1694CONFIG_PPC_WERROR=y 1718CONFIG_PPC_WERROR=y
1695CONFIG_PRINT_STACK_DEPTH=64 1719CONFIG_PRINT_STACK_DEPTH=64
@@ -1717,7 +1741,6 @@ CONFIG_CRYPTO=y
1717# 1741#
1718# Crypto core or helper 1742# Crypto core or helper
1719# 1743#
1720# CONFIG_CRYPTO_FIPS is not set
1721CONFIG_CRYPTO_ALGAPI=y 1744CONFIG_CRYPTO_ALGAPI=y
1722CONFIG_CRYPTO_ALGAPI2=y 1745CONFIG_CRYPTO_ALGAPI2=y
1723CONFIG_CRYPTO_AEAD=y 1746CONFIG_CRYPTO_AEAD=y
@@ -1760,11 +1783,13 @@ CONFIG_CRYPTO_PCBC=m
1760# 1783#
1761CONFIG_CRYPTO_HMAC=y 1784CONFIG_CRYPTO_HMAC=y
1762# CONFIG_CRYPTO_XCBC is not set 1785# CONFIG_CRYPTO_XCBC is not set
1786# CONFIG_CRYPTO_VMAC is not set
1763 1787
1764# 1788#
1765# Digest 1789# Digest
1766# 1790#
1767CONFIG_CRYPTO_CRC32C=m 1791CONFIG_CRYPTO_CRC32C=m
1792# CONFIG_CRYPTO_GHASH is not set
1768# CONFIG_CRYPTO_MD4 is not set 1793# CONFIG_CRYPTO_MD4 is not set
1769CONFIG_CRYPTO_MD5=y 1794CONFIG_CRYPTO_MD5=y
1770# CONFIG_CRYPTO_MICHAEL_MIC is not set 1795# CONFIG_CRYPTO_MICHAEL_MIC is not set
@@ -1772,16 +1797,16 @@ CONFIG_CRYPTO_MD5=y
1772# CONFIG_CRYPTO_RMD160 is not set 1797# CONFIG_CRYPTO_RMD160 is not set
1773# CONFIG_CRYPTO_RMD256 is not set 1798# CONFIG_CRYPTO_RMD256 is not set
1774# CONFIG_CRYPTO_RMD320 is not set 1799# CONFIG_CRYPTO_RMD320 is not set
1775CONFIG_CRYPTO_SHA1=m 1800CONFIG_CRYPTO_SHA1=y
1776# CONFIG_CRYPTO_SHA256 is not set 1801CONFIG_CRYPTO_SHA256=y
1777# CONFIG_CRYPTO_SHA512 is not set 1802CONFIG_CRYPTO_SHA512=y
1778# CONFIG_CRYPTO_TGR192 is not set 1803# CONFIG_CRYPTO_TGR192 is not set
1779# CONFIG_CRYPTO_WP512 is not set 1804# CONFIG_CRYPTO_WP512 is not set
1780 1805
1781# 1806#
1782# Ciphers 1807# Ciphers
1783# 1808#
1784# CONFIG_CRYPTO_AES is not set 1809CONFIG_CRYPTO_AES=y
1785# CONFIG_CRYPTO_ANUBIS is not set 1810# CONFIG_CRYPTO_ANUBIS is not set
1786# CONFIG_CRYPTO_ARC4 is not set 1811# CONFIG_CRYPTO_ARC4 is not set
1787# CONFIG_CRYPTO_BLOWFISH is not set 1812# CONFIG_CRYPTO_BLOWFISH is not set
diff --git a/arch/powerpc/configs/mpc866_ads_defconfig b/arch/powerpc/configs/mpc866_ads_defconfig
index 6809b61ed3de..40d6f0568ca5 100644
--- a/arch/powerpc/configs/mpc866_ads_defconfig
+++ b/arch/powerpc/configs/mpc866_ads_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.31-rc4 3# Linux kernel version: 2.6.32-rc5
4# Wed Jul 29 23:31:57 2009 4# Thu Nov 5 08:20:15 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -16,6 +16,7 @@ CONFIG_PPC_8xx=y
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_8xx=y 17CONFIG_8xx=y
18CONFIG_PPC_MMU_NOHASH=y 18CONFIG_PPC_MMU_NOHASH=y
19CONFIG_PPC_MMU_NOHASH_32=y
19# CONFIG_PPC_MM_SLICES is not set 20# CONFIG_PPC_MM_SLICES is not set
20CONFIG_NOT_COHERENT_CACHE=y 21CONFIG_NOT_COHERENT_CACHE=y
21CONFIG_PPC32=y 22CONFIG_PPC32=y
@@ -29,6 +30,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
29CONFIG_GENERIC_HARDIRQS=y 30CONFIG_GENERIC_HARDIRQS=y
30CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 31CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
31# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 32# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
33# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
32CONFIG_IRQ_PER_CPU=y 34CONFIG_IRQ_PER_CPU=y
33CONFIG_STACKTRACE_SUPPORT=y 35CONFIG_STACKTRACE_SUPPORT=y
34CONFIG_HAVE_LATENCYTOP_SUPPORT=y 36CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -76,11 +78,12 @@ CONFIG_SYSVIPC_SYSCTL=y
76# 78#
77# RCU Subsystem 79# RCU Subsystem
78# 80#
79CONFIG_CLASSIC_RCU=y 81CONFIG_TREE_RCU=y
80# CONFIG_TREE_RCU is not set 82# CONFIG_TREE_PREEMPT_RCU is not set
81# CONFIG_PREEMPT_RCU is not set 83# CONFIG_RCU_TRACE is not set
84CONFIG_RCU_FANOUT=32
85# CONFIG_RCU_FANOUT_EXACT is not set
82# CONFIG_TREE_RCU_TRACE is not set 86# CONFIG_TREE_RCU_TRACE is not set
83# CONFIG_PREEMPT_RCU_TRACE is not set
84# CONFIG_IKCONFIG is not set 87# CONFIG_IKCONFIG is not set
85CONFIG_LOG_BUF_SHIFT=14 88CONFIG_LOG_BUF_SHIFT=14
86CONFIG_GROUP_SCHED=y 89CONFIG_GROUP_SCHED=y
@@ -113,28 +116,29 @@ CONFIG_TIMERFD=y
113CONFIG_EVENTFD=y 116CONFIG_EVENTFD=y
114CONFIG_SHMEM=y 117CONFIG_SHMEM=y
115CONFIG_AIO=y 118CONFIG_AIO=y
116CONFIG_HAVE_PERF_COUNTERS=y 119CONFIG_HAVE_PERF_EVENTS=y
117 120
118# 121#
119# Performance Counters 122# Kernel Performance Events And Counters
120# 123#
124# CONFIG_PERF_EVENTS is not set
121# CONFIG_PERF_COUNTERS is not set 125# CONFIG_PERF_COUNTERS is not set
122# CONFIG_VM_EVENT_COUNTERS is not set 126# CONFIG_VM_EVENT_COUNTERS is not set
123CONFIG_SLUB_DEBUG=y 127CONFIG_SLUB_DEBUG=y
124# CONFIG_STRIP_ASM_SYMS is not set
125CONFIG_COMPAT_BRK=y 128CONFIG_COMPAT_BRK=y
126# CONFIG_SLAB is not set 129# CONFIG_SLAB is not set
127CONFIG_SLUB=y 130CONFIG_SLUB=y
128# CONFIG_SLOB is not set 131# CONFIG_SLOB is not set
129# CONFIG_PROFILING is not set 132# CONFIG_PROFILING is not set
130# CONFIG_MARKERS is not set
131CONFIG_HAVE_OPROFILE=y 133CONFIG_HAVE_OPROFILE=y
132CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 134CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
133CONFIG_HAVE_IOREMAP_PROT=y 135CONFIG_HAVE_IOREMAP_PROT=y
134CONFIG_HAVE_KPROBES=y 136CONFIG_HAVE_KPROBES=y
135CONFIG_HAVE_KRETPROBES=y 137CONFIG_HAVE_KRETPROBES=y
136CONFIG_HAVE_ARCH_TRACEHOOK=y 138CONFIG_HAVE_ARCH_TRACEHOOK=y
139CONFIG_HAVE_DMA_ATTRS=y
137CONFIG_HAVE_CLK=y 140CONFIG_HAVE_CLK=y
141CONFIG_HAVE_DMA_API_DEBUG=y
138 142
139# 143#
140# GCOV-based kernel profiling 144# GCOV-based kernel profiling
@@ -233,10 +237,10 @@ CONFIG_BINFMT_ELF=y
233CONFIG_MATH_EMULATION=y 237CONFIG_MATH_EMULATION=y
234# CONFIG_IOMMU_HELPER is not set 238# CONFIG_IOMMU_HELPER is not set
235# CONFIG_SWIOTLB is not set 239# CONFIG_SWIOTLB is not set
236CONFIG_PPC_NEED_DMA_SYNC_OPS=y
237CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 240CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
238CONFIG_ARCH_HAS_WALK_MEMORY=y 241CONFIG_ARCH_HAS_WALK_MEMORY=y
239CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 242CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
243CONFIG_MAX_ACTIVE_REGIONS=32
240CONFIG_ARCH_FLATMEM_ENABLE=y 244CONFIG_ARCH_FLATMEM_ENABLE=y
241CONFIG_ARCH_POPULATES_NODE_MAP=y 245CONFIG_ARCH_POPULATES_NODE_MAP=y
242CONFIG_SELECT_MEMORY_MODEL=y 246CONFIG_SELECT_MEMORY_MODEL=y
@@ -254,6 +258,7 @@ CONFIG_BOUNCE=y
254CONFIG_VIRT_TO_BUS=y 258CONFIG_VIRT_TO_BUS=y
255CONFIG_HAVE_MLOCK=y 259CONFIG_HAVE_MLOCK=y
256CONFIG_HAVE_MLOCKED_PAGE_BIT=y 260CONFIG_HAVE_MLOCKED_PAGE_BIT=y
261# CONFIG_KSM is not set
257CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 262CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
258CONFIG_PPC_4K_PAGES=y 263CONFIG_PPC_4K_PAGES=y
259# CONFIG_PPC_16K_PAGES is not set 264# CONFIG_PPC_16K_PAGES is not set
@@ -340,6 +345,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
340# CONFIG_NETFILTER is not set 345# CONFIG_NETFILTER is not set
341# CONFIG_IP_DCCP is not set 346# CONFIG_IP_DCCP is not set
342# CONFIG_IP_SCTP is not set 347# CONFIG_IP_SCTP is not set
348# CONFIG_RDS is not set
343# CONFIG_TIPC is not set 349# CONFIG_TIPC is not set
344# CONFIG_ATM is not set 350# CONFIG_ATM is not set
345# CONFIG_BRIDGE is not set 351# CONFIG_BRIDGE is not set
@@ -369,6 +375,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
369# CONFIG_AF_RXRPC is not set 375# CONFIG_AF_RXRPC is not set
370CONFIG_WIRELESS=y 376CONFIG_WIRELESS=y
371# CONFIG_CFG80211 is not set 377# CONFIG_CFG80211 is not set
378CONFIG_CFG80211_DEFAULT_PS_VALUE=0
372CONFIG_WIRELESS_OLD_REGULATORY=y 379CONFIG_WIRELESS_OLD_REGULATORY=y
373# CONFIG_WIRELESS_EXT is not set 380# CONFIG_WIRELESS_EXT is not set
374# CONFIG_LIB80211 is not set 381# CONFIG_LIB80211 is not set
@@ -376,7 +383,6 @@ CONFIG_WIRELESS_OLD_REGULATORY=y
376# 383#
377# CFG80211 needs to be enabled for MAC80211 384# CFG80211 needs to be enabled for MAC80211
378# 385#
379CONFIG_MAC80211_DEFAULT_PS_VALUE=0
380# CONFIG_WIMAX is not set 386# CONFIG_WIMAX is not set
381# CONFIG_RFKILL is not set 387# CONFIG_RFKILL is not set
382# CONFIG_NET_9P is not set 388# CONFIG_NET_9P is not set
@@ -467,6 +473,8 @@ CONFIG_MII=y
467# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set 473# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
468# CONFIG_B44 is not set 474# CONFIG_B44 is not set
469# CONFIG_KS8842 is not set 475# CONFIG_KS8842 is not set
476# CONFIG_KS8851_MLL is not set
477# CONFIG_XILINX_EMACLITE is not set
470CONFIG_FS_ENET=y 478CONFIG_FS_ENET=y
471CONFIG_FS_ENET_HAS_SCC=y 479CONFIG_FS_ENET_HAS_SCC=y
472CONFIG_FS_ENET_HAS_FEC=y 480CONFIG_FS_ENET_HAS_FEC=y
@@ -476,10 +484,7 @@ CONFIG_NETDEV_1000=y
476# CONFIG_GIANFAR is not set 484# CONFIG_GIANFAR is not set
477# CONFIG_MV643XX_ETH is not set 485# CONFIG_MV643XX_ETH is not set
478CONFIG_NETDEV_10000=y 486CONFIG_NETDEV_10000=y
479 487CONFIG_WLAN=y
480#
481# Wireless LAN
482#
483# CONFIG_WLAN_PRE80211 is not set 488# CONFIG_WLAN_PRE80211 is not set
484# CONFIG_WLAN_80211 is not set 489# CONFIG_WLAN_80211 is not set
485 490
@@ -520,6 +525,7 @@ CONFIG_INPUT_KEYBOARD=y
520CONFIG_KEYBOARD_ATKBD=y 525CONFIG_KEYBOARD_ATKBD=y
521# CONFIG_KEYBOARD_LKKBD is not set 526# CONFIG_KEYBOARD_LKKBD is not set
522# CONFIG_KEYBOARD_NEWTON is not set 527# CONFIG_KEYBOARD_NEWTON is not set
528# CONFIG_KEYBOARD_OPENCORES is not set
523# CONFIG_KEYBOARD_STOWAWAY is not set 529# CONFIG_KEYBOARD_STOWAWAY is not set
524# CONFIG_KEYBOARD_SUNKBD is not set 530# CONFIG_KEYBOARD_SUNKBD is not set
525# CONFIG_KEYBOARD_XTKBD is not set 531# CONFIG_KEYBOARD_XTKBD is not set
@@ -530,6 +536,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y
530CONFIG_MOUSE_PS2_SYNAPTICS=y 536CONFIG_MOUSE_PS2_SYNAPTICS=y
531CONFIG_MOUSE_PS2_TRACKPOINT=y 537CONFIG_MOUSE_PS2_TRACKPOINT=y
532# CONFIG_MOUSE_PS2_ELANTECH is not set 538# CONFIG_MOUSE_PS2_ELANTECH is not set
539# CONFIG_MOUSE_PS2_SENTELIC is not set
533# CONFIG_MOUSE_PS2_TOUCHKIT is not set 540# CONFIG_MOUSE_PS2_TOUCHKIT is not set
534# CONFIG_MOUSE_SERIAL is not set 541# CONFIG_MOUSE_SERIAL is not set
535# CONFIG_MOUSE_VSXXXAA is not set 542# CONFIG_MOUSE_VSXXXAA is not set
@@ -595,6 +602,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
595# CONFIG_POWER_SUPPLY is not set 602# CONFIG_POWER_SUPPLY is not set
596CONFIG_HWMON=y 603CONFIG_HWMON=y
597# CONFIG_HWMON_VID is not set 604# CONFIG_HWMON_VID is not set
605# CONFIG_HWMON_DEBUG_CHIP is not set
606
607#
608# Native drivers
609#
598# CONFIG_SENSORS_F71805F is not set 610# CONFIG_SENSORS_F71805F is not set
599# CONFIG_SENSORS_F71882FG is not set 611# CONFIG_SENSORS_F71882FG is not set
600# CONFIG_SENSORS_IT87 is not set 612# CONFIG_SENSORS_IT87 is not set
@@ -605,9 +617,7 @@ CONFIG_HWMON=y
605# CONFIG_SENSORS_VT1211 is not set 617# CONFIG_SENSORS_VT1211 is not set
606# CONFIG_SENSORS_W83627HF is not set 618# CONFIG_SENSORS_W83627HF is not set
607# CONFIG_SENSORS_W83627EHF is not set 619# CONFIG_SENSORS_W83627EHF is not set
608# CONFIG_HWMON_DEBUG_CHIP is not set
609# CONFIG_THERMAL is not set 620# CONFIG_THERMAL is not set
610# CONFIG_THERMAL_HWMON is not set
611# CONFIG_WATCHDOG is not set 621# CONFIG_WATCHDOG is not set
612CONFIG_SSB_POSSIBLE=y 622CONFIG_SSB_POSSIBLE=y
613 623
@@ -641,7 +651,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y
641# CONFIG_SOUND is not set 651# CONFIG_SOUND is not set
642CONFIG_HID_SUPPORT=y 652CONFIG_HID_SUPPORT=y
643CONFIG_HID=y 653CONFIG_HID=y
644# CONFIG_HID_DEBUG is not set
645# CONFIG_HIDRAW is not set 654# CONFIG_HIDRAW is not set
646# CONFIG_HID_PID is not set 655# CONFIG_HID_PID is not set
647 656
@@ -705,6 +714,7 @@ CONFIG_FS_MBCACHE=y
705# CONFIG_GFS2_FS is not set 714# CONFIG_GFS2_FS is not set
706# CONFIG_OCFS2_FS is not set 715# CONFIG_OCFS2_FS is not set
707# CONFIG_BTRFS_FS is not set 716# CONFIG_BTRFS_FS is not set
717# CONFIG_NILFS2_FS is not set
708CONFIG_FILE_LOCKING=y 718CONFIG_FILE_LOCKING=y
709CONFIG_FSNOTIFY=y 719CONFIG_FSNOTIFY=y
710CONFIG_DNOTIFY=y 720CONFIG_DNOTIFY=y
@@ -763,7 +773,6 @@ CONFIG_CRAMFS=y
763# CONFIG_ROMFS_FS is not set 773# CONFIG_ROMFS_FS is not set
764# CONFIG_SYSV_FS is not set 774# CONFIG_SYSV_FS is not set
765# CONFIG_UFS_FS is not set 775# CONFIG_UFS_FS is not set
766# CONFIG_NILFS2_FS is not set
767CONFIG_NETWORK_FILESYSTEMS=y 776CONFIG_NETWORK_FILESYSTEMS=y
768CONFIG_NFS_FS=y 777CONFIG_NFS_FS=y
769CONFIG_NFS_V3=y 778CONFIG_NFS_V3=y
@@ -836,6 +845,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
836CONFIG_ENABLE_MUST_CHECK=y 845CONFIG_ENABLE_MUST_CHECK=y
837CONFIG_FRAME_WARN=1024 846CONFIG_FRAME_WARN=1024
838# CONFIG_MAGIC_SYSRQ is not set 847# CONFIG_MAGIC_SYSRQ is not set
848# CONFIG_STRIP_ASM_SYMS is not set
839# CONFIG_UNUSED_SYMBOLS is not set 849# CONFIG_UNUSED_SYMBOLS is not set
840# CONFIG_DEBUG_FS is not set 850# CONFIG_DEBUG_FS is not set
841# CONFIG_HEADERS_CHECK is not set 851# CONFIG_HEADERS_CHECK is not set
@@ -851,6 +861,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
851CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 861CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
852CONFIG_TRACING_SUPPORT=y 862CONFIG_TRACING_SUPPORT=y
853# CONFIG_FTRACE is not set 863# CONFIG_FTRACE is not set
864# CONFIG_DMA_API_DEBUG is not set
854# CONFIG_SAMPLES is not set 865# CONFIG_SAMPLES is not set
855CONFIG_HAVE_ARCH_KGDB=y 866CONFIG_HAVE_ARCH_KGDB=y
856# CONFIG_PPC_DISABLE_WERROR is not set 867# CONFIG_PPC_DISABLE_WERROR is not set
@@ -871,7 +882,6 @@ CONFIG_CRYPTO=y
871# 882#
872# Crypto core or helper 883# Crypto core or helper
873# 884#
874# CONFIG_CRYPTO_FIPS is not set
875# CONFIG_CRYPTO_MANAGER is not set 885# CONFIG_CRYPTO_MANAGER is not set
876# CONFIG_CRYPTO_MANAGER2 is not set 886# CONFIG_CRYPTO_MANAGER2 is not set
877# CONFIG_CRYPTO_GF128MUL is not set 887# CONFIG_CRYPTO_GF128MUL is not set
@@ -902,11 +912,13 @@ CONFIG_CRYPTO=y
902# 912#
903# CONFIG_CRYPTO_HMAC is not set 913# CONFIG_CRYPTO_HMAC is not set
904# CONFIG_CRYPTO_XCBC is not set 914# CONFIG_CRYPTO_XCBC is not set
915# CONFIG_CRYPTO_VMAC is not set
905 916
906# 917#
907# Digest 918# Digest
908# 919#
909# CONFIG_CRYPTO_CRC32C is not set 920# CONFIG_CRYPTO_CRC32C is not set
921# CONFIG_CRYPTO_GHASH is not set
910# CONFIG_CRYPTO_MD4 is not set 922# CONFIG_CRYPTO_MD4 is not set
911# CONFIG_CRYPTO_MD5 is not set 923# CONFIG_CRYPTO_MD5 is not set
912# CONFIG_CRYPTO_MICHAEL_MIC is not set 924# CONFIG_CRYPTO_MICHAEL_MIC is not set
diff --git a/arch/powerpc/configs/mpc86xx_defconfig b/arch/powerpc/configs/mpc86xx_defconfig
index 0e8684a3138d..5b3abb42ae30 100644
--- a/arch/powerpc/configs/mpc86xx_defconfig
+++ b/arch/powerpc/configs/mpc86xx_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.31-rc4 3# Linux kernel version: 2.6.32-rc5
4# Wed Jul 29 23:31:58 2009 4# Thu Nov 5 08:20:16 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -36,6 +36,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
36CONFIG_GENERIC_HARDIRQS=y 36CONFIG_GENERIC_HARDIRQS=y
37CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 37CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
38# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 38# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
39# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
39CONFIG_IRQ_PER_CPU=y 40CONFIG_IRQ_PER_CPU=y
40CONFIG_STACKTRACE_SUPPORT=y 41CONFIG_STACKTRACE_SUPPORT=y
41CONFIG_HAVE_LATENCYTOP_SUPPORT=y 42CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -88,11 +89,12 @@ CONFIG_AUDIT=y
88# 89#
89# RCU Subsystem 90# RCU Subsystem
90# 91#
91CONFIG_CLASSIC_RCU=y 92CONFIG_TREE_RCU=y
92# CONFIG_TREE_RCU is not set 93# CONFIG_TREE_PREEMPT_RCU is not set
93# CONFIG_PREEMPT_RCU is not set 94# CONFIG_RCU_TRACE is not set
95CONFIG_RCU_FANOUT=32
96# CONFIG_RCU_FANOUT_EXACT is not set
94# CONFIG_TREE_RCU_TRACE is not set 97# CONFIG_TREE_RCU_TRACE is not set
95# CONFIG_PREEMPT_RCU_TRACE is not set
96CONFIG_IKCONFIG=y 98CONFIG_IKCONFIG=y
97CONFIG_IKCONFIG_PROC=y 99CONFIG_IKCONFIG_PROC=y
98CONFIG_LOG_BUF_SHIFT=14 100CONFIG_LOG_BUF_SHIFT=14
@@ -131,22 +133,21 @@ CONFIG_TIMERFD=y
131CONFIG_EVENTFD=y 133CONFIG_EVENTFD=y
132CONFIG_SHMEM=y 134CONFIG_SHMEM=y
133CONFIG_AIO=y 135CONFIG_AIO=y
134CONFIG_HAVE_PERF_COUNTERS=y 136CONFIG_HAVE_PERF_EVENTS=y
135 137
136# 138#
137# Performance Counters 139# Kernel Performance Events And Counters
138# 140#
141# CONFIG_PERF_EVENTS is not set
139# CONFIG_PERF_COUNTERS is not set 142# CONFIG_PERF_COUNTERS is not set
140CONFIG_VM_EVENT_COUNTERS=y 143CONFIG_VM_EVENT_COUNTERS=y
141CONFIG_PCI_QUIRKS=y 144CONFIG_PCI_QUIRKS=y
142CONFIG_SLUB_DEBUG=y 145CONFIG_SLUB_DEBUG=y
143# CONFIG_STRIP_ASM_SYMS is not set
144CONFIG_COMPAT_BRK=y 146CONFIG_COMPAT_BRK=y
145# CONFIG_SLAB is not set 147# CONFIG_SLAB is not set
146CONFIG_SLUB=y 148CONFIG_SLUB=y
147# CONFIG_SLOB is not set 149# CONFIG_SLOB is not set
148# CONFIG_PROFILING is not set 150# CONFIG_PROFILING is not set
149# CONFIG_MARKERS is not set
150CONFIG_HAVE_OPROFILE=y 151CONFIG_HAVE_OPROFILE=y
151# CONFIG_KPROBES is not set 152# CONFIG_KPROBES is not set
152CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 153CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -154,7 +155,9 @@ CONFIG_HAVE_IOREMAP_PROT=y
154CONFIG_HAVE_KPROBES=y 155CONFIG_HAVE_KPROBES=y
155CONFIG_HAVE_KRETPROBES=y 156CONFIG_HAVE_KRETPROBES=y
156CONFIG_HAVE_ARCH_TRACEHOOK=y 157CONFIG_HAVE_ARCH_TRACEHOOK=y
158CONFIG_HAVE_DMA_ATTRS=y
157CONFIG_USE_GENERIC_SMP_HELPERS=y 159CONFIG_USE_GENERIC_SMP_HELPERS=y
160CONFIG_HAVE_DMA_API_DEBUG=y
158 161
159# 162#
160# GCOV-based kernel profiling 163# GCOV-based kernel profiling
@@ -253,13 +256,13 @@ CONFIG_BINFMT_ELF=y
253CONFIG_BINFMT_MISC=m 256CONFIG_BINFMT_MISC=m
254CONFIG_IOMMU_HELPER=y 257CONFIG_IOMMU_HELPER=y
255CONFIG_SWIOTLB=y 258CONFIG_SWIOTLB=y
256CONFIG_PPC_NEED_DMA_SYNC_OPS=y
257CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 259CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
258CONFIG_ARCH_HAS_WALK_MEMORY=y 260CONFIG_ARCH_HAS_WALK_MEMORY=y
259CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 261CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
260# CONFIG_KEXEC is not set 262# CONFIG_KEXEC is not set
261# CONFIG_CRASH_DUMP is not set 263# CONFIG_CRASH_DUMP is not set
262# CONFIG_IRQ_ALL_CPUS is not set 264# CONFIG_IRQ_ALL_CPUS is not set
265CONFIG_MAX_ACTIVE_REGIONS=32
263CONFIG_ARCH_FLATMEM_ENABLE=y 266CONFIG_ARCH_FLATMEM_ENABLE=y
264CONFIG_ARCH_POPULATES_NODE_MAP=y 267CONFIG_ARCH_POPULATES_NODE_MAP=y
265CONFIG_SELECT_MEMORY_MODEL=y 268CONFIG_SELECT_MEMORY_MODEL=y
@@ -277,6 +280,7 @@ CONFIG_BOUNCE=y
277CONFIG_VIRT_TO_BUS=y 280CONFIG_VIRT_TO_BUS=y
278CONFIG_HAVE_MLOCK=y 281CONFIG_HAVE_MLOCK=y
279CONFIG_HAVE_MLOCKED_PAGE_BIT=y 282CONFIG_HAVE_MLOCKED_PAGE_BIT=y
283# CONFIG_KSM is not set
280CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 284CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
281CONFIG_PPC_4K_PAGES=y 285CONFIG_PPC_4K_PAGES=y
282# CONFIG_PPC_16K_PAGES is not set 286# CONFIG_PPC_16K_PAGES is not set
@@ -406,6 +410,7 @@ CONFIG_IP_SCTP=m
406# CONFIG_SCTP_HMAC_NONE is not set 410# CONFIG_SCTP_HMAC_NONE is not set
407# CONFIG_SCTP_HMAC_SHA1 is not set 411# CONFIG_SCTP_HMAC_SHA1 is not set
408CONFIG_SCTP_HMAC_MD5=y 412CONFIG_SCTP_HMAC_MD5=y
413# CONFIG_RDS is not set
409# CONFIG_TIPC is not set 414# CONFIG_TIPC is not set
410# CONFIG_ATM is not set 415# CONFIG_ATM is not set
411# CONFIG_BRIDGE is not set 416# CONFIG_BRIDGE is not set
@@ -436,6 +441,7 @@ CONFIG_SCTP_HMAC_MD5=y
436CONFIG_FIB_RULES=y 441CONFIG_FIB_RULES=y
437CONFIG_WIRELESS=y 442CONFIG_WIRELESS=y
438# CONFIG_CFG80211 is not set 443# CONFIG_CFG80211 is not set
444CONFIG_CFG80211_DEFAULT_PS_VALUE=0
439CONFIG_WIRELESS_OLD_REGULATORY=y 445CONFIG_WIRELESS_OLD_REGULATORY=y
440# CONFIG_WIRELESS_EXT is not set 446# CONFIG_WIRELESS_EXT is not set
441# CONFIG_LIB80211 is not set 447# CONFIG_LIB80211 is not set
@@ -443,7 +449,6 @@ CONFIG_WIRELESS_OLD_REGULATORY=y
443# 449#
444# CFG80211 needs to be enabled for MAC80211 450# CFG80211 needs to be enabled for MAC80211
445# 451#
446CONFIG_MAC80211_DEFAULT_PS_VALUE=0
447# CONFIG_WIMAX is not set 452# CONFIG_WIMAX is not set
448# CONFIG_RFKILL is not set 453# CONFIG_RFKILL is not set
449# CONFIG_NET_9P is not set 454# CONFIG_NET_9P is not set
@@ -456,6 +461,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
456# Generic Driver Options 461# Generic Driver Options
457# 462#
458CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 463CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
464# CONFIG_DEVTMPFS is not set
459CONFIG_STANDALONE=y 465CONFIG_STANDALONE=y
460CONFIG_PREVENT_FIRMWARE_BUILD=y 466CONFIG_PREVENT_FIRMWARE_BUILD=y
461CONFIG_FW_LOADER=y 467CONFIG_FW_LOADER=y
@@ -549,6 +555,7 @@ CONFIG_SCSI_LOWLEVEL=y
549# CONFIG_ISCSI_TCP is not set 555# CONFIG_ISCSI_TCP is not set
550# CONFIG_SCSI_CXGB3_ISCSI is not set 556# CONFIG_SCSI_CXGB3_ISCSI is not set
551# CONFIG_SCSI_BNX2_ISCSI is not set 557# CONFIG_SCSI_BNX2_ISCSI is not set
558# CONFIG_BE2ISCSI is not set
552# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 559# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
553# CONFIG_SCSI_3W_9XXX is not set 560# CONFIG_SCSI_3W_9XXX is not set
554# CONFIG_SCSI_ACARD is not set 561# CONFIG_SCSI_ACARD is not set
@@ -588,11 +595,14 @@ CONFIG_SCSI_LOWLEVEL=y
588# CONFIG_SCSI_DC390T is not set 595# CONFIG_SCSI_DC390T is not set
589# CONFIG_SCSI_NSP32 is not set 596# CONFIG_SCSI_NSP32 is not set
590# CONFIG_SCSI_DEBUG is not set 597# CONFIG_SCSI_DEBUG is not set
598# CONFIG_SCSI_PMCRAID is not set
591# CONFIG_SCSI_SRP is not set 599# CONFIG_SCSI_SRP is not set
600# CONFIG_SCSI_BFA_FC is not set
592# CONFIG_SCSI_DH is not set 601# CONFIG_SCSI_DH is not set
593# CONFIG_SCSI_OSD_INITIATOR is not set 602# CONFIG_SCSI_OSD_INITIATOR is not set
594CONFIG_ATA=y 603CONFIG_ATA=y
595# CONFIG_ATA_NONSTANDARD is not set 604# CONFIG_ATA_NONSTANDARD is not set
605CONFIG_ATA_VERBOSE_ERROR=y
596CONFIG_SATA_PMP=y 606CONFIG_SATA_PMP=y
597CONFIG_SATA_AHCI=y 607CONFIG_SATA_AHCI=y
598# CONFIG_SATA_SIL24 is not set 608# CONFIG_SATA_SIL24 is not set
@@ -615,6 +625,7 @@ CONFIG_ATA_SFF=y
615CONFIG_PATA_ALI=y 625CONFIG_PATA_ALI=y
616# CONFIG_PATA_AMD is not set 626# CONFIG_PATA_AMD is not set
617# CONFIG_PATA_ARTOP is not set 627# CONFIG_PATA_ARTOP is not set
628# CONFIG_PATA_ATP867X is not set
618# CONFIG_PATA_ATIIXP is not set 629# CONFIG_PATA_ATIIXP is not set
619# CONFIG_PATA_CMD640_PCI is not set 630# CONFIG_PATA_CMD640_PCI is not set
620# CONFIG_PATA_CMD64X is not set 631# CONFIG_PATA_CMD64X is not set
@@ -642,6 +653,7 @@ CONFIG_PATA_ALI=y
642# CONFIG_PATA_OPTIDMA is not set 653# CONFIG_PATA_OPTIDMA is not set
643# CONFIG_PATA_PDC_OLD is not set 654# CONFIG_PATA_PDC_OLD is not set
644# CONFIG_PATA_RADISYS is not set 655# CONFIG_PATA_RADISYS is not set
656# CONFIG_PATA_RDC is not set
645# CONFIG_PATA_RZ1000 is not set 657# CONFIG_PATA_RZ1000 is not set
646# CONFIG_PATA_SC1200 is not set 658# CONFIG_PATA_SC1200 is not set
647# CONFIG_PATA_SERVERWORKS is not set 659# CONFIG_PATA_SERVERWORKS is not set
@@ -718,7 +730,9 @@ CONFIG_MII=y
718# CONFIG_NET_PCI is not set 730# CONFIG_NET_PCI is not set
719# CONFIG_B44 is not set 731# CONFIG_B44 is not set
720# CONFIG_KS8842 is not set 732# CONFIG_KS8842 is not set
733# CONFIG_KS8851_MLL is not set
721# CONFIG_ATL2 is not set 734# CONFIG_ATL2 is not set
735# CONFIG_XILINX_EMACLITE is not set
722CONFIG_NETDEV_1000=y 736CONFIG_NETDEV_1000=y
723# CONFIG_ACENIC is not set 737# CONFIG_ACENIC is not set
724# CONFIG_DL2K is not set 738# CONFIG_DL2K is not set
@@ -766,10 +780,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
766# CONFIG_SFC is not set 780# CONFIG_SFC is not set
767# CONFIG_BE2NET is not set 781# CONFIG_BE2NET is not set
768# CONFIG_TR is not set 782# CONFIG_TR is not set
769 783CONFIG_WLAN=y
770#
771# Wireless LAN
772#
773# CONFIG_WLAN_PRE80211 is not set 784# CONFIG_WLAN_PRE80211 is not set
774# CONFIG_WLAN_80211 is not set 785# CONFIG_WLAN_80211 is not set
775 786
@@ -883,6 +894,7 @@ CONFIG_NVRAM=y
883CONFIG_DEVPORT=y 894CONFIG_DEVPORT=y
884CONFIG_I2C=y 895CONFIG_I2C=y
885CONFIG_I2C_BOARDINFO=y 896CONFIG_I2C_BOARDINFO=y
897CONFIG_I2C_COMPAT=y
886# CONFIG_I2C_CHARDEV is not set 898# CONFIG_I2C_CHARDEV is not set
887CONFIG_I2C_HELPER_AUTO=y 899CONFIG_I2C_HELPER_AUTO=y
888 900
@@ -938,9 +950,6 @@ CONFIG_I2C_MPC=y
938# Miscellaneous I2C Chip support 950# Miscellaneous I2C Chip support
939# 951#
940# CONFIG_DS1682 is not set 952# CONFIG_DS1682 is not set
941# CONFIG_SENSORS_PCF8574 is not set
942# CONFIG_PCF8575 is not set
943# CONFIG_SENSORS_PCA9539 is not set
944# CONFIG_SENSORS_TSL2550 is not set 953# CONFIG_SENSORS_TSL2550 is not set
945# CONFIG_I2C_DEBUG_CORE is not set 954# CONFIG_I2C_DEBUG_CORE is not set
946# CONFIG_I2C_DEBUG_ALGO is not set 955# CONFIG_I2C_DEBUG_ALGO is not set
@@ -974,15 +983,19 @@ CONFIG_GPIOLIB=y
974# PCI GPIO expanders: 983# PCI GPIO expanders:
975# 984#
976# CONFIG_GPIO_BT8XX is not set 985# CONFIG_GPIO_BT8XX is not set
986# CONFIG_GPIO_LANGWELL is not set
977 987
978# 988#
979# SPI GPIO expanders: 989# SPI GPIO expanders:
980# 990#
991
992#
993# AC97 GPIO expanders:
994#
981# CONFIG_W1 is not set 995# CONFIG_W1 is not set
982# CONFIG_POWER_SUPPLY is not set 996# CONFIG_POWER_SUPPLY is not set
983# CONFIG_HWMON is not set 997# CONFIG_HWMON is not set
984# CONFIG_THERMAL is not set 998# CONFIG_THERMAL is not set
985# CONFIG_THERMAL_HWMON is not set
986# CONFIG_WATCHDOG is not set 999# CONFIG_WATCHDOG is not set
987CONFIG_SSB_POSSIBLE=y 1000CONFIG_SSB_POSSIBLE=y
988 1001
@@ -1003,6 +1016,7 @@ CONFIG_SSB_POSSIBLE=y
1003# CONFIG_MFD_TMIO is not set 1016# CONFIG_MFD_TMIO is not set
1004# CONFIG_PMIC_DA903X is not set 1017# CONFIG_PMIC_DA903X is not set
1005# CONFIG_MFD_WM8400 is not set 1018# CONFIG_MFD_WM8400 is not set
1019# CONFIG_MFD_WM831X is not set
1006# CONFIG_MFD_WM8350_I2C is not set 1020# CONFIG_MFD_WM8350_I2C is not set
1007# CONFIG_MFD_PCF50633 is not set 1021# CONFIG_MFD_PCF50633 is not set
1008# CONFIG_AB3100_CORE is not set 1022# CONFIG_AB3100_CORE is not set
@@ -1013,6 +1027,7 @@ CONFIG_SSB_POSSIBLE=y
1013# Graphics support 1027# Graphics support
1014# 1028#
1015# CONFIG_AGP is not set 1029# CONFIG_AGP is not set
1030CONFIG_VGA_ARB=y
1016# CONFIG_DRM is not set 1031# CONFIG_DRM is not set
1017# CONFIG_VGASTATE is not set 1032# CONFIG_VGASTATE is not set
1018CONFIG_VIDEO_OUTPUT_CONTROL=y 1033CONFIG_VIDEO_OUTPUT_CONTROL=y
@@ -1032,6 +1047,7 @@ CONFIG_VGA_CONSOLE=y
1032CONFIG_DUMMY_CONSOLE=y 1047CONFIG_DUMMY_CONSOLE=y
1033CONFIG_SOUND=y 1048CONFIG_SOUND=y
1034CONFIG_SOUND_OSS_CORE=y 1049CONFIG_SOUND_OSS_CORE=y
1050CONFIG_SOUND_OSS_CORE_PRECLAIM=y
1035CONFIG_SND=y 1051CONFIG_SND=y
1036CONFIG_SND_TIMER=y 1052CONFIG_SND_TIMER=y
1037CONFIG_SND_PCM=y 1053CONFIG_SND_PCM=y
@@ -1135,7 +1151,6 @@ CONFIG_SND_USB=y
1135CONFIG_AC97_BUS=y 1151CONFIG_AC97_BUS=y
1136CONFIG_HID_SUPPORT=y 1152CONFIG_HID_SUPPORT=y
1137CONFIG_HID=y 1153CONFIG_HID=y
1138# CONFIG_HID_DEBUG is not set
1139# CONFIG_HIDRAW is not set 1154# CONFIG_HIDRAW is not set
1140 1155
1141# 1156#
@@ -1158,6 +1173,7 @@ CONFIG_HID_CYPRESS=y
1158CONFIG_HID_EZKEY=y 1173CONFIG_HID_EZKEY=y
1159# CONFIG_HID_KYE is not set 1174# CONFIG_HID_KYE is not set
1160CONFIG_HID_GYRATION=y 1175CONFIG_HID_GYRATION=y
1176# CONFIG_HID_TWINHAN is not set
1161# CONFIG_HID_KENSINGTON is not set 1177# CONFIG_HID_KENSINGTON is not set
1162CONFIG_HID_LOGITECH=y 1178CONFIG_HID_LOGITECH=y
1163# CONFIG_LOGITECH_FF is not set 1179# CONFIG_LOGITECH_FF is not set
@@ -1210,6 +1226,7 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y
1210# CONFIG_USB_OXU210HP_HCD is not set 1226# CONFIG_USB_OXU210HP_HCD is not set
1211# CONFIG_USB_ISP116X_HCD is not set 1227# CONFIG_USB_ISP116X_HCD is not set
1212# CONFIG_USB_ISP1760_HCD is not set 1228# CONFIG_USB_ISP1760_HCD is not set
1229# CONFIG_USB_ISP1362_HCD is not set
1213CONFIG_USB_OHCI_HCD=y 1230CONFIG_USB_OHCI_HCD=y
1214CONFIG_USB_OHCI_HCD_PPC_OF_BE=y 1231CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
1215CONFIG_USB_OHCI_HCD_PPC_OF_LE=y 1232CONFIG_USB_OHCI_HCD_PPC_OF_LE=y
@@ -1389,6 +1406,7 @@ CONFIG_FS_MBCACHE=y
1389# CONFIG_GFS2_FS is not set 1406# CONFIG_GFS2_FS is not set
1390# CONFIG_OCFS2_FS is not set 1407# CONFIG_OCFS2_FS is not set
1391# CONFIG_BTRFS_FS is not set 1408# CONFIG_BTRFS_FS is not set
1409# CONFIG_NILFS2_FS is not set
1392CONFIG_FILE_LOCKING=y 1410CONFIG_FILE_LOCKING=y
1393CONFIG_FSNOTIFY=y 1411CONFIG_FSNOTIFY=y
1394CONFIG_DNOTIFY=y 1412CONFIG_DNOTIFY=y
@@ -1459,7 +1477,6 @@ CONFIG_SYSV_FS=m
1459CONFIG_UFS_FS=m 1477CONFIG_UFS_FS=m
1460# CONFIG_UFS_FS_WRITE is not set 1478# CONFIG_UFS_FS_WRITE is not set
1461# CONFIG_UFS_DEBUG is not set 1479# CONFIG_UFS_DEBUG is not set
1462# CONFIG_NILFS2_FS is not set
1463CONFIG_NETWORK_FILESYSTEMS=y 1480CONFIG_NETWORK_FILESYSTEMS=y
1464CONFIG_NFS_FS=y 1481CONFIG_NFS_FS=y
1465CONFIG_NFS_V3=y 1482CONFIG_NFS_V3=y
@@ -1577,6 +1594,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
1577CONFIG_ENABLE_MUST_CHECK=y 1594CONFIG_ENABLE_MUST_CHECK=y
1578CONFIG_FRAME_WARN=1024 1595CONFIG_FRAME_WARN=1024
1579# CONFIG_MAGIC_SYSRQ is not set 1596# CONFIG_MAGIC_SYSRQ is not set
1597# CONFIG_STRIP_ASM_SYMS is not set
1580# CONFIG_UNUSED_SYMBOLS is not set 1598# CONFIG_UNUSED_SYMBOLS is not set
1581# CONFIG_DEBUG_FS is not set 1599# CONFIG_DEBUG_FS is not set
1582# CONFIG_HEADERS_CHECK is not set 1600# CONFIG_HEADERS_CHECK is not set
@@ -1594,6 +1612,7 @@ CONFIG_SCHED_DEBUG=y
1594# CONFIG_DEBUG_OBJECTS is not set 1612# CONFIG_DEBUG_OBJECTS is not set
1595# CONFIG_SLUB_DEBUG_ON is not set 1613# CONFIG_SLUB_DEBUG_ON is not set
1596# CONFIG_SLUB_STATS is not set 1614# CONFIG_SLUB_STATS is not set
1615# CONFIG_DEBUG_KMEMLEAK is not set
1597# CONFIG_DEBUG_RT_MUTEXES is not set 1616# CONFIG_DEBUG_RT_MUTEXES is not set
1598# CONFIG_RT_MUTEX_TESTER is not set 1617# CONFIG_RT_MUTEX_TESTER is not set
1599# CONFIG_DEBUG_SPINLOCK is not set 1618# CONFIG_DEBUG_SPINLOCK is not set
@@ -1613,10 +1632,12 @@ CONFIG_DEBUG_INFO=y
1613# CONFIG_DEBUG_LIST is not set 1632# CONFIG_DEBUG_LIST is not set
1614# CONFIG_DEBUG_SG is not set 1633# CONFIG_DEBUG_SG is not set
1615# CONFIG_DEBUG_NOTIFIERS is not set 1634# CONFIG_DEBUG_NOTIFIERS is not set
1635# CONFIG_DEBUG_CREDENTIALS is not set
1616# CONFIG_RCU_TORTURE_TEST is not set 1636# CONFIG_RCU_TORTURE_TEST is not set
1617# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1637# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1618# CONFIG_BACKTRACE_SELF_TEST is not set 1638# CONFIG_BACKTRACE_SELF_TEST is not set
1619# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 1639# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1640# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
1620# CONFIG_FAULT_INJECTION is not set 1641# CONFIG_FAULT_INJECTION is not set
1621# CONFIG_LATENCYTOP is not set 1642# CONFIG_LATENCYTOP is not set
1622CONFIG_SYSCTL_SYSCALL_CHECK=y 1643CONFIG_SYSCTL_SYSCALL_CHECK=y
@@ -1639,10 +1660,10 @@ CONFIG_BRANCH_PROFILE_NONE=y
1639# CONFIG_KMEMTRACE is not set 1660# CONFIG_KMEMTRACE is not set
1640# CONFIG_WORKQUEUE_TRACER is not set 1661# CONFIG_WORKQUEUE_TRACER is not set
1641# CONFIG_BLK_DEV_IO_TRACE is not set 1662# CONFIG_BLK_DEV_IO_TRACE is not set
1663# CONFIG_DMA_API_DEBUG is not set
1642# CONFIG_SAMPLES is not set 1664# CONFIG_SAMPLES is not set
1643CONFIG_HAVE_ARCH_KGDB=y 1665CONFIG_HAVE_ARCH_KGDB=y
1644# CONFIG_KGDB is not set 1666# CONFIG_KGDB is not set
1645# CONFIG_KMEMCHECK is not set
1646# CONFIG_PPC_DISABLE_WERROR is not set 1667# CONFIG_PPC_DISABLE_WERROR is not set
1647CONFIG_PPC_WERROR=y 1668CONFIG_PPC_WERROR=y
1648CONFIG_PRINT_STACK_DEPTH=64 1669CONFIG_PRINT_STACK_DEPTH=64
@@ -1669,7 +1690,6 @@ CONFIG_CRYPTO=y
1669# 1690#
1670# Crypto core or helper 1691# Crypto core or helper
1671# 1692#
1672# CONFIG_CRYPTO_FIPS is not set
1673CONFIG_CRYPTO_ALGAPI=y 1693CONFIG_CRYPTO_ALGAPI=y
1674CONFIG_CRYPTO_ALGAPI2=y 1694CONFIG_CRYPTO_ALGAPI2=y
1675CONFIG_CRYPTO_AEAD2=y 1695CONFIG_CRYPTO_AEAD2=y
@@ -1711,11 +1731,13 @@ CONFIG_CRYPTO_PCBC=m
1711# 1731#
1712CONFIG_CRYPTO_HMAC=y 1732CONFIG_CRYPTO_HMAC=y
1713# CONFIG_CRYPTO_XCBC is not set 1733# CONFIG_CRYPTO_XCBC is not set
1734# CONFIG_CRYPTO_VMAC is not set
1714 1735
1715# 1736#
1716# Digest 1737# Digest
1717# 1738#
1718CONFIG_CRYPTO_CRC32C=m 1739CONFIG_CRYPTO_CRC32C=m
1740# CONFIG_CRYPTO_GHASH is not set
1719# CONFIG_CRYPTO_MD4 is not set 1741# CONFIG_CRYPTO_MD4 is not set
1720CONFIG_CRYPTO_MD5=y 1742CONFIG_CRYPTO_MD5=y
1721# CONFIG_CRYPTO_MICHAEL_MIC is not set 1743# CONFIG_CRYPTO_MICHAEL_MIC is not set
diff --git a/arch/powerpc/configs/mpc885_ads_defconfig b/arch/powerpc/configs/mpc885_ads_defconfig
index dbe8e869a827..1da3488a603d 100644
--- a/arch/powerpc/configs/mpc885_ads_defconfig
+++ b/arch/powerpc/configs/mpc885_ads_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.31-rc4 3# Linux kernel version: 2.6.32-rc5
4# Wed Jul 29 23:31:59 2009 4# Thu Nov 5 08:20:17 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -16,6 +16,7 @@ CONFIG_PPC_8xx=y
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_8xx=y 17CONFIG_8xx=y
18CONFIG_PPC_MMU_NOHASH=y 18CONFIG_PPC_MMU_NOHASH=y
19CONFIG_PPC_MMU_NOHASH_32=y
19# CONFIG_PPC_MM_SLICES is not set 20# CONFIG_PPC_MM_SLICES is not set
20CONFIG_NOT_COHERENT_CACHE=y 21CONFIG_NOT_COHERENT_CACHE=y
21CONFIG_PPC32=y 22CONFIG_PPC32=y
@@ -29,6 +30,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
29CONFIG_GENERIC_HARDIRQS=y 30CONFIG_GENERIC_HARDIRQS=y
30CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 31CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
31# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 32# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
33# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
32CONFIG_IRQ_PER_CPU=y 34CONFIG_IRQ_PER_CPU=y
33CONFIG_STACKTRACE_SUPPORT=y 35CONFIG_STACKTRACE_SUPPORT=y
34CONFIG_HAVE_LATENCYTOP_SUPPORT=y 36CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -77,11 +79,12 @@ CONFIG_SYSVIPC_SYSCTL=y
77# 79#
78# RCU Subsystem 80# RCU Subsystem
79# 81#
80CONFIG_CLASSIC_RCU=y 82CONFIG_TREE_RCU=y
81# CONFIG_TREE_RCU is not set 83# CONFIG_TREE_PREEMPT_RCU is not set
82# CONFIG_PREEMPT_RCU is not set 84# CONFIG_RCU_TRACE is not set
85CONFIG_RCU_FANOUT=32
86# CONFIG_RCU_FANOUT_EXACT is not set
83# CONFIG_TREE_RCU_TRACE is not set 87# CONFIG_TREE_RCU_TRACE is not set
84# CONFIG_PREEMPT_RCU_TRACE is not set
85# CONFIG_IKCONFIG is not set 88# CONFIG_IKCONFIG is not set
86CONFIG_LOG_BUF_SHIFT=14 89CONFIG_LOG_BUF_SHIFT=14
87CONFIG_GROUP_SCHED=y 90CONFIG_GROUP_SCHED=y
@@ -115,28 +118,29 @@ CONFIG_TIMERFD=y
115CONFIG_EVENTFD=y 118CONFIG_EVENTFD=y
116CONFIG_SHMEM=y 119CONFIG_SHMEM=y
117CONFIG_AIO=y 120CONFIG_AIO=y
118CONFIG_HAVE_PERF_COUNTERS=y 121CONFIG_HAVE_PERF_EVENTS=y
119 122
120# 123#
121# Performance Counters 124# Kernel Performance Events And Counters
122# 125#
126# CONFIG_PERF_EVENTS is not set
123# CONFIG_PERF_COUNTERS is not set 127# CONFIG_PERF_COUNTERS is not set
124# CONFIG_VM_EVENT_COUNTERS is not set 128# CONFIG_VM_EVENT_COUNTERS is not set
125CONFIG_SLUB_DEBUG=y 129CONFIG_SLUB_DEBUG=y
126# CONFIG_STRIP_ASM_SYMS is not set
127CONFIG_COMPAT_BRK=y 130CONFIG_COMPAT_BRK=y
128# CONFIG_SLAB is not set 131# CONFIG_SLAB is not set
129CONFIG_SLUB=y 132CONFIG_SLUB=y
130# CONFIG_SLOB is not set 133# CONFIG_SLOB is not set
131# CONFIG_PROFILING is not set 134# CONFIG_PROFILING is not set
132# CONFIG_MARKERS is not set
133CONFIG_HAVE_OPROFILE=y 135CONFIG_HAVE_OPROFILE=y
134CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 136CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
135CONFIG_HAVE_IOREMAP_PROT=y 137CONFIG_HAVE_IOREMAP_PROT=y
136CONFIG_HAVE_KPROBES=y 138CONFIG_HAVE_KPROBES=y
137CONFIG_HAVE_KRETPROBES=y 139CONFIG_HAVE_KRETPROBES=y
138CONFIG_HAVE_ARCH_TRACEHOOK=y 140CONFIG_HAVE_ARCH_TRACEHOOK=y
141CONFIG_HAVE_DMA_ATTRS=y
139CONFIG_HAVE_CLK=y 142CONFIG_HAVE_CLK=y
143CONFIG_HAVE_DMA_API_DEBUG=y
140 144
141# 145#
142# GCOV-based kernel profiling 146# GCOV-based kernel profiling
@@ -241,10 +245,10 @@ CONFIG_BINFMT_ELF=y
241CONFIG_8XX_MINIMAL_FPEMU=y 245CONFIG_8XX_MINIMAL_FPEMU=y
242# CONFIG_IOMMU_HELPER is not set 246# CONFIG_IOMMU_HELPER is not set
243# CONFIG_SWIOTLB is not set 247# CONFIG_SWIOTLB is not set
244CONFIG_PPC_NEED_DMA_SYNC_OPS=y
245CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 248CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
246CONFIG_ARCH_HAS_WALK_MEMORY=y 249CONFIG_ARCH_HAS_WALK_MEMORY=y
247CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 250CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
251CONFIG_MAX_ACTIVE_REGIONS=32
248CONFIG_ARCH_FLATMEM_ENABLE=y 252CONFIG_ARCH_FLATMEM_ENABLE=y
249CONFIG_ARCH_POPULATES_NODE_MAP=y 253CONFIG_ARCH_POPULATES_NODE_MAP=y
250CONFIG_SELECT_MEMORY_MODEL=y 254CONFIG_SELECT_MEMORY_MODEL=y
@@ -262,6 +266,7 @@ CONFIG_BOUNCE=y
262CONFIG_VIRT_TO_BUS=y 266CONFIG_VIRT_TO_BUS=y
263CONFIG_HAVE_MLOCK=y 267CONFIG_HAVE_MLOCK=y
264CONFIG_HAVE_MLOCKED_PAGE_BIT=y 268CONFIG_HAVE_MLOCKED_PAGE_BIT=y
269# CONFIG_KSM is not set
265CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 270CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
266CONFIG_PPC_4K_PAGES=y 271CONFIG_PPC_4K_PAGES=y
267# CONFIG_PPC_16K_PAGES is not set 272# CONFIG_PPC_16K_PAGES is not set
@@ -344,6 +349,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
344# CONFIG_NETFILTER is not set 349# CONFIG_NETFILTER is not set
345# CONFIG_IP_DCCP is not set 350# CONFIG_IP_DCCP is not set
346# CONFIG_IP_SCTP is not set 351# CONFIG_IP_SCTP is not set
352# CONFIG_RDS is not set
347# CONFIG_TIPC is not set 353# CONFIG_TIPC is not set
348# CONFIG_ATM is not set 354# CONFIG_ATM is not set
349# CONFIG_BRIDGE is not set 355# CONFIG_BRIDGE is not set
@@ -373,6 +379,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
373# CONFIG_AF_RXRPC is not set 379# CONFIG_AF_RXRPC is not set
374CONFIG_WIRELESS=y 380CONFIG_WIRELESS=y
375# CONFIG_CFG80211 is not set 381# CONFIG_CFG80211 is not set
382CONFIG_CFG80211_DEFAULT_PS_VALUE=0
376CONFIG_WIRELESS_OLD_REGULATORY=y 383CONFIG_WIRELESS_OLD_REGULATORY=y
377# CONFIG_WIRELESS_EXT is not set 384# CONFIG_WIRELESS_EXT is not set
378# CONFIG_LIB80211 is not set 385# CONFIG_LIB80211 is not set
@@ -380,7 +387,6 @@ CONFIG_WIRELESS_OLD_REGULATORY=y
380# 387#
381# CFG80211 needs to be enabled for MAC80211 388# CFG80211 needs to be enabled for MAC80211
382# 389#
383CONFIG_MAC80211_DEFAULT_PS_VALUE=0
384# CONFIG_WIMAX is not set 390# CONFIG_WIMAX is not set
385# CONFIG_RFKILL is not set 391# CONFIG_RFKILL is not set
386# CONFIG_NET_9P is not set 392# CONFIG_NET_9P is not set
@@ -393,6 +399,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
393# Generic Driver Options 399# Generic Driver Options
394# 400#
395CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 401CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
402# CONFIG_DEVTMPFS is not set
396CONFIG_STANDALONE=y 403CONFIG_STANDALONE=y
397CONFIG_PREVENT_FIRMWARE_BUILD=y 404CONFIG_PREVENT_FIRMWARE_BUILD=y
398# CONFIG_FW_LOADER is not set 405# CONFIG_FW_LOADER is not set
@@ -540,16 +547,15 @@ CONFIG_MII=y
540# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set 547# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
541# CONFIG_B44 is not set 548# CONFIG_B44 is not set
542# CONFIG_KS8842 is not set 549# CONFIG_KS8842 is not set
550# CONFIG_KS8851_MLL is not set
551# CONFIG_XILINX_EMACLITE is not set
543CONFIG_FS_ENET=y 552CONFIG_FS_ENET=y
544# CONFIG_FS_ENET_HAS_SCC is not set 553# CONFIG_FS_ENET_HAS_SCC is not set
545CONFIG_FS_ENET_HAS_FEC=y 554CONFIG_FS_ENET_HAS_FEC=y
546CONFIG_FS_ENET_MDIO_FEC=y 555CONFIG_FS_ENET_MDIO_FEC=y
547# CONFIG_NETDEV_1000 is not set 556# CONFIG_NETDEV_1000 is not set
548# CONFIG_NETDEV_10000 is not set 557# CONFIG_NETDEV_10000 is not set
549 558CONFIG_WLAN=y
550#
551# Wireless LAN
552#
553# CONFIG_WLAN_PRE80211 is not set 559# CONFIG_WLAN_PRE80211 is not set
554# CONFIG_WLAN_80211 is not set 560# CONFIG_WLAN_80211 is not set
555 561
@@ -622,7 +628,6 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
622# CONFIG_POWER_SUPPLY is not set 628# CONFIG_POWER_SUPPLY is not set
623# CONFIG_HWMON is not set 629# CONFIG_HWMON is not set
624# CONFIG_THERMAL is not set 630# CONFIG_THERMAL is not set
625# CONFIG_THERMAL_HWMON is not set
626# CONFIG_WATCHDOG is not set 631# CONFIG_WATCHDOG is not set
627CONFIG_SSB_POSSIBLE=y 632CONFIG_SSB_POSSIBLE=y
628 633
@@ -683,6 +688,7 @@ CONFIG_SSB_POSSIBLE=y
683# CONFIG_GFS2_FS is not set 688# CONFIG_GFS2_FS is not set
684# CONFIG_OCFS2_FS is not set 689# CONFIG_OCFS2_FS is not set
685# CONFIG_BTRFS_FS is not set 690# CONFIG_BTRFS_FS is not set
691# CONFIG_NILFS2_FS is not set
686CONFIG_FILE_LOCKING=y 692CONFIG_FILE_LOCKING=y
687CONFIG_FSNOTIFY=y 693CONFIG_FSNOTIFY=y
688# CONFIG_DNOTIFY is not set 694# CONFIG_DNOTIFY is not set
@@ -742,7 +748,6 @@ CONFIG_CRAMFS=y
742# CONFIG_ROMFS_FS is not set 748# CONFIG_ROMFS_FS is not set
743# CONFIG_SYSV_FS is not set 749# CONFIG_SYSV_FS is not set
744# CONFIG_UFS_FS is not set 750# CONFIG_UFS_FS is not set
745# CONFIG_NILFS2_FS is not set
746CONFIG_NETWORK_FILESYSTEMS=y 751CONFIG_NETWORK_FILESYSTEMS=y
747CONFIG_NFS_FS=y 752CONFIG_NFS_FS=y
748CONFIG_NFS_V3=y 753CONFIG_NFS_V3=y
@@ -814,6 +819,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
814CONFIG_ENABLE_MUST_CHECK=y 819CONFIG_ENABLE_MUST_CHECK=y
815CONFIG_FRAME_WARN=1024 820CONFIG_FRAME_WARN=1024
816CONFIG_MAGIC_SYSRQ=y 821CONFIG_MAGIC_SYSRQ=y
822# CONFIG_STRIP_ASM_SYMS is not set
817# CONFIG_UNUSED_SYMBOLS is not set 823# CONFIG_UNUSED_SYMBOLS is not set
818# CONFIG_DEBUG_FS is not set 824# CONFIG_DEBUG_FS is not set
819# CONFIG_HEADERS_CHECK is not set 825# CONFIG_HEADERS_CHECK is not set
@@ -831,6 +837,7 @@ CONFIG_SCHED_DEBUG=y
831# CONFIG_DEBUG_OBJECTS is not set 837# CONFIG_DEBUG_OBJECTS is not set
832# CONFIG_SLUB_DEBUG_ON is not set 838# CONFIG_SLUB_DEBUG_ON is not set
833# CONFIG_SLUB_STATS is not set 839# CONFIG_SLUB_STATS is not set
840# CONFIG_DEBUG_KMEMLEAK is not set
834# CONFIG_DEBUG_SPINLOCK is not set 841# CONFIG_DEBUG_SPINLOCK is not set
835# CONFIG_DEBUG_MUTEXES is not set 842# CONFIG_DEBUG_MUTEXES is not set
836# CONFIG_DEBUG_LOCK_ALLOC is not set 843# CONFIG_DEBUG_LOCK_ALLOC is not set
@@ -847,10 +854,12 @@ CONFIG_DEBUG_INFO=y
847# CONFIG_DEBUG_LIST is not set 854# CONFIG_DEBUG_LIST is not set
848# CONFIG_DEBUG_SG is not set 855# CONFIG_DEBUG_SG is not set
849# CONFIG_DEBUG_NOTIFIERS is not set 856# CONFIG_DEBUG_NOTIFIERS is not set
857# CONFIG_DEBUG_CREDENTIALS is not set
850# CONFIG_RCU_TORTURE_TEST is not set 858# CONFIG_RCU_TORTURE_TEST is not set
851# CONFIG_RCU_CPU_STALL_DETECTOR is not set 859# CONFIG_RCU_CPU_STALL_DETECTOR is not set
852# CONFIG_BACKTRACE_SELF_TEST is not set 860# CONFIG_BACKTRACE_SELF_TEST is not set
853# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 861# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
862# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
854# CONFIG_FAULT_INJECTION is not set 863# CONFIG_FAULT_INJECTION is not set
855# CONFIG_LATENCYTOP is not set 864# CONFIG_LATENCYTOP is not set
856# CONFIG_DEBUG_PAGEALLOC is not set 865# CONFIG_DEBUG_PAGEALLOC is not set
@@ -872,10 +881,10 @@ CONFIG_BRANCH_PROFILE_NONE=y
872# CONFIG_KMEMTRACE is not set 881# CONFIG_KMEMTRACE is not set
873# CONFIG_WORKQUEUE_TRACER is not set 882# CONFIG_WORKQUEUE_TRACER is not set
874# CONFIG_BLK_DEV_IO_TRACE is not set 883# CONFIG_BLK_DEV_IO_TRACE is not set
884# CONFIG_DMA_API_DEBUG is not set
875# CONFIG_SAMPLES is not set 885# CONFIG_SAMPLES is not set
876CONFIG_HAVE_ARCH_KGDB=y 886CONFIG_HAVE_ARCH_KGDB=y
877# CONFIG_KGDB is not set 887# CONFIG_KGDB is not set
878# CONFIG_KMEMCHECK is not set
879# CONFIG_PPC_DISABLE_WERROR is not set 888# CONFIG_PPC_DISABLE_WERROR is not set
880CONFIG_PPC_WERROR=y 889CONFIG_PPC_WERROR=y
881CONFIG_PRINT_STACK_DEPTH=64 890CONFIG_PRINT_STACK_DEPTH=64
diff --git a/arch/powerpc/configs/pasemi_defconfig b/arch/powerpc/configs/pasemi_defconfig
index 4f8681cc8d77..20ba0cfff8ba 100644
--- a/arch/powerpc/configs/pasemi_defconfig
+++ b/arch/powerpc/configs/pasemi_defconfig
@@ -1,49 +1,58 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.26-rc3 3# Linux kernel version: 2.6.32-rc3
4# Tue May 27 16:08:06 2008 4# Tue Oct 6 10:27:18 2009
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7 7
8# 8#
9# Processor support 9# Processor support
10# 10#
11CONFIG_PPC_BOOK3S_64=y
12# CONFIG_PPC_BOOK3E_64 is not set
13CONFIG_PPC_BOOK3S=y
11CONFIG_POWER4_ONLY=y 14CONFIG_POWER4_ONLY=y
12CONFIG_POWER4=y 15CONFIG_POWER4=y
13# CONFIG_TUNE_CELL is not set 16# CONFIG_TUNE_CELL is not set
14CONFIG_PPC_FPU=y 17CONFIG_PPC_FPU=y
15CONFIG_ALTIVEC=y 18CONFIG_ALTIVEC=y
19# CONFIG_VSX is not set
16CONFIG_PPC_STD_MMU=y 20CONFIG_PPC_STD_MMU=y
21CONFIG_PPC_STD_MMU_64=y
17CONFIG_PPC_MM_SLICES=y 22CONFIG_PPC_MM_SLICES=y
18# CONFIG_VIRT_CPU_ACCOUNTING is not set 23# CONFIG_VIRT_CPU_ACCOUNTING is not set
24CONFIG_PPC_HAVE_PMU_SUPPORT=y
25CONFIG_PPC_PERF_CTRS=y
19CONFIG_SMP=y 26CONFIG_SMP=y
20CONFIG_NR_CPUS=2 27CONFIG_NR_CPUS=2
21CONFIG_64BIT=y 28CONFIG_64BIT=y
22CONFIG_WORD_SIZE=64 29CONFIG_WORD_SIZE=64
23CONFIG_PPC_MERGE=y 30CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
24CONFIG_MMU=y 31CONFIG_MMU=y
25CONFIG_GENERIC_CMOS_UPDATE=y 32CONFIG_GENERIC_CMOS_UPDATE=y
26CONFIG_GENERIC_TIME=y 33CONFIG_GENERIC_TIME=y
27CONFIG_GENERIC_TIME_VSYSCALL=y 34CONFIG_GENERIC_TIME_VSYSCALL=y
28CONFIG_GENERIC_CLOCKEVENTS=y 35CONFIG_GENERIC_CLOCKEVENTS=y
29CONFIG_GENERIC_HARDIRQS=y 36CONFIG_GENERIC_HARDIRQS=y
37CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
30CONFIG_HAVE_SETUP_PER_CPU_AREA=y 38CONFIG_HAVE_SETUP_PER_CPU_AREA=y
39CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
31CONFIG_IRQ_PER_CPU=y 40CONFIG_IRQ_PER_CPU=y
32CONFIG_STACKTRACE_SUPPORT=y 41CONFIG_STACKTRACE_SUPPORT=y
42CONFIG_HAVE_LATENCYTOP_SUPPORT=y
33CONFIG_TRACE_IRQFLAGS_SUPPORT=y 43CONFIG_TRACE_IRQFLAGS_SUPPORT=y
34CONFIG_LOCKDEP_SUPPORT=y 44CONFIG_LOCKDEP_SUPPORT=y
35CONFIG_RWSEM_XCHGADD_ALGORITHM=y 45CONFIG_RWSEM_XCHGADD_ALGORITHM=y
36CONFIG_ARCH_HAS_ILOG2_U32=y 46CONFIG_ARCH_HAS_ILOG2_U32=y
37CONFIG_ARCH_HAS_ILOG2_U64=y 47CONFIG_ARCH_HAS_ILOG2_U64=y
38CONFIG_GENERIC_HWEIGHT=y 48CONFIG_GENERIC_HWEIGHT=y
39CONFIG_GENERIC_CALIBRATE_DELAY=y
40CONFIG_GENERIC_FIND_NEXT_BIT=y 49CONFIG_GENERIC_FIND_NEXT_BIT=y
41CONFIG_ARCH_NO_VIRT_TO_BUS=y 50CONFIG_ARCH_NO_VIRT_TO_BUS=y
42CONFIG_PPC=y 51CONFIG_PPC=y
43CONFIG_EARLY_PRINTK=y 52CONFIG_EARLY_PRINTK=y
44CONFIG_COMPAT=y 53CONFIG_COMPAT=y
45CONFIG_SYSVIPC_COMPAT=y 54CONFIG_SYSVIPC_COMPAT=y
46CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 55CONFIG_SCHED_OMIT_FRAME_POINTER=y
47CONFIG_ARCH_MAY_HAVE_PC_FDC=y 56CONFIG_ARCH_MAY_HAVE_PC_FDC=y
48CONFIG_PPC_OF=y 57CONFIG_PPC_OF=y
49CONFIG_OF=y 58CONFIG_OF=y
@@ -51,11 +60,14 @@ CONFIG_PPC_UDBG_16550=y
51# CONFIG_GENERIC_TBSYNC is not set 60# CONFIG_GENERIC_TBSYNC is not set
52CONFIG_AUDIT_ARCH=y 61CONFIG_AUDIT_ARCH=y
53CONFIG_GENERIC_BUG=y 62CONFIG_GENERIC_BUG=y
63CONFIG_DTC=y
54# CONFIG_DEFAULT_UIMAGE is not set 64# CONFIG_DEFAULT_UIMAGE is not set
55# CONFIG_PPC_DCR_NATIVE is not set 65# CONFIG_PPC_DCR_NATIVE is not set
56# CONFIG_PPC_DCR_MMIO is not set 66# CONFIG_PPC_DCR_MMIO is not set
57# CONFIG_PPC_OF_PLATFORM_PCI is not set 67# CONFIG_PPC_OF_PLATFORM_PCI is not set
68CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
58CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 69CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
70CONFIG_CONSTRUCTORS=y
59 71
60# 72#
61# General setup 73# General setup
@@ -72,10 +84,20 @@ CONFIG_SYSVIPC_SYSCTL=y
72# CONFIG_BSD_PROCESS_ACCT is not set 84# CONFIG_BSD_PROCESS_ACCT is not set
73# CONFIG_TASKSTATS is not set 85# CONFIG_TASKSTATS is not set
74# CONFIG_AUDIT is not set 86# CONFIG_AUDIT is not set
87
88#
89# RCU Subsystem
90#
91CONFIG_TREE_RCU=y
92# CONFIG_TREE_PREEMPT_RCU is not set
93# CONFIG_RCU_TRACE is not set
94CONFIG_RCU_FANOUT=64
95# CONFIG_RCU_FANOUT_EXACT is not set
96# CONFIG_TREE_RCU_TRACE is not set
75# CONFIG_IKCONFIG is not set 97# CONFIG_IKCONFIG is not set
76CONFIG_LOG_BUF_SHIFT=17 98CONFIG_LOG_BUF_SHIFT=17
77# CONFIG_CGROUPS is not set
78# CONFIG_GROUP_SCHED is not set 99# CONFIG_GROUP_SCHED is not set
100# CONFIG_CGROUPS is not set
79CONFIG_SYSFS_DEPRECATED=y 101CONFIG_SYSFS_DEPRECATED=y
80CONFIG_SYSFS_DEPRECATED_V2=y 102CONFIG_SYSFS_DEPRECATED_V2=y
81# CONFIG_RELAY is not set 103# CONFIG_RELAY is not set
@@ -84,13 +106,17 @@ CONFIG_NAMESPACES=y
84# CONFIG_IPC_NS is not set 106# CONFIG_IPC_NS is not set
85# CONFIG_USER_NS is not set 107# CONFIG_USER_NS is not set
86# CONFIG_PID_NS is not set 108# CONFIG_PID_NS is not set
109# CONFIG_NET_NS is not set
87CONFIG_BLK_DEV_INITRD=y 110CONFIG_BLK_DEV_INITRD=y
88CONFIG_INITRAMFS_SOURCE="" 111CONFIG_INITRAMFS_SOURCE=""
112CONFIG_RD_GZIP=y
113CONFIG_RD_BZIP2=y
114CONFIG_RD_LZMA=y
89# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 115# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
90CONFIG_SYSCTL=y 116CONFIG_SYSCTL=y
117CONFIG_ANON_INODES=y
91# CONFIG_EMBEDDED is not set 118# CONFIG_EMBEDDED is not set
92CONFIG_SYSCTL_SYSCALL=y 119CONFIG_SYSCTL_SYSCALL=y
93CONFIG_SYSCTL_SYSCALL_CHECK=y
94CONFIG_KALLSYMS=y 120CONFIG_KALLSYMS=y
95# CONFIG_KALLSYMS_ALL is not set 121# CONFIG_KALLSYMS_ALL is not set
96# CONFIG_KALLSYMS_EXTRA_PASS is not set 122# CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -98,32 +124,52 @@ CONFIG_HOTPLUG=y
98CONFIG_PRINTK=y 124CONFIG_PRINTK=y
99CONFIG_BUG=y 125CONFIG_BUG=y
100CONFIG_ELF_CORE=y 126CONFIG_ELF_CORE=y
101CONFIG_COMPAT_BRK=y
102CONFIG_BASE_FULL=y 127CONFIG_BASE_FULL=y
103CONFIG_FUTEX=y 128CONFIG_FUTEX=y
104CONFIG_ANON_INODES=y
105CONFIG_EPOLL=y 129CONFIG_EPOLL=y
106CONFIG_SIGNALFD=y 130CONFIG_SIGNALFD=y
107CONFIG_TIMERFD=y 131CONFIG_TIMERFD=y
108CONFIG_EVENTFD=y 132CONFIG_EVENTFD=y
109CONFIG_SHMEM=y 133CONFIG_SHMEM=y
134CONFIG_AIO=y
135CONFIG_HAVE_PERF_EVENTS=y
136
137#
138# Kernel Performance Events And Counters
139#
140CONFIG_PERF_EVENTS=y
141CONFIG_EVENT_PROFILE=y
142# CONFIG_PERF_COUNTERS is not set
110CONFIG_VM_EVENT_COUNTERS=y 143CONFIG_VM_EVENT_COUNTERS=y
144CONFIG_PCI_QUIRKS=y
111CONFIG_SLUB_DEBUG=y 145CONFIG_SLUB_DEBUG=y
146CONFIG_COMPAT_BRK=y
112# CONFIG_SLAB is not set 147# CONFIG_SLAB is not set
113CONFIG_SLUB=y 148CONFIG_SLUB=y
114# CONFIG_SLOB is not set 149# CONFIG_SLOB is not set
115CONFIG_PROFILING=y 150CONFIG_PROFILING=y
116# CONFIG_MARKERS is not set 151CONFIG_TRACEPOINTS=y
117CONFIG_OPROFILE=y 152CONFIG_OPROFILE=y
118CONFIG_HAVE_OPROFILE=y 153CONFIG_HAVE_OPROFILE=y
119# CONFIG_KPROBES is not set 154# CONFIG_KPROBES is not set
155CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
156CONFIG_HAVE_SYSCALL_WRAPPERS=y
157CONFIG_HAVE_IOREMAP_PROT=y
120CONFIG_HAVE_KPROBES=y 158CONFIG_HAVE_KPROBES=y
121CONFIG_HAVE_KRETPROBES=y 159CONFIG_HAVE_KRETPROBES=y
122# CONFIG_HAVE_DMA_ATTRS is not set 160CONFIG_HAVE_ARCH_TRACEHOOK=y
123CONFIG_PROC_PAGE_MONITOR=y 161CONFIG_HAVE_DMA_ATTRS=y
162CONFIG_USE_GENERIC_SMP_HELPERS=y
163CONFIG_HAVE_DMA_API_DEBUG=y
164
165#
166# GCOV-based kernel profiling
167#
168# CONFIG_GCOV_KERNEL is not set
169# CONFIG_SLOW_WORK is not set
170# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
124CONFIG_SLABINFO=y 171CONFIG_SLABINFO=y
125CONFIG_RT_MUTEXES=y 172CONFIG_RT_MUTEXES=y
126# CONFIG_TINY_SHMEM is not set
127CONFIG_BASE_SMALL=0 173CONFIG_BASE_SMALL=0
128CONFIG_MODULES=y 174CONFIG_MODULES=y
129# CONFIG_MODULE_FORCE_LOAD is not set 175# CONFIG_MODULE_FORCE_LOAD is not set
@@ -131,11 +177,10 @@ CONFIG_MODULE_UNLOAD=y
131# CONFIG_MODULE_FORCE_UNLOAD is not set 177# CONFIG_MODULE_FORCE_UNLOAD is not set
132# CONFIG_MODVERSIONS is not set 178# CONFIG_MODVERSIONS is not set
133# CONFIG_MODULE_SRCVERSION_ALL is not set 179# CONFIG_MODULE_SRCVERSION_ALL is not set
134# CONFIG_KMOD is not set
135CONFIG_STOP_MACHINE=y 180CONFIG_STOP_MACHINE=y
136CONFIG_BLOCK=y 181CONFIG_BLOCK=y
137# CONFIG_BLK_DEV_IO_TRACE is not set
138# CONFIG_BLK_DEV_BSG is not set 182# CONFIG_BLK_DEV_BSG is not set
183# CONFIG_BLK_DEV_INTEGRITY is not set
139CONFIG_BLOCK_COMPAT=y 184CONFIG_BLOCK_COMPAT=y
140 185
141# 186#
@@ -150,19 +195,14 @@ CONFIG_DEFAULT_AS=y
150# CONFIG_DEFAULT_CFQ is not set 195# CONFIG_DEFAULT_CFQ is not set
151# CONFIG_DEFAULT_NOOP is not set 196# CONFIG_DEFAULT_NOOP is not set
152CONFIG_DEFAULT_IOSCHED="anticipatory" 197CONFIG_DEFAULT_IOSCHED="anticipatory"
153CONFIG_CLASSIC_RCU=y 198# CONFIG_FREEZER is not set
199CONFIG_PPC_MSI_BITMAP=y
154 200
155# 201#
156# Platform support 202# Platform support
157# 203#
158CONFIG_PPC_MULTIPLATFORM=y
159# CONFIG_PPC_82xx is not set
160# CONFIG_PPC_83xx is not set
161# CONFIG_PPC_86xx is not set
162# CONFIG_PPC_PSERIES is not set 204# CONFIG_PPC_PSERIES is not set
163# CONFIG_PPC_ISERIES is not set 205# CONFIG_PPC_ISERIES is not set
164# CONFIG_PPC_MPC512x is not set
165# CONFIG_PPC_MPC5121 is not set
166# CONFIG_PPC_PMAC is not set 206# CONFIG_PPC_PMAC is not set
167# CONFIG_PPC_MAPLE is not set 207# CONFIG_PPC_MAPLE is not set
168CONFIG_PPC_PASEMI=y 208CONFIG_PPC_PASEMI=y
@@ -178,8 +218,10 @@ CONFIG_PPC_PASEMI_MDIO=y
178# CONFIG_PPC_CELL_NATIVE is not set 218# CONFIG_PPC_CELL_NATIVE is not set
179# CONFIG_PPC_IBM_CELL_BLADE is not set 219# CONFIG_PPC_IBM_CELL_BLADE is not set
180# CONFIG_PPC_CELLEB is not set 220# CONFIG_PPC_CELLEB is not set
221# CONFIG_PPC_CELL_QPACE is not set
181# CONFIG_PQ2ADS is not set 222# CONFIG_PQ2ADS is not set
182CONFIG_PPC_NATIVE=y 223CONFIG_PPC_NATIVE=y
224CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
183# CONFIG_IPIC is not set 225# CONFIG_IPIC is not set
184CONFIG_MPIC=y 226CONFIG_MPIC=y
185# CONFIG_MPIC_WEIRD is not set 227# CONFIG_MPIC_WEIRD is not set
@@ -213,6 +255,7 @@ CONFIG_CPU_FREQ_GOV_ONDEMAND=y
213# 255#
214CONFIG_PPC_PASEMI_CPUFREQ=y 256CONFIG_PPC_PASEMI_CPUFREQ=y
215# CONFIG_FSL_ULI1575 is not set 257# CONFIG_FSL_ULI1575 is not set
258# CONFIG_SIMPLE_GPIO is not set
216 259
217# 260#
218# Kernel options 261# Kernel options
@@ -226,16 +269,19 @@ CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
226# CONFIG_HZ_300 is not set 269# CONFIG_HZ_300 is not set
227CONFIG_HZ_1000=y 270CONFIG_HZ_1000=y
228CONFIG_HZ=1000 271CONFIG_HZ=1000
229# CONFIG_SCHED_HRTICK is not set 272CONFIG_SCHED_HRTICK=y
230CONFIG_PREEMPT_NONE=y 273CONFIG_PREEMPT_NONE=y
231# CONFIG_PREEMPT_VOLUNTARY is not set 274# CONFIG_PREEMPT_VOLUNTARY is not set
232# CONFIG_PREEMPT is not set 275# CONFIG_PREEMPT is not set
233CONFIG_BINFMT_ELF=y 276CONFIG_BINFMT_ELF=y
234CONFIG_COMPAT_BINFMT_ELF=y 277CONFIG_COMPAT_BINFMT_ELF=y
278# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
279# CONFIG_HAVE_AOUT is not set
235# CONFIG_BINFMT_MISC is not set 280# CONFIG_BINFMT_MISC is not set
236CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y 281CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y
237CONFIG_IOMMU_VMERGE=y 282CONFIG_IOMMU_VMERGE=y
238CONFIG_IOMMU_HELPER=y 283CONFIG_IOMMU_HELPER=y
284# CONFIG_SWIOTLB is not set
239CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 285CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
240CONFIG_ARCH_HAS_WALK_MEMORY=y 286CONFIG_ARCH_HAS_WALK_MEMORY=y
241CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 287CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
@@ -243,6 +289,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
243# CONFIG_CRASH_DUMP is not set 289# CONFIG_CRASH_DUMP is not set
244# CONFIG_IRQ_ALL_CPUS is not set 290# CONFIG_IRQ_ALL_CPUS is not set
245# CONFIG_NUMA is not set 291# CONFIG_NUMA is not set
292CONFIG_MAX_ACTIVE_REGIONS=256
246CONFIG_ARCH_SELECT_MEMORY_MODEL=y 293CONFIG_ARCH_SELECT_MEMORY_MODEL=y
247CONFIG_ARCH_FLATMEM_ENABLE=y 294CONFIG_ARCH_FLATMEM_ENABLE=y
248CONFIG_ARCH_SPARSEMEM_ENABLE=y 295CONFIG_ARCH_SPARSEMEM_ENABLE=y
@@ -253,20 +300,28 @@ CONFIG_FLATMEM_MANUAL=y
253# CONFIG_SPARSEMEM_MANUAL is not set 300# CONFIG_SPARSEMEM_MANUAL is not set
254CONFIG_FLATMEM=y 301CONFIG_FLATMEM=y
255CONFIG_FLAT_NODE_MEM_MAP=y 302CONFIG_FLAT_NODE_MEM_MAP=y
256# CONFIG_SPARSEMEM_STATIC is not set
257CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y 303CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
258CONFIG_PAGEFLAGS_EXTENDED=y 304CONFIG_PAGEFLAGS_EXTENDED=y
259CONFIG_SPLIT_PTLOCK_CPUS=4 305CONFIG_SPLIT_PTLOCK_CPUS=4
260CONFIG_RESOURCES_64BIT=y 306CONFIG_MIGRATION=y
307CONFIG_PHYS_ADDR_T_64BIT=y
261CONFIG_ZONE_DMA_FLAG=1 308CONFIG_ZONE_DMA_FLAG=1
262CONFIG_BOUNCE=y 309CONFIG_BOUNCE=y
310CONFIG_HAVE_MLOCK=y
311CONFIG_HAVE_MLOCKED_PAGE_BIT=y
312# CONFIG_KSM is not set
313CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
263CONFIG_PPC_HAS_HASH_64K=y 314CONFIG_PPC_HAS_HASH_64K=y
315# CONFIG_PPC_4K_PAGES is not set
316# CONFIG_PPC_16K_PAGES is not set
264CONFIG_PPC_64K_PAGES=y 317CONFIG_PPC_64K_PAGES=y
318# CONFIG_PPC_256K_PAGES is not set
265CONFIG_FORCE_MAX_ZONEORDER=9 319CONFIG_FORCE_MAX_ZONEORDER=9
266# CONFIG_PPC_SUBPAGE_PROT is not set 320# CONFIG_PPC_SUBPAGE_PROT is not set
267# CONFIG_SCHED_SMT is not set 321# CONFIG_SCHED_SMT is not set
268CONFIG_PROC_DEVICETREE=y 322CONFIG_PROC_DEVICETREE=y
269# CONFIG_CMDLINE_BOOL is not set 323# CONFIG_CMDLINE_BOOL is not set
324CONFIG_EXTRA_TARGETS=""
270# CONFIG_PM is not set 325# CONFIG_PM is not set
271# CONFIG_SECCOMP is not set 326# CONFIG_SECCOMP is not set
272CONFIG_ISA_DMA_API=y 327CONFIG_ISA_DMA_API=y
@@ -285,6 +340,8 @@ CONFIG_ARCH_SUPPORTS_MSI=y
285CONFIG_PCI_MSI=y 340CONFIG_PCI_MSI=y
286CONFIG_PCI_LEGACY=y 341CONFIG_PCI_LEGACY=y
287# CONFIG_PCI_DEBUG is not set 342# CONFIG_PCI_DEBUG is not set
343# CONFIG_PCI_STUB is not set
344# CONFIG_PCI_IOV is not set
288CONFIG_PCCARD=y 345CONFIG_PCCARD=y
289CONFIG_PCMCIA_DEBUG=y 346CONFIG_PCMCIA_DEBUG=y
290CONFIG_PCMCIA=y 347CONFIG_PCMCIA=y
@@ -301,13 +358,10 @@ CONFIG_CARDBUS=y
301CONFIG_ELECTRA_CF=y 358CONFIG_ELECTRA_CF=y
302# CONFIG_HOTPLUG_PCI is not set 359# CONFIG_HOTPLUG_PCI is not set
303# CONFIG_HAS_RAPIDIO is not set 360# CONFIG_HAS_RAPIDIO is not set
361# CONFIG_RELOCATABLE is not set
304CONFIG_PAGE_OFFSET=0xc000000000000000 362CONFIG_PAGE_OFFSET=0xc000000000000000
305CONFIG_KERNEL_START=0xc000000000000000 363CONFIG_KERNEL_START=0xc000000000000000
306CONFIG_PHYSICAL_START=0x00000000 364CONFIG_PHYSICAL_START=0x00000000
307
308#
309# Networking
310#
311CONFIG_NET=y 365CONFIG_NET=y
312 366
313# 367#
@@ -356,9 +410,11 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
356# CONFIG_NETFILTER is not set 410# CONFIG_NETFILTER is not set
357# CONFIG_IP_DCCP is not set 411# CONFIG_IP_DCCP is not set
358# CONFIG_IP_SCTP is not set 412# CONFIG_IP_SCTP is not set
413# CONFIG_RDS is not set
359# CONFIG_TIPC is not set 414# CONFIG_TIPC is not set
360# CONFIG_ATM is not set 415# CONFIG_ATM is not set
361# CONFIG_BRIDGE is not set 416# CONFIG_BRIDGE is not set
417# CONFIG_NET_DSA is not set
362# CONFIG_VLAN_8021Q is not set 418# CONFIG_VLAN_8021Q is not set
363# CONFIG_DECNET is not set 419# CONFIG_DECNET is not set
364# CONFIG_LLC2 is not set 420# CONFIG_LLC2 is not set
@@ -368,25 +424,32 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
368# CONFIG_LAPB is not set 424# CONFIG_LAPB is not set
369# CONFIG_ECONET is not set 425# CONFIG_ECONET is not set
370# CONFIG_WAN_ROUTER is not set 426# CONFIG_WAN_ROUTER is not set
427# CONFIG_PHONET is not set
428# CONFIG_IEEE802154 is not set
371# CONFIG_NET_SCHED is not set 429# CONFIG_NET_SCHED is not set
430# CONFIG_DCB is not set
372 431
373# 432#
374# Network testing 433# Network testing
375# 434#
376# CONFIG_NET_PKTGEN is not set 435# CONFIG_NET_PKTGEN is not set
436# CONFIG_NET_DROP_MONITOR is not set
377# CONFIG_HAMRADIO is not set 437# CONFIG_HAMRADIO is not set
378# CONFIG_CAN is not set 438# CONFIG_CAN is not set
379# CONFIG_IRDA is not set 439# CONFIG_IRDA is not set
380# CONFIG_BT is not set 440# CONFIG_BT is not set
381# CONFIG_AF_RXRPC is not set 441# CONFIG_AF_RXRPC is not set
442CONFIG_WIRELESS=y
443# CONFIG_CFG80211 is not set
444CONFIG_CFG80211_DEFAULT_PS_VALUE=0
445# CONFIG_WIRELESS_OLD_REGULATORY is not set
446# CONFIG_WIRELESS_EXT is not set
447# CONFIG_LIB80211 is not set
382 448
383# 449#
384# Wireless 450# CFG80211 needs to be enabled for MAC80211
385# 451#
386# CONFIG_CFG80211 is not set 452# CONFIG_WIMAX is not set
387# CONFIG_WIRELESS_EXT is not set
388# CONFIG_MAC80211 is not set
389# CONFIG_IEEE80211 is not set
390# CONFIG_RFKILL is not set 453# CONFIG_RFKILL is not set
391# CONFIG_NET_9P is not set 454# CONFIG_NET_9P is not set
392 455
@@ -398,15 +461,19 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
398# Generic Driver Options 461# Generic Driver Options
399# 462#
400CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 463CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
464# CONFIG_DEVTMPFS is not set
401CONFIG_STANDALONE=y 465CONFIG_STANDALONE=y
402CONFIG_PREVENT_FIRMWARE_BUILD=y 466CONFIG_PREVENT_FIRMWARE_BUILD=y
403CONFIG_FW_LOADER=y 467CONFIG_FW_LOADER=y
468CONFIG_FIRMWARE_IN_KERNEL=y
469CONFIG_EXTRA_FIRMWARE=""
404# CONFIG_DEBUG_DRIVER is not set 470# CONFIG_DEBUG_DRIVER is not set
405# CONFIG_DEBUG_DEVRES is not set 471# CONFIG_DEBUG_DEVRES is not set
406# CONFIG_SYS_HYPERVISOR is not set 472# CONFIG_SYS_HYPERVISOR is not set
407# CONFIG_CONNECTOR is not set 473# CONFIG_CONNECTOR is not set
408CONFIG_MTD=y 474CONFIG_MTD=y
409# CONFIG_MTD_DEBUG is not set 475# CONFIG_MTD_DEBUG is not set
476# CONFIG_MTD_TESTS is not set
410CONFIG_MTD_CONCAT=y 477CONFIG_MTD_CONCAT=y
411# CONFIG_MTD_PARTITIONS is not set 478# CONFIG_MTD_PARTITIONS is not set
412 479
@@ -478,11 +545,17 @@ CONFIG_MTD_NAND_PASEMI=y
478# CONFIG_MTD_ONENAND is not set 545# CONFIG_MTD_ONENAND is not set
479 546
480# 547#
548# LPDDR flash memory drivers
549#
550# CONFIG_MTD_LPDDR is not set
551
552#
481# UBI - Unsorted block images 553# UBI - Unsorted block images
482# 554#
483# CONFIG_MTD_UBI is not set 555# CONFIG_MTD_UBI is not set
484CONFIG_OF_DEVICE=y 556CONFIG_OF_DEVICE=y
485CONFIG_OF_I2C=y 557CONFIG_OF_I2C=y
558CONFIG_OF_MDIO=y
486# CONFIG_PARPORT is not set 559# CONFIG_PARPORT is not set
487CONFIG_BLK_DEV=y 560CONFIG_BLK_DEV=y
488# CONFIG_BLK_DEV_FD is not set 561# CONFIG_BLK_DEV_FD is not set
@@ -501,29 +574,41 @@ CONFIG_BLK_DEV_RAM_SIZE=16384
501# CONFIG_BLK_DEV_XIP is not set 574# CONFIG_BLK_DEV_XIP is not set
502# CONFIG_CDROM_PKTCDVD is not set 575# CONFIG_CDROM_PKTCDVD is not set
503# CONFIG_ATA_OVER_ETH is not set 576# CONFIG_ATA_OVER_ETH is not set
577# CONFIG_BLK_DEV_HD is not set
504CONFIG_MISC_DEVICES=y 578CONFIG_MISC_DEVICES=y
505# CONFIG_PHANTOM is not set 579# CONFIG_PHANTOM is not set
506# CONFIG_EEPROM_93CX6 is not set
507# CONFIG_SGI_IOC4 is not set 580# CONFIG_SGI_IOC4 is not set
508# CONFIG_TIFM_CORE is not set 581# CONFIG_TIFM_CORE is not set
582# CONFIG_ICS932S401 is not set
509# CONFIG_ENCLOSURE_SERVICES is not set 583# CONFIG_ENCLOSURE_SERVICES is not set
584# CONFIG_HP_ILO is not set
585# CONFIG_ISL29003 is not set
586# CONFIG_C2PORT is not set
587
588#
589# EEPROM support
590#
591# CONFIG_EEPROM_AT24 is not set
592CONFIG_EEPROM_LEGACY=y
593# CONFIG_EEPROM_MAX6875 is not set
594# CONFIG_EEPROM_93CX6 is not set
595# CONFIG_CB710_CORE is not set
510CONFIG_HAVE_IDE=y 596CONFIG_HAVE_IDE=y
511CONFIG_IDE=y 597CONFIG_IDE=y
512CONFIG_BLK_DEV_IDE=y
513 598
514# 599#
515# Please see Documentation/ide/ide.txt for help/info on IDE drives 600# Please see Documentation/ide/ide.txt for help/info on IDE drives
516# 601#
602CONFIG_IDE_ATAPI=y
517# CONFIG_BLK_DEV_IDE_SATA is not set 603# CONFIG_BLK_DEV_IDE_SATA is not set
518CONFIG_BLK_DEV_IDEDISK=y 604CONFIG_IDE_GD=y
519CONFIG_IDEDISK_MULTI_MODE=y 605CONFIG_IDE_GD_ATA=y
606# CONFIG_IDE_GD_ATAPI is not set
520# CONFIG_BLK_DEV_IDECS is not set 607# CONFIG_BLK_DEV_IDECS is not set
521# CONFIG_BLK_DEV_DELKIN is not set 608# CONFIG_BLK_DEV_DELKIN is not set
522CONFIG_BLK_DEV_IDECD=y 609CONFIG_BLK_DEV_IDECD=y
523CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y 610CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
524# CONFIG_BLK_DEV_IDETAPE is not set 611# CONFIG_BLK_DEV_IDETAPE is not set
525# CONFIG_BLK_DEV_IDEFLOPPY is not set
526CONFIG_BLK_DEV_IDESCSI=y
527CONFIG_IDE_TASK_IOCTL=y 612CONFIG_IDE_TASK_IOCTL=y
528CONFIG_IDE_PROC_FS=y 613CONFIG_IDE_PROC_FS=y
529 614
@@ -542,14 +627,13 @@ CONFIG_IDE_PROC_FS=y
542# CONFIG_BLK_DEV_AMD74XX is not set 627# CONFIG_BLK_DEV_AMD74XX is not set
543# CONFIG_BLK_DEV_CMD64X is not set 628# CONFIG_BLK_DEV_CMD64X is not set
544# CONFIG_BLK_DEV_TRIFLEX is not set 629# CONFIG_BLK_DEV_TRIFLEX is not set
545# CONFIG_BLK_DEV_CY82C693 is not set
546# CONFIG_BLK_DEV_CS5520 is not set 630# CONFIG_BLK_DEV_CS5520 is not set
547# CONFIG_BLK_DEV_CS5530 is not set 631# CONFIG_BLK_DEV_CS5530 is not set
548# CONFIG_BLK_DEV_HPT34X is not set
549# CONFIG_BLK_DEV_HPT366 is not set 632# CONFIG_BLK_DEV_HPT366 is not set
550# CONFIG_BLK_DEV_JMICRON is not set 633# CONFIG_BLK_DEV_JMICRON is not set
551# CONFIG_BLK_DEV_SC1200 is not set 634# CONFIG_BLK_DEV_SC1200 is not set
552# CONFIG_BLK_DEV_PIIX is not set 635# CONFIG_BLK_DEV_PIIX is not set
636# CONFIG_BLK_DEV_IT8172 is not set
553# CONFIG_BLK_DEV_IT8213 is not set 637# CONFIG_BLK_DEV_IT8213 is not set
554# CONFIG_BLK_DEV_IT821X is not set 638# CONFIG_BLK_DEV_IT821X is not set
555# CONFIG_BLK_DEV_NS87415 is not set 639# CONFIG_BLK_DEV_NS87415 is not set
@@ -563,8 +647,6 @@ CONFIG_IDE_PROC_FS=y
563# CONFIG_BLK_DEV_VIA82CXXX is not set 647# CONFIG_BLK_DEV_VIA82CXXX is not set
564# CONFIG_BLK_DEV_TC86C001 is not set 648# CONFIG_BLK_DEV_TC86C001 is not set
565# CONFIG_BLK_DEV_IDEDMA is not set 649# CONFIG_BLK_DEV_IDEDMA is not set
566# CONFIG_BLK_DEV_HD_ONLY is not set
567# CONFIG_BLK_DEV_HD is not set
568 650
569# 651#
570# SCSI device support 652# SCSI device support
@@ -586,10 +668,6 @@ CONFIG_BLK_DEV_SR=y
586CONFIG_BLK_DEV_SR_VENDOR=y 668CONFIG_BLK_DEV_SR_VENDOR=y
587CONFIG_CHR_DEV_SG=y 669CONFIG_CHR_DEV_SG=y
588CONFIG_CHR_DEV_SCH=y 670CONFIG_CHR_DEV_SCH=y
589
590#
591# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
592#
593CONFIG_SCSI_MULTI_LUN=y 671CONFIG_SCSI_MULTI_LUN=y
594CONFIG_SCSI_CONSTANTS=y 672CONFIG_SCSI_CONSTANTS=y
595CONFIG_SCSI_LOGGING=y 673CONFIG_SCSI_LOGGING=y
@@ -606,6 +684,8 @@ CONFIG_SCSI_WAIT_SCAN=m
606# CONFIG_SCSI_SRP_ATTRS is not set 684# CONFIG_SCSI_SRP_ATTRS is not set
607CONFIG_SCSI_LOWLEVEL=y 685CONFIG_SCSI_LOWLEVEL=y
608# CONFIG_ISCSI_TCP is not set 686# CONFIG_ISCSI_TCP is not set
687# CONFIG_SCSI_CXGB3_ISCSI is not set
688# CONFIG_SCSI_BNX2_ISCSI is not set
609# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 689# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
610# CONFIG_SCSI_3W_9XXX is not set 690# CONFIG_SCSI_3W_9XXX is not set
611# CONFIG_SCSI_ACARD is not set 691# CONFIG_SCSI_ACARD is not set
@@ -614,11 +694,16 @@ CONFIG_SCSI_LOWLEVEL=y
614# CONFIG_SCSI_AIC7XXX_OLD is not set 694# CONFIG_SCSI_AIC7XXX_OLD is not set
615# CONFIG_SCSI_AIC79XX is not set 695# CONFIG_SCSI_AIC79XX is not set
616# CONFIG_SCSI_AIC94XX is not set 696# CONFIG_SCSI_AIC94XX is not set
697# CONFIG_SCSI_MVSAS is not set
617# CONFIG_SCSI_ARCMSR is not set 698# CONFIG_SCSI_ARCMSR is not set
618# CONFIG_MEGARAID_NEWGEN is not set 699# CONFIG_MEGARAID_NEWGEN is not set
619# CONFIG_MEGARAID_LEGACY is not set 700# CONFIG_MEGARAID_LEGACY is not set
620# CONFIG_MEGARAID_SAS is not set 701# CONFIG_MEGARAID_SAS is not set
702# CONFIG_SCSI_MPT2SAS is not set
621# CONFIG_SCSI_HPTIOP is not set 703# CONFIG_SCSI_HPTIOP is not set
704# CONFIG_LIBFC is not set
705# CONFIG_LIBFCOE is not set
706# CONFIG_FCOE is not set
622# CONFIG_SCSI_DMX3191D is not set 707# CONFIG_SCSI_DMX3191D is not set
623# CONFIG_SCSI_EATA is not set 708# CONFIG_SCSI_EATA is not set
624# CONFIG_SCSI_FUTURE_DOMAIN is not set 709# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -626,7 +711,6 @@ CONFIG_SCSI_LOWLEVEL=y
626# CONFIG_SCSI_IPS is not set 711# CONFIG_SCSI_IPS is not set
627# CONFIG_SCSI_INITIO is not set 712# CONFIG_SCSI_INITIO is not set
628# CONFIG_SCSI_INIA100 is not set 713# CONFIG_SCSI_INIA100 is not set
629# CONFIG_SCSI_MVSAS is not set
630# CONFIG_SCSI_STEX is not set 714# CONFIG_SCSI_STEX is not set
631# CONFIG_SCSI_SYM53C8XX_2 is not set 715# CONFIG_SCSI_SYM53C8XX_2 is not set
632# CONFIG_SCSI_IPR is not set 716# CONFIG_SCSI_IPR is not set
@@ -637,10 +721,14 @@ CONFIG_SCSI_LOWLEVEL=y
637# CONFIG_SCSI_DC395x is not set 721# CONFIG_SCSI_DC395x is not set
638# CONFIG_SCSI_DC390T is not set 722# CONFIG_SCSI_DC390T is not set
639# CONFIG_SCSI_DEBUG is not set 723# CONFIG_SCSI_DEBUG is not set
724# CONFIG_SCSI_PMCRAID is not set
640# CONFIG_SCSI_SRP is not set 725# CONFIG_SCSI_SRP is not set
641# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set 726# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
727# CONFIG_SCSI_DH is not set
728# CONFIG_SCSI_OSD_INITIATOR is not set
642CONFIG_ATA=y 729CONFIG_ATA=y
643# CONFIG_ATA_NONSTANDARD is not set 730# CONFIG_ATA_NONSTANDARD is not set
731CONFIG_ATA_VERBOSE_ERROR=y
644CONFIG_SATA_PMP=y 732CONFIG_SATA_PMP=y
645# CONFIG_SATA_AHCI is not set 733# CONFIG_SATA_AHCI is not set
646CONFIG_SATA_SIL24=y 734CONFIG_SATA_SIL24=y
@@ -662,6 +750,7 @@ CONFIG_SATA_MV=y
662# CONFIG_PATA_ALI is not set 750# CONFIG_PATA_ALI is not set
663# CONFIG_PATA_AMD is not set 751# CONFIG_PATA_AMD is not set
664# CONFIG_PATA_ARTOP is not set 752# CONFIG_PATA_ARTOP is not set
753# CONFIG_PATA_ATP867X is not set
665# CONFIG_PATA_ATIIXP is not set 754# CONFIG_PATA_ATIIXP is not set
666# CONFIG_PATA_CMD640_PCI is not set 755# CONFIG_PATA_CMD640_PCI is not set
667# CONFIG_PATA_CMD64X is not set 756# CONFIG_PATA_CMD64X is not set
@@ -690,6 +779,7 @@ CONFIG_ATA_GENERIC=y
690CONFIG_PATA_PCMCIA=y 779CONFIG_PATA_PCMCIA=y
691# CONFIG_PATA_PDC_OLD is not set 780# CONFIG_PATA_PDC_OLD is not set
692# CONFIG_PATA_RADISYS is not set 781# CONFIG_PATA_RADISYS is not set
782# CONFIG_PATA_RDC is not set
693# CONFIG_PATA_RZ1000 is not set 783# CONFIG_PATA_RZ1000 is not set
694# CONFIG_PATA_SC1200 is not set 784# CONFIG_PATA_SC1200 is not set
695# CONFIG_PATA_SERVERWORKS is not set 785# CONFIG_PATA_SERVERWORKS is not set
@@ -703,12 +793,15 @@ CONFIG_PATA_OF_PLATFORM=y
703# CONFIG_PATA_SCH is not set 793# CONFIG_PATA_SCH is not set
704CONFIG_MD=y 794CONFIG_MD=y
705CONFIG_BLK_DEV_MD=y 795CONFIG_BLK_DEV_MD=y
796CONFIG_MD_AUTODETECT=y
706CONFIG_MD_LINEAR=y 797CONFIG_MD_LINEAR=y
707CONFIG_MD_RAID0=y 798CONFIG_MD_RAID0=y
708CONFIG_MD_RAID1=y 799CONFIG_MD_RAID1=y
709CONFIG_MD_RAID10=y 800CONFIG_MD_RAID10=y
710CONFIG_MD_RAID456=y 801CONFIG_MD_RAID456=y
711CONFIG_MD_RAID5_RESHAPE=y 802# CONFIG_MULTICORE_RAID456 is not set
803CONFIG_MD_RAID6_PQ=y
804# CONFIG_ASYNC_RAID6_TEST is not set
712# CONFIG_MD_MULTIPATH is not set 805# CONFIG_MD_MULTIPATH is not set
713# CONFIG_MD_FAULTY is not set 806# CONFIG_MD_FAULTY is not set
714CONFIG_BLK_DEV_DM=y 807CONFIG_BLK_DEV_DM=y
@@ -725,12 +818,19 @@ CONFIG_DM_CRYPT=y
725# 818#
726# IEEE 1394 (FireWire) support 819# IEEE 1394 (FireWire) support
727# 820#
821
822#
823# You can enable one or both FireWire driver stacks.
824#
825
826#
827# See the help texts for more information.
828#
728# CONFIG_FIREWIRE is not set 829# CONFIG_FIREWIRE is not set
729# CONFIG_IEEE1394 is not set 830# CONFIG_IEEE1394 is not set
730# CONFIG_I2O is not set 831# CONFIG_I2O is not set
731# CONFIG_MACINTOSH_DRIVERS is not set 832# CONFIG_MACINTOSH_DRIVERS is not set
732CONFIG_NETDEVICES=y 833CONFIG_NETDEVICES=y
733# CONFIG_NETDEVICES_MULTIQUEUE is not set
734CONFIG_DUMMY=y 834CONFIG_DUMMY=y
735# CONFIG_BONDING is not set 835# CONFIG_BONDING is not set
736# CONFIG_MACVLAN is not set 836# CONFIG_MACVLAN is not set
@@ -753,6 +853,9 @@ CONFIG_MARVELL_PHY=y
753# CONFIG_BROADCOM_PHY is not set 853# CONFIG_BROADCOM_PHY is not set
754# CONFIG_ICPLUS_PHY is not set 854# CONFIG_ICPLUS_PHY is not set
755# CONFIG_REALTEK_PHY is not set 855# CONFIG_REALTEK_PHY is not set
856# CONFIG_NATIONAL_PHY is not set
857# CONFIG_STE10XP is not set
858# CONFIG_LSI_ET1011C_PHY is not set
756# CONFIG_FIXED_PHY is not set 859# CONFIG_FIXED_PHY is not set
757# CONFIG_MDIO_BITBANG is not set 860# CONFIG_MDIO_BITBANG is not set
758CONFIG_NET_ETHERNET=y 861CONFIG_NET_ETHERNET=y
@@ -761,19 +864,23 @@ CONFIG_MII=y
761# CONFIG_SUNGEM is not set 864# CONFIG_SUNGEM is not set
762# CONFIG_CASSINI is not set 865# CONFIG_CASSINI is not set
763# CONFIG_NET_VENDOR_3COM is not set 866# CONFIG_NET_VENDOR_3COM is not set
867# CONFIG_ETHOC is not set
868# CONFIG_DNET is not set
764# CONFIG_NET_TULIP is not set 869# CONFIG_NET_TULIP is not set
765# CONFIG_HP100 is not set 870# CONFIG_HP100 is not set
766# CONFIG_IBM_NEW_EMAC_ZMII is not set 871# CONFIG_IBM_NEW_EMAC_ZMII is not set
767# CONFIG_IBM_NEW_EMAC_RGMII is not set 872# CONFIG_IBM_NEW_EMAC_RGMII is not set
768# CONFIG_IBM_NEW_EMAC_TAH is not set 873# CONFIG_IBM_NEW_EMAC_TAH is not set
769# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 874# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
875# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
876# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
877# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
770CONFIG_NET_PCI=y 878CONFIG_NET_PCI=y
771# CONFIG_PCNET32 is not set 879# CONFIG_PCNET32 is not set
772# CONFIG_AMD8111_ETH is not set 880# CONFIG_AMD8111_ETH is not set
773# CONFIG_ADAPTEC_STARFIRE is not set 881# CONFIG_ADAPTEC_STARFIRE is not set
774# CONFIG_B44 is not set 882# CONFIG_B44 is not set
775# CONFIG_FORCEDETH is not set 883# CONFIG_FORCEDETH is not set
776# CONFIG_EEPRO100 is not set
777# CONFIG_E100 is not set 884# CONFIG_E100 is not set
778# CONFIG_FEALNX is not set 885# CONFIG_FEALNX is not set
779# CONFIG_NATSEMI is not set 886# CONFIG_NATSEMI is not set
@@ -783,19 +890,22 @@ CONFIG_NET_PCI=y
783# CONFIG_R6040 is not set 890# CONFIG_R6040 is not set
784# CONFIG_SIS900 is not set 891# CONFIG_SIS900 is not set
785# CONFIG_EPIC100 is not set 892# CONFIG_EPIC100 is not set
893# CONFIG_SMSC9420 is not set
786# CONFIG_SUNDANCE is not set 894# CONFIG_SUNDANCE is not set
895# CONFIG_TLAN is not set
896# CONFIG_KS8842 is not set
897# CONFIG_KS8851_MLL is not set
787# CONFIG_VIA_RHINE is not set 898# CONFIG_VIA_RHINE is not set
788# CONFIG_SC92031 is not set 899# CONFIG_SC92031 is not set
900# CONFIG_ATL2 is not set
789CONFIG_NETDEV_1000=y 901CONFIG_NETDEV_1000=y
790# CONFIG_ACENIC is not set 902# CONFIG_ACENIC is not set
791# CONFIG_DL2K is not set 903# CONFIG_DL2K is not set
792CONFIG_E1000=y 904CONFIG_E1000=y
793CONFIG_E1000_NAPI=y
794# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
795# CONFIG_E1000E is not set 905# CONFIG_E1000E is not set
796# CONFIG_E1000E_ENABLED is not set
797# CONFIG_IP1000 is not set 906# CONFIG_IP1000 is not set
798# CONFIG_IGB is not set 907# CONFIG_IGB is not set
908# CONFIG_IGBVF is not set
799# CONFIG_NS83820 is not set 909# CONFIG_NS83820 is not set
800# CONFIG_HAMACHI is not set 910# CONFIG_HAMACHI is not set
801# CONFIG_YELLOWFIN is not set 911# CONFIG_YELLOWFIN is not set
@@ -806,30 +916,40 @@ CONFIG_E1000_NAPI=y
806# CONFIG_VIA_VELOCITY is not set 916# CONFIG_VIA_VELOCITY is not set
807CONFIG_TIGON3=y 917CONFIG_TIGON3=y
808# CONFIG_BNX2 is not set 918# CONFIG_BNX2 is not set
919# CONFIG_CNIC is not set
809# CONFIG_QLA3XXX is not set 920# CONFIG_QLA3XXX is not set
810# CONFIG_ATL1 is not set 921# CONFIG_ATL1 is not set
922# CONFIG_ATL1E is not set
923# CONFIG_ATL1C is not set
924# CONFIG_JME is not set
811CONFIG_NETDEV_10000=y 925CONFIG_NETDEV_10000=y
812# CONFIG_CHELSIO_T1 is not set 926# CONFIG_CHELSIO_T1 is not set
927CONFIG_CHELSIO_T3_DEPENDS=y
813# CONFIG_CHELSIO_T3 is not set 928# CONFIG_CHELSIO_T3 is not set
929# CONFIG_ENIC is not set
814# CONFIG_IXGBE is not set 930# CONFIG_IXGBE is not set
815# CONFIG_IXGB is not set 931# CONFIG_IXGB is not set
816# CONFIG_S2IO is not set 932# CONFIG_S2IO is not set
933# CONFIG_VXGE is not set
817# CONFIG_MYRI10GE is not set 934# CONFIG_MYRI10GE is not set
818# CONFIG_NETXEN_NIC is not set 935# CONFIG_NETXEN_NIC is not set
819# CONFIG_NIU is not set 936# CONFIG_NIU is not set
820CONFIG_PASEMI_MAC=y 937CONFIG_PASEMI_MAC=y
938# CONFIG_MLX4_EN is not set
821# CONFIG_MLX4_CORE is not set 939# CONFIG_MLX4_CORE is not set
822# CONFIG_TEHUTI is not set 940# CONFIG_TEHUTI is not set
823# CONFIG_BNX2X is not set 941# CONFIG_BNX2X is not set
942# CONFIG_QLGE is not set
824# CONFIG_SFC is not set 943# CONFIG_SFC is not set
944# CONFIG_BE2NET is not set
825# CONFIG_TR is not set 945# CONFIG_TR is not set
946CONFIG_WLAN=y
947# CONFIG_WLAN_PRE80211 is not set
948# CONFIG_WLAN_80211 is not set
826 949
827# 950#
828# Wireless LAN 951# Enable WiMAX (Networking options) to see the WiMAX drivers
829# 952#
830# CONFIG_WLAN_PRE80211 is not set
831# CONFIG_WLAN_80211 is not set
832# CONFIG_IWLWIFI_LEDS is not set
833 953
834# 954#
835# USB Network Adapters 955# USB Network Adapters
@@ -874,17 +994,23 @@ CONFIG_INPUT_EVDEV=y
874# Input Device Drivers 994# Input Device Drivers
875# 995#
876CONFIG_INPUT_KEYBOARD=y 996CONFIG_INPUT_KEYBOARD=y
997# CONFIG_KEYBOARD_ADP5588 is not set
877# CONFIG_KEYBOARD_ATKBD is not set 998# CONFIG_KEYBOARD_ATKBD is not set
878# CONFIG_KEYBOARD_SUNKBD is not set 999# CONFIG_QT2160 is not set
879# CONFIG_KEYBOARD_LKKBD is not set 1000# CONFIG_KEYBOARD_LKKBD is not set
880# CONFIG_KEYBOARD_XTKBD is not set 1001# CONFIG_KEYBOARD_MAX7359 is not set
881# CONFIG_KEYBOARD_NEWTON is not set 1002# CONFIG_KEYBOARD_NEWTON is not set
1003# CONFIG_KEYBOARD_OPENCORES is not set
882# CONFIG_KEYBOARD_STOWAWAY is not set 1004# CONFIG_KEYBOARD_STOWAWAY is not set
1005# CONFIG_KEYBOARD_SUNKBD is not set
1006# CONFIG_KEYBOARD_XTKBD is not set
883CONFIG_INPUT_MOUSE=y 1007CONFIG_INPUT_MOUSE=y
884# CONFIG_MOUSE_PS2 is not set 1008# CONFIG_MOUSE_PS2 is not set
885# CONFIG_MOUSE_SERIAL is not set 1009# CONFIG_MOUSE_SERIAL is not set
886# CONFIG_MOUSE_APPLETOUCH is not set 1010# CONFIG_MOUSE_APPLETOUCH is not set
1011# CONFIG_MOUSE_BCM5974 is not set
887# CONFIG_MOUSE_VSXXXAA is not set 1012# CONFIG_MOUSE_VSXXXAA is not set
1013# CONFIG_MOUSE_SYNAPTICS_I2C is not set
888# CONFIG_INPUT_JOYSTICK is not set 1014# CONFIG_INPUT_JOYSTICK is not set
889# CONFIG_INPUT_TABLET is not set 1015# CONFIG_INPUT_TABLET is not set
890# CONFIG_INPUT_TOUCHSCREEN is not set 1016# CONFIG_INPUT_TOUCHSCREEN is not set
@@ -900,6 +1026,7 @@ CONFIG_INPUT_MOUSE=y
900# Character devices 1026# Character devices
901# 1027#
902CONFIG_VT=y 1028CONFIG_VT=y
1029CONFIG_CONSOLE_TRANSLATIONS=y
903CONFIG_VT_CONSOLE=y 1030CONFIG_VT_CONSOLE=y
904CONFIG_HW_CONSOLE=y 1031CONFIG_HW_CONSOLE=y
905# CONFIG_VT_HW_CONSOLE_BINDING is not set 1032# CONFIG_VT_HW_CONSOLE_BINDING is not set
@@ -926,10 +1053,13 @@ CONFIG_SERIAL_CORE_CONSOLE=y
926# CONFIG_SERIAL_JSM is not set 1053# CONFIG_SERIAL_JSM is not set
927# CONFIG_SERIAL_OF_PLATFORM is not set 1054# CONFIG_SERIAL_OF_PLATFORM is not set
928CONFIG_UNIX98_PTYS=y 1055CONFIG_UNIX98_PTYS=y
1056# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
929CONFIG_LEGACY_PTYS=y 1057CONFIG_LEGACY_PTYS=y
930CONFIG_LEGACY_PTY_COUNT=4 1058CONFIG_LEGACY_PTY_COUNT=4
1059# CONFIG_HVC_UDBG is not set
931# CONFIG_IPMI_HANDLER is not set 1060# CONFIG_IPMI_HANDLER is not set
932CONFIG_HW_RANDOM=y 1061CONFIG_HW_RANDOM=y
1062# CONFIG_HW_RANDOM_TIMERIOMEM is not set
933CONFIG_HW_RANDOM_PASEMI=y 1063CONFIG_HW_RANDOM_PASEMI=y
934# CONFIG_R3964 is not set 1064# CONFIG_R3964 is not set
935# CONFIG_APPLICOM is not set 1065# CONFIG_APPLICOM is not set
@@ -948,57 +1078,85 @@ CONFIG_MAX_RAW_DEVS=256
948CONFIG_DEVPORT=y 1078CONFIG_DEVPORT=y
949CONFIG_I2C=y 1079CONFIG_I2C=y
950CONFIG_I2C_BOARDINFO=y 1080CONFIG_I2C_BOARDINFO=y
1081CONFIG_I2C_COMPAT=y
951CONFIG_I2C_CHARDEV=y 1082CONFIG_I2C_CHARDEV=y
1083CONFIG_I2C_HELPER_AUTO=y
952CONFIG_I2C_ALGOBIT=y 1084CONFIG_I2C_ALGOBIT=y
953 1085
954# 1086#
955# I2C Hardware Bus support 1087# I2C Hardware Bus support
956# 1088#
1089
1090#
1091# PC SMBus host controller drivers
1092#
957# CONFIG_I2C_ALI1535 is not set 1093# CONFIG_I2C_ALI1535 is not set
958# CONFIG_I2C_ALI1563 is not set 1094# CONFIG_I2C_ALI1563 is not set
959# CONFIG_I2C_ALI15X3 is not set 1095# CONFIG_I2C_ALI15X3 is not set
960# CONFIG_I2C_AMD756 is not set 1096# CONFIG_I2C_AMD756 is not set
961# CONFIG_I2C_AMD8111 is not set 1097# CONFIG_I2C_AMD8111 is not set
962# CONFIG_I2C_I801 is not set 1098# CONFIG_I2C_I801 is not set
963# CONFIG_I2C_I810 is not set 1099# CONFIG_I2C_ISCH is not set
964# CONFIG_I2C_PIIX4 is not set 1100# CONFIG_I2C_PIIX4 is not set
965# CONFIG_I2C_NFORCE2 is not set 1101# CONFIG_I2C_NFORCE2 is not set
966# CONFIG_I2C_OCORES is not set
967# CONFIG_I2C_PARPORT_LIGHT is not set
968CONFIG_I2C_PASEMI=y
969# CONFIG_I2C_PROSAVAGE is not set
970# CONFIG_I2C_SAVAGE4 is not set
971# CONFIG_I2C_SIMTEC is not set
972# CONFIG_I2C_SIS5595 is not set 1102# CONFIG_I2C_SIS5595 is not set
973# CONFIG_I2C_SIS630 is not set 1103# CONFIG_I2C_SIS630 is not set
974# CONFIG_I2C_SIS96X is not set 1104# CONFIG_I2C_SIS96X is not set
975# CONFIG_I2C_TAOS_EVM is not set
976# CONFIG_I2C_STUB is not set
977# CONFIG_I2C_TINY_USB is not set
978# CONFIG_I2C_VIA is not set 1105# CONFIG_I2C_VIA is not set
979# CONFIG_I2C_VIAPRO is not set 1106# CONFIG_I2C_VIAPRO is not set
1107
1108#
1109# I2C system bus drivers (mostly embedded / system-on-chip)
1110#
1111# CONFIG_I2C_OCORES is not set
1112CONFIG_I2C_PASEMI=y
1113# CONFIG_I2C_SIMTEC is not set
1114
1115#
1116# External I2C/SMBus adapter drivers
1117#
1118# CONFIG_I2C_PARPORT_LIGHT is not set
1119# CONFIG_I2C_TAOS_EVM is not set
1120# CONFIG_I2C_TINY_USB is not set
1121
1122#
1123# Graphics adapter I2C/DDC channel drivers
1124#
980# CONFIG_I2C_VOODOO3 is not set 1125# CONFIG_I2C_VOODOO3 is not set
1126
1127#
1128# Other I2C/SMBus bus drivers
1129#
981# CONFIG_I2C_PCA_PLATFORM is not set 1130# CONFIG_I2C_PCA_PLATFORM is not set
1131# CONFIG_I2C_STUB is not set
982 1132
983# 1133#
984# Miscellaneous I2C Chip support 1134# Miscellaneous I2C Chip support
985# 1135#
986# CONFIG_DS1682 is not set 1136# CONFIG_DS1682 is not set
987CONFIG_EEPROM_LEGACY=y
988# CONFIG_SENSORS_PCF8574 is not set
989# CONFIG_PCF8575 is not set
990# CONFIG_SENSORS_PCF8591 is not set
991# CONFIG_SENSORS_MAX6875 is not set
992# CONFIG_SENSORS_TSL2550 is not set 1137# CONFIG_SENSORS_TSL2550 is not set
993# CONFIG_I2C_DEBUG_CORE is not set 1138# CONFIG_I2C_DEBUG_CORE is not set
994# CONFIG_I2C_DEBUG_ALGO is not set 1139# CONFIG_I2C_DEBUG_ALGO is not set
995# CONFIG_I2C_DEBUG_BUS is not set 1140# CONFIG_I2C_DEBUG_BUS is not set
996# CONFIG_I2C_DEBUG_CHIP is not set 1141# CONFIG_I2C_DEBUG_CHIP is not set
997# CONFIG_SPI is not set 1142# CONFIG_SPI is not set
1143
1144#
1145# PPS support
1146#
1147# CONFIG_PPS is not set
1148CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
1149# CONFIG_GPIOLIB is not set
998# CONFIG_W1 is not set 1150# CONFIG_W1 is not set
999# CONFIG_POWER_SUPPLY is not set 1151# CONFIG_POWER_SUPPLY is not set
1000CONFIG_HWMON=y 1152CONFIG_HWMON=y
1001CONFIG_HWMON_VID=y 1153CONFIG_HWMON_VID=y
1154# CONFIG_HWMON_DEBUG_CHIP is not set
1155
1156#
1157# Native drivers
1158#
1159# CONFIG_SENSORS_AD7414 is not set
1002# CONFIG_SENSORS_AD7418 is not set 1160# CONFIG_SENSORS_AD7418 is not set
1003# CONFIG_SENSORS_ADM1021 is not set 1161# CONFIG_SENSORS_ADM1021 is not set
1004# CONFIG_SENSORS_ADM1025 is not set 1162# CONFIG_SENSORS_ADM1025 is not set
@@ -1006,14 +1164,17 @@ CONFIG_HWMON_VID=y
1006# CONFIG_SENSORS_ADM1029 is not set 1164# CONFIG_SENSORS_ADM1029 is not set
1007# CONFIG_SENSORS_ADM1031 is not set 1165# CONFIG_SENSORS_ADM1031 is not set
1008# CONFIG_SENSORS_ADM9240 is not set 1166# CONFIG_SENSORS_ADM9240 is not set
1167# CONFIG_SENSORS_ADT7462 is not set
1009# CONFIG_SENSORS_ADT7470 is not set 1168# CONFIG_SENSORS_ADT7470 is not set
1010# CONFIG_SENSORS_ADT7473 is not set 1169# CONFIG_SENSORS_ADT7473 is not set
1170# CONFIG_SENSORS_ADT7475 is not set
1011# CONFIG_SENSORS_ATXP1 is not set 1171# CONFIG_SENSORS_ATXP1 is not set
1012# CONFIG_SENSORS_DS1621 is not set 1172# CONFIG_SENSORS_DS1621 is not set
1013# CONFIG_SENSORS_I5K_AMB is not set 1173# CONFIG_SENSORS_I5K_AMB is not set
1014# CONFIG_SENSORS_F71805F is not set 1174# CONFIG_SENSORS_F71805F is not set
1015# CONFIG_SENSORS_F71882FG is not set 1175# CONFIG_SENSORS_F71882FG is not set
1016# CONFIG_SENSORS_F75375S is not set 1176# CONFIG_SENSORS_F75375S is not set
1177# CONFIG_SENSORS_G760A is not set
1017# CONFIG_SENSORS_GL518SM is not set 1178# CONFIG_SENSORS_GL518SM is not set
1018# CONFIG_SENSORS_GL520SM is not set 1179# CONFIG_SENSORS_GL520SM is not set
1019# CONFIG_SENSORS_IT87 is not set 1180# CONFIG_SENSORS_IT87 is not set
@@ -1028,10 +1189,14 @@ CONFIG_SENSORS_LM85=y
1028CONFIG_SENSORS_LM90=y 1189CONFIG_SENSORS_LM90=y
1029# CONFIG_SENSORS_LM92 is not set 1190# CONFIG_SENSORS_LM92 is not set
1030# CONFIG_SENSORS_LM93 is not set 1191# CONFIG_SENSORS_LM93 is not set
1192# CONFIG_SENSORS_LTC4215 is not set
1193# CONFIG_SENSORS_LTC4245 is not set
1194# CONFIG_SENSORS_LM95241 is not set
1031# CONFIG_SENSORS_MAX1619 is not set 1195# CONFIG_SENSORS_MAX1619 is not set
1032# CONFIG_SENSORS_MAX6650 is not set 1196# CONFIG_SENSORS_MAX6650 is not set
1033# CONFIG_SENSORS_PC87360 is not set 1197# CONFIG_SENSORS_PC87360 is not set
1034# CONFIG_SENSORS_PC87427 is not set 1198# CONFIG_SENSORS_PC87427 is not set
1199# CONFIG_SENSORS_PCF8591 is not set
1035# CONFIG_SENSORS_SIS5595 is not set 1200# CONFIG_SENSORS_SIS5595 is not set
1036# CONFIG_SENSORS_DME1737 is not set 1201# CONFIG_SENSORS_DME1737 is not set
1037# CONFIG_SENSORS_SMSC47M1 is not set 1202# CONFIG_SENSORS_SMSC47M1 is not set
@@ -1039,6 +1204,8 @@ CONFIG_SENSORS_LM90=y
1039# CONFIG_SENSORS_SMSC47B397 is not set 1204# CONFIG_SENSORS_SMSC47B397 is not set
1040# CONFIG_SENSORS_ADS7828 is not set 1205# CONFIG_SENSORS_ADS7828 is not set
1041# CONFIG_SENSORS_THMC50 is not set 1206# CONFIG_SENSORS_THMC50 is not set
1207# CONFIG_SENSORS_TMP401 is not set
1208# CONFIG_SENSORS_TMP421 is not set
1042# CONFIG_SENSORS_VIA686A is not set 1209# CONFIG_SENSORS_VIA686A is not set
1043# CONFIG_SENSORS_VT1211 is not set 1210# CONFIG_SENSORS_VT1211 is not set
1044# CONFIG_SENSORS_VT8231 is not set 1211# CONFIG_SENSORS_VT8231 is not set
@@ -1050,44 +1217,40 @@ CONFIG_SENSORS_LM90=y
1050# CONFIG_SENSORS_W83L786NG is not set 1217# CONFIG_SENSORS_W83L786NG is not set
1051# CONFIG_SENSORS_W83627HF is not set 1218# CONFIG_SENSORS_W83627HF is not set
1052# CONFIG_SENSORS_W83627EHF is not set 1219# CONFIG_SENSORS_W83627EHF is not set
1053# CONFIG_HWMON_DEBUG_CHIP is not set
1054# CONFIG_THERMAL is not set 1220# CONFIG_THERMAL is not set
1055# CONFIG_WATCHDOG is not set 1221# CONFIG_WATCHDOG is not set
1222CONFIG_SSB_POSSIBLE=y
1056 1223
1057# 1224#
1058# Sonics Silicon Backplane 1225# Sonics Silicon Backplane
1059# 1226#
1060CONFIG_SSB_POSSIBLE=y
1061# CONFIG_SSB is not set 1227# CONFIG_SSB is not set
1062 1228
1063# 1229#
1064# Multifunction device drivers 1230# Multifunction device drivers
1065# 1231#
1232# CONFIG_MFD_CORE is not set
1066# CONFIG_MFD_SM501 is not set 1233# CONFIG_MFD_SM501 is not set
1067# CONFIG_HTC_PASIC3 is not set 1234# CONFIG_HTC_PASIC3 is not set
1068 1235# CONFIG_TWL4030_CORE is not set
1069# 1236# CONFIG_MFD_TMIO is not set
1070# Multimedia devices 1237# CONFIG_PMIC_DA903X is not set
1071# 1238# CONFIG_MFD_WM8400 is not set
1072 1239# CONFIG_MFD_WM831X is not set
1073# 1240# CONFIG_MFD_WM8350_I2C is not set
1074# Multimedia core support 1241# CONFIG_MFD_PCF50633 is not set
1075# 1242# CONFIG_AB3100_CORE is not set
1076# CONFIG_VIDEO_DEV is not set 1243# CONFIG_REGULATOR is not set
1077# CONFIG_DVB_CORE is not set 1244# CONFIG_MEDIA_SUPPORT is not set
1078# CONFIG_VIDEO_MEDIA is not set
1079
1080#
1081# Multimedia drivers
1082#
1083CONFIG_DAB=y
1084# CONFIG_USB_DABUSB is not set
1085 1245
1086# 1246#
1087# Graphics support 1247# Graphics support
1088# 1248#
1089# CONFIG_AGP is not set 1249# CONFIG_AGP is not set
1250CONFIG_VGA_ARB=y
1090CONFIG_DRM=y 1251CONFIG_DRM=y
1252CONFIG_DRM_KMS_HELPER=y
1253CONFIG_DRM_TTM=y
1091# CONFIG_DRM_TDFX is not set 1254# CONFIG_DRM_TDFX is not set
1092# CONFIG_DRM_R128 is not set 1255# CONFIG_DRM_R128 is not set
1093CONFIG_DRM_RADEON=y 1256CONFIG_DRM_RADEON=y
@@ -1099,6 +1262,7 @@ CONFIG_VGASTATE=y
1099CONFIG_FB=y 1262CONFIG_FB=y
1100CONFIG_FIRMWARE_EDID=y 1263CONFIG_FIRMWARE_EDID=y
1101CONFIG_FB_DDC=y 1264CONFIG_FB_DDC=y
1265# CONFIG_FB_BOOT_VESA_SUPPORT is not set
1102CONFIG_FB_CFB_FILLRECT=y 1266CONFIG_FB_CFB_FILLRECT=y
1103CONFIG_FB_CFB_COPYAREA=y 1267CONFIG_FB_CFB_COPYAREA=y
1104CONFIG_FB_CFB_IMAGEBLIT=y 1268CONFIG_FB_CFB_IMAGEBLIT=y
@@ -1140,6 +1304,7 @@ CONFIG_FB_RADEON_BACKLIGHT=y
1140# CONFIG_FB_S3 is not set 1304# CONFIG_FB_S3 is not set
1141# CONFIG_FB_SAVAGE is not set 1305# CONFIG_FB_SAVAGE is not set
1142# CONFIG_FB_SIS is not set 1306# CONFIG_FB_SIS is not set
1307# CONFIG_FB_VIA is not set
1143# CONFIG_FB_NEOMAGIC is not set 1308# CONFIG_FB_NEOMAGIC is not set
1144# CONFIG_FB_KYRO is not set 1309# CONFIG_FB_KYRO is not set
1145# CONFIG_FB_3DFX is not set 1310# CONFIG_FB_3DFX is not set
@@ -1148,12 +1313,16 @@ CONFIG_FB_RADEON_BACKLIGHT=y
1148# CONFIG_FB_TRIDENT is not set 1313# CONFIG_FB_TRIDENT is not set
1149# CONFIG_FB_ARK is not set 1314# CONFIG_FB_ARK is not set
1150# CONFIG_FB_PM3 is not set 1315# CONFIG_FB_PM3 is not set
1316# CONFIG_FB_CARMINE is not set
1151# CONFIG_FB_IBM_GXT4500 is not set 1317# CONFIG_FB_IBM_GXT4500 is not set
1152# CONFIG_FB_VIRTUAL is not set 1318# CONFIG_FB_VIRTUAL is not set
1319# CONFIG_FB_METRONOME is not set
1320# CONFIG_FB_MB862XX is not set
1321# CONFIG_FB_BROADSHEET is not set
1153CONFIG_BACKLIGHT_LCD_SUPPORT=y 1322CONFIG_BACKLIGHT_LCD_SUPPORT=y
1154# CONFIG_LCD_CLASS_DEVICE is not set 1323# CONFIG_LCD_CLASS_DEVICE is not set
1155CONFIG_BACKLIGHT_CLASS_DEVICE=y 1324CONFIG_BACKLIGHT_CLASS_DEVICE=y
1156# CONFIG_BACKLIGHT_CORGI is not set 1325CONFIG_BACKLIGHT_GENERIC=y
1157 1326
1158# 1327#
1159# Display device support 1328# Display device support
@@ -1177,15 +1346,9 @@ CONFIG_LOGO=y
1177CONFIG_LOGO_LINUX_MONO=y 1346CONFIG_LOGO_LINUX_MONO=y
1178CONFIG_LOGO_LINUX_VGA16=y 1347CONFIG_LOGO_LINUX_VGA16=y
1179CONFIG_LOGO_LINUX_CLUT224=y 1348CONFIG_LOGO_LINUX_CLUT224=y
1180
1181#
1182# Sound
1183#
1184CONFIG_SOUND=y 1349CONFIG_SOUND=y
1185 1350CONFIG_SOUND_OSS_CORE=y
1186# 1351CONFIG_SOUND_OSS_CORE_PRECLAIM=y
1187# Advanced Linux Sound Architecture
1188#
1189CONFIG_SND=y 1352CONFIG_SND=y
1190CONFIG_SND_TIMER=y 1353CONFIG_SND_TIMER=y
1191CONFIG_SND_PCM=y 1354CONFIG_SND_PCM=y
@@ -1198,24 +1361,24 @@ CONFIG_SND_MIXER_OSS=y
1198CONFIG_SND_PCM_OSS=y 1361CONFIG_SND_PCM_OSS=y
1199CONFIG_SND_PCM_OSS_PLUGINS=y 1362CONFIG_SND_PCM_OSS_PLUGINS=y
1200CONFIG_SND_SEQUENCER_OSS=y 1363CONFIG_SND_SEQUENCER_OSS=y
1364# CONFIG_SND_HRTIMER is not set
1201# CONFIG_SND_DYNAMIC_MINORS is not set 1365# CONFIG_SND_DYNAMIC_MINORS is not set
1202CONFIG_SND_SUPPORT_OLD_API=y 1366CONFIG_SND_SUPPORT_OLD_API=y
1203CONFIG_SND_VERBOSE_PROCFS=y 1367CONFIG_SND_VERBOSE_PROCFS=y
1204# CONFIG_SND_VERBOSE_PRINTK is not set 1368# CONFIG_SND_VERBOSE_PRINTK is not set
1205# CONFIG_SND_DEBUG is not set 1369# CONFIG_SND_DEBUG is not set
1206 1370CONFIG_SND_RAWMIDI_SEQ=y
1207# 1371# CONFIG_SND_OPL3_LIB_SEQ is not set
1208# Generic devices 1372# CONFIG_SND_OPL4_LIB_SEQ is not set
1209# 1373# CONFIG_SND_SBAWE_SEQ is not set
1374# CONFIG_SND_EMU10K1_SEQ is not set
1375CONFIG_SND_DRIVERS=y
1210# CONFIG_SND_DUMMY is not set 1376# CONFIG_SND_DUMMY is not set
1211# CONFIG_SND_VIRMIDI is not set 1377# CONFIG_SND_VIRMIDI is not set
1212# CONFIG_SND_MTPAV is not set 1378# CONFIG_SND_MTPAV is not set
1213# CONFIG_SND_SERIAL_U16550 is not set 1379# CONFIG_SND_SERIAL_U16550 is not set
1214# CONFIG_SND_MPU401 is not set 1380# CONFIG_SND_MPU401 is not set
1215 1381CONFIG_SND_PCI=y
1216#
1217# PCI devices
1218#
1219# CONFIG_SND_AD1889 is not set 1382# CONFIG_SND_AD1889 is not set
1220# CONFIG_SND_ALS300 is not set 1383# CONFIG_SND_ALS300 is not set
1221# CONFIG_SND_ALS4000 is not set 1384# CONFIG_SND_ALS4000 is not set
@@ -1234,6 +1397,7 @@ CONFIG_SND_VERBOSE_PROCFS=y
1234# CONFIG_SND_CS4281 is not set 1397# CONFIG_SND_CS4281 is not set
1235# CONFIG_SND_CS46XX is not set 1398# CONFIG_SND_CS46XX is not set
1236# CONFIG_SND_CS5530 is not set 1399# CONFIG_SND_CS5530 is not set
1400# CONFIG_SND_CTXFI is not set
1237# CONFIG_SND_DARLA20 is not set 1401# CONFIG_SND_DARLA20 is not set
1238# CONFIG_SND_GINA20 is not set 1402# CONFIG_SND_GINA20 is not set
1239# CONFIG_SND_LAYLA20 is not set 1403# CONFIG_SND_LAYLA20 is not set
@@ -1246,6 +1410,8 @@ CONFIG_SND_VERBOSE_PROCFS=y
1246# CONFIG_SND_INDIGO is not set 1410# CONFIG_SND_INDIGO is not set
1247# CONFIG_SND_INDIGOIO is not set 1411# CONFIG_SND_INDIGOIO is not set
1248# CONFIG_SND_INDIGODJ is not set 1412# CONFIG_SND_INDIGODJ is not set
1413# CONFIG_SND_INDIGOIOX is not set
1414# CONFIG_SND_INDIGODJX is not set
1249# CONFIG_SND_EMU10K1 is not set 1415# CONFIG_SND_EMU10K1 is not set
1250# CONFIG_SND_EMU10K1X is not set 1416# CONFIG_SND_EMU10K1X is not set
1251# CONFIG_SND_ENS1370 is not set 1417# CONFIG_SND_ENS1370 is not set
@@ -1262,6 +1428,7 @@ CONFIG_SND_VERBOSE_PROCFS=y
1262# CONFIG_SND_INTEL8X0 is not set 1428# CONFIG_SND_INTEL8X0 is not set
1263# CONFIG_SND_INTEL8X0M is not set 1429# CONFIG_SND_INTEL8X0M is not set
1264# CONFIG_SND_KORG1212 is not set 1430# CONFIG_SND_KORG1212 is not set
1431# CONFIG_SND_LX6464ES is not set
1265# CONFIG_SND_MAESTRO3 is not set 1432# CONFIG_SND_MAESTRO3 is not set
1266# CONFIG_SND_MIXART is not set 1433# CONFIG_SND_MIXART is not set
1267# CONFIG_SND_NM256 is not set 1434# CONFIG_SND_NM256 is not set
@@ -1277,57 +1444,64 @@ CONFIG_SND_VERBOSE_PROCFS=y
1277# CONFIG_SND_VIRTUOSO is not set 1444# CONFIG_SND_VIRTUOSO is not set
1278# CONFIG_SND_VX222 is not set 1445# CONFIG_SND_VX222 is not set
1279# CONFIG_SND_YMFPCI is not set 1446# CONFIG_SND_YMFPCI is not set
1280 1447CONFIG_SND_PPC=y
1281# 1448CONFIG_SND_USB=y
1282# ALSA PowerMac devices
1283#
1284
1285#
1286# ALSA PowerPC devices
1287#
1288
1289#
1290# USB devices
1291#
1292CONFIG_SND_USB_AUDIO=y 1449CONFIG_SND_USB_AUDIO=y
1293CONFIG_SND_USB_USX2Y=y 1450CONFIG_SND_USB_USX2Y=y
1294# CONFIG_SND_USB_CAIAQ is not set 1451# CONFIG_SND_USB_CAIAQ is not set
1295 1452CONFIG_SND_PCMCIA=y
1296#
1297# PCMCIA devices
1298#
1299# CONFIG_SND_VXPOCKET is not set 1453# CONFIG_SND_VXPOCKET is not set
1300# CONFIG_SND_PDAUDIOCF is not set 1454# CONFIG_SND_PDAUDIOCF is not set
1301
1302#
1303# System on Chip audio support
1304#
1305# CONFIG_SND_SOC is not set 1455# CONFIG_SND_SOC is not set
1306
1307#
1308# ALSA SoC audio for Freescale SOCs
1309#
1310
1311#
1312# SoC Audio for the Texas Instruments OMAP
1313#
1314
1315#
1316# Open Sound System
1317#
1318# CONFIG_SOUND_PRIME is not set 1456# CONFIG_SOUND_PRIME is not set
1319CONFIG_HID_SUPPORT=y 1457CONFIG_HID_SUPPORT=y
1320CONFIG_HID=y 1458CONFIG_HID=y
1321# CONFIG_HID_DEBUG is not set
1322# CONFIG_HIDRAW is not set 1459# CONFIG_HIDRAW is not set
1323 1460
1324# 1461#
1325# USB Input Devices 1462# USB Input Devices
1326# 1463#
1327CONFIG_USB_HID=y 1464CONFIG_USB_HID=y
1328# CONFIG_USB_HIDINPUT_POWERBOOK is not set 1465# CONFIG_HID_PID is not set
1329# CONFIG_HID_FF is not set
1330# CONFIG_USB_HIDDEV is not set 1466# CONFIG_USB_HIDDEV is not set
1467
1468#
1469# Special HID drivers
1470#
1471CONFIG_HID_A4TECH=y
1472CONFIG_HID_APPLE=y
1473CONFIG_HID_BELKIN=y
1474CONFIG_HID_CHERRY=y
1475CONFIG_HID_CHICONY=y
1476CONFIG_HID_CYPRESS=y
1477CONFIG_HID_DRAGONRISE=y
1478# CONFIG_DRAGONRISE_FF is not set
1479CONFIG_HID_EZKEY=y
1480CONFIG_HID_KYE=y
1481CONFIG_HID_GYRATION=y
1482CONFIG_HID_TWINHAN=y
1483CONFIG_HID_KENSINGTON=y
1484CONFIG_HID_LOGITECH=y
1485# CONFIG_LOGITECH_FF is not set
1486# CONFIG_LOGIRUMBLEPAD2_FF is not set
1487CONFIG_HID_MICROSOFT=y
1488CONFIG_HID_MONTEREY=y
1489CONFIG_HID_NTRIG=y
1490CONFIG_HID_PANTHERLORD=y
1491# CONFIG_PANTHERLORD_FF is not set
1492CONFIG_HID_PETALYNX=y
1493CONFIG_HID_SAMSUNG=y
1494CONFIG_HID_SONY=y
1495CONFIG_HID_SUNPLUS=y
1496CONFIG_HID_GREENASIA=y
1497# CONFIG_GREENASIA_FF is not set
1498CONFIG_HID_SMARTJOYPLUS=y
1499# CONFIG_SMARTJOYPLUS_FF is not set
1500CONFIG_HID_TOPSEED=y
1501CONFIG_HID_THRUSTMASTER=y
1502# CONFIG_THRUSTMASTER_FF is not set
1503CONFIG_HID_ZEROPLUS=y
1504# CONFIG_ZEROPLUS_FF is not set
1331CONFIG_USB_SUPPORT=y 1505CONFIG_USB_SUPPORT=y
1332CONFIG_USB_ARCH_HAS_HCD=y 1506CONFIG_USB_ARCH_HAS_HCD=y
1333CONFIG_USB_ARCH_HAS_OHCI=y 1507CONFIG_USB_ARCH_HAS_OHCI=y
@@ -1343,18 +1517,26 @@ CONFIG_USB_DEVICEFS=y
1343# CONFIG_USB_DEVICE_CLASS is not set 1517# CONFIG_USB_DEVICE_CLASS is not set
1344# CONFIG_USB_DYNAMIC_MINORS is not set 1518# CONFIG_USB_DYNAMIC_MINORS is not set
1345# CONFIG_USB_OTG is not set 1519# CONFIG_USB_OTG is not set
1520# CONFIG_USB_MON is not set
1521# CONFIG_USB_WUSB is not set
1522# CONFIG_USB_WUSB_CBAF is not set
1346 1523
1347# 1524#
1348# USB Host Controller Drivers 1525# USB Host Controller Drivers
1349# 1526#
1350# CONFIG_USB_C67X00_HCD is not set 1527# CONFIG_USB_C67X00_HCD is not set
1528# CONFIG_USB_XHCI_HCD is not set
1351CONFIG_USB_EHCI_HCD=y 1529CONFIG_USB_EHCI_HCD=y
1352# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1530# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1353# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1531# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1354CONFIG_USB_EHCI_HCD_PPC_OF=y 1532CONFIG_USB_EHCI_HCD_PPC_OF=y
1533# CONFIG_USB_OXU210HP_HCD is not set
1355# CONFIG_USB_ISP116X_HCD is not set 1534# CONFIG_USB_ISP116X_HCD is not set
1356# CONFIG_USB_ISP1760_HCD is not set 1535# CONFIG_USB_ISP1760_HCD is not set
1536# CONFIG_USB_ISP1362_HCD is not set
1357CONFIG_USB_OHCI_HCD=y 1537CONFIG_USB_OHCI_HCD=y
1538# CONFIG_USB_OHCI_HCD_PPC_OF_BE is not set
1539# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set
1358# CONFIG_USB_OHCI_HCD_PPC_OF is not set 1540# CONFIG_USB_OHCI_HCD_PPC_OF is not set
1359# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set 1541# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
1360# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set 1542# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
@@ -1363,6 +1545,8 @@ CONFIG_USB_UHCI_HCD=y
1363CONFIG_USB_SL811_HCD=y 1545CONFIG_USB_SL811_HCD=y
1364# CONFIG_USB_SL811_CS is not set 1546# CONFIG_USB_SL811_CS is not set
1365# CONFIG_USB_R8A66597_HCD is not set 1547# CONFIG_USB_R8A66597_HCD is not set
1548# CONFIG_USB_WHCI_HCD is not set
1549# CONFIG_USB_HWA_HCD is not set
1366 1550
1367# 1551#
1368# USB Device Class drivers 1552# USB Device Class drivers
@@ -1370,20 +1554,20 @@ CONFIG_USB_SL811_HCD=y
1370# CONFIG_USB_ACM is not set 1554# CONFIG_USB_ACM is not set
1371# CONFIG_USB_PRINTER is not set 1555# CONFIG_USB_PRINTER is not set
1372# CONFIG_USB_WDM is not set 1556# CONFIG_USB_WDM is not set
1557# CONFIG_USB_TMC is not set
1373 1558
1374# 1559#
1375# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1560# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
1376# 1561#
1377 1562
1378# 1563#
1379# may also be needed; see USB_STORAGE Help for more information 1564# also be needed; see USB_STORAGE Help for more info
1380# 1565#
1381CONFIG_USB_STORAGE=y 1566CONFIG_USB_STORAGE=y
1382# CONFIG_USB_STORAGE_DEBUG is not set 1567# CONFIG_USB_STORAGE_DEBUG is not set
1383# CONFIG_USB_STORAGE_DATAFAB is not set 1568# CONFIG_USB_STORAGE_DATAFAB is not set
1384# CONFIG_USB_STORAGE_FREECOM is not set 1569# CONFIG_USB_STORAGE_FREECOM is not set
1385# CONFIG_USB_STORAGE_ISD200 is not set 1570# CONFIG_USB_STORAGE_ISD200 is not set
1386# CONFIG_USB_STORAGE_DPCM is not set
1387# CONFIG_USB_STORAGE_USBAT is not set 1571# CONFIG_USB_STORAGE_USBAT is not set
1388# CONFIG_USB_STORAGE_SDDR09 is not set 1572# CONFIG_USB_STORAGE_SDDR09 is not set
1389# CONFIG_USB_STORAGE_SDDR55 is not set 1573# CONFIG_USB_STORAGE_SDDR55 is not set
@@ -1399,7 +1583,6 @@ CONFIG_USB_LIBUSUAL=y
1399# 1583#
1400# CONFIG_USB_MDC800 is not set 1584# CONFIG_USB_MDC800 is not set
1401# CONFIG_USB_MICROTEK is not set 1585# CONFIG_USB_MICROTEK is not set
1402# CONFIG_USB_MON is not set
1403 1586
1404# 1587#
1405# USB port drivers 1588# USB port drivers
@@ -1412,7 +1595,7 @@ CONFIG_USB_LIBUSUAL=y
1412# CONFIG_USB_EMI62 is not set 1595# CONFIG_USB_EMI62 is not set
1413# CONFIG_USB_EMI26 is not set 1596# CONFIG_USB_EMI26 is not set
1414# CONFIG_USB_ADUTUX is not set 1597# CONFIG_USB_ADUTUX is not set
1415# CONFIG_USB_AUERSWALD is not set 1598# CONFIG_USB_SEVSEG is not set
1416# CONFIG_USB_RIO500 is not set 1599# CONFIG_USB_RIO500 is not set
1417# CONFIG_USB_LEGOTOWER is not set 1600# CONFIG_USB_LEGOTOWER is not set
1418# CONFIG_USB_LCD is not set 1601# CONFIG_USB_LCD is not set
@@ -1420,7 +1603,6 @@ CONFIG_USB_LIBUSUAL=y
1420# CONFIG_USB_LED is not set 1603# CONFIG_USB_LED is not set
1421# CONFIG_USB_CYPRESS_CY7C63 is not set 1604# CONFIG_USB_CYPRESS_CY7C63 is not set
1422# CONFIG_USB_CYTHERM is not set 1605# CONFIG_USB_CYTHERM is not set
1423# CONFIG_USB_PHIDGET is not set
1424# CONFIG_USB_IDMOUSE is not set 1606# CONFIG_USB_IDMOUSE is not set
1425# CONFIG_USB_FTDI_ELAN is not set 1607# CONFIG_USB_FTDI_ELAN is not set
1426# CONFIG_USB_APPLEDISPLAY is not set 1608# CONFIG_USB_APPLEDISPLAY is not set
@@ -1429,7 +1611,15 @@ CONFIG_USB_LIBUSUAL=y
1429# CONFIG_USB_TRANCEVIBRATOR is not set 1611# CONFIG_USB_TRANCEVIBRATOR is not set
1430# CONFIG_USB_IOWARRIOR is not set 1612# CONFIG_USB_IOWARRIOR is not set
1431# CONFIG_USB_TEST is not set 1613# CONFIG_USB_TEST is not set
1614# CONFIG_USB_ISIGHTFW is not set
1615# CONFIG_USB_VST is not set
1432# CONFIG_USB_GADGET is not set 1616# CONFIG_USB_GADGET is not set
1617
1618#
1619# OTG and related infrastructure
1620#
1621# CONFIG_NOP_USB_XCEIV is not set
1622# CONFIG_UWB is not set
1433# CONFIG_MMC is not set 1623# CONFIG_MMC is not set
1434# CONFIG_MEMSTICK is not set 1624# CONFIG_MEMSTICK is not set
1435# CONFIG_NEW_LEDS is not set 1625# CONFIG_NEW_LEDS is not set
@@ -1443,6 +1633,7 @@ CONFIG_EDAC=y
1443# CONFIG_EDAC_DEBUG is not set 1633# CONFIG_EDAC_DEBUG is not set
1444CONFIG_EDAC_MM_EDAC=y 1634CONFIG_EDAC_MM_EDAC=y
1445CONFIG_EDAC_PASEMI=y 1635CONFIG_EDAC_PASEMI=y
1636# CONFIG_EDAC_CPC925 is not set
1446CONFIG_RTC_LIB=y 1637CONFIG_RTC_LIB=y
1447CONFIG_RTC_CLASS=y 1638CONFIG_RTC_CLASS=y
1448CONFIG_RTC_HCTOSYS=y 1639CONFIG_RTC_HCTOSYS=y
@@ -1472,6 +1663,9 @@ CONFIG_RTC_DRV_DS1307=y
1472# CONFIG_RTC_DRV_PCF8583 is not set 1663# CONFIG_RTC_DRV_PCF8583 is not set
1473# CONFIG_RTC_DRV_M41T80 is not set 1664# CONFIG_RTC_DRV_M41T80 is not set
1474# CONFIG_RTC_DRV_S35390A is not set 1665# CONFIG_RTC_DRV_S35390A is not set
1666# CONFIG_RTC_DRV_FM3130 is not set
1667# CONFIG_RTC_DRV_RX8581 is not set
1668# CONFIG_RTC_DRV_RX8025 is not set
1475 1669
1476# 1670#
1477# SPI RTC drivers 1671# SPI RTC drivers
@@ -1481,21 +1675,31 @@ CONFIG_RTC_DRV_DS1307=y
1481# Platform RTC drivers 1675# Platform RTC drivers
1482# 1676#
1483# CONFIG_RTC_DRV_CMOS is not set 1677# CONFIG_RTC_DRV_CMOS is not set
1678# CONFIG_RTC_DRV_DS1286 is not set
1484# CONFIG_RTC_DRV_DS1511 is not set 1679# CONFIG_RTC_DRV_DS1511 is not set
1485# CONFIG_RTC_DRV_DS1553 is not set 1680# CONFIG_RTC_DRV_DS1553 is not set
1486# CONFIG_RTC_DRV_DS1742 is not set 1681# CONFIG_RTC_DRV_DS1742 is not set
1487# CONFIG_RTC_DRV_STK17TA8 is not set 1682# CONFIG_RTC_DRV_STK17TA8 is not set
1488# CONFIG_RTC_DRV_M48T86 is not set 1683# CONFIG_RTC_DRV_M48T86 is not set
1684# CONFIG_RTC_DRV_M48T35 is not set
1489# CONFIG_RTC_DRV_M48T59 is not set 1685# CONFIG_RTC_DRV_M48T59 is not set
1686# CONFIG_RTC_DRV_BQ4802 is not set
1490# CONFIG_RTC_DRV_V3020 is not set 1687# CONFIG_RTC_DRV_V3020 is not set
1491 1688
1492# 1689#
1493# on-CPU RTC drivers 1690# on-CPU RTC drivers
1494# 1691#
1692# CONFIG_RTC_DRV_GENERIC is not set
1495# CONFIG_DMADEVICES is not set 1693# CONFIG_DMADEVICES is not set
1694# CONFIG_AUXDISPLAY is not set
1496# CONFIG_UIO is not set 1695# CONFIG_UIO is not set
1497 1696
1498# 1697#
1698# TI VLYNQ
1699#
1700# CONFIG_STAGING is not set
1701
1702#
1499# File systems 1703# File systems
1500# 1704#
1501CONFIG_EXT2_FS=y 1705CONFIG_EXT2_FS=y
@@ -1504,11 +1708,13 @@ CONFIG_EXT2_FS_POSIX_ACL=y
1504# CONFIG_EXT2_FS_SECURITY is not set 1708# CONFIG_EXT2_FS_SECURITY is not set
1505# CONFIG_EXT2_FS_XIP is not set 1709# CONFIG_EXT2_FS_XIP is not set
1506CONFIG_EXT3_FS=y 1710CONFIG_EXT3_FS=y
1711# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
1507CONFIG_EXT3_FS_XATTR=y 1712CONFIG_EXT3_FS_XATTR=y
1508# CONFIG_EXT3_FS_POSIX_ACL is not set 1713# CONFIG_EXT3_FS_POSIX_ACL is not set
1509# CONFIG_EXT3_FS_SECURITY is not set 1714# CONFIG_EXT3_FS_SECURITY is not set
1510# CONFIG_EXT4DEV_FS is not set 1715# CONFIG_EXT4_FS is not set
1511CONFIG_JBD=y 1716CONFIG_JBD=y
1717# CONFIG_JBD_DEBUG is not set
1512CONFIG_FS_MBCACHE=y 1718CONFIG_FS_MBCACHE=y
1513# CONFIG_REISERFS_FS is not set 1719# CONFIG_REISERFS_FS is not set
1514# CONFIG_JFS_FS is not set 1720# CONFIG_JFS_FS is not set
@@ -1516,6 +1722,10 @@ CONFIG_FS_POSIX_ACL=y
1516# CONFIG_XFS_FS is not set 1722# CONFIG_XFS_FS is not set
1517# CONFIG_GFS2_FS is not set 1723# CONFIG_GFS2_FS is not set
1518# CONFIG_OCFS2_FS is not set 1724# CONFIG_OCFS2_FS is not set
1725# CONFIG_BTRFS_FS is not set
1726# CONFIG_NILFS2_FS is not set
1727CONFIG_FILE_LOCKING=y
1728CONFIG_FSNOTIFY=y
1519CONFIG_DNOTIFY=y 1729CONFIG_DNOTIFY=y
1520CONFIG_INOTIFY=y 1730CONFIG_INOTIFY=y
1521CONFIG_INOTIFY_USER=y 1731CONFIG_INOTIFY_USER=y
@@ -1525,6 +1735,11 @@ CONFIG_AUTOFS4_FS=y
1525# CONFIG_FUSE_FS is not set 1735# CONFIG_FUSE_FS is not set
1526 1736
1527# 1737#
1738# Caches
1739#
1740# CONFIG_FSCACHE is not set
1741
1742#
1528# CD-ROM/DVD Filesystems 1743# CD-ROM/DVD Filesystems
1529# 1744#
1530CONFIG_ISO9660_FS=y 1745CONFIG_ISO9660_FS=y
@@ -1549,16 +1764,14 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
1549CONFIG_PROC_FS=y 1764CONFIG_PROC_FS=y
1550CONFIG_PROC_KCORE=y 1765CONFIG_PROC_KCORE=y
1551CONFIG_PROC_SYSCTL=y 1766CONFIG_PROC_SYSCTL=y
1767CONFIG_PROC_PAGE_MONITOR=y
1552CONFIG_SYSFS=y 1768CONFIG_SYSFS=y
1553CONFIG_TMPFS=y 1769CONFIG_TMPFS=y
1554# CONFIG_TMPFS_POSIX_ACL is not set 1770# CONFIG_TMPFS_POSIX_ACL is not set
1555CONFIG_HUGETLBFS=y 1771CONFIG_HUGETLBFS=y
1556CONFIG_HUGETLB_PAGE=y 1772CONFIG_HUGETLB_PAGE=y
1557CONFIG_CONFIGFS_FS=y 1773CONFIG_CONFIGFS_FS=y
1558 1774CONFIG_MISC_FILESYSTEMS=y
1559#
1560# Miscellaneous filesystems
1561#
1562# CONFIG_ADFS_FS is not set 1775# CONFIG_ADFS_FS is not set
1563# CONFIG_AFFS_FS is not set 1776# CONFIG_AFFS_FS is not set
1564# CONFIG_HFS_FS is not set 1777# CONFIG_HFS_FS is not set
@@ -1578,8 +1791,10 @@ CONFIG_JFFS2_ZLIB=y
1578CONFIG_JFFS2_RTIME=y 1791CONFIG_JFFS2_RTIME=y
1579# CONFIG_JFFS2_RUBIN is not set 1792# CONFIG_JFFS2_RUBIN is not set
1580# CONFIG_CRAMFS is not set 1793# CONFIG_CRAMFS is not set
1794# CONFIG_SQUASHFS is not set
1581# CONFIG_VXFS_FS is not set 1795# CONFIG_VXFS_FS is not set
1582# CONFIG_MINIX_FS is not set 1796# CONFIG_MINIX_FS is not set
1797# CONFIG_OMFS_FS is not set
1583# CONFIG_HPFS_FS is not set 1798# CONFIG_HPFS_FS is not set
1584# CONFIG_QNX4FS_FS is not set 1799# CONFIG_QNX4FS_FS is not set
1585# CONFIG_ROMFS_FS is not set 1800# CONFIG_ROMFS_FS is not set
@@ -1590,18 +1805,17 @@ CONFIG_NFS_FS=y
1590CONFIG_NFS_V3=y 1805CONFIG_NFS_V3=y
1591# CONFIG_NFS_V3_ACL is not set 1806# CONFIG_NFS_V3_ACL is not set
1592# CONFIG_NFS_V4 is not set 1807# CONFIG_NFS_V4 is not set
1808CONFIG_ROOT_NFS=y
1593CONFIG_NFSD=y 1809CONFIG_NFSD=y
1594CONFIG_NFSD_V3=y 1810CONFIG_NFSD_V3=y
1595# CONFIG_NFSD_V3_ACL is not set 1811# CONFIG_NFSD_V3_ACL is not set
1596CONFIG_NFSD_V4=y 1812CONFIG_NFSD_V4=y
1597CONFIG_ROOT_NFS=y
1598CONFIG_LOCKD=y 1813CONFIG_LOCKD=y
1599CONFIG_LOCKD_V4=y 1814CONFIG_LOCKD_V4=y
1600CONFIG_EXPORTFS=y 1815CONFIG_EXPORTFS=y
1601CONFIG_NFS_COMMON=y 1816CONFIG_NFS_COMMON=y
1602CONFIG_SUNRPC=y 1817CONFIG_SUNRPC=y
1603CONFIG_SUNRPC_GSS=y 1818CONFIG_SUNRPC_GSS=y
1604# CONFIG_SUNRPC_BIND34 is not set
1605CONFIG_RPCSEC_GSS_KRB5=y 1819CONFIG_RPCSEC_GSS_KRB5=y
1606# CONFIG_RPCSEC_GSS_SPKM3 is not set 1820# CONFIG_RPCSEC_GSS_SPKM3 is not set
1607# CONFIG_SMB_FS is not set 1821# CONFIG_SMB_FS is not set
@@ -1672,25 +1886,30 @@ CONFIG_NLS_ISO8859_1=y
1672# CONFIG_NLS_KOI8_U is not set 1886# CONFIG_NLS_KOI8_U is not set
1673# CONFIG_NLS_UTF8 is not set 1887# CONFIG_NLS_UTF8 is not set
1674# CONFIG_DLM is not set 1888# CONFIG_DLM is not set
1889CONFIG_BINARY_PRINTF=y
1675 1890
1676# 1891#
1677# Library routines 1892# Library routines
1678# 1893#
1679CONFIG_BITREVERSE=y 1894CONFIG_BITREVERSE=y
1680# CONFIG_GENERIC_FIND_FIRST_BIT is not set 1895CONFIG_GENERIC_FIND_LAST_BIT=y
1681CONFIG_CRC_CCITT=y 1896CONFIG_CRC_CCITT=y
1682# CONFIG_CRC16 is not set 1897# CONFIG_CRC16 is not set
1898# CONFIG_CRC_T10DIF is not set
1683CONFIG_CRC_ITU_T=y 1899CONFIG_CRC_ITU_T=y
1684CONFIG_CRC32=y 1900CONFIG_CRC32=y
1685# CONFIG_CRC7 is not set 1901# CONFIG_CRC7 is not set
1686CONFIG_LIBCRC32C=m 1902# CONFIG_LIBCRC32C is not set
1687CONFIG_ZLIB_INFLATE=y 1903CONFIG_ZLIB_INFLATE=y
1688CONFIG_ZLIB_DEFLATE=y 1904CONFIG_ZLIB_DEFLATE=y
1689CONFIG_PLIST=y 1905CONFIG_DECOMPRESS_GZIP=y
1906CONFIG_DECOMPRESS_BZIP2=y
1907CONFIG_DECOMPRESS_LZMA=y
1690CONFIG_HAS_IOMEM=y 1908CONFIG_HAS_IOMEM=y
1691CONFIG_HAS_IOPORT=y 1909CONFIG_HAS_IOPORT=y
1692CONFIG_HAS_DMA=y 1910CONFIG_HAS_DMA=y
1693CONFIG_HAVE_LMB=y 1911CONFIG_HAVE_LMB=y
1912CONFIG_NLATTR=y
1694 1913
1695# 1914#
1696# Kernel hacking 1915# Kernel hacking
@@ -1700,18 +1919,25 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
1700CONFIG_ENABLE_MUST_CHECK=y 1919CONFIG_ENABLE_MUST_CHECK=y
1701CONFIG_FRAME_WARN=2048 1920CONFIG_FRAME_WARN=2048
1702CONFIG_MAGIC_SYSRQ=y 1921CONFIG_MAGIC_SYSRQ=y
1922# CONFIG_STRIP_ASM_SYMS is not set
1703# CONFIG_UNUSED_SYMBOLS is not set 1923# CONFIG_UNUSED_SYMBOLS is not set
1704# CONFIG_DEBUG_FS is not set 1924CONFIG_DEBUG_FS=y
1705# CONFIG_HEADERS_CHECK is not set 1925# CONFIG_HEADERS_CHECK is not set
1706CONFIG_DEBUG_KERNEL=y 1926CONFIG_DEBUG_KERNEL=y
1707# CONFIG_DEBUG_SHIRQ is not set 1927# CONFIG_DEBUG_SHIRQ is not set
1708CONFIG_DETECT_SOFTLOCKUP=y 1928CONFIG_DETECT_SOFTLOCKUP=y
1929# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
1930CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
1931CONFIG_DETECT_HUNG_TASK=y
1932# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
1933CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
1709# CONFIG_SCHED_DEBUG is not set 1934# CONFIG_SCHED_DEBUG is not set
1710# CONFIG_SCHEDSTATS is not set 1935# CONFIG_SCHEDSTATS is not set
1711# CONFIG_TIMER_STATS is not set 1936# CONFIG_TIMER_STATS is not set
1712# CONFIG_DEBUG_OBJECTS is not set 1937# CONFIG_DEBUG_OBJECTS is not set
1713# CONFIG_SLUB_DEBUG_ON is not set 1938# CONFIG_SLUB_DEBUG_ON is not set
1714# CONFIG_SLUB_STATS is not set 1939# CONFIG_SLUB_STATS is not set
1940# CONFIG_DEBUG_KMEMLEAK is not set
1715# CONFIG_DEBUG_RT_MUTEXES is not set 1941# CONFIG_DEBUG_RT_MUTEXES is not set
1716# CONFIG_RT_MUTEX_TESTER is not set 1942# CONFIG_RT_MUTEX_TESTER is not set
1717# CONFIG_DEBUG_SPINLOCK is not set 1943# CONFIG_DEBUG_SPINLOCK is not set
@@ -1721,26 +1947,71 @@ CONFIG_DETECT_SOFTLOCKUP=y
1721# CONFIG_LOCK_STAT is not set 1947# CONFIG_LOCK_STAT is not set
1722# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 1948# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1723# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set 1949# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1950CONFIG_STACKTRACE=y
1724# CONFIG_DEBUG_KOBJECT is not set 1951# CONFIG_DEBUG_KOBJECT is not set
1725CONFIG_DEBUG_BUGVERBOSE=y 1952CONFIG_DEBUG_BUGVERBOSE=y
1726# CONFIG_DEBUG_INFO is not set 1953# CONFIG_DEBUG_INFO is not set
1727# CONFIG_DEBUG_VM is not set 1954# CONFIG_DEBUG_VM is not set
1728# CONFIG_DEBUG_WRITECOUNT is not set 1955# CONFIG_DEBUG_WRITECOUNT is not set
1956CONFIG_DEBUG_MEMORY_INIT=y
1729# CONFIG_DEBUG_LIST is not set 1957# CONFIG_DEBUG_LIST is not set
1730# CONFIG_DEBUG_SG is not set 1958# CONFIG_DEBUG_SG is not set
1731# CONFIG_BOOT_PRINTK_DELAY is not set 1959# CONFIG_DEBUG_NOTIFIERS is not set
1960# CONFIG_DEBUG_CREDENTIALS is not set
1732# CONFIG_RCU_TORTURE_TEST is not set 1961# CONFIG_RCU_TORTURE_TEST is not set
1962# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1733# CONFIG_BACKTRACE_SELF_TEST is not set 1963# CONFIG_BACKTRACE_SELF_TEST is not set
1964# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1965# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
1734# CONFIG_FAULT_INJECTION is not set 1966# CONFIG_FAULT_INJECTION is not set
1967# CONFIG_LATENCYTOP is not set
1968CONFIG_SYSCTL_SYSCALL_CHECK=y
1969# CONFIG_DEBUG_PAGEALLOC is not set
1970CONFIG_NOP_TRACER=y
1971CONFIG_HAVE_FUNCTION_TRACER=y
1972CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
1973CONFIG_HAVE_DYNAMIC_FTRACE=y
1974CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1975CONFIG_RING_BUFFER=y
1976CONFIG_EVENT_TRACING=y
1977CONFIG_CONTEXT_SWITCH_TRACER=y
1978CONFIG_RING_BUFFER_ALLOW_SWAP=y
1979CONFIG_TRACING=y
1980CONFIG_TRACING_SUPPORT=y
1981CONFIG_FTRACE=y
1982# CONFIG_FUNCTION_TRACER is not set
1983# CONFIG_IRQSOFF_TRACER is not set
1984# CONFIG_SCHED_TRACER is not set
1985# CONFIG_ENABLE_DEFAULT_TRACERS is not set
1986# CONFIG_BOOT_TRACER is not set
1987CONFIG_BRANCH_PROFILE_NONE=y
1988# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
1989# CONFIG_PROFILE_ALL_BRANCHES is not set
1990# CONFIG_STACK_TRACER is not set
1991# CONFIG_KMEMTRACE is not set
1992# CONFIG_WORKQUEUE_TRACER is not set
1993# CONFIG_BLK_DEV_IO_TRACE is not set
1994# CONFIG_RING_BUFFER_BENCHMARK is not set
1995# CONFIG_DYNAMIC_DEBUG is not set
1996# CONFIG_DMA_API_DEBUG is not set
1735# CONFIG_SAMPLES is not set 1997# CONFIG_SAMPLES is not set
1998CONFIG_HAVE_ARCH_KGDB=y
1999# CONFIG_KGDB is not set
2000# CONFIG_PPC_DISABLE_WERROR is not set
2001CONFIG_PPC_WERROR=y
2002CONFIG_PRINT_STACK_DEPTH=64
1736# CONFIG_DEBUG_STACKOVERFLOW is not set 2003# CONFIG_DEBUG_STACKOVERFLOW is not set
1737# CONFIG_DEBUG_STACK_USAGE is not set 2004# CONFIG_DEBUG_STACK_USAGE is not set
1738# CONFIG_DEBUG_PAGEALLOC is not set 2005# CONFIG_PPC_EMULATED_STATS is not set
1739CONFIG_DEBUGGER=y 2006# CONFIG_CODE_PATCHING_SELFTEST is not set
2007# CONFIG_FTR_FIXUP_SELFTEST is not set
2008# CONFIG_MSI_BITMAP_SELFTEST is not set
1740CONFIG_XMON=y 2009CONFIG_XMON=y
1741CONFIG_XMON_DEFAULT=y 2010CONFIG_XMON_DEFAULT=y
1742CONFIG_XMON_DISASSEMBLY=y 2011CONFIG_XMON_DISASSEMBLY=y
2012CONFIG_DEBUGGER=y
1743# CONFIG_IRQSTACKS is not set 2013# CONFIG_IRQSTACKS is not set
2014# CONFIG_VIRQ_DEBUG is not set
1744# CONFIG_BOOTX_TEXT is not set 2015# CONFIG_BOOTX_TEXT is not set
1745# CONFIG_PPC_EARLY_DEBUG is not set 2016# CONFIG_PPC_EARLY_DEBUG is not set
1746 2017
@@ -1749,23 +2020,34 @@ CONFIG_XMON_DISASSEMBLY=y
1749# 2020#
1750# CONFIG_KEYS is not set 2021# CONFIG_KEYS is not set
1751# CONFIG_SECURITY is not set 2022# CONFIG_SECURITY is not set
2023# CONFIG_SECURITYFS is not set
1752# CONFIG_SECURITY_FILE_CAPABILITIES is not set 2024# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1753CONFIG_XOR_BLOCKS=y 2025CONFIG_XOR_BLOCKS=y
1754CONFIG_ASYNC_CORE=y 2026CONFIG_ASYNC_CORE=y
1755CONFIG_ASYNC_MEMCPY=y 2027CONFIG_ASYNC_MEMCPY=y
1756CONFIG_ASYNC_XOR=y 2028CONFIG_ASYNC_XOR=y
2029CONFIG_ASYNC_PQ=y
2030CONFIG_ASYNC_RAID6_RECOV=y
1757CONFIG_CRYPTO=y 2031CONFIG_CRYPTO=y
1758 2032
1759# 2033#
1760# Crypto core or helper 2034# Crypto core or helper
1761# 2035#
1762CONFIG_CRYPTO_ALGAPI=y 2036CONFIG_CRYPTO_ALGAPI=y
2037CONFIG_CRYPTO_ALGAPI2=y
1763CONFIG_CRYPTO_AEAD=y 2038CONFIG_CRYPTO_AEAD=y
2039CONFIG_CRYPTO_AEAD2=y
1764CONFIG_CRYPTO_BLKCIPHER=y 2040CONFIG_CRYPTO_BLKCIPHER=y
2041CONFIG_CRYPTO_BLKCIPHER2=y
1765CONFIG_CRYPTO_HASH=y 2042CONFIG_CRYPTO_HASH=y
2043CONFIG_CRYPTO_HASH2=y
2044CONFIG_CRYPTO_RNG2=y
2045CONFIG_CRYPTO_PCOMP=y
1766CONFIG_CRYPTO_MANAGER=y 2046CONFIG_CRYPTO_MANAGER=y
2047CONFIG_CRYPTO_MANAGER2=y
1767# CONFIG_CRYPTO_GF128MUL is not set 2048# CONFIG_CRYPTO_GF128MUL is not set
1768# CONFIG_CRYPTO_NULL is not set 2049# CONFIG_CRYPTO_NULL is not set
2050CONFIG_CRYPTO_WORKQUEUE=y
1769# CONFIG_CRYPTO_CRYPTD is not set 2051# CONFIG_CRYPTO_CRYPTD is not set
1770CONFIG_CRYPTO_AUTHENC=y 2052CONFIG_CRYPTO_AUTHENC=y
1771# CONFIG_CRYPTO_TEST is not set 2053# CONFIG_CRYPTO_TEST is not set
@@ -1793,14 +2075,20 @@ CONFIG_CRYPTO_CBC=y
1793# 2075#
1794CONFIG_CRYPTO_HMAC=y 2076CONFIG_CRYPTO_HMAC=y
1795# CONFIG_CRYPTO_XCBC is not set 2077# CONFIG_CRYPTO_XCBC is not set
2078# CONFIG_CRYPTO_VMAC is not set
1796 2079
1797# 2080#
1798# Digest 2081# Digest
1799# 2082#
1800# CONFIG_CRYPTO_CRC32C is not set 2083# CONFIG_CRYPTO_CRC32C is not set
2084# CONFIG_CRYPTO_GHASH is not set
1801CONFIG_CRYPTO_MD4=y 2085CONFIG_CRYPTO_MD4=y
1802CONFIG_CRYPTO_MD5=y 2086CONFIG_CRYPTO_MD5=y
1803# CONFIG_CRYPTO_MICHAEL_MIC is not set 2087# CONFIG_CRYPTO_MICHAEL_MIC is not set
2088# CONFIG_CRYPTO_RMD128 is not set
2089# CONFIG_CRYPTO_RMD160 is not set
2090# CONFIG_CRYPTO_RMD256 is not set
2091# CONFIG_CRYPTO_RMD320 is not set
1804CONFIG_CRYPTO_SHA1=y 2092CONFIG_CRYPTO_SHA1=y
1805CONFIG_CRYPTO_SHA256=y 2093CONFIG_CRYPTO_SHA256=y
1806CONFIG_CRYPTO_SHA512=y 2094CONFIG_CRYPTO_SHA512=y
@@ -1830,7 +2118,13 @@ CONFIG_CRYPTO_DES=y
1830# Compression 2118# Compression
1831# 2119#
1832# CONFIG_CRYPTO_DEFLATE is not set 2120# CONFIG_CRYPTO_DEFLATE is not set
2121# CONFIG_CRYPTO_ZLIB is not set
1833# CONFIG_CRYPTO_LZO is not set 2122# CONFIG_CRYPTO_LZO is not set
2123
2124#
2125# Random Number Generation
2126#
2127# CONFIG_CRYPTO_ANSI_CPRNG is not set
1834CONFIG_CRYPTO_HW=y 2128CONFIG_CRYPTO_HW=y
1835# CONFIG_CRYPTO_DEV_HIFN_795X is not set 2129# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1836# CONFIG_PPC_CLOCK is not set 2130# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/pq2fads_defconfig b/arch/powerpc/configs/pq2fads_defconfig
index ff96bb43c32d..b7911216af78 100644
--- a/arch/powerpc/configs/pq2fads_defconfig
+++ b/arch/powerpc/configs/pq2fads_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.31-rc4 3# Linux kernel version: 2.6.32-rc5
4# Wed Jul 29 23:32:00 2009 4# Thu Nov 5 08:20:17 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -34,6 +34,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
34CONFIG_GENERIC_HARDIRQS=y 34CONFIG_GENERIC_HARDIRQS=y
35CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 35CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
37# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
37CONFIG_IRQ_PER_CPU=y 38CONFIG_IRQ_PER_CPU=y
38CONFIG_STACKTRACE_SUPPORT=y 39CONFIG_STACKTRACE_SUPPORT=y
39CONFIG_HAVE_LATENCYTOP_SUPPORT=y 40CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -82,11 +83,12 @@ CONFIG_SYSVIPC_SYSCTL=y
82# 83#
83# RCU Subsystem 84# RCU Subsystem
84# 85#
85CONFIG_CLASSIC_RCU=y 86CONFIG_TREE_RCU=y
86# CONFIG_TREE_RCU is not set 87# CONFIG_TREE_PREEMPT_RCU is not set
87# CONFIG_PREEMPT_RCU is not set 88# CONFIG_RCU_TRACE is not set
89CONFIG_RCU_FANOUT=32
90# CONFIG_RCU_FANOUT_EXACT is not set
88# CONFIG_TREE_RCU_TRACE is not set 91# CONFIG_TREE_RCU_TRACE is not set
89# CONFIG_PREEMPT_RCU_TRACE is not set
90CONFIG_IKCONFIG=y 92CONFIG_IKCONFIG=y
91CONFIG_IKCONFIG_PROC=y 93CONFIG_IKCONFIG_PROC=y
92CONFIG_LOG_BUF_SHIFT=14 94CONFIG_LOG_BUF_SHIFT=14
@@ -120,29 +122,30 @@ CONFIG_TIMERFD=y
120CONFIG_EVENTFD=y 122CONFIG_EVENTFD=y
121CONFIG_SHMEM=y 123CONFIG_SHMEM=y
122CONFIG_AIO=y 124CONFIG_AIO=y
123CONFIG_HAVE_PERF_COUNTERS=y 125CONFIG_HAVE_PERF_EVENTS=y
124 126
125# 127#
126# Performance Counters 128# Kernel Performance Events And Counters
127# 129#
130# CONFIG_PERF_EVENTS is not set
128# CONFIG_PERF_COUNTERS is not set 131# CONFIG_PERF_COUNTERS is not set
129CONFIG_VM_EVENT_COUNTERS=y 132CONFIG_VM_EVENT_COUNTERS=y
130CONFIG_PCI_QUIRKS=y 133CONFIG_PCI_QUIRKS=y
131CONFIG_SLUB_DEBUG=y 134CONFIG_SLUB_DEBUG=y
132# CONFIG_STRIP_ASM_SYMS is not set
133CONFIG_COMPAT_BRK=y 135CONFIG_COMPAT_BRK=y
134# CONFIG_SLAB is not set 136# CONFIG_SLAB is not set
135CONFIG_SLUB=y 137CONFIG_SLUB=y
136# CONFIG_SLOB is not set 138# CONFIG_SLOB is not set
137# CONFIG_PROFILING is not set 139# CONFIG_PROFILING is not set
138# CONFIG_MARKERS is not set
139CONFIG_HAVE_OPROFILE=y 140CONFIG_HAVE_OPROFILE=y
140CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 141CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
141CONFIG_HAVE_IOREMAP_PROT=y 142CONFIG_HAVE_IOREMAP_PROT=y
142CONFIG_HAVE_KPROBES=y 143CONFIG_HAVE_KPROBES=y
143CONFIG_HAVE_KRETPROBES=y 144CONFIG_HAVE_KRETPROBES=y
144CONFIG_HAVE_ARCH_TRACEHOOK=y 145CONFIG_HAVE_ARCH_TRACEHOOK=y
146CONFIG_HAVE_DMA_ATTRS=y
145CONFIG_HAVE_CLK=y 147CONFIG_HAVE_CLK=y
148CONFIG_HAVE_DMA_API_DEBUG=y
146 149
147# 150#
148# GCOV-based kernel profiling 151# GCOV-based kernel profiling
@@ -155,6 +158,7 @@ CONFIG_BASE_SMALL=0
155# CONFIG_MODULES is not set 158# CONFIG_MODULES is not set
156CONFIG_BLOCK=y 159CONFIG_BLOCK=y
157CONFIG_LBDAF=y 160CONFIG_LBDAF=y
161CONFIG_BLK_DEV_BSG=y
158# CONFIG_BLK_DEV_INTEGRITY is not set 162# CONFIG_BLK_DEV_INTEGRITY is not set
159 163
160# 164#
@@ -239,6 +243,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
239CONFIG_ARCH_HAS_WALK_MEMORY=y 243CONFIG_ARCH_HAS_WALK_MEMORY=y
240CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 244CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
241# CONFIG_CRASH_DUMP is not set 245# CONFIG_CRASH_DUMP is not set
246CONFIG_MAX_ACTIVE_REGIONS=32
242CONFIG_ARCH_FLATMEM_ENABLE=y 247CONFIG_ARCH_FLATMEM_ENABLE=y
243CONFIG_ARCH_POPULATES_NODE_MAP=y 248CONFIG_ARCH_POPULATES_NODE_MAP=y
244CONFIG_FLATMEM=y 249CONFIG_FLATMEM=y
@@ -252,6 +257,7 @@ CONFIG_BOUNCE=y
252CONFIG_VIRT_TO_BUS=y 257CONFIG_VIRT_TO_BUS=y
253CONFIG_HAVE_MLOCK=y 258CONFIG_HAVE_MLOCK=y
254CONFIG_HAVE_MLOCKED_PAGE_BIT=y 259CONFIG_HAVE_MLOCKED_PAGE_BIT=y
260# CONFIG_KSM is not set
255CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 261CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
256CONFIG_PPC_4K_PAGES=y 262CONFIG_PPC_4K_PAGES=y
257# CONFIG_PPC_16K_PAGES is not set 263# CONFIG_PPC_16K_PAGES is not set
@@ -401,6 +407,7 @@ CONFIG_NETFILTER_ADVANCED=y
401# CONFIG_BT is not set 407# CONFIG_BT is not set
402CONFIG_WIRELESS=y 408CONFIG_WIRELESS=y
403# CONFIG_CFG80211 is not set 409# CONFIG_CFG80211 is not set
410CONFIG_CFG80211_DEFAULT_PS_VALUE=0
404CONFIG_WIRELESS_OLD_REGULATORY=y 411CONFIG_WIRELESS_OLD_REGULATORY=y
405# CONFIG_WIRELESS_EXT is not set 412# CONFIG_WIRELESS_EXT is not set
406# CONFIG_LIB80211 is not set 413# CONFIG_LIB80211 is not set
@@ -408,7 +415,6 @@ CONFIG_WIRELESS_OLD_REGULATORY=y
408# 415#
409# CFG80211 needs to be enabled for MAC80211 416# CFG80211 needs to be enabled for MAC80211
410# 417#
411CONFIG_MAC80211_DEFAULT_PS_VALUE=0
412# CONFIG_WIMAX is not set 418# CONFIG_WIMAX is not set
413# CONFIG_RFKILL is not set 419# CONFIG_RFKILL is not set
414 420
@@ -420,6 +426,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
420# Generic Driver Options 426# Generic Driver Options
421# 427#
422CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 428CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
429# CONFIG_DEVTMPFS is not set
423CONFIG_STANDALONE=y 430CONFIG_STANDALONE=y
424CONFIG_PREVENT_FIRMWARE_BUILD=y 431CONFIG_PREVENT_FIRMWARE_BUILD=y
425# CONFIG_FW_LOADER is not set 432# CONFIG_FW_LOADER is not set
@@ -481,7 +488,6 @@ CONFIG_MTD_CFI_UTIL=y
481# CONFIG_MTD_COMPLEX_MAPPINGS is not set 488# CONFIG_MTD_COMPLEX_MAPPINGS is not set
482# CONFIG_MTD_PHYSMAP is not set 489# CONFIG_MTD_PHYSMAP is not set
483CONFIG_MTD_PHYSMAP_OF=y 490CONFIG_MTD_PHYSMAP_OF=y
484# CONFIG_MTD_SBC8240 is not set
485# CONFIG_MTD_INTEL_VR_NOR is not set 491# CONFIG_MTD_INTEL_VR_NOR is not set
486# CONFIG_MTD_PLATRAM is not set 492# CONFIG_MTD_PLATRAM is not set
487 493
@@ -664,7 +670,9 @@ CONFIG_MII=y
664# CONFIG_NET_PCI is not set 670# CONFIG_NET_PCI is not set
665# CONFIG_B44 is not set 671# CONFIG_B44 is not set
666# CONFIG_KS8842 is not set 672# CONFIG_KS8842 is not set
673# CONFIG_KS8851_MLL is not set
667# CONFIG_ATL2 is not set 674# CONFIG_ATL2 is not set
675# CONFIG_XILINX_EMACLITE is not set
668CONFIG_FS_ENET=y 676CONFIG_FS_ENET=y
669# CONFIG_FS_ENET_HAS_SCC is not set 677# CONFIG_FS_ENET_HAS_SCC is not set
670CONFIG_FS_ENET_HAS_FCC=y 678CONFIG_FS_ENET_HAS_FCC=y
@@ -712,10 +720,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
712# CONFIG_SFC is not set 720# CONFIG_SFC is not set
713# CONFIG_BE2NET is not set 721# CONFIG_BE2NET is not set
714# CONFIG_TR is not set 722# CONFIG_TR is not set
715 723CONFIG_WLAN=y
716#
717# Wireless LAN
718#
719# CONFIG_WLAN_PRE80211 is not set 724# CONFIG_WLAN_PRE80211 is not set
720# CONFIG_WLAN_80211 is not set 725# CONFIG_WLAN_80211 is not set
721 726
@@ -764,6 +769,7 @@ CONFIG_KEYBOARD_ATKBD=y
764# CONFIG_KEYBOARD_GPIO is not set 769# CONFIG_KEYBOARD_GPIO is not set
765# CONFIG_KEYBOARD_MATRIX is not set 770# CONFIG_KEYBOARD_MATRIX is not set
766# CONFIG_KEYBOARD_NEWTON is not set 771# CONFIG_KEYBOARD_NEWTON is not set
772# CONFIG_KEYBOARD_OPENCORES is not set
767# CONFIG_KEYBOARD_STOWAWAY is not set 773# CONFIG_KEYBOARD_STOWAWAY is not set
768# CONFIG_KEYBOARD_SUNKBD is not set 774# CONFIG_KEYBOARD_SUNKBD is not set
769# CONFIG_KEYBOARD_XTKBD is not set 775# CONFIG_KEYBOARD_XTKBD is not set
@@ -774,6 +780,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y
774CONFIG_MOUSE_PS2_SYNAPTICS=y 780CONFIG_MOUSE_PS2_SYNAPTICS=y
775CONFIG_MOUSE_PS2_TRACKPOINT=y 781CONFIG_MOUSE_PS2_TRACKPOINT=y
776# CONFIG_MOUSE_PS2_ELANTECH is not set 782# CONFIG_MOUSE_PS2_ELANTECH is not set
783# CONFIG_MOUSE_PS2_SENTELIC is not set
777# CONFIG_MOUSE_PS2_TOUCHKIT is not set 784# CONFIG_MOUSE_PS2_TOUCHKIT is not set
778# CONFIG_MOUSE_SERIAL is not set 785# CONFIG_MOUSE_SERIAL is not set
779# CONFIG_MOUSE_APPLETOUCH is not set 786# CONFIG_MOUSE_APPLETOUCH is not set
@@ -855,15 +862,19 @@ CONFIG_GPIOLIB=y
855# PCI GPIO expanders: 862# PCI GPIO expanders:
856# 863#
857# CONFIG_GPIO_BT8XX is not set 864# CONFIG_GPIO_BT8XX is not set
865# CONFIG_GPIO_LANGWELL is not set
858 866
859# 867#
860# SPI GPIO expanders: 868# SPI GPIO expanders:
861# 869#
870
871#
872# AC97 GPIO expanders:
873#
862# CONFIG_W1 is not set 874# CONFIG_W1 is not set
863# CONFIG_POWER_SUPPLY is not set 875# CONFIG_POWER_SUPPLY is not set
864# CONFIG_HWMON is not set 876# CONFIG_HWMON is not set
865# CONFIG_THERMAL is not set 877# CONFIG_THERMAL is not set
866# CONFIG_THERMAL_HWMON is not set
867# CONFIG_WATCHDOG is not set 878# CONFIG_WATCHDOG is not set
868CONFIG_SSB_POSSIBLE=y 879CONFIG_SSB_POSSIBLE=y
869 880
@@ -886,6 +897,7 @@ CONFIG_SSB_POSSIBLE=y
886# Graphics support 897# Graphics support
887# 898#
888# CONFIG_AGP is not set 899# CONFIG_AGP is not set
900CONFIG_VGA_ARB=y
889# CONFIG_DRM is not set 901# CONFIG_DRM is not set
890# CONFIG_VGASTATE is not set 902# CONFIG_VGASTATE is not set
891CONFIG_VIDEO_OUTPUT_CONTROL=y 903CONFIG_VIDEO_OUTPUT_CONTROL=y
@@ -905,7 +917,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
905# CONFIG_USB is not set 917# CONFIG_USB is not set
906# CONFIG_USB_OTG_WHITELIST is not set 918# CONFIG_USB_OTG_WHITELIST is not set
907# CONFIG_USB_OTG_BLACKLIST_HUB is not set 919# CONFIG_USB_OTG_BLACKLIST_HUB is not set
908# CONFIG_USB_MUSB_HDRC is not set
909# CONFIG_USB_GADGET_MUSB_HDRC is not set 920# CONFIG_USB_GADGET_MUSB_HDRC is not set
910 921
911# 922#
@@ -922,6 +933,7 @@ CONFIG_USB_GADGET_SELECTED=y
922# CONFIG_USB_GADGET_LH7A40X is not set 933# CONFIG_USB_GADGET_LH7A40X is not set
923# CONFIG_USB_GADGET_OMAP is not set 934# CONFIG_USB_GADGET_OMAP is not set
924# CONFIG_USB_GADGET_PXA25X is not set 935# CONFIG_USB_GADGET_PXA25X is not set
936# CONFIG_USB_GADGET_R8A66597 is not set
925# CONFIG_USB_GADGET_PXA27X is not set 937# CONFIG_USB_GADGET_PXA27X is not set
926# CONFIG_USB_GADGET_S3C_HSOTG is not set 938# CONFIG_USB_GADGET_S3C_HSOTG is not set
927# CONFIG_USB_GADGET_IMX is not set 939# CONFIG_USB_GADGET_IMX is not set
@@ -940,6 +952,7 @@ CONFIG_USB_GADGET_DUALSPEED=y
940# CONFIG_USB_AUDIO is not set 952# CONFIG_USB_AUDIO is not set
941CONFIG_USB_ETH=y 953CONFIG_USB_ETH=y
942CONFIG_USB_ETH_RNDIS=y 954CONFIG_USB_ETH_RNDIS=y
955# CONFIG_USB_ETH_EEM is not set
943# CONFIG_USB_GADGETFS is not set 956# CONFIG_USB_GADGETFS is not set
944# CONFIG_USB_FILE_STORAGE is not set 957# CONFIG_USB_FILE_STORAGE is not set
945# CONFIG_USB_G_SERIAL is not set 958# CONFIG_USB_G_SERIAL is not set
@@ -1148,6 +1161,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
1148CONFIG_ENABLE_MUST_CHECK=y 1161CONFIG_ENABLE_MUST_CHECK=y
1149CONFIG_FRAME_WARN=1024 1162CONFIG_FRAME_WARN=1024
1150CONFIG_MAGIC_SYSRQ=y 1163CONFIG_MAGIC_SYSRQ=y
1164# CONFIG_STRIP_ASM_SYMS is not set
1151# CONFIG_UNUSED_SYMBOLS is not set 1165# CONFIG_UNUSED_SYMBOLS is not set
1152# CONFIG_DEBUG_FS is not set 1166# CONFIG_DEBUG_FS is not set
1153# CONFIG_HEADERS_CHECK is not set 1167# CONFIG_HEADERS_CHECK is not set
@@ -1183,10 +1197,12 @@ CONFIG_DEBUG_INFO=y
1183# CONFIG_DEBUG_LIST is not set 1197# CONFIG_DEBUG_LIST is not set
1184# CONFIG_DEBUG_SG is not set 1198# CONFIG_DEBUG_SG is not set
1185# CONFIG_DEBUG_NOTIFIERS is not set 1199# CONFIG_DEBUG_NOTIFIERS is not set
1200# CONFIG_DEBUG_CREDENTIALS is not set
1186# CONFIG_RCU_TORTURE_TEST is not set 1201# CONFIG_RCU_TORTURE_TEST is not set
1187# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1202# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1188# CONFIG_BACKTRACE_SELF_TEST is not set 1203# CONFIG_BACKTRACE_SELF_TEST is not set
1189# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 1204# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1205# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
1190# CONFIG_FAULT_INJECTION is not set 1206# CONFIG_FAULT_INJECTION is not set
1191# CONFIG_LATENCYTOP is not set 1207# CONFIG_LATENCYTOP is not set
1192CONFIG_SYSCTL_SYSCALL_CHECK=y 1208CONFIG_SYSCTL_SYSCALL_CHECK=y
@@ -1209,6 +1225,7 @@ CONFIG_BRANCH_PROFILE_NONE=y
1209# CONFIG_KMEMTRACE is not set 1225# CONFIG_KMEMTRACE is not set
1210# CONFIG_WORKQUEUE_TRACER is not set 1226# CONFIG_WORKQUEUE_TRACER is not set
1211# CONFIG_BLK_DEV_IO_TRACE is not set 1227# CONFIG_BLK_DEV_IO_TRACE is not set
1228# CONFIG_DMA_API_DEBUG is not set
1212# CONFIG_SAMPLES is not set 1229# CONFIG_SAMPLES is not set
1213CONFIG_HAVE_ARCH_KGDB=y 1230CONFIG_HAVE_ARCH_KGDB=y
1214# CONFIG_PPC_DISABLE_WERROR is not set 1231# CONFIG_PPC_DISABLE_WERROR is not set
@@ -1237,7 +1254,6 @@ CONFIG_CRYPTO=y
1237# 1254#
1238# Crypto core or helper 1255# Crypto core or helper
1239# 1256#
1240# CONFIG_CRYPTO_FIPS is not set
1241CONFIG_CRYPTO_ALGAPI=y 1257CONFIG_CRYPTO_ALGAPI=y
1242CONFIG_CRYPTO_ALGAPI2=y 1258CONFIG_CRYPTO_ALGAPI2=y
1243CONFIG_CRYPTO_AEAD2=y 1259CONFIG_CRYPTO_AEAD2=y
@@ -1279,6 +1295,7 @@ CONFIG_CRYPTO_PCBC=y
1279# Digest 1295# Digest
1280# 1296#
1281# CONFIG_CRYPTO_CRC32C is not set 1297# CONFIG_CRYPTO_CRC32C is not set
1298# CONFIG_CRYPTO_GHASH is not set
1282# CONFIG_CRYPTO_MD4 is not set 1299# CONFIG_CRYPTO_MD4 is not set
1283CONFIG_CRYPTO_MD5=y 1300CONFIG_CRYPTO_MD5=y
1284# CONFIG_CRYPTO_MICHAEL_MIC is not set 1301# CONFIG_CRYPTO_MICHAEL_MIC is not set
diff --git a/arch/powerpc/configs/prpmc2800_defconfig b/arch/powerpc/configs/prpmc2800_defconfig
index 1293c465d7fa..ef50ce45d50b 100644
--- a/arch/powerpc/configs/prpmc2800_defconfig
+++ b/arch/powerpc/configs/prpmc2800_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.31-rc4 3# Linux kernel version: 2.6.32-rc5
4# Wed Jul 29 23:32:01 2009 4# Thu Nov 5 08:20:18 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -36,6 +36,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
36CONFIG_GENERIC_HARDIRQS=y 36CONFIG_GENERIC_HARDIRQS=y
37CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 37CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
38# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 38# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
39# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
39CONFIG_IRQ_PER_CPU=y 40CONFIG_IRQ_PER_CPU=y
40CONFIG_STACKTRACE_SUPPORT=y 41CONFIG_STACKTRACE_SUPPORT=y
41CONFIG_HAVE_LATENCYTOP_SUPPORT=y 42CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -85,11 +86,12 @@ CONFIG_POSIX_MQUEUE_SYSCTL=y
85# 86#
86# RCU Subsystem 87# RCU Subsystem
87# 88#
88CONFIG_CLASSIC_RCU=y 89CONFIG_TREE_RCU=y
89# CONFIG_TREE_RCU is not set 90# CONFIG_TREE_PREEMPT_RCU is not set
90# CONFIG_PREEMPT_RCU is not set 91# CONFIG_RCU_TRACE is not set
92CONFIG_RCU_FANOUT=32
93# CONFIG_RCU_FANOUT_EXACT is not set
91# CONFIG_TREE_RCU_TRACE is not set 94# CONFIG_TREE_RCU_TRACE is not set
92# CONFIG_PREEMPT_RCU_TRACE is not set
93# CONFIG_IKCONFIG is not set 95# CONFIG_IKCONFIG is not set
94CONFIG_LOG_BUF_SHIFT=14 96CONFIG_LOG_BUF_SHIFT=14
95CONFIG_GROUP_SCHED=y 97CONFIG_GROUP_SCHED=y
@@ -131,28 +133,29 @@ CONFIG_TIMERFD=y
131CONFIG_EVENTFD=y 133CONFIG_EVENTFD=y
132CONFIG_SHMEM=y 134CONFIG_SHMEM=y
133CONFIG_AIO=y 135CONFIG_AIO=y
134CONFIG_HAVE_PERF_COUNTERS=y 136CONFIG_HAVE_PERF_EVENTS=y
135 137
136# 138#
137# Performance Counters 139# Kernel Performance Events And Counters
138# 140#
141# CONFIG_PERF_EVENTS is not set
139# CONFIG_PERF_COUNTERS is not set 142# CONFIG_PERF_COUNTERS is not set
140CONFIG_VM_EVENT_COUNTERS=y 143CONFIG_VM_EVENT_COUNTERS=y
141CONFIG_PCI_QUIRKS=y 144CONFIG_PCI_QUIRKS=y
142CONFIG_SLUB_DEBUG=y 145CONFIG_SLUB_DEBUG=y
143# CONFIG_STRIP_ASM_SYMS is not set
144CONFIG_COMPAT_BRK=y 146CONFIG_COMPAT_BRK=y
145# CONFIG_SLAB is not set 147# CONFIG_SLAB is not set
146CONFIG_SLUB=y 148CONFIG_SLUB=y
147# CONFIG_SLOB is not set 149# CONFIG_SLOB is not set
148# CONFIG_PROFILING is not set 150# CONFIG_PROFILING is not set
149# CONFIG_MARKERS is not set
150CONFIG_HAVE_OPROFILE=y 151CONFIG_HAVE_OPROFILE=y
151CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 152CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
152CONFIG_HAVE_IOREMAP_PROT=y 153CONFIG_HAVE_IOREMAP_PROT=y
153CONFIG_HAVE_KPROBES=y 154CONFIG_HAVE_KPROBES=y
154CONFIG_HAVE_KRETPROBES=y 155CONFIG_HAVE_KRETPROBES=y
155CONFIG_HAVE_ARCH_TRACEHOOK=y 156CONFIG_HAVE_ARCH_TRACEHOOK=y
157CONFIG_HAVE_DMA_ATTRS=y
158CONFIG_HAVE_DMA_API_DEBUG=y
156 159
157# 160#
158# GCOV-based kernel profiling 161# GCOV-based kernel profiling
@@ -244,12 +247,12 @@ CONFIG_BINFMT_ELF=y
244CONFIG_BINFMT_MISC=y 247CONFIG_BINFMT_MISC=y
245# CONFIG_IOMMU_HELPER is not set 248# CONFIG_IOMMU_HELPER is not set
246# CONFIG_SWIOTLB is not set 249# CONFIG_SWIOTLB is not set
247CONFIG_PPC_NEED_DMA_SYNC_OPS=y
248CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 250CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
249CONFIG_ARCH_HAS_WALK_MEMORY=y 251CONFIG_ARCH_HAS_WALK_MEMORY=y
250CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 252CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
251# CONFIG_KEXEC is not set 253# CONFIG_KEXEC is not set
252# CONFIG_CRASH_DUMP is not set 254# CONFIG_CRASH_DUMP is not set
255CONFIG_MAX_ACTIVE_REGIONS=32
253CONFIG_ARCH_FLATMEM_ENABLE=y 256CONFIG_ARCH_FLATMEM_ENABLE=y
254CONFIG_ARCH_POPULATES_NODE_MAP=y 257CONFIG_ARCH_POPULATES_NODE_MAP=y
255CONFIG_SELECT_MEMORY_MODEL=y 258CONFIG_SELECT_MEMORY_MODEL=y
@@ -267,6 +270,7 @@ CONFIG_BOUNCE=y
267CONFIG_VIRT_TO_BUS=y 270CONFIG_VIRT_TO_BUS=y
268CONFIG_HAVE_MLOCK=y 271CONFIG_HAVE_MLOCK=y
269CONFIG_HAVE_MLOCKED_PAGE_BIT=y 272CONFIG_HAVE_MLOCKED_PAGE_BIT=y
273# CONFIG_KSM is not set
270CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 274CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
271CONFIG_PPC_4K_PAGES=y 275CONFIG_PPC_4K_PAGES=y
272# CONFIG_PPC_16K_PAGES is not set 276# CONFIG_PPC_16K_PAGES is not set
@@ -360,6 +364,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
360# CONFIG_NETFILTER is not set 364# CONFIG_NETFILTER is not set
361# CONFIG_IP_DCCP is not set 365# CONFIG_IP_DCCP is not set
362# CONFIG_IP_SCTP is not set 366# CONFIG_IP_SCTP is not set
367# CONFIG_RDS is not set
363# CONFIG_TIPC is not set 368# CONFIG_TIPC is not set
364# CONFIG_ATM is not set 369# CONFIG_ATM is not set
365# CONFIG_BRIDGE is not set 370# CONFIG_BRIDGE is not set
@@ -389,6 +394,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
389# CONFIG_AF_RXRPC is not set 394# CONFIG_AF_RXRPC is not set
390CONFIG_WIRELESS=y 395CONFIG_WIRELESS=y
391# CONFIG_CFG80211 is not set 396# CONFIG_CFG80211 is not set
397CONFIG_CFG80211_DEFAULT_PS_VALUE=0
392CONFIG_WIRELESS_OLD_REGULATORY=y 398CONFIG_WIRELESS_OLD_REGULATORY=y
393# CONFIG_WIRELESS_EXT is not set 399# CONFIG_WIRELESS_EXT is not set
394# CONFIG_LIB80211 is not set 400# CONFIG_LIB80211 is not set
@@ -396,7 +402,6 @@ CONFIG_WIRELESS_OLD_REGULATORY=y
396# 402#
397# CFG80211 needs to be enabled for MAC80211 403# CFG80211 needs to be enabled for MAC80211
398# 404#
399CONFIG_MAC80211_DEFAULT_PS_VALUE=0
400# CONFIG_WIMAX is not set 405# CONFIG_WIMAX is not set
401# CONFIG_RFKILL is not set 406# CONFIG_RFKILL is not set
402# CONFIG_NET_9P is not set 407# CONFIG_NET_9P is not set
@@ -409,6 +414,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
409# Generic Driver Options 414# Generic Driver Options
410# 415#
411CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 416CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
417# CONFIG_DEVTMPFS is not set
412CONFIG_STANDALONE=y 418CONFIG_STANDALONE=y
413CONFIG_PREVENT_FIRMWARE_BUILD=y 419CONFIG_PREVENT_FIRMWARE_BUILD=y
414CONFIG_FW_LOADER=y 420CONFIG_FW_LOADER=y
@@ -633,6 +639,7 @@ CONFIG_SCSI_LOWLEVEL=y
633# CONFIG_ISCSI_TCP is not set 639# CONFIG_ISCSI_TCP is not set
634# CONFIG_SCSI_CXGB3_ISCSI is not set 640# CONFIG_SCSI_CXGB3_ISCSI is not set
635# CONFIG_SCSI_BNX2_ISCSI is not set 641# CONFIG_SCSI_BNX2_ISCSI is not set
642# CONFIG_BE2ISCSI is not set
636# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 643# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
637# CONFIG_SCSI_3W_9XXX is not set 644# CONFIG_SCSI_3W_9XXX is not set
638# CONFIG_SCSI_ACARD is not set 645# CONFIG_SCSI_ACARD is not set
@@ -672,11 +679,14 @@ CONFIG_SCSI_LOWLEVEL=y
672# CONFIG_SCSI_DC390T is not set 679# CONFIG_SCSI_DC390T is not set
673# CONFIG_SCSI_NSP32 is not set 680# CONFIG_SCSI_NSP32 is not set
674# CONFIG_SCSI_DEBUG is not set 681# CONFIG_SCSI_DEBUG is not set
682# CONFIG_SCSI_PMCRAID is not set
675# CONFIG_SCSI_SRP is not set 683# CONFIG_SCSI_SRP is not set
684# CONFIG_SCSI_BFA_FC is not set
676# CONFIG_SCSI_DH is not set 685# CONFIG_SCSI_DH is not set
677# CONFIG_SCSI_OSD_INITIATOR is not set 686# CONFIG_SCSI_OSD_INITIATOR is not set
678CONFIG_ATA=y 687CONFIG_ATA=y
679# CONFIG_ATA_NONSTANDARD is not set 688# CONFIG_ATA_NONSTANDARD is not set
689CONFIG_ATA_VERBOSE_ERROR=y
680CONFIG_SATA_PMP=y 690CONFIG_SATA_PMP=y
681# CONFIG_SATA_AHCI is not set 691# CONFIG_SATA_AHCI is not set
682# CONFIG_SATA_SIL24 is not set 692# CONFIG_SATA_SIL24 is not set
@@ -698,6 +708,7 @@ CONFIG_SATA_MV=y
698# CONFIG_PATA_ALI is not set 708# CONFIG_PATA_ALI is not set
699# CONFIG_PATA_AMD is not set 709# CONFIG_PATA_AMD is not set
700# CONFIG_PATA_ARTOP is not set 710# CONFIG_PATA_ARTOP is not set
711# CONFIG_PATA_ATP867X is not set
701# CONFIG_PATA_ATIIXP is not set 712# CONFIG_PATA_ATIIXP is not set
702# CONFIG_PATA_CMD640_PCI is not set 713# CONFIG_PATA_CMD640_PCI is not set
703# CONFIG_PATA_CMD64X is not set 714# CONFIG_PATA_CMD64X is not set
@@ -725,6 +736,7 @@ CONFIG_SATA_MV=y
725# CONFIG_PATA_OPTIDMA is not set 736# CONFIG_PATA_OPTIDMA is not set
726# CONFIG_PATA_PDC_OLD is not set 737# CONFIG_PATA_PDC_OLD is not set
727# CONFIG_PATA_RADISYS is not set 738# CONFIG_PATA_RADISYS is not set
739# CONFIG_PATA_RDC is not set
728# CONFIG_PATA_RZ1000 is not set 740# CONFIG_PATA_RZ1000 is not set
729# CONFIG_PATA_SC1200 is not set 741# CONFIG_PATA_SC1200 is not set
730# CONFIG_PATA_SERVERWORKS is not set 742# CONFIG_PATA_SERVERWORKS is not set
@@ -823,9 +835,11 @@ CONFIG_8139TOO=y
823# CONFIG_SUNDANCE is not set 835# CONFIG_SUNDANCE is not set
824# CONFIG_TLAN is not set 836# CONFIG_TLAN is not set
825# CONFIG_KS8842 is not set 837# CONFIG_KS8842 is not set
838# CONFIG_KS8851_MLL is not set
826# CONFIG_VIA_RHINE is not set 839# CONFIG_VIA_RHINE is not set
827# CONFIG_SC92031 is not set 840# CONFIG_SC92031 is not set
828# CONFIG_ATL2 is not set 841# CONFIG_ATL2 is not set
842# CONFIG_XILINX_EMACLITE is not set
829CONFIG_NETDEV_1000=y 843CONFIG_NETDEV_1000=y
830# CONFIG_ACENIC is not set 844# CONFIG_ACENIC is not set
831# CONFIG_DL2K is not set 845# CONFIG_DL2K is not set
@@ -871,10 +885,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
871# CONFIG_SFC is not set 885# CONFIG_SFC is not set
872# CONFIG_BE2NET is not set 886# CONFIG_BE2NET is not set
873# CONFIG_TR is not set 887# CONFIG_TR is not set
874 888CONFIG_WLAN=y
875#
876# Wireless LAN
877#
878# CONFIG_WLAN_PRE80211 is not set 889# CONFIG_WLAN_PRE80211 is not set
879# CONFIG_WLAN_80211 is not set 890# CONFIG_WLAN_80211 is not set
880 891
@@ -977,6 +988,7 @@ CONFIG_LEGACY_PTY_COUNT=256
977CONFIG_DEVPORT=y 988CONFIG_DEVPORT=y
978CONFIG_I2C=y 989CONFIG_I2C=y
979CONFIG_I2C_BOARDINFO=y 990CONFIG_I2C_BOARDINFO=y
991CONFIG_I2C_COMPAT=y
980CONFIG_I2C_CHARDEV=y 992CONFIG_I2C_CHARDEV=y
981CONFIG_I2C_HELPER_AUTO=y 993CONFIG_I2C_HELPER_AUTO=y
982 994
@@ -1031,9 +1043,6 @@ CONFIG_I2C_MV64XXX=y
1031# Miscellaneous I2C Chip support 1043# Miscellaneous I2C Chip support
1032# 1044#
1033# CONFIG_DS1682 is not set 1045# CONFIG_DS1682 is not set
1034# CONFIG_SENSORS_PCF8574 is not set
1035# CONFIG_PCF8575 is not set
1036# CONFIG_SENSORS_PCA9539 is not set
1037# CONFIG_SENSORS_TSL2550 is not set 1046# CONFIG_SENSORS_TSL2550 is not set
1038# CONFIG_I2C_DEBUG_CORE is not set 1047# CONFIG_I2C_DEBUG_CORE is not set
1039# CONFIG_I2C_DEBUG_ALGO is not set 1048# CONFIG_I2C_DEBUG_ALGO is not set
@@ -1051,6 +1060,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
1051# CONFIG_POWER_SUPPLY is not set 1060# CONFIG_POWER_SUPPLY is not set
1052CONFIG_HWMON=y 1061CONFIG_HWMON=y
1053# CONFIG_HWMON_VID is not set 1062# CONFIG_HWMON_VID is not set
1063# CONFIG_HWMON_DEBUG_CHIP is not set
1064
1065#
1066# Native drivers
1067#
1054# CONFIG_SENSORS_AD7414 is not set 1068# CONFIG_SENSORS_AD7414 is not set
1055# CONFIG_SENSORS_AD7418 is not set 1069# CONFIG_SENSORS_AD7418 is not set
1056# CONFIG_SENSORS_ADM1021 is not set 1070# CONFIG_SENSORS_ADM1021 is not set
@@ -1100,6 +1114,7 @@ CONFIG_HWMON=y
1100# CONFIG_SENSORS_ADS7828 is not set 1114# CONFIG_SENSORS_ADS7828 is not set
1101# CONFIG_SENSORS_THMC50 is not set 1115# CONFIG_SENSORS_THMC50 is not set
1102# CONFIG_SENSORS_TMP401 is not set 1116# CONFIG_SENSORS_TMP401 is not set
1117# CONFIG_SENSORS_TMP421 is not set
1103# CONFIG_SENSORS_VIA686A is not set 1118# CONFIG_SENSORS_VIA686A is not set
1104# CONFIG_SENSORS_VT1211 is not set 1119# CONFIG_SENSORS_VT1211 is not set
1105# CONFIG_SENSORS_VT8231 is not set 1120# CONFIG_SENSORS_VT8231 is not set
@@ -1111,9 +1126,7 @@ CONFIG_HWMON=y
1111# CONFIG_SENSORS_W83L786NG is not set 1126# CONFIG_SENSORS_W83L786NG is not set
1112# CONFIG_SENSORS_W83627HF is not set 1127# CONFIG_SENSORS_W83627HF is not set
1113# CONFIG_SENSORS_W83627EHF is not set 1128# CONFIG_SENSORS_W83627EHF is not set
1114# CONFIG_HWMON_DEBUG_CHIP is not set
1115# CONFIG_THERMAL is not set 1129# CONFIG_THERMAL is not set
1116# CONFIG_THERMAL_HWMON is not set
1117# CONFIG_WATCHDOG is not set 1130# CONFIG_WATCHDOG is not set
1118CONFIG_SSB_POSSIBLE=y 1131CONFIG_SSB_POSSIBLE=y
1119 1132
@@ -1132,6 +1145,7 @@ CONFIG_SSB_POSSIBLE=y
1132# CONFIG_MFD_TMIO is not set 1145# CONFIG_MFD_TMIO is not set
1133# CONFIG_PMIC_DA903X is not set 1146# CONFIG_PMIC_DA903X is not set
1134# CONFIG_MFD_WM8400 is not set 1147# CONFIG_MFD_WM8400 is not set
1148# CONFIG_MFD_WM831X is not set
1135# CONFIG_MFD_WM8350_I2C is not set 1149# CONFIG_MFD_WM8350_I2C is not set
1136# CONFIG_MFD_PCF50633 is not set 1150# CONFIG_MFD_PCF50633 is not set
1137# CONFIG_AB3100_CORE is not set 1151# CONFIG_AB3100_CORE is not set
@@ -1142,6 +1156,7 @@ CONFIG_SSB_POSSIBLE=y
1142# Graphics support 1156# Graphics support
1143# 1157#
1144# CONFIG_AGP is not set 1158# CONFIG_AGP is not set
1159CONFIG_VGA_ARB=y
1145# CONFIG_DRM is not set 1160# CONFIG_DRM is not set
1146# CONFIG_VGASTATE is not set 1161# CONFIG_VGASTATE is not set
1147CONFIG_VIDEO_OUTPUT_CONTROL=y 1162CONFIG_VIDEO_OUTPUT_CONTROL=y
@@ -1162,7 +1177,6 @@ CONFIG_DUMMY_CONSOLE=y
1162# CONFIG_SOUND is not set 1177# CONFIG_SOUND is not set
1163CONFIG_HID_SUPPORT=y 1178CONFIG_HID_SUPPORT=y
1164CONFIG_HID=y 1179CONFIG_HID=y
1165# CONFIG_HID_DEBUG is not set
1166# CONFIG_HIDRAW is not set 1180# CONFIG_HIDRAW is not set
1167 1181
1168# 1182#
@@ -1186,6 +1200,7 @@ CONFIG_HID_DRAGONRISE=y
1186CONFIG_HID_EZKEY=y 1200CONFIG_HID_EZKEY=y
1187CONFIG_HID_KYE=y 1201CONFIG_HID_KYE=y
1188CONFIG_HID_GYRATION=y 1202CONFIG_HID_GYRATION=y
1203CONFIG_HID_TWINHAN=y
1189CONFIG_HID_KENSINGTON=y 1204CONFIG_HID_KENSINGTON=y
1190CONFIG_HID_LOGITECH=y 1205CONFIG_HID_LOGITECH=y
1191# CONFIG_LOGITECH_FF is not set 1206# CONFIG_LOGITECH_FF is not set
@@ -1239,6 +1254,7 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y
1239# CONFIG_USB_OXU210HP_HCD is not set 1254# CONFIG_USB_OXU210HP_HCD is not set
1240# CONFIG_USB_ISP116X_HCD is not set 1255# CONFIG_USB_ISP116X_HCD is not set
1241# CONFIG_USB_ISP1760_HCD is not set 1256# CONFIG_USB_ISP1760_HCD is not set
1257# CONFIG_USB_ISP1362_HCD is not set
1242CONFIG_USB_OHCI_HCD=y 1258CONFIG_USB_OHCI_HCD=y
1243# CONFIG_USB_OHCI_HCD_PPC_OF_BE is not set 1259# CONFIG_USB_OHCI_HCD_PPC_OF_BE is not set
1244# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set 1260# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set
@@ -1404,6 +1420,7 @@ CONFIG_FS_MBCACHE=y
1404# CONFIG_GFS2_FS is not set 1420# CONFIG_GFS2_FS is not set
1405# CONFIG_OCFS2_FS is not set 1421# CONFIG_OCFS2_FS is not set
1406# CONFIG_BTRFS_FS is not set 1422# CONFIG_BTRFS_FS is not set
1423# CONFIG_NILFS2_FS is not set
1407CONFIG_FILE_LOCKING=y 1424CONFIG_FILE_LOCKING=y
1408CONFIG_FSNOTIFY=y 1425CONFIG_FSNOTIFY=y
1409CONFIG_DNOTIFY=y 1426CONFIG_DNOTIFY=y
@@ -1463,7 +1480,6 @@ CONFIG_MISC_FILESYSTEMS=y
1463# CONFIG_ROMFS_FS is not set 1480# CONFIG_ROMFS_FS is not set
1464# CONFIG_SYSV_FS is not set 1481# CONFIG_SYSV_FS is not set
1465# CONFIG_UFS_FS is not set 1482# CONFIG_UFS_FS is not set
1466# CONFIG_NILFS2_FS is not set
1467CONFIG_NETWORK_FILESYSTEMS=y 1483CONFIG_NETWORK_FILESYSTEMS=y
1468CONFIG_NFS_FS=y 1484CONFIG_NFS_FS=y
1469# CONFIG_NFS_V3 is not set 1485# CONFIG_NFS_V3 is not set
@@ -1576,6 +1592,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
1576CONFIG_ENABLE_MUST_CHECK=y 1592CONFIG_ENABLE_MUST_CHECK=y
1577CONFIG_FRAME_WARN=1024 1593CONFIG_FRAME_WARN=1024
1578# CONFIG_MAGIC_SYSRQ is not set 1594# CONFIG_MAGIC_SYSRQ is not set
1595# CONFIG_STRIP_ASM_SYMS is not set
1579# CONFIG_UNUSED_SYMBOLS is not set 1596# CONFIG_UNUSED_SYMBOLS is not set
1580# CONFIG_DEBUG_FS is not set 1597# CONFIG_DEBUG_FS is not set
1581# CONFIG_HEADERS_CHECK is not set 1598# CONFIG_HEADERS_CHECK is not set
@@ -1593,6 +1610,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
1593CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1610CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1594CONFIG_TRACING_SUPPORT=y 1611CONFIG_TRACING_SUPPORT=y
1595# CONFIG_FTRACE is not set 1612# CONFIG_FTRACE is not set
1613# CONFIG_DMA_API_DEBUG is not set
1596# CONFIG_SAMPLES is not set 1614# CONFIG_SAMPLES is not set
1597CONFIG_HAVE_ARCH_KGDB=y 1615CONFIG_HAVE_ARCH_KGDB=y
1598# CONFIG_PPC_DISABLE_WERROR is not set 1616# CONFIG_PPC_DISABLE_WERROR is not set
@@ -1614,7 +1632,6 @@ CONFIG_CRYPTO=y
1614# 1632#
1615# Crypto core or helper 1633# Crypto core or helper
1616# 1634#
1617# CONFIG_CRYPTO_FIPS is not set
1618# CONFIG_CRYPTO_MANAGER is not set 1635# CONFIG_CRYPTO_MANAGER is not set
1619# CONFIG_CRYPTO_MANAGER2 is not set 1636# CONFIG_CRYPTO_MANAGER2 is not set
1620# CONFIG_CRYPTO_GF128MUL is not set 1637# CONFIG_CRYPTO_GF128MUL is not set
@@ -1645,11 +1662,13 @@ CONFIG_CRYPTO=y
1645# 1662#
1646# CONFIG_CRYPTO_HMAC is not set 1663# CONFIG_CRYPTO_HMAC is not set
1647# CONFIG_CRYPTO_XCBC is not set 1664# CONFIG_CRYPTO_XCBC is not set
1665# CONFIG_CRYPTO_VMAC is not set
1648 1666
1649# 1667#
1650# Digest 1668# Digest
1651# 1669#
1652# CONFIG_CRYPTO_CRC32C is not set 1670# CONFIG_CRYPTO_CRC32C is not set
1671# CONFIG_CRYPTO_GHASH is not set
1653# CONFIG_CRYPTO_MD4 is not set 1672# CONFIG_CRYPTO_MD4 is not set
1654# CONFIG_CRYPTO_MD5 is not set 1673# CONFIG_CRYPTO_MD5 is not set
1655# CONFIG_CRYPTO_MICHAEL_MIC is not set 1674# CONFIG_CRYPTO_MICHAEL_MIC is not set
diff --git a/arch/powerpc/configs/storcenter_defconfig b/arch/powerpc/configs/storcenter_defconfig
index 28384dc01003..524263158fc0 100644
--- a/arch/powerpc/configs/storcenter_defconfig
+++ b/arch/powerpc/configs/storcenter_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.31-rc4 3# Linux kernel version: 2.6.32-rc5
4# Wed Jul 29 23:32:01 2009 4# Thu Nov 5 08:20:19 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -34,6 +34,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
34CONFIG_GENERIC_HARDIRQS=y 34CONFIG_GENERIC_HARDIRQS=y
35CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 35CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
37# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
37CONFIG_IRQ_PER_CPU=y 38CONFIG_IRQ_PER_CPU=y
38CONFIG_STACKTRACE_SUPPORT=y 39CONFIG_STACKTRACE_SUPPORT=y
39CONFIG_HAVE_LATENCYTOP_SUPPORT=y 40CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -82,11 +83,12 @@ CONFIG_SYSVIPC_SYSCTL=y
82# 83#
83# RCU Subsystem 84# RCU Subsystem
84# 85#
85CONFIG_CLASSIC_RCU=y 86CONFIG_TREE_RCU=y
86# CONFIG_TREE_RCU is not set 87# CONFIG_TREE_PREEMPT_RCU is not set
87# CONFIG_PREEMPT_RCU is not set 88# CONFIG_RCU_TRACE is not set
89CONFIG_RCU_FANOUT=32
90# CONFIG_RCU_FANOUT_EXACT is not set
88# CONFIG_TREE_RCU_TRACE is not set 91# CONFIG_TREE_RCU_TRACE is not set
89# CONFIG_PREEMPT_RCU_TRACE is not set
90# CONFIG_IKCONFIG is not set 92# CONFIG_IKCONFIG is not set
91CONFIG_LOG_BUF_SHIFT=14 93CONFIG_LOG_BUF_SHIFT=14
92CONFIG_GROUP_SCHED=y 94CONFIG_GROUP_SCHED=y
@@ -118,28 +120,29 @@ CONFIG_TIMERFD=y
118CONFIG_EVENTFD=y 120CONFIG_EVENTFD=y
119CONFIG_SHMEM=y 121CONFIG_SHMEM=y
120CONFIG_AIO=y 122CONFIG_AIO=y
121CONFIG_HAVE_PERF_COUNTERS=y 123CONFIG_HAVE_PERF_EVENTS=y
122 124
123# 125#
124# Performance Counters 126# Kernel Performance Events And Counters
125# 127#
128# CONFIG_PERF_EVENTS is not set
126# CONFIG_PERF_COUNTERS is not set 129# CONFIG_PERF_COUNTERS is not set
127CONFIG_VM_EVENT_COUNTERS=y 130CONFIG_VM_EVENT_COUNTERS=y
128CONFIG_PCI_QUIRKS=y 131CONFIG_PCI_QUIRKS=y
129CONFIG_SLUB_DEBUG=y 132CONFIG_SLUB_DEBUG=y
130# CONFIG_STRIP_ASM_SYMS is not set
131CONFIG_COMPAT_BRK=y 133CONFIG_COMPAT_BRK=y
132# CONFIG_SLAB is not set 134# CONFIG_SLAB is not set
133CONFIG_SLUB=y 135CONFIG_SLUB=y
134# CONFIG_SLOB is not set 136# CONFIG_SLOB is not set
135# CONFIG_PROFILING is not set 137# CONFIG_PROFILING is not set
136# CONFIG_MARKERS is not set
137CONFIG_HAVE_OPROFILE=y 138CONFIG_HAVE_OPROFILE=y
138CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 139CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
139CONFIG_HAVE_IOREMAP_PROT=y 140CONFIG_HAVE_IOREMAP_PROT=y
140CONFIG_HAVE_KPROBES=y 141CONFIG_HAVE_KPROBES=y
141CONFIG_HAVE_KRETPROBES=y 142CONFIG_HAVE_KRETPROBES=y
142CONFIG_HAVE_ARCH_TRACEHOOK=y 143CONFIG_HAVE_ARCH_TRACEHOOK=y
144CONFIG_HAVE_DMA_ATTRS=y
145CONFIG_HAVE_DMA_API_DEBUG=y
143 146
144# 147#
145# GCOV-based kernel profiling 148# GCOV-based kernel profiling
@@ -243,6 +246,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
243CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 246CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
244# CONFIG_KEXEC is not set 247# CONFIG_KEXEC is not set
245# CONFIG_CRASH_DUMP is not set 248# CONFIG_CRASH_DUMP is not set
249CONFIG_MAX_ACTIVE_REGIONS=32
246CONFIG_ARCH_FLATMEM_ENABLE=y 250CONFIG_ARCH_FLATMEM_ENABLE=y
247CONFIG_ARCH_POPULATES_NODE_MAP=y 251CONFIG_ARCH_POPULATES_NODE_MAP=y
248CONFIG_SELECT_MEMORY_MODEL=y 252CONFIG_SELECT_MEMORY_MODEL=y
@@ -260,6 +264,7 @@ CONFIG_BOUNCE=y
260CONFIG_VIRT_TO_BUS=y 264CONFIG_VIRT_TO_BUS=y
261CONFIG_HAVE_MLOCK=y 265CONFIG_HAVE_MLOCK=y
262CONFIG_HAVE_MLOCKED_PAGE_BIT=y 266CONFIG_HAVE_MLOCKED_PAGE_BIT=y
267# CONFIG_KSM is not set
263CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 268CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
264CONFIG_PPC_4K_PAGES=y 269CONFIG_PPC_4K_PAGES=y
265# CONFIG_PPC_16K_PAGES is not set 270# CONFIG_PPC_16K_PAGES is not set
@@ -349,6 +354,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
349# CONFIG_NETFILTER is not set 354# CONFIG_NETFILTER is not set
350# CONFIG_IP_DCCP is not set 355# CONFIG_IP_DCCP is not set
351# CONFIG_IP_SCTP is not set 356# CONFIG_IP_SCTP is not set
357# CONFIG_RDS is not set
352# CONFIG_TIPC is not set 358# CONFIG_TIPC is not set
353# CONFIG_ATM is not set 359# CONFIG_ATM is not set
354# CONFIG_BRIDGE is not set 360# CONFIG_BRIDGE is not set
@@ -378,6 +384,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
378# CONFIG_AF_RXRPC is not set 384# CONFIG_AF_RXRPC is not set
379CONFIG_WIRELESS=y 385CONFIG_WIRELESS=y
380# CONFIG_CFG80211 is not set 386# CONFIG_CFG80211 is not set
387CONFIG_CFG80211_DEFAULT_PS_VALUE=0
381CONFIG_WIRELESS_OLD_REGULATORY=y 388CONFIG_WIRELESS_OLD_REGULATORY=y
382# CONFIG_WIRELESS_EXT is not set 389# CONFIG_WIRELESS_EXT is not set
383# CONFIG_LIB80211 is not set 390# CONFIG_LIB80211 is not set
@@ -385,7 +392,6 @@ CONFIG_WIRELESS_OLD_REGULATORY=y
385# 392#
386# CFG80211 needs to be enabled for MAC80211 393# CFG80211 needs to be enabled for MAC80211
387# 394#
388CONFIG_MAC80211_DEFAULT_PS_VALUE=0
389# CONFIG_WIMAX is not set 395# CONFIG_WIMAX is not set
390# CONFIG_RFKILL is not set 396# CONFIG_RFKILL is not set
391# CONFIG_NET_9P is not set 397# CONFIG_NET_9P is not set
@@ -398,6 +404,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
398# Generic Driver Options 404# Generic Driver Options
399# 405#
400CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 406CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
407# CONFIG_DEVTMPFS is not set
401CONFIG_STANDALONE=y 408CONFIG_STANDALONE=y
402CONFIG_PREVENT_FIRMWARE_BUILD=y 409CONFIG_PREVENT_FIRMWARE_BUILD=y
403# CONFIG_FW_LOADER is not set 410# CONFIG_FW_LOADER is not set
@@ -405,9 +412,9 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
405# CONFIG_CONNECTOR is not set 412# CONFIG_CONNECTOR is not set
406CONFIG_MTD=y 413CONFIG_MTD=y
407# CONFIG_MTD_DEBUG is not set 414# CONFIG_MTD_DEBUG is not set
415# CONFIG_MTD_TESTS is not set
408# CONFIG_MTD_CONCAT is not set 416# CONFIG_MTD_CONCAT is not set
409CONFIG_MTD_PARTITIONS=y 417CONFIG_MTD_PARTITIONS=y
410# CONFIG_MTD_TESTS is not set
411# CONFIG_MTD_REDBOOT_PARTS is not set 418# CONFIG_MTD_REDBOOT_PARTS is not set
412CONFIG_MTD_CMDLINE_PARTS=y 419CONFIG_MTD_CMDLINE_PARTS=y
413CONFIG_MTD_OF_PARTS=y 420CONFIG_MTD_OF_PARTS=y
@@ -619,6 +626,7 @@ CONFIG_SCSI_SPI_ATTRS=y
619CONFIG_SCSI_LOWLEVEL=y 626CONFIG_SCSI_LOWLEVEL=y
620# CONFIG_ISCSI_TCP is not set 627# CONFIG_ISCSI_TCP is not set
621# CONFIG_SCSI_BNX2_ISCSI is not set 628# CONFIG_SCSI_BNX2_ISCSI is not set
629# CONFIG_BE2ISCSI is not set
622# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 630# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
623# CONFIG_SCSI_3W_9XXX is not set 631# CONFIG_SCSI_3W_9XXX is not set
624# CONFIG_SCSI_ACARD is not set 632# CONFIG_SCSI_ACARD is not set
@@ -657,7 +665,9 @@ CONFIG_SCSI_LOWLEVEL=y
657# CONFIG_SCSI_DC390T is not set 665# CONFIG_SCSI_DC390T is not set
658# CONFIG_SCSI_NSP32 is not set 666# CONFIG_SCSI_NSP32 is not set
659# CONFIG_SCSI_DEBUG is not set 667# CONFIG_SCSI_DEBUG is not set
668# CONFIG_SCSI_PMCRAID is not set
660# CONFIG_SCSI_SRP is not set 669# CONFIG_SCSI_SRP is not set
670# CONFIG_SCSI_BFA_FC is not set
661# CONFIG_SCSI_DH is not set 671# CONFIG_SCSI_DH is not set
662# CONFIG_SCSI_OSD_INITIATOR is not set 672# CONFIG_SCSI_OSD_INITIATOR is not set
663# CONFIG_ATA is not set 673# CONFIG_ATA is not set
@@ -670,6 +680,7 @@ CONFIG_MD_RAID1=y
670# CONFIG_MD_RAID10 is not set 680# CONFIG_MD_RAID10 is not set
671CONFIG_MD_RAID456=y 681CONFIG_MD_RAID456=y
672CONFIG_MD_RAID6_PQ=y 682CONFIG_MD_RAID6_PQ=y
683# CONFIG_ASYNC_RAID6_TEST is not set
673# CONFIG_MD_MULTIPATH is not set 684# CONFIG_MD_MULTIPATH is not set
674# CONFIG_MD_FAULTY is not set 685# CONFIG_MD_FAULTY is not set
675# CONFIG_BLK_DEV_DM is not set 686# CONFIG_BLK_DEV_DM is not set
@@ -729,10 +740,7 @@ CONFIG_R8169=y
729# CONFIG_JME is not set 740# CONFIG_JME is not set
730# CONFIG_NETDEV_10000 is not set 741# CONFIG_NETDEV_10000 is not set
731# CONFIG_TR is not set 742# CONFIG_TR is not set
732 743CONFIG_WLAN=y
733#
734# Wireless LAN
735#
736# CONFIG_WLAN_PRE80211 is not set 744# CONFIG_WLAN_PRE80211 is not set
737# CONFIG_WLAN_80211 is not set 745# CONFIG_WLAN_80211 is not set
738 746
@@ -813,6 +821,7 @@ CONFIG_NVRAM=y
813CONFIG_DEVPORT=y 821CONFIG_DEVPORT=y
814CONFIG_I2C=y 822CONFIG_I2C=y
815CONFIG_I2C_BOARDINFO=y 823CONFIG_I2C_BOARDINFO=y
824CONFIG_I2C_COMPAT=y
816CONFIG_I2C_CHARDEV=y 825CONFIG_I2C_CHARDEV=y
817CONFIG_I2C_HELPER_AUTO=y 826CONFIG_I2C_HELPER_AUTO=y
818 827
@@ -867,9 +876,6 @@ CONFIG_I2C_MPC=y
867# Miscellaneous I2C Chip support 876# Miscellaneous I2C Chip support
868# 877#
869# CONFIG_DS1682 is not set 878# CONFIG_DS1682 is not set
870# CONFIG_SENSORS_PCF8574 is not set
871# CONFIG_PCF8575 is not set
872# CONFIG_SENSORS_PCA9539 is not set
873# CONFIG_SENSORS_TSL2550 is not set 879# CONFIG_SENSORS_TSL2550 is not set
874# CONFIG_I2C_DEBUG_CORE is not set 880# CONFIG_I2C_DEBUG_CORE is not set
875# CONFIG_I2C_DEBUG_ALGO is not set 881# CONFIG_I2C_DEBUG_ALGO is not set
@@ -887,7 +893,6 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
887# CONFIG_POWER_SUPPLY is not set 893# CONFIG_POWER_SUPPLY is not set
888# CONFIG_HWMON is not set 894# CONFIG_HWMON is not set
889# CONFIG_THERMAL is not set 895# CONFIG_THERMAL is not set
890# CONFIG_THERMAL_HWMON is not set
891# CONFIG_WATCHDOG is not set 896# CONFIG_WATCHDOG is not set
892CONFIG_SSB_POSSIBLE=y 897CONFIG_SSB_POSSIBLE=y
893 898
@@ -906,6 +911,7 @@ CONFIG_SSB_POSSIBLE=y
906# CONFIG_MFD_TMIO is not set 911# CONFIG_MFD_TMIO is not set
907# CONFIG_PMIC_DA903X is not set 912# CONFIG_PMIC_DA903X is not set
908# CONFIG_MFD_WM8400 is not set 913# CONFIG_MFD_WM8400 is not set
914# CONFIG_MFD_WM831X is not set
909# CONFIG_MFD_WM8350_I2C is not set 915# CONFIG_MFD_WM8350_I2C is not set
910# CONFIG_MFD_PCF50633 is not set 916# CONFIG_MFD_PCF50633 is not set
911# CONFIG_AB3100_CORE is not set 917# CONFIG_AB3100_CORE is not set
@@ -916,6 +922,7 @@ CONFIG_SSB_POSSIBLE=y
916# Graphics support 922# Graphics support
917# 923#
918# CONFIG_AGP is not set 924# CONFIG_AGP is not set
925CONFIG_VGA_ARB=y
919# CONFIG_DRM is not set 926# CONFIG_DRM is not set
920# CONFIG_VGASTATE is not set 927# CONFIG_VGASTATE is not set
921# CONFIG_VIDEO_OUTPUT_CONTROL is not set 928# CONFIG_VIDEO_OUTPUT_CONTROL is not set
@@ -961,6 +968,7 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y
961# CONFIG_USB_OXU210HP_HCD is not set 968# CONFIG_USB_OXU210HP_HCD is not set
962# CONFIG_USB_ISP116X_HCD is not set 969# CONFIG_USB_ISP116X_HCD is not set
963# CONFIG_USB_ISP1760_HCD is not set 970# CONFIG_USB_ISP1760_HCD is not set
971# CONFIG_USB_ISP1362_HCD is not set
964CONFIG_USB_OHCI_HCD=y 972CONFIG_USB_OHCI_HCD=y
965# CONFIG_USB_OHCI_HCD_PPC_OF_BE is not set 973# CONFIG_USB_OHCI_HCD_PPC_OF_BE is not set
966# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set 974# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set
@@ -1141,6 +1149,7 @@ CONFIG_XFS_FS=m
1141# CONFIG_GFS2_FS is not set 1149# CONFIG_GFS2_FS is not set
1142# CONFIG_OCFS2_FS is not set 1150# CONFIG_OCFS2_FS is not set
1143# CONFIG_BTRFS_FS is not set 1151# CONFIG_BTRFS_FS is not set
1152# CONFIG_NILFS2_FS is not set
1144CONFIG_FILE_LOCKING=y 1153CONFIG_FILE_LOCKING=y
1145CONFIG_FSNOTIFY=y 1154CONFIG_FSNOTIFY=y
1146CONFIG_DNOTIFY=y 1155CONFIG_DNOTIFY=y
@@ -1210,7 +1219,6 @@ CONFIG_JFFS2_RTIME=y
1210# CONFIG_ROMFS_FS is not set 1219# CONFIG_ROMFS_FS is not set
1211# CONFIG_SYSV_FS is not set 1220# CONFIG_SYSV_FS is not set
1212# CONFIG_UFS_FS is not set 1221# CONFIG_UFS_FS is not set
1213# CONFIG_NILFS2_FS is not set
1214# CONFIG_NETWORK_FILESYSTEMS is not set 1222# CONFIG_NETWORK_FILESYSTEMS is not set
1215CONFIG_EXPORTFS=m 1223CONFIG_EXPORTFS=m
1216 1224
@@ -1307,6 +1315,7 @@ CONFIG_GENERIC_ATOMIC64=y
1307# CONFIG_ENABLE_MUST_CHECK is not set 1315# CONFIG_ENABLE_MUST_CHECK is not set
1308CONFIG_FRAME_WARN=1024 1316CONFIG_FRAME_WARN=1024
1309# CONFIG_MAGIC_SYSRQ is not set 1317# CONFIG_MAGIC_SYSRQ is not set
1318# CONFIG_STRIP_ASM_SYMS is not set
1310# CONFIG_UNUSED_SYMBOLS is not set 1319# CONFIG_UNUSED_SYMBOLS is not set
1311# CONFIG_DEBUG_FS is not set 1320# CONFIG_DEBUG_FS is not set
1312# CONFIG_HEADERS_CHECK is not set 1321# CONFIG_HEADERS_CHECK is not set
@@ -1324,6 +1333,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
1324CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1333CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1325CONFIG_TRACING_SUPPORT=y 1334CONFIG_TRACING_SUPPORT=y
1326# CONFIG_FTRACE is not set 1335# CONFIG_FTRACE is not set
1336# CONFIG_DMA_API_DEBUG is not set
1327# CONFIG_SAMPLES is not set 1337# CONFIG_SAMPLES is not set
1328CONFIG_HAVE_ARCH_KGDB=y 1338CONFIG_HAVE_ARCH_KGDB=y
1329# CONFIG_PPC_DISABLE_WERROR is not set 1339# CONFIG_PPC_DISABLE_WERROR is not set
@@ -1344,6 +1354,8 @@ CONFIG_XOR_BLOCKS=y
1344CONFIG_ASYNC_CORE=y 1354CONFIG_ASYNC_CORE=y
1345CONFIG_ASYNC_MEMCPY=y 1355CONFIG_ASYNC_MEMCPY=y
1346CONFIG_ASYNC_XOR=y 1356CONFIG_ASYNC_XOR=y
1357CONFIG_ASYNC_PQ=y
1358CONFIG_ASYNC_RAID6_RECOV=y
1347# CONFIG_CRYPTO is not set 1359# CONFIG_CRYPTO is not set
1348# CONFIG_PPC_CLOCK is not set 1360# CONFIG_PPC_CLOCK is not set
1349# CONFIG_VIRTUALIZATION is not set 1361# CONFIG_VIRTUALIZATION is not set
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index 92dc844299b6..a136a11c490d 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -777,7 +777,7 @@ int update_persistent_clock(struct timespec now)
777 return ppc_md.set_rtc_time(&tm); 777 return ppc_md.set_rtc_time(&tm);
778} 778}
779 779
780void read_persistent_clock(struct timespec *ts) 780static void __read_persistent_clock(struct timespec *ts)
781{ 781{
782 struct rtc_time tm; 782 struct rtc_time tm;
783 static int first = 1; 783 static int first = 1;
@@ -800,10 +800,23 @@ void read_persistent_clock(struct timespec *ts)
800 return; 800 return;
801 } 801 }
802 ppc_md.get_rtc_time(&tm); 802 ppc_md.get_rtc_time(&tm);
803
803 ts->tv_sec = mktime(tm.tm_year+1900, tm.tm_mon+1, tm.tm_mday, 804 ts->tv_sec = mktime(tm.tm_year+1900, tm.tm_mon+1, tm.tm_mday,
804 tm.tm_hour, tm.tm_min, tm.tm_sec); 805 tm.tm_hour, tm.tm_min, tm.tm_sec);
805} 806}
806 807
808void read_persistent_clock(struct timespec *ts)
809{
810 __read_persistent_clock(ts);
811
812 /* Sanitize it in case real time clock is set below EPOCH */
813 if (ts->tv_sec < 0) {
814 ts->tv_sec = 0;
815 ts->tv_nsec = 0;
816 }
817
818}
819
807/* clocksource code */ 820/* clocksource code */
808static cycle_t rtc_read(struct clocksource *cs) 821static cycle_t rtc_read(struct clocksource *cs)
809{ 822{
diff --git a/arch/powerpc/kvm/timing.h b/arch/powerpc/kvm/timing.h
index bb13b1f3cd5a..806ef67868bd 100644
--- a/arch/powerpc/kvm/timing.h
+++ b/arch/powerpc/kvm/timing.h
@@ -48,7 +48,11 @@ static inline void kvmppc_set_exit_type(struct kvm_vcpu *vcpu, int type) {}
48static inline void kvmppc_account_exit_stat(struct kvm_vcpu *vcpu, int type) 48static inline void kvmppc_account_exit_stat(struct kvm_vcpu *vcpu, int type)
49{ 49{
50 /* type has to be known at build time for optimization */ 50 /* type has to be known at build time for optimization */
51
52 /* The BUILD_BUG_ON below breaks in funny ways, commented out
53 * for now ... -BenH
51 BUILD_BUG_ON(__builtin_constant_p(type)); 54 BUILD_BUG_ON(__builtin_constant_p(type));
55 */
52 switch (type) { 56 switch (type) {
53 case EXT_INTR_EXITS: 57 case EXT_INTR_EXITS:
54 vcpu->stat.ext_intr_exits++; 58 vcpu->stat.ext_intr_exits++;
diff --git a/arch/powerpc/mm/mmu_context_nohash.c b/arch/powerpc/mm/mmu_context_nohash.c
index c2f93dc470e6..be4f34c30a0b 100644
--- a/arch/powerpc/mm/mmu_context_nohash.c
+++ b/arch/powerpc/mm/mmu_context_nohash.c
@@ -25,8 +25,8 @@
25 * also clear mm->cpu_vm_mask bits when processes are migrated 25 * also clear mm->cpu_vm_mask bits when processes are migrated
26 */ 26 */
27 27
28#define DEBUG_MAP_CONSISTENCY 28//#define DEBUG_MAP_CONSISTENCY
29#define DEBUG_CLAMP_LAST_CONTEXT 31 29//#define DEBUG_CLAMP_LAST_CONTEXT 31
30//#define DEBUG_HARDER 30//#define DEBUG_HARDER
31 31
32/* We don't use DEBUG because it tends to be compiled in always nowadays 32/* We don't use DEBUG because it tends to be compiled in always nowadays
diff --git a/arch/powerpc/platforms/82xx/ep8248e.c b/arch/powerpc/platforms/82xx/ep8248e.c
index 51fcae41f08a..f9aee182e6f7 100644
--- a/arch/powerpc/platforms/82xx/ep8248e.c
+++ b/arch/powerpc/platforms/82xx/ep8248e.c
@@ -132,12 +132,25 @@ static int __devinit ep8248e_mdio_probe(struct of_device *ofdev,
132 return -ENOMEM; 132 return -ENOMEM;
133 133
134 bus->irq = kmalloc(sizeof(int) * PHY_MAX_ADDR, GFP_KERNEL); 134 bus->irq = kmalloc(sizeof(int) * PHY_MAX_ADDR, GFP_KERNEL);
135 if (bus->irq == NULL) {
136 ret = -ENOMEM;
137 goto err_free_bus;
138 }
135 139
136 bus->name = "ep8248e-mdio-bitbang"; 140 bus->name = "ep8248e-mdio-bitbang";
137 bus->parent = &ofdev->dev; 141 bus->parent = &ofdev->dev;
138 snprintf(bus->id, MII_BUS_ID_SIZE, "%x", res.start); 142 snprintf(bus->id, MII_BUS_ID_SIZE, "%x", res.start);
139 143
140 return of_mdiobus_register(bus, ofdev->node); 144 ret = of_mdiobus_register(bus, ofdev->node);
145 if (ret)
146 goto err_free_irq;
147
148 return 0;
149err_free_irq:
150 kfree(bus->irq);
151err_free_bus:
152 free_mdio_bitbang(bus);
153 return ret;
141} 154}
142 155
143static int ep8248e_mdio_remove(struct of_device *ofdev) 156static int ep8248e_mdio_remove(struct of_device *ofdev)
diff --git a/arch/powerpc/platforms/pseries/msi.c b/arch/powerpc/platforms/pseries/msi.c
index bf2e1ac41308..1164c3430f2c 100644
--- a/arch/powerpc/platforms/pseries/msi.c
+++ b/arch/powerpc/platforms/pseries/msi.c
@@ -432,8 +432,6 @@ static int rtas_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)
432 /* Read config space back so we can restore after reset */ 432 /* Read config space back so we can restore after reset */
433 read_msi_msg(virq, &msg); 433 read_msi_msg(virq, &msg);
434 entry->msg = msg; 434 entry->msg = msg;
435
436 unmask_msi_irq(virq);
437 } 435 }
438 436
439 return 0; 437 return 0;
diff --git a/arch/powerpc/platforms/pseries/xics.c b/arch/powerpc/platforms/pseries/xics.c
index 419f8a637ffe..b9bf0eedccf2 100644
--- a/arch/powerpc/platforms/pseries/xics.c
+++ b/arch/powerpc/platforms/pseries/xics.c
@@ -18,6 +18,7 @@
18#include <linux/init.h> 18#include <linux/init.h>
19#include <linux/radix-tree.h> 19#include <linux/radix-tree.h>
20#include <linux/cpu.h> 20#include <linux/cpu.h>
21#include <linux/msi.h>
21#include <linux/of.h> 22#include <linux/of.h>
22 23
23#include <asm/firmware.h> 24#include <asm/firmware.h>
@@ -219,6 +220,14 @@ static void xics_unmask_irq(unsigned int virq)
219 220
220static unsigned int xics_startup(unsigned int virq) 221static unsigned int xics_startup(unsigned int virq)
221{ 222{
223 /*
224 * The generic MSI code returns with the interrupt disabled on the
225 * card, using the MSI mask bits. Firmware doesn't appear to unmask
226 * at that level, so we do it here by hand.
227 */
228 if (irq_to_desc(virq)->msi_desc)
229 unmask_msi_irq(virq);
230
222 /* unmask it */ 231 /* unmask it */
223 xics_unmask_irq(virq); 232 xics_unmask_irq(virq);
224 return 0; 233 return 0;
diff --git a/arch/sh/include/asm/rwsem.h b/arch/sh/include/asm/rwsem.h
index 1987f3ea7f1b..06e2251a5e48 100644
--- a/arch/sh/include/asm/rwsem.h
+++ b/arch/sh/include/asm/rwsem.h
@@ -41,7 +41,7 @@ struct rw_semaphore {
41#endif 41#endif
42 42
43#define __RWSEM_INITIALIZER(name) \ 43#define __RWSEM_INITIALIZER(name) \
44 { RWSEM_UNLOCKED_VALUE, SPIN_LOCK_UNLOCKED, \ 44 { RWSEM_UNLOCKED_VALUE, __SPIN_LOCK_UNLOCKED((name).wait_lock), \
45 LIST_HEAD_INIT((name).wait_list) \ 45 LIST_HEAD_INIT((name).wait_list) \
46 __RWSEM_DEP_MAP_INIT(name) } 46 __RWSEM_DEP_MAP_INIT(name) }
47 47
diff --git a/arch/sh/kernel/dwarf.c b/arch/sh/kernel/dwarf.c
index 2d07084e4882..d76a23170dbb 100644
--- a/arch/sh/kernel/dwarf.c
+++ b/arch/sh/kernel/dwarf.c
@@ -555,7 +555,7 @@ struct dwarf_frame * dwarf_unwind_stack(unsigned long pc,
555 * NOTE: the return address is guaranteed to be setup by the 555 * NOTE: the return address is guaranteed to be setup by the
556 * time this function makes its first function call. 556 * time this function makes its first function call.
557 */ 557 */
558 if (!pc && !prev) 558 if (!pc || !prev)
559 pc = (unsigned long)current_text_addr(); 559 pc = (unsigned long)current_text_addr();
560 560
561#ifdef CONFIG_FUNCTION_GRAPH_TRACER 561#ifdef CONFIG_FUNCTION_GRAPH_TRACER
diff --git a/arch/sh/mm/cache-sh4.c b/arch/sh/mm/cache-sh4.c
index 519e2d16cd06..b7f235c74d66 100644
--- a/arch/sh/mm/cache-sh4.c
+++ b/arch/sh/mm/cache-sh4.c
@@ -72,6 +72,7 @@ static void __uses_jump_to_uncached sh4_flush_icache_range(void *args)
72 72
73 for (v = start; v < end; v += L1_CACHE_BYTES) { 73 for (v = start; v < end; v += L1_CACHE_BYTES) {
74 unsigned long icacheaddr; 74 unsigned long icacheaddr;
75 int j, n;
75 76
76 __ocbwb(v); 77 __ocbwb(v);
77 78
@@ -79,8 +80,10 @@ static void __uses_jump_to_uncached sh4_flush_icache_range(void *args)
79 cpu_data->icache.entry_mask); 80 cpu_data->icache.entry_mask);
80 81
81 /* Clear i-cache line valid-bit */ 82 /* Clear i-cache line valid-bit */
83 n = boot_cpu_data.icache.n_aliases;
82 for (i = 0; i < cpu_data->icache.ways; i++) { 84 for (i = 0; i < cpu_data->icache.ways; i++) {
83 __raw_writel(0, icacheaddr); 85 for (j = 0; j < n; j++)
86 __raw_writel(0, icacheaddr + (j * PAGE_SIZE));
84 icacheaddr += cpu_data->icache.way_incr; 87 icacheaddr += cpu_data->icache.way_incr;
85 } 88 }
86 } 89 }
diff --git a/arch/sparc/include/asm/system_64.h b/arch/sparc/include/asm/system_64.h
index 25e848f0cad7..d47a98e66972 100644
--- a/arch/sparc/include/asm/system_64.h
+++ b/arch/sparc/include/asm/system_64.h
@@ -63,6 +63,10 @@ do { __asm__ __volatile__("ba,pt %%xcc, 1f\n\t" \
63 : : : "memory"); \ 63 : : : "memory"); \
64} while (0) 64} while (0)
65 65
66/* The kernel always executes in TSO memory model these days,
67 * and furthermore most sparc64 chips implement more stringent
68 * memory ordering than required by the specifications.
69 */
66#define mb() membar_safe("#StoreLoad") 70#define mb() membar_safe("#StoreLoad")
67#define rmb() __asm__ __volatile__("":::"memory") 71#define rmb() __asm__ __volatile__("":::"memory")
68#define wmb() __asm__ __volatile__("":::"memory") 72#define wmb() __asm__ __volatile__("":::"memory")
diff --git a/arch/sparc/kernel/prom_common.c b/arch/sparc/kernel/prom_common.c
index 138910c67206..d80a65d9e893 100644
--- a/arch/sparc/kernel/prom_common.c
+++ b/arch/sparc/kernel/prom_common.c
@@ -79,6 +79,7 @@ int of_set_property(struct device_node *dp, const char *name, void *val, int len
79 79
80 err = -ENODEV; 80 err = -ENODEV;
81 81
82 mutex_lock(&of_set_property_mutex);
82 write_lock(&devtree_lock); 83 write_lock(&devtree_lock);
83 prevp = &dp->properties; 84 prevp = &dp->properties;
84 while (*prevp) { 85 while (*prevp) {
@@ -88,9 +89,7 @@ int of_set_property(struct device_node *dp, const char *name, void *val, int len
88 void *old_val = prop->value; 89 void *old_val = prop->value;
89 int ret; 90 int ret;
90 91
91 mutex_lock(&of_set_property_mutex);
92 ret = prom_setprop(dp->node, name, val, len); 92 ret = prom_setprop(dp->node, name, val, len);
93 mutex_unlock(&of_set_property_mutex);
94 93
95 err = -EINVAL; 94 err = -EINVAL;
96 if (ret >= 0) { 95 if (ret >= 0) {
@@ -109,6 +108,7 @@ int of_set_property(struct device_node *dp, const char *name, void *val, int len
109 prevp = &(*prevp)->next; 108 prevp = &(*prevp)->next;
110 } 109 }
111 write_unlock(&devtree_lock); 110 write_unlock(&devtree_lock);
111 mutex_unlock(&of_set_property_mutex);
112 112
113 /* XXX Upate procfs if necessary... */ 113 /* XXX Upate procfs if necessary... */
114 114
diff --git a/arch/sparc/kernel/visemul.c b/arch/sparc/kernel/visemul.c
index b956fd71c131..d231cbd5c526 100644
--- a/arch/sparc/kernel/visemul.c
+++ b/arch/sparc/kernel/visemul.c
@@ -617,7 +617,7 @@ static void pmul(struct pt_regs *regs, unsigned int insn, unsigned int opf)
617 rs2 = fps_regval(f, RS2(insn)); 617 rs2 = fps_regval(f, RS2(insn));
618 618
619 rd_val = 0; 619 rd_val = 0;
620 src2 = (rs2 >> (opf == FMUL8x16AU_OPF) ? 16 : 0); 620 src2 = rs2 >> (opf == FMUL8x16AU_OPF ? 16 : 0);
621 for (byte = 0; byte < 4; byte++) { 621 for (byte = 0; byte < 4; byte++) {
622 u16 src1 = (rs1 >> (byte * 8)) & 0x00ff; 622 u16 src1 = (rs1 >> (byte * 8)) & 0x00ff;
623 u32 prod = src1 * src2; 623 u32 prod = src1 * src2;
diff --git a/arch/x86/include/asm/amd_iommu.h b/arch/x86/include/asm/amd_iommu.h
index ac95995b7bad..4b180897e6b5 100644
--- a/arch/x86/include/asm/amd_iommu.h
+++ b/arch/x86/include/asm/amd_iommu.h
@@ -31,6 +31,7 @@ extern irqreturn_t amd_iommu_int_handler(int irq, void *data);
31extern void amd_iommu_flush_all_domains(void); 31extern void amd_iommu_flush_all_domains(void);
32extern void amd_iommu_flush_all_devices(void); 32extern void amd_iommu_flush_all_devices(void);
33extern void amd_iommu_shutdown(void); 33extern void amd_iommu_shutdown(void);
34extern void amd_iommu_apply_erratum_63(u16 devid);
34#else 35#else
35static inline int amd_iommu_init(void) { return -ENODEV; } 36static inline int amd_iommu_init(void) { return -ENODEV; }
36static inline void amd_iommu_detect(void) { } 37static inline void amd_iommu_detect(void) { }
diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h
index e8de2f6f5ca5..617bd56b3070 100644
--- a/arch/x86/include/asm/desc.h
+++ b/arch/x86/include/asm/desc.h
@@ -288,7 +288,7 @@ static inline void load_LDT(mm_context_t *pc)
288 288
289static inline unsigned long get_desc_base(const struct desc_struct *desc) 289static inline unsigned long get_desc_base(const struct desc_struct *desc)
290{ 290{
291 return desc->base0 | ((desc->base1) << 16) | ((desc->base2) << 24); 291 return (unsigned)(desc->base0 | ((desc->base1) << 16) | ((desc->base2) << 24));
292} 292}
293 293
294static inline void set_desc_base(struct desc_struct *desc, unsigned long base) 294static inline void set_desc_base(struct desc_struct *desc, unsigned long base)
diff --git a/arch/x86/include/asm/dma-mapping.h b/arch/x86/include/asm/dma-mapping.h
index 0ee770d23d0e..6a25d5d42836 100644
--- a/arch/x86/include/asm/dma-mapping.h
+++ b/arch/x86/include/asm/dma-mapping.h
@@ -14,6 +14,12 @@
14#include <asm/swiotlb.h> 14#include <asm/swiotlb.h>
15#include <asm-generic/dma-coherent.h> 15#include <asm-generic/dma-coherent.h>
16 16
17#ifdef CONFIG_ISA
18# define ISA_DMA_BIT_MASK DMA_BIT_MASK(24)
19#else
20# define ISA_DMA_BIT_MASK DMA_BIT_MASK(32)
21#endif
22
17extern dma_addr_t bad_dma_address; 23extern dma_addr_t bad_dma_address;
18extern int iommu_merge; 24extern int iommu_merge;
19extern struct device x86_dma_fallback_dev; 25extern struct device x86_dma_fallback_dev;
@@ -124,10 +130,8 @@ dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
124 if (dma_alloc_from_coherent(dev, size, dma_handle, &memory)) 130 if (dma_alloc_from_coherent(dev, size, dma_handle, &memory))
125 return memory; 131 return memory;
126 132
127 if (!dev) { 133 if (!dev)
128 dev = &x86_dma_fallback_dev; 134 dev = &x86_dma_fallback_dev;
129 gfp |= GFP_DMA;
130 }
131 135
132 if (!is_device_dma_capable(dev)) 136 if (!is_device_dma_capable(dev))
133 return NULL; 137 return NULL;
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
index c3429e8b2424..c9786480f0fe 100644
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -1000,7 +1000,7 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
1000#define thread_saved_pc(t) (*(unsigned long *)((t)->thread.sp - 8)) 1000#define thread_saved_pc(t) (*(unsigned long *)((t)->thread.sp - 8))
1001 1001
1002#define task_pt_regs(tsk) ((struct pt_regs *)(tsk)->thread.sp0 - 1) 1002#define task_pt_regs(tsk) ((struct pt_regs *)(tsk)->thread.sp0 - 1)
1003#define KSTK_ESP(tsk) -1 /* sorry. doesn't work for syscall. */ 1003extern unsigned long KSTK_ESP(struct task_struct *task);
1004#endif /* CONFIG_X86_64 */ 1004#endif /* CONFIG_X86_64 */
1005 1005
1006extern void start_thread(struct pt_regs *regs, unsigned long new_ip, 1006extern void start_thread(struct pt_regs *regs, unsigned long new_ip,
diff --git a/arch/x86/include/asm/topology.h b/arch/x86/include/asm/topology.h
index d823c245f63b..40e37b10c6c0 100644
--- a/arch/x86/include/asm/topology.h
+++ b/arch/x86/include/asm/topology.h
@@ -143,7 +143,7 @@ extern unsigned long node_remap_size[];
143 | 1*SD_BALANCE_FORK \ 143 | 1*SD_BALANCE_FORK \
144 | 0*SD_BALANCE_WAKE \ 144 | 0*SD_BALANCE_WAKE \
145 | 1*SD_WAKE_AFFINE \ 145 | 1*SD_WAKE_AFFINE \
146 | 1*SD_PREFER_LOCAL \ 146 | 0*SD_PREFER_LOCAL \
147 | 0*SD_SHARE_CPUPOWER \ 147 | 0*SD_SHARE_CPUPOWER \
148 | 0*SD_POWERSAVINGS_BALANCE \ 148 | 0*SD_POWERSAVINGS_BALANCE \
149 | 0*SD_SHARE_PKG_RESOURCES \ 149 | 0*SD_SHARE_PKG_RESOURCES \
diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c
index 98f230f6a28d..0285521e0a99 100644
--- a/arch/x86/kernel/amd_iommu.c
+++ b/arch/x86/kernel/amd_iommu.c
@@ -1220,6 +1220,8 @@ static void __detach_device(struct protection_domain *domain, u16 devid)
1220 amd_iommu_dev_table[devid].data[1] = 0; 1220 amd_iommu_dev_table[devid].data[1] = 0;
1221 amd_iommu_dev_table[devid].data[2] = 0; 1221 amd_iommu_dev_table[devid].data[2] = 0;
1222 1222
1223 amd_iommu_apply_erratum_63(devid);
1224
1223 /* decrease reference counter */ 1225 /* decrease reference counter */
1224 domain->dev_cnt -= 1; 1226 domain->dev_cnt -= 1;
1225 1227
diff --git a/arch/x86/kernel/amd_iommu_init.c b/arch/x86/kernel/amd_iommu_init.c
index b4b61d462dcc..c20001e4f556 100644
--- a/arch/x86/kernel/amd_iommu_init.c
+++ b/arch/x86/kernel/amd_iommu_init.c
@@ -240,7 +240,7 @@ static void iommu_feature_enable(struct amd_iommu *iommu, u8 bit)
240 writel(ctrl, iommu->mmio_base + MMIO_CONTROL_OFFSET); 240 writel(ctrl, iommu->mmio_base + MMIO_CONTROL_OFFSET);
241} 241}
242 242
243static void __init iommu_feature_disable(struct amd_iommu *iommu, u8 bit) 243static void iommu_feature_disable(struct amd_iommu *iommu, u8 bit)
244{ 244{
245 u32 ctrl; 245 u32 ctrl;
246 246
@@ -519,6 +519,26 @@ static void set_dev_entry_bit(u16 devid, u8 bit)
519 amd_iommu_dev_table[devid].data[i] |= (1 << _bit); 519 amd_iommu_dev_table[devid].data[i] |= (1 << _bit);
520} 520}
521 521
522static int get_dev_entry_bit(u16 devid, u8 bit)
523{
524 int i = (bit >> 5) & 0x07;
525 int _bit = bit & 0x1f;
526
527 return (amd_iommu_dev_table[devid].data[i] & (1 << _bit)) >> _bit;
528}
529
530
531void amd_iommu_apply_erratum_63(u16 devid)
532{
533 int sysmgt;
534
535 sysmgt = get_dev_entry_bit(devid, DEV_ENTRY_SYSMGT1) |
536 (get_dev_entry_bit(devid, DEV_ENTRY_SYSMGT2) << 1);
537
538 if (sysmgt == 0x01)
539 set_dev_entry_bit(devid, DEV_ENTRY_IW);
540}
541
522/* Writes the specific IOMMU for a device into the rlookup table */ 542/* Writes the specific IOMMU for a device into the rlookup table */
523static void __init set_iommu_for_device(struct amd_iommu *iommu, u16 devid) 543static void __init set_iommu_for_device(struct amd_iommu *iommu, u16 devid)
524{ 544{
@@ -547,6 +567,8 @@ static void __init set_dev_entry_from_acpi(struct amd_iommu *iommu,
547 if (flags & ACPI_DEVFLAG_LINT1) 567 if (flags & ACPI_DEVFLAG_LINT1)
548 set_dev_entry_bit(devid, DEV_ENTRY_LINT1_PASS); 568 set_dev_entry_bit(devid, DEV_ENTRY_LINT1_PASS);
549 569
570 amd_iommu_apply_erratum_63(devid);
571
550 set_iommu_for_device(iommu, devid); 572 set_iommu_for_device(iommu, devid);
551} 573}
552 574
diff --git a/arch/x86/kernel/cpu/mtrr/cleanup.c b/arch/x86/kernel/cpu/mtrr/cleanup.c
index 315738c74aad..73c86db5acbe 100644
--- a/arch/x86/kernel/cpu/mtrr/cleanup.c
+++ b/arch/x86/kernel/cpu/mtrr/cleanup.c
@@ -846,7 +846,7 @@ int __init mtrr_cleanup(unsigned address_bits)
846 sort(range, nr_range, sizeof(struct res_range), cmp_range, NULL); 846 sort(range, nr_range, sizeof(struct res_range), cmp_range, NULL);
847 847
848 range_sums = sum_ranges(range, nr_range); 848 range_sums = sum_ranges(range, nr_range);
849 printk(KERN_INFO "total RAM coverred: %ldM\n", 849 printk(KERN_INFO "total RAM covered: %ldM\n",
850 range_sums >> (20 - PAGE_SHIFT)); 850 range_sums >> (20 - PAGE_SHIFT));
851 851
852 if (mtrr_chunk_size && mtrr_gran_size) { 852 if (mtrr_chunk_size && mtrr_gran_size) {
diff --git a/arch/x86/kernel/microcode_amd.c b/arch/x86/kernel/microcode_amd.c
index 366baa179913..f4c538b681ca 100644
--- a/arch/x86/kernel/microcode_amd.c
+++ b/arch/x86/kernel/microcode_amd.c
@@ -317,6 +317,12 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device)
317 return UCODE_NFOUND; 317 return UCODE_NFOUND;
318 } 318 }
319 319
320 if (*(u32 *)firmware->data != UCODE_MAGIC) {
321 printk(KERN_ERR "microcode: invalid UCODE_MAGIC (0x%08x)\n",
322 *(u32 *)firmware->data);
323 return UCODE_ERROR;
324 }
325
320 ret = generic_load_microcode(cpu, firmware->data, firmware->size); 326 ret = generic_load_microcode(cpu, firmware->data, firmware->size);
321 327
322 release_firmware(firmware); 328 release_firmware(firmware);
diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
index b2a71dca5642..a6e804d16c35 100644
--- a/arch/x86/kernel/pci-dma.c
+++ b/arch/x86/kernel/pci-dma.c
@@ -45,12 +45,10 @@ int iommu_pass_through __read_mostly;
45dma_addr_t bad_dma_address __read_mostly = 0; 45dma_addr_t bad_dma_address __read_mostly = 0;
46EXPORT_SYMBOL(bad_dma_address); 46EXPORT_SYMBOL(bad_dma_address);
47 47
48/* Dummy device used for NULL arguments (normally ISA). Better would 48/* Dummy device used for NULL arguments (normally ISA). */
49 be probably a smaller DMA mask, but this is bug-to-bug compatible
50 to older i386. */
51struct device x86_dma_fallback_dev = { 49struct device x86_dma_fallback_dev = {
52 .init_name = "fallback device", 50 .init_name = "fallback device",
53 .coherent_dma_mask = DMA_BIT_MASK(32), 51 .coherent_dma_mask = ISA_DMA_BIT_MASK,
54 .dma_mask = &x86_dma_fallback_dev.coherent_dma_mask, 52 .dma_mask = &x86_dma_fallback_dev.coherent_dma_mask,
55}; 53};
56EXPORT_SYMBOL(x86_dma_fallback_dev); 54EXPORT_SYMBOL(x86_dma_fallback_dev);
diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
index ad535b683170..eb62cbcaa490 100644
--- a/arch/x86/kernel/process_64.c
+++ b/arch/x86/kernel/process_64.c
@@ -664,3 +664,8 @@ long sys_arch_prctl(int code, unsigned long addr)
664 return do_arch_prctl(current, code, addr); 664 return do_arch_prctl(current, code, addr);
665} 665}
666 666
667unsigned long KSTK_ESP(struct task_struct *task)
668{
669 return (test_tsk_thread_flag(task, TIF_IA32)) ?
670 (task_pt_regs(task)->sp) : ((task)->thread.usersp);
671}
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
index a1a3cdda06e1..f93078746e00 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -436,6 +436,14 @@ static struct dmi_system_id __initdata pci_reboot_dmi_table[] = {
436 DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro5"), 436 DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro5"),
437 }, 437 },
438 }, 438 },
439 { /* Handle problems with rebooting on Apple Macmini3,1 */
440 .callback = set_pci_reboot,
441 .ident = "Apple Macmini3,1",
442 .matches = {
443 DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
444 DMI_MATCH(DMI_PRODUCT_NAME, "Macmini3,1"),
445 },
446 },
439 { } 447 { }
440}; 448};
441 449
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index e09f0e2c14b5..2a34f9c5be21 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -660,6 +660,13 @@ static struct dmi_system_id __initdata bad_bios_dmi_table[] = {
660 }, 660 },
661 }, 661 },
662 { 662 {
663 .callback = dmi_low_memory_corruption,
664 .ident = "Phoenix/MSC BIOS",
665 .matches = {
666 DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix/MSC"),
667 },
668 },
669 {
663 /* 670 /*
664 * AMI BIOS with low memory corruption was found on Intel DG45ID board. 671 * AMI BIOS with low memory corruption was found on Intel DG45ID board.
665 * It hase different DMI_BIOS_VENDOR = "Intel Corp.", for now we will 672 * It hase different DMI_BIOS_VENDOR = "Intel Corp.", for now we will
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 9b9695322f56..ae07d261527c 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -1692,7 +1692,7 @@ static int kvm_vcpu_ioctl_x86_setup_mce(struct kvm_vcpu *vcpu,
1692 unsigned bank_num = mcg_cap & 0xff, bank; 1692 unsigned bank_num = mcg_cap & 0xff, bank;
1693 1693
1694 r = -EINVAL; 1694 r = -EINVAL;
1695 if (!bank_num) 1695 if (!bank_num || bank_num >= KVM_MAX_MCE_BANKS)
1696 goto out; 1696 goto out;
1697 if (mcg_cap & ~(KVM_MCE_CAP_SUPPORTED | 0xff | 0xff0000)) 1697 if (mcg_cap & ~(KVM_MCE_CAP_SUPPORTED | 0xff | 0xff0000))
1698 goto out; 1698 goto out;
@@ -4051,7 +4051,7 @@ static int save_guest_segment_descriptor(struct kvm_vcpu *vcpu, u16 selector,
4051 return kvm_write_guest_virt(dtable.base + index*8, seg_desc, sizeof(*seg_desc), vcpu); 4051 return kvm_write_guest_virt(dtable.base + index*8, seg_desc, sizeof(*seg_desc), vcpu);
4052} 4052}
4053 4053
4054static u32 get_tss_base_addr(struct kvm_vcpu *vcpu, 4054static gpa_t get_tss_base_addr(struct kvm_vcpu *vcpu,
4055 struct desc_struct *seg_desc) 4055 struct desc_struct *seg_desc)
4056{ 4056{
4057 u32 base_addr = get_desc_base(seg_desc); 4057 u32 base_addr = get_desc_base(seg_desc);
diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
index 334e63ca7b2b..2feb9bdedaaf 100644
--- a/arch/x86/mm/ioremap.c
+++ b/arch/x86/mm/ioremap.c
@@ -170,8 +170,7 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr,
170 (unsigned long long)phys_addr, 170 (unsigned long long)phys_addr,
171 (unsigned long long)(phys_addr + size), 171 (unsigned long long)(phys_addr + size),
172 prot_val, new_prot_val); 172 prot_val, new_prot_val);
173 free_memtype(phys_addr, phys_addr + size); 173 goto err_free_memtype;
174 return NULL;
175 } 174 }
176 prot_val = new_prot_val; 175 prot_val = new_prot_val;
177 } 176 }
@@ -197,26 +196,25 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr,
197 */ 196 */
198 area = get_vm_area_caller(size, VM_IOREMAP, caller); 197 area = get_vm_area_caller(size, VM_IOREMAP, caller);
199 if (!area) 198 if (!area)
200 return NULL; 199 goto err_free_memtype;
201 area->phys_addr = phys_addr; 200 area->phys_addr = phys_addr;
202 vaddr = (unsigned long) area->addr; 201 vaddr = (unsigned long) area->addr;
203 202
204 if (kernel_map_sync_memtype(phys_addr, size, prot_val)) { 203 if (kernel_map_sync_memtype(phys_addr, size, prot_val))
205 free_memtype(phys_addr, phys_addr + size); 204 goto err_free_area;
206 free_vm_area(area);
207 return NULL;
208 }
209 205
210 if (ioremap_page_range(vaddr, vaddr + size, phys_addr, prot)) { 206 if (ioremap_page_range(vaddr, vaddr + size, phys_addr, prot))
211 free_memtype(phys_addr, phys_addr + size); 207 goto err_free_area;
212 free_vm_area(area);
213 return NULL;
214 }
215 208
216 ret_addr = (void __iomem *) (vaddr + offset); 209 ret_addr = (void __iomem *) (vaddr + offset);
217 mmiotrace_ioremap(unaligned_phys_addr, unaligned_size, ret_addr); 210 mmiotrace_ioremap(unaligned_phys_addr, unaligned_size, ret_addr);
218 211
219 return ret_addr; 212 return ret_addr;
213err_free_area:
214 free_vm_area(area);
215err_free_memtype:
216 free_memtype(phys_addr, phys_addr + size);
217 return NULL;
220} 218}
221 219
222/** 220/**
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index 23a4d80fb39e..dfbf70e65860 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -178,6 +178,7 @@ static __read_mostly unsigned int cpuid_leaf1_ecx_mask = ~0;
178static void xen_cpuid(unsigned int *ax, unsigned int *bx, 178static void xen_cpuid(unsigned int *ax, unsigned int *bx,
179 unsigned int *cx, unsigned int *dx) 179 unsigned int *cx, unsigned int *dx)
180{ 180{
181 unsigned maskebx = ~0;
181 unsigned maskecx = ~0; 182 unsigned maskecx = ~0;
182 unsigned maskedx = ~0; 183 unsigned maskedx = ~0;
183 184
@@ -185,9 +186,16 @@ static void xen_cpuid(unsigned int *ax, unsigned int *bx,
185 * Mask out inconvenient features, to try and disable as many 186 * Mask out inconvenient features, to try and disable as many
186 * unsupported kernel subsystems as possible. 187 * unsupported kernel subsystems as possible.
187 */ 188 */
188 if (*ax == 1) { 189 switch (*ax) {
190 case 1:
189 maskecx = cpuid_leaf1_ecx_mask; 191 maskecx = cpuid_leaf1_ecx_mask;
190 maskedx = cpuid_leaf1_edx_mask; 192 maskedx = cpuid_leaf1_edx_mask;
193 break;
194
195 case 0xb:
196 /* Suppress extended topology stuff */
197 maskebx = 0;
198 break;
191 } 199 }
192 200
193 asm(XEN_EMULATE_PREFIX "cpuid" 201 asm(XEN_EMULATE_PREFIX "cpuid"
@@ -197,6 +205,7 @@ static void xen_cpuid(unsigned int *ax, unsigned int *bx,
197 "=d" (*dx) 205 "=d" (*dx)
198 : "0" (*ax), "2" (*cx)); 206 : "0" (*ax), "2" (*cx));
199 207
208 *bx &= maskebx;
200 *cx &= maskecx; 209 *cx &= maskecx;
201 *dx &= maskedx; 210 *dx &= maskedx;
202} 211}
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-23 15:36:11 -0500