aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/alpha/include/asm/percpu.h2
-rw-r--r--arch/alpha/kernel/head.S3
-rw-r--r--arch/alpha/kernel/vmlinux.lds.S2
-rw-r--r--arch/arm/include/asm/unistd.h2
-rw-r--r--arch/arm/kernel/calls.S2
-rw-r--r--arch/arm/mach-imx/include/mach/gpio.h1
-rw-r--r--arch/arm/mach-kirkwood/common.c1
-rw-r--r--arch/arm/mach-kirkwood/include/mach/bridge-regs.h42
-rw-r--r--arch/arm/mach-kirkwood/include/mach/debug-macro.S2
-rw-r--r--arch/arm/mach-kirkwood/include/mach/entry-macro.S2
-rw-r--r--arch/arm/mach-kirkwood/include/mach/kirkwood.h53
-rw-r--r--arch/arm/mach-kirkwood/include/mach/system.h3
-rw-r--r--arch/arm/mach-kirkwood/irq.c1
-rw-r--r--arch/arm/mach-loki/addr-map.c1
-rw-r--r--arch/arm/mach-loki/include/mach/bridge-regs.h33
-rw-r--r--arch/arm/mach-loki/include/mach/entry-macro.S2
-rw-r--r--arch/arm/mach-loki/include/mach/loki.h14
-rw-r--r--arch/arm/mach-loki/include/mach/system.h3
-rw-r--r--arch/arm/mach-loki/irq.c1
-rw-r--r--arch/arm/mach-mv78xx0/common.c1
-rw-r--r--arch/arm/mach-mv78xx0/include/mach/bridge-regs.h39
-rw-r--r--arch/arm/mach-mv78xx0/include/mach/entry-macro.S2
-rw-r--r--arch/arm/mach-mv78xx0/include/mach/mv78xx0.h42
-rw-r--r--arch/arm/mach-mv78xx0/include/mach/system.h3
-rw-r--r--arch/arm/mach-mv78xx0/irq.c2
-rw-r--r--arch/arm/mach-orion5x/addr-map.c2
-rw-r--r--arch/arm/mach-orion5x/include/mach/bridge-regs.h41
-rw-r--r--arch/arm/mach-orion5x/include/mach/entry-macro.S2
-rw-r--r--arch/arm/mach-orion5x/include/mach/orion5x.h68
-rw-r--r--arch/arm/mach-orion5x/include/mach/system.h3
-rw-r--r--arch/arm/mach-orion5x/irq.c2
-rw-r--r--arch/arm/mach-orion5x/mss2-setup.c1
-rw-r--r--arch/arm/mach-orion5x/pci.c1
-rw-r--r--arch/arm/mach-pxa/include/mach/audio.h10
-rw-r--r--arch/arm/mach-pxa/include/mach/palmasoc.h7
-rw-r--r--arch/arm/mach-pxa/mioa701.c6
-rw-r--r--arch/arm/mach-pxa/palmld.c18
-rw-r--r--arch/arm/mach-pxa/palmt5.c18
-rw-r--r--arch/arm/mach-pxa/palmtx.c23
-rw-r--r--arch/arm/mach-pxa/pcm990-baseboard.c6
-rw-r--r--arch/arm/plat-orion/time.c2
-rw-r--r--arch/frv/kernel/head.S3
-rw-r--r--arch/frv/kernel/vmlinux.lds.S2
-rw-r--r--arch/ia64/include/asm/smp.h2
-rw-r--r--arch/ia64/kvm/kvm-ia64.c14
-rw-r--r--arch/m32r/kernel/head.S2
-rw-r--r--arch/m32r/kernel/vmlinux.lds.S2
-rw-r--r--arch/m68k/configs/amiga_defconfig163
-rw-r--r--arch/m68k/configs/apollo_defconfig120
-rw-r--r--arch/m68k/configs/atari_defconfig155
-rw-r--r--arch/m68k/configs/bvme6000_defconfig119
-rw-r--r--arch/m68k/configs/hp300_defconfig120
-rw-r--r--arch/m68k/configs/mac_defconfig125
-rw-r--r--arch/m68k/configs/multi_defconfig157
-rw-r--r--arch/m68k/configs/mvme147_defconfig119
-rw-r--r--arch/m68k/configs/mvme16x_defconfig119
-rw-r--r--arch/m68k/configs/q40_defconfig122
-rw-r--r--arch/m68k/configs/sun3_defconfig120
-rw-r--r--arch/m68k/configs/sun3x_defconfig120
-rw-r--r--arch/m68k/include/asm/unistd.h4
-rw-r--r--arch/m68k/kernel/entry.S2
-rw-r--r--arch/m68k/kernel/head.S2
-rw-r--r--arch/m68k/kernel/sun3-head.S2
-rw-r--r--arch/m68k/kernel/vmlinux-std.lds2
-rw-r--r--arch/m68k/kernel/vmlinux-sun3.lds2
-rw-r--r--arch/m68knommu/Kconfig1
-rw-r--r--arch/m68knommu/configs/m5208evb_defconfig163
-rw-r--r--arch/m68knommu/configs/m5249evb_defconfig268
-rw-r--r--arch/m68knommu/configs/m5272c3_defconfig645
-rw-r--r--arch/m68knommu/configs/m5275evb_defconfig167
-rw-r--r--arch/m68knommu/configs/m5307c3_defconfig231
-rw-r--r--arch/m68knommu/configs/m5407c3_defconfig179
-rw-r--r--arch/m68knommu/kernel/asm-offsets.c6
-rw-r--r--arch/m68knommu/kernel/dma.c37
-rw-r--r--arch/m68knommu/kernel/syscalltable.S2
-rw-r--r--arch/m68knommu/kernel/vmlinux.lds.S2
-rw-r--r--arch/m68knommu/platform/527x/config.c5
-rw-r--r--arch/microblaze/Makefile8
-rw-r--r--arch/microblaze/include/asm/cache.h5
-rw-r--r--arch/microblaze/include/asm/entry.h4
-rw-r--r--arch/microblaze/include/asm/exceptions.h3
-rw-r--r--arch/microblaze/include/asm/processor.h21
-rw-r--r--arch/microblaze/include/asm/ptrace.h4
-rw-r--r--arch/microblaze/include/asm/unistd.h4
-rw-r--r--arch/microblaze/kernel/asm-offsets.c2
-rw-r--r--arch/microblaze/kernel/cpu/cache.c3
-rw-r--r--arch/microblaze/kernel/cpu/cpuinfo-pvr-full.c9
-rw-r--r--arch/microblaze/kernel/cpu/cpuinfo.c2
-rw-r--r--arch/microblaze/kernel/cpu/mb.c4
-rw-r--r--arch/microblaze/kernel/early_printk.c2
-rw-r--r--arch/microblaze/kernel/process.c20
-rw-r--r--arch/microblaze/kernel/signal.c14
-rw-r--r--arch/microblaze/kernel/syscall_table.S2
-rw-r--r--arch/microblaze/kernel/timer.c2
-rw-r--r--arch/microblaze/kernel/traps.c2
-rw-r--r--arch/mn10300/configs/asb2303_defconfig160
-rw-r--r--arch/mn10300/kernel/head.S3
-rw-r--r--arch/mn10300/kernel/vmlinux.lds.S5
-rw-r--r--arch/powerpc/boot/dts/lite5200b.dts39
-rw-r--r--arch/powerpc/configs/52xx/cm5200_defconfig69
-rw-r--r--arch/powerpc/configs/52xx/lite5200b_defconfig74
-rw-r--r--arch/powerpc/configs/52xx/motionpro_defconfig77
-rw-r--r--arch/powerpc/configs/52xx/pcm030_defconfig69
-rw-r--r--arch/powerpc/configs/52xx/tqm5200_defconfig76
-rw-r--r--arch/powerpc/configs/85xx/mpc8536_ds_defconfig1802
-rw-r--r--arch/powerpc/configs/85xx/mpc8544_ds_defconfig1802
-rw-r--r--arch/powerpc/configs/85xx/mpc8568mds_defconfig1309
-rw-r--r--arch/powerpc/configs/mpc5200_defconfig188
-rw-r--r--arch/powerpc/configs/mpc85xx_defconfig252
-rw-r--r--arch/powerpc/configs/mpc85xx_smp_defconfig (renamed from arch/powerpc/configs/85xx/mpc8572_ds_defconfig)343
-rw-r--r--arch/powerpc/include/asm/elf.h3
-rw-r--r--arch/powerpc/kernel/head_32.S3
-rw-r--r--arch/powerpc/kernel/head_40x.S3
-rw-r--r--arch/powerpc/kernel/head_44x.S3
-rw-r--r--arch/powerpc/kernel/head_8xx.S3
-rw-r--r--arch/powerpc/kernel/head_fsl_booke.S3
-rw-r--r--arch/powerpc/kernel/prom_parse.c11
-rw-r--r--arch/powerpc/kernel/vmlinux.lds.S2
-rw-r--r--arch/powerpc/mm/hash_utils_64.c2
-rw-r--r--arch/powerpc/platforms/fsl_uli1575.c5
-rw-r--r--arch/powerpc/platforms/pasemi/setup.c4
-rw-r--r--arch/powerpc/platforms/ps3/os-area.c2
-rw-r--r--arch/powerpc/sysdev/fsl_rio.c28
-rw-r--r--arch/s390/appldata/appldata_base.c32
-rw-r--r--arch/s390/appldata/appldata_mem.c2
-rw-r--r--arch/s390/defconfig63
-rw-r--r--arch/s390/include/asm/cputime.h4
-rw-r--r--arch/s390/kernel/head.S3
-rw-r--r--arch/s390/kernel/ipl.c1
-rw-r--r--arch/s390/kernel/vmlinux.lds.S4
-rw-r--r--arch/s390/kernel/vtime.c16
-rw-r--r--arch/sh/boards/mach-dreamcast/setup.c6
-rw-r--r--arch/sh/boards/mach-se/7751/Makefile2
-rw-r--r--arch/sh/boards/mach-se/7751/io.c16
-rw-r--r--arch/sh/boards/mach-se/7751/pci.c147
-rw-r--r--arch/sh/boards/mach-se/7780/irq.c27
-rw-r--r--arch/sh/boards/mach-snapgear/io.c16
-rw-r--r--arch/sh/boards/mach-systemh/io.c16
-rw-r--r--arch/sh/boards/mach-titan/io.c20
-rw-r--r--arch/sh/configs/sh7785lcr_defconfig57
-rw-r--r--arch/sh/drivers/pci/Kconfig18
-rw-r--r--arch/sh/drivers/pci/Makefile28
-rw-r--r--arch/sh/drivers/pci/fixups-cayman.c (renamed from arch/sh/drivers/pci/ops-cayman.c)12
-rw-r--r--arch/sh/drivers/pci/fixups-dreamcast.c9
-rw-r--r--arch/sh/drivers/pci/fixups-landisk.c (renamed from arch/sh/drivers/pci/ops-landisk.c)33
-rw-r--r--arch/sh/drivers/pci/fixups-lboxre2.c41
-rw-r--r--arch/sh/drivers/pci/fixups-r7780rp.c41
-rw-r--r--arch/sh/drivers/pci/fixups-rts7751r2d.c48
-rw-r--r--arch/sh/drivers/pci/fixups-sdk7780.c63
-rw-r--r--arch/sh/drivers/pci/fixups-se7751.c111
-rw-r--r--arch/sh/drivers/pci/fixups-se7780.c60
-rw-r--r--arch/sh/drivers/pci/fixups-sh7785lcr.c46
-rw-r--r--arch/sh/drivers/pci/fixups-snapgear.c38
-rw-r--r--arch/sh/drivers/pci/fixups-titan.c (renamed from arch/sh/drivers/pci/ops-titan.c)39
-rw-r--r--arch/sh/drivers/pci/ops-dreamcast.c107
-rw-r--r--arch/sh/drivers/pci/ops-lboxre2.c63
-rw-r--r--arch/sh/drivers/pci/ops-r7780rp.c68
-rw-r--r--arch/sh/drivers/pci/ops-rts7751r2d.c74
-rw-r--r--arch/sh/drivers/pci/ops-sdk7780.c73
-rw-r--r--arch/sh/drivers/pci/ops-se7780.c96
-rw-r--r--arch/sh/drivers/pci/ops-sh03.c45
-rw-r--r--arch/sh/drivers/pci/ops-sh4.c79
-rw-r--r--arch/sh/drivers/pci/ops-sh5.c25
-rw-r--r--arch/sh/drivers/pci/ops-sh7785lcr.c66
-rw-r--r--arch/sh/drivers/pci/ops-snapgear.c94
-rw-r--r--arch/sh/drivers/pci/pci-auto.c545
-rw-r--r--arch/sh/drivers/pci/pci-dreamcast.c102
-rw-r--r--arch/sh/drivers/pci/pci-sh4.h19
-rw-r--r--arch/sh/drivers/pci/pci-sh5.c51
-rw-r--r--arch/sh/drivers/pci/pci-sh5.h3
-rw-r--r--arch/sh/drivers/pci/pci-sh7751.c216
-rw-r--r--arch/sh/drivers/pci/pci-sh7751.h12
-rw-r--r--arch/sh/drivers/pci/pci-sh7780.c227
-rw-r--r--arch/sh/drivers/pci/pci-sh7780.h16
-rw-r--r--arch/sh/drivers/pci/pci.c279
-rw-r--r--arch/sh/include/asm/pci.h98
-rw-r--r--arch/sh/include/mach-dreamcast/mach/pci.h2
-rw-r--r--arch/sh/kernel/head_32.S3
-rw-r--r--arch/sh/kernel/head_64.S5
-rw-r--r--arch/sh/kernel/io.c1
-rw-r--r--arch/sh/kernel/vmlinux_32.lds.S2
-rw-r--r--arch/sh/kernel/vmlinux_64.lds.S2
-rw-r--r--arch/sh/mm/ioremap_32.c14
-rw-r--r--arch/sparc/configs/sparc32_defconfig98
-rw-r--r--arch/sparc/configs/sparc64_defconfig182
-rw-r--r--arch/sparc/kernel/head_32.S2
-rw-r--r--arch/sparc/kernel/of_device_32.c21
-rw-r--r--arch/sparc/kernel/of_device_64.c21
-rw-r--r--arch/sparc/kernel/vmlinux.lds.S2
-rw-r--r--arch/x86/include/asm/desc.h2
-rw-r--r--arch/x86/include/asm/hardirq.h2
-rw-r--r--arch/x86/include/asm/processor.h6
-rw-r--r--arch/x86/include/asm/tlbflush.h2
-rw-r--r--arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c30
-rw-r--r--arch/x86/kvm/mmu.c2
-rw-r--r--arch/x86/kvm/x86.c8
-rw-r--r--arch/xtensa/kernel/head.S3
-rw-r--r--arch/xtensa/kernel/vmlinux.lds.S4
198 files changed, 5023 insertions, 8992 deletions
diff --git a/arch/alpha/include/asm/percpu.h b/arch/alpha/include/asm/percpu.h
index 3495e8e00d70..e9e0bb5a23bf 100644
--- a/arch/alpha/include/asm/percpu.h
+++ b/arch/alpha/include/asm/percpu.h
@@ -73,6 +73,6 @@ extern unsigned long __per_cpu_offset[NR_CPUS];
73 73
74#endif /* SMP */ 74#endif /* SMP */
75 75
76#define DECLARE_PER_CPU(type, name) extern __typeof__(type) per_cpu_var(name) 76#include <asm-generic/percpu.h>
77 77
78#endif /* __ALPHA_PERCPU_H */ 78#endif /* __ALPHA_PERCPU_H */
diff --git a/arch/alpha/kernel/head.S b/arch/alpha/kernel/head.S
index 7ac1f1372c36..4bdd1d2ff353 100644
--- a/arch/alpha/kernel/head.S
+++ b/arch/alpha/kernel/head.S
@@ -7,10 +7,11 @@
7 * the kernel global pointer and jump to the kernel entry-point. 7 * the kernel global pointer and jump to the kernel entry-point.
8 */ 8 */
9 9
10#include <linux/init.h>
10#include <asm/system.h> 11#include <asm/system.h>
11#include <asm/asm-offsets.h> 12#include <asm/asm-offsets.h>
12 13
13.section .text.head, "ax" 14__HEAD
14.globl swapper_pg_dir 15.globl swapper_pg_dir
15.globl _stext 16.globl _stext
16swapper_pg_dir=SWAPPER_PGD 17swapper_pg_dir=SWAPPER_PGD
diff --git a/arch/alpha/kernel/vmlinux.lds.S b/arch/alpha/kernel/vmlinux.lds.S
index ef37fc1acaea..b9d6568e5f7f 100644
--- a/arch/alpha/kernel/vmlinux.lds.S
+++ b/arch/alpha/kernel/vmlinux.lds.S
@@ -16,7 +16,7 @@ SECTIONS
16 16
17 _text = .; /* Text and read-only data */ 17 _text = .; /* Text and read-only data */
18 .text : { 18 .text : {
19 *(.text.head) 19 HEAD_TEXT
20 TEXT_TEXT 20 TEXT_TEXT
21 SCHED_TEXT 21 SCHED_TEXT
22 LOCK_TEXT 22 LOCK_TEXT
diff --git a/arch/arm/include/asm/unistd.h b/arch/arm/include/asm/unistd.h
index 010618487cf1..94cc58ef61ae 100644
--- a/arch/arm/include/asm/unistd.h
+++ b/arch/arm/include/asm/unistd.h
@@ -387,6 +387,8 @@
387#define __NR_dup3 (__NR_SYSCALL_BASE+358) 387#define __NR_dup3 (__NR_SYSCALL_BASE+358)
388#define __NR_pipe2 (__NR_SYSCALL_BASE+359) 388#define __NR_pipe2 (__NR_SYSCALL_BASE+359)
389#define __NR_inotify_init1 (__NR_SYSCALL_BASE+360) 389#define __NR_inotify_init1 (__NR_SYSCALL_BASE+360)
390#define __NR_preadv (__NR_SYSCALL_BASE+361)
391#define __NR_pwritev (__NR_SYSCALL_BASE+362)
390 392
391/* 393/*
392 * The following SWIs are ARM private. 394 * The following SWIs are ARM private.
diff --git a/arch/arm/kernel/calls.S b/arch/arm/kernel/calls.S
index 9ca8d13f05f7..1680e9e9c831 100644
--- a/arch/arm/kernel/calls.S
+++ b/arch/arm/kernel/calls.S
@@ -370,6 +370,8 @@
370 CALL(sys_dup3) 370 CALL(sys_dup3)
371 CALL(sys_pipe2) 371 CALL(sys_pipe2)
372/* 360 */ CALL(sys_inotify_init1) 372/* 360 */ CALL(sys_inotify_init1)
373 CALL(sys_preadv)
374 CALL(sys_pwritev)
373#ifndef syscalls_counted 375#ifndef syscalls_counted
374.equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls 376.equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls
375#define syscalls_counted 377#define syscalls_counted
diff --git a/arch/arm/mach-imx/include/mach/gpio.h b/arch/arm/mach-imx/include/mach/gpio.h
index 502d5aa2c093..6c2942f82922 100644
--- a/arch/arm/mach-imx/include/mach/gpio.h
+++ b/arch/arm/mach-imx/include/mach/gpio.h
@@ -1,6 +1,7 @@
1#ifndef _IMX_GPIO_H 1#ifndef _IMX_GPIO_H
2 2
3#include <linux/kernel.h> 3#include <linux/kernel.h>
4#include <mach/hardware.h>
4#include <mach/imx-regs.h> 5#include <mach/imx-regs.h>
5 6
6#define IMX_GPIO_ALLOC_MODE_NORMAL 0 7#define IMX_GPIO_ALLOC_MODE_NORMAL 0
diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
index 16dc9ea08393..eeb00240d784 100644
--- a/arch/arm/mach-kirkwood/common.c
+++ b/arch/arm/mach-kirkwood/common.c
@@ -23,6 +23,7 @@
23#include <asm/mach/map.h> 23#include <asm/mach/map.h>
24#include <asm/mach/time.h> 24#include <asm/mach/time.h>
25#include <mach/kirkwood.h> 25#include <mach/kirkwood.h>
26#include <mach/bridge-regs.h>
26#include <plat/cache-feroceon-l2.h> 27#include <plat/cache-feroceon-l2.h>
27#include <plat/ehci-orion.h> 28#include <plat/ehci-orion.h>
28#include <plat/mvsdio.h> 29#include <plat/mvsdio.h>
diff --git a/arch/arm/mach-kirkwood/include/mach/bridge-regs.h b/arch/arm/mach-kirkwood/include/mach/bridge-regs.h
new file mode 100644
index 000000000000..4f7029f521cc
--- /dev/null
+++ b/arch/arm/mach-kirkwood/include/mach/bridge-regs.h
@@ -0,0 +1,42 @@
1/*
2 * arch/arm/mach-kirkwood/include/mach/bridge-regs.h
3 *
4 * Mbus-L to Mbus Bridge Registers
5 *
6 * This file is licensed under the terms of the GNU General Public
7 * License version 2. This program is licensed "as is" without any
8 * warranty of any kind, whether express or implied.
9 */
10
11#ifndef __ASM_ARCH_BRIDGE_REGS_H
12#define __ASM_ARCH_BRIDGE_REGS_H
13
14#include <mach/kirkwood.h>
15
16#define CPU_CONTROL (BRIDGE_VIRT_BASE | 0x0104)
17#define CPU_RESET 0x00000002
18
19#define RSTOUTn_MASK (BRIDGE_VIRT_BASE | 0x0108)
20#define SOFT_RESET_OUT_EN 0x00000004
21
22#define SYSTEM_SOFT_RESET (BRIDGE_VIRT_BASE | 0x010c)
23#define SOFT_RESET 0x00000001
24
25#define BRIDGE_CAUSE (BRIDGE_VIRT_BASE | 0x0110)
26#define BRIDGE_MASK (BRIDGE_VIRT_BASE | 0x0114)
27#define BRIDGE_INT_TIMER0 0x0002
28#define BRIDGE_INT_TIMER1 0x0004
29#define BRIDGE_INT_TIMER1_CLR (~0x0004)
30
31#define IRQ_VIRT_BASE (BRIDGE_VIRT_BASE | 0x0200)
32#define IRQ_CAUSE_LOW_OFF 0x0000
33#define IRQ_MASK_LOW_OFF 0x0004
34#define IRQ_CAUSE_HIGH_OFF 0x0010
35#define IRQ_MASK_HIGH_OFF 0x0014
36
37#define TIMER_VIRT_BASE (BRIDGE_VIRT_BASE | 0x0300)
38
39#define L2_CONFIG_REG (BRIDGE_VIRT_BASE | 0x0128)
40#define L2_WRITETHROUGH 0x00000010
41
42#endif
diff --git a/arch/arm/mach-kirkwood/include/mach/debug-macro.S b/arch/arm/mach-kirkwood/include/mach/debug-macro.S
index c0cc5b5c82ac..a4a55c199d77 100644
--- a/arch/arm/mach-kirkwood/include/mach/debug-macro.S
+++ b/arch/arm/mach-kirkwood/include/mach/debug-macro.S
@@ -6,7 +6,7 @@
6 * published by the Free Software Foundation. 6 * published by the Free Software Foundation.
7*/ 7*/
8 8
9#include <mach/kirkwood.h> 9#include <mach/bridge-regs.h>
10 10
11 .macro addruart,rx 11 .macro addruart,rx
12 mrc p15, 0, \rx, c1, c0 12 mrc p15, 0, \rx, c1, c0
diff --git a/arch/arm/mach-kirkwood/include/mach/entry-macro.S b/arch/arm/mach-kirkwood/include/mach/entry-macro.S
index 83e0cba77b36..8939d36f893c 100644
--- a/arch/arm/mach-kirkwood/include/mach/entry-macro.S
+++ b/arch/arm/mach-kirkwood/include/mach/entry-macro.S
@@ -8,7 +8,7 @@
8 * warranty of any kind, whether express or implied. 8 * warranty of any kind, whether express or implied.
9 */ 9 */
10 10
11#include <mach/kirkwood.h> 11#include <mach/bridge-regs.h>
12 12
13 .macro disable_fiq 13 .macro disable_fiq
14 .endm 14 .endm
diff --git a/arch/arm/mach-kirkwood/include/mach/kirkwood.h b/arch/arm/mach-kirkwood/include/mach/kirkwood.h
index 38c986853590..b3e13958821d 100644
--- a/arch/arm/mach-kirkwood/include/mach/kirkwood.h
+++ b/arch/arm/mach-kirkwood/include/mach/kirkwood.h
@@ -44,44 +44,6 @@
44#define KIRKWOOD_PCIE_MEM_SIZE SZ_128M 44#define KIRKWOOD_PCIE_MEM_SIZE SZ_128M
45 45
46/* 46/*
47 * MBUS bridge registers.
48 */
49#define BRIDGE_VIRT_BASE (KIRKWOOD_REGS_VIRT_BASE | 0x20000)
50#define CPU_CONTROL (BRIDGE_VIRT_BASE | 0x0104)
51#define CPU_RESET 0x00000002
52#define RSTOUTn_MASK (BRIDGE_VIRT_BASE | 0x0108)
53#define SOFT_RESET_OUT_EN 0x00000004
54#define SYSTEM_SOFT_RESET (BRIDGE_VIRT_BASE | 0x010c)
55#define SOFT_RESET 0x00000001
56#define BRIDGE_CAUSE (BRIDGE_VIRT_BASE | 0x0110)
57#define BRIDGE_MASK (BRIDGE_VIRT_BASE | 0x0114)
58#define BRIDGE_INT_TIMER0 0x0002
59#define BRIDGE_INT_TIMER1 0x0004
60#define BRIDGE_INT_TIMER1_CLR (~0x0004)
61#define IRQ_VIRT_BASE (BRIDGE_VIRT_BASE | 0x0200)
62#define IRQ_CAUSE_LOW_OFF 0x0000
63#define IRQ_MASK_LOW_OFF 0x0004
64#define IRQ_CAUSE_HIGH_OFF 0x0010
65#define IRQ_MASK_HIGH_OFF 0x0014
66#define TIMER_VIRT_BASE (BRIDGE_VIRT_BASE | 0x0300)
67#define L2_CONFIG_REG (BRIDGE_VIRT_BASE | 0x0128)
68#define L2_WRITETHROUGH 0x00000010
69
70/*
71 * Supported devices and revisions.
72 */
73#define MV88F6281_DEV_ID 0x6281
74#define MV88F6281_REV_Z0 0
75#define MV88F6281_REV_A0 2
76
77#define MV88F6192_DEV_ID 0x6192
78#define MV88F6192_REV_Z0 0
79#define MV88F6192_REV_A0 2
80
81#define MV88F6180_DEV_ID 0x6180
82#define MV88F6180_REV_A0 2
83
84/*
85 * Register Map 47 * Register Map
86 */ 48 */
87#define DDR_VIRT_BASE (KIRKWOOD_REGS_VIRT_BASE | 0x00000) 49#define DDR_VIRT_BASE (KIRKWOOD_REGS_VIRT_BASE | 0x00000)
@@ -99,6 +61,8 @@
99#define UART1_PHYS_BASE (DEV_BUS_PHYS_BASE | 0x2100) 61#define UART1_PHYS_BASE (DEV_BUS_PHYS_BASE | 0x2100)
100#define UART1_VIRT_BASE (DEV_BUS_VIRT_BASE | 0x2100) 62#define UART1_VIRT_BASE (DEV_BUS_VIRT_BASE | 0x2100)
101 63
64#define BRIDGE_VIRT_BASE (KIRKWOOD_REGS_VIRT_BASE | 0x20000)
65
102#define PCIE_VIRT_BASE (KIRKWOOD_REGS_VIRT_BASE | 0x40000) 66#define PCIE_VIRT_BASE (KIRKWOOD_REGS_VIRT_BASE | 0x40000)
103 67
104#define USB_PHYS_BASE (KIRKWOOD_REGS_PHYS_BASE | 0x50000) 68#define USB_PHYS_BASE (KIRKWOOD_REGS_PHYS_BASE | 0x50000)
@@ -119,5 +83,18 @@
119 83
120#define SDIO_PHYS_BASE (KIRKWOOD_REGS_PHYS_BASE | 0x90000) 84#define SDIO_PHYS_BASE (KIRKWOOD_REGS_PHYS_BASE | 0x90000)
121 85
86/*
87 * Supported devices and revisions.
88 */
89#define MV88F6281_DEV_ID 0x6281
90#define MV88F6281_REV_Z0 0
91#define MV88F6281_REV_A0 2
92
93#define MV88F6192_DEV_ID 0x6192
94#define MV88F6192_REV_Z0 0
95#define MV88F6192_REV_A0 2
96
97#define MV88F6180_DEV_ID 0x6180
98#define MV88F6180_REV_A0 2
122 99
123#endif 100#endif
diff --git a/arch/arm/mach-kirkwood/include/mach/system.h b/arch/arm/mach-kirkwood/include/mach/system.h
index 23a1914c1da8..7568e95d279b 100644
--- a/arch/arm/mach-kirkwood/include/mach/system.h
+++ b/arch/arm/mach-kirkwood/include/mach/system.h
@@ -9,8 +9,7 @@
9#ifndef __ASM_ARCH_SYSTEM_H 9#ifndef __ASM_ARCH_SYSTEM_H
10#define __ASM_ARCH_SYSTEM_H 10#define __ASM_ARCH_SYSTEM_H
11 11
12#include <mach/hardware.h> 12#include <mach/bridge-regs.h>
13#include <mach/kirkwood.h>
14 13
15static inline void arch_idle(void) 14static inline void arch_idle(void)
16{ 15{
diff --git a/arch/arm/mach-kirkwood/irq.c b/arch/arm/mach-kirkwood/irq.c
index 06083b23bb44..28020abf49e1 100644
--- a/arch/arm/mach-kirkwood/irq.c
+++ b/arch/arm/mach-kirkwood/irq.c
@@ -12,6 +12,7 @@
12#include <linux/init.h> 12#include <linux/init.h>
13#include <linux/irq.h> 13#include <linux/irq.h>
14#include <linux/io.h> 14#include <linux/io.h>
15#include <mach/bridge-regs.h>
15#include <plat/irq.h> 16#include <plat/irq.h>
16#include <asm/gpio.h> 17#include <asm/gpio.h>
17#include "common.h" 18#include "common.h"
diff --git a/arch/arm/mach-loki/addr-map.c b/arch/arm/mach-loki/addr-map.c
index 0332d8f5c18c..b9537c97beba 100644
--- a/arch/arm/mach-loki/addr-map.c
+++ b/arch/arm/mach-loki/addr-map.c
@@ -38,6 +38,7 @@
38/* 38/*
39 * CPU Address Decode Windows registers 39 * CPU Address Decode Windows registers
40 */ 40 */
41#define BRIDGE_REG(x) (BRIDGE_VIRT_BASE | (x))
41#define CPU_WIN_CTRL(n) BRIDGE_REG(0x000 | ((n) << 4)) 42#define CPU_WIN_CTRL(n) BRIDGE_REG(0x000 | ((n) << 4))
42#define CPU_WIN_BASE(n) BRIDGE_REG(0x004 | ((n) << 4)) 43#define CPU_WIN_BASE(n) BRIDGE_REG(0x004 | ((n) << 4))
43#define CPU_WIN_REMAP_LO(n) BRIDGE_REG(0x008 | ((n) << 4)) 44#define CPU_WIN_REMAP_LO(n) BRIDGE_REG(0x008 | ((n) << 4))
diff --git a/arch/arm/mach-loki/include/mach/bridge-regs.h b/arch/arm/mach-loki/include/mach/bridge-regs.h
new file mode 100644
index 000000000000..a3fabf70044f
--- /dev/null
+++ b/arch/arm/mach-loki/include/mach/bridge-regs.h
@@ -0,0 +1,33 @@
1/*
2 * arch/arm/mach-loki/include/mach/bridge-regs.h
3 *
4 * This file is licensed under the terms of the GNU General Public
5 * License version 2. This program is licensed "as is" without any
6 * warranty of any kind, whether express or implied.
7 */
8
9#ifndef __ASM_ARCH_BRIDGE_REGS_H
10#define __ASM_ARCH_BRIDGE_REGS_H
11
12#include <mach/loki.h>
13
14#define RSTOUTn_MASK (BRIDGE_VIRT_BASE | 0x0108)
15#define SOFT_RESET_OUT_EN 0x00000004
16
17#define SYSTEM_SOFT_RESET (BRIDGE_VIRT_BASE | 0x010c)
18#define SOFT_RESET 0x00000001
19
20#define BRIDGE_CAUSE (BRIDGE_VIRT_BASE | 0x0110)
21
22#define BRIDGE_MASK (BRIDGE_VIRT_BASE | 0x0114)
23#define BRIDGE_INT_TIMER0 0x0002
24#define BRIDGE_INT_TIMER1 0x0004
25#define BRIDGE_INT_TIMER1_CLR 0x0004
26
27#define IRQ_VIRT_BASE (BRIDGE_VIRT_BASE | 0x0200)
28#define IRQ_CAUSE_OFF 0x0000
29#define IRQ_MASK_OFF 0x0004
30
31#define TIMER_VIRT_BASE (BRIDGE_VIRT_BASE | 0x0300)
32
33#endif
diff --git a/arch/arm/mach-loki/include/mach/entry-macro.S b/arch/arm/mach-loki/include/mach/entry-macro.S
index 332af38ec13c..bc917ed3a62d 100644
--- a/arch/arm/mach-loki/include/mach/entry-macro.S
+++ b/arch/arm/mach-loki/include/mach/entry-macro.S
@@ -8,7 +8,7 @@
8 * warranty of any kind, whether express or implied. 8 * warranty of any kind, whether express or implied.
9 */ 9 */
10 10
11#include <mach/loki.h> 11#include <mach/bridge-regs.h>
12 12
13 .macro disable_fiq 13 .macro disable_fiq
14 .endm 14 .endm
diff --git a/arch/arm/mach-loki/include/mach/loki.h b/arch/arm/mach-loki/include/mach/loki.h
index c00af6ba5578..bfca7c265f43 100644
--- a/arch/arm/mach-loki/include/mach/loki.h
+++ b/arch/arm/mach-loki/include/mach/loki.h
@@ -58,20 +58,6 @@
58#define UART1_VIRT_BASE (DEV_BUS_VIRT_BASE | 0x2100) 58#define UART1_VIRT_BASE (DEV_BUS_VIRT_BASE | 0x2100)
59 59
60#define BRIDGE_VIRT_BASE (LOKI_REGS_VIRT_BASE | 0x20000) 60#define BRIDGE_VIRT_BASE (LOKI_REGS_VIRT_BASE | 0x20000)
61#define BRIDGE_REG(x) (BRIDGE_VIRT_BASE | (x))
62#define RSTOUTn_MASK (BRIDGE_VIRT_BASE | 0x0108)
63#define SOFT_RESET_OUT_EN 0x00000004
64#define SYSTEM_SOFT_RESET (BRIDGE_VIRT_BASE | 0x010c)
65#define SOFT_RESET 0x00000001
66#define BRIDGE_CAUSE (BRIDGE_VIRT_BASE | 0x0110)
67#define BRIDGE_MASK (BRIDGE_VIRT_BASE | 0x0114)
68#define BRIDGE_INT_TIMER0 0x0002
69#define BRIDGE_INT_TIMER1 0x0004
70#define BRIDGE_INT_TIMER1_CLR 0x0004
71#define IRQ_VIRT_BASE (BRIDGE_VIRT_BASE | 0x0200)
72#define IRQ_CAUSE_OFF 0x0000
73#define IRQ_MASK_OFF 0x0004
74#define TIMER_VIRT_BASE (BRIDGE_VIRT_BASE | 0x0300)
75 61
76#define PCIE0_VIRT_BASE (LOKI_REGS_VIRT_BASE | 0x30000) 62#define PCIE0_VIRT_BASE (LOKI_REGS_VIRT_BASE | 0x30000)
77 63
diff --git a/arch/arm/mach-loki/include/mach/system.h b/arch/arm/mach-loki/include/mach/system.h
index c1de36fe9b37..71895199a534 100644
--- a/arch/arm/mach-loki/include/mach/system.h
+++ b/arch/arm/mach-loki/include/mach/system.h
@@ -9,8 +9,7 @@
9#ifndef __ASM_ARCH_SYSTEM_H 9#ifndef __ASM_ARCH_SYSTEM_H
10#define __ASM_ARCH_SYSTEM_H 10#define __ASM_ARCH_SYSTEM_H
11 11
12#include <mach/hardware.h> 12#include <mach/bridge-regs.h>
13#include <mach/loki.h>
14 13
15static inline void arch_idle(void) 14static inline void arch_idle(void)
16{ 15{
diff --git a/arch/arm/mach-loki/irq.c b/arch/arm/mach-loki/irq.c
index e1f97338d5b7..76b211bfcca2 100644
--- a/arch/arm/mach-loki/irq.c
+++ b/arch/arm/mach-loki/irq.c
@@ -12,6 +12,7 @@
12#include <linux/init.h> 12#include <linux/init.h>
13#include <linux/irq.h> 13#include <linux/irq.h>
14#include <linux/io.h> 14#include <linux/io.h>
15#include <mach/bridge-regs.h>
15#include <plat/irq.h> 16#include <plat/irq.h>
16#include "common.h" 17#include "common.h"
17 18
diff --git a/arch/arm/mach-mv78xx0/common.c b/arch/arm/mach-mv78xx0/common.c
index a575daaa62d1..9ba595083dab 100644
--- a/arch/arm/mach-mv78xx0/common.c
+++ b/arch/arm/mach-mv78xx0/common.c
@@ -20,6 +20,7 @@
20#include <asm/mach/map.h> 20#include <asm/mach/map.h>
21#include <asm/mach/time.h> 21#include <asm/mach/time.h>
22#include <mach/mv78xx0.h> 22#include <mach/mv78xx0.h>
23#include <mach/bridge-regs.h>
23#include <plat/cache-feroceon-l2.h> 24#include <plat/cache-feroceon-l2.h>
24#include <plat/ehci-orion.h> 25#include <plat/ehci-orion.h>
25#include <plat/orion_nand.h> 26#include <plat/orion_nand.h>
diff --git a/arch/arm/mach-mv78xx0/include/mach/bridge-regs.h b/arch/arm/mach-mv78xx0/include/mach/bridge-regs.h
new file mode 100644
index 000000000000..2d14c4fe294d
--- /dev/null
+++ b/arch/arm/mach-mv78xx0/include/mach/bridge-regs.h
@@ -0,0 +1,39 @@
1/*
2 * arch/arm/mach-mv78xx0/include/mach/bridge-regs.h
3 *
4 * This file is licensed under the terms of the GNU General Public
5 * License version 2. This program is licensed "as is" without any
6 * warranty of any kind, whether express or implied.
7 */
8
9#ifndef __ASM_ARCH_BRIDGE_REGS_H
10#define __ASM_ARCH_BRIDGE_REGS_H
11
12#include <mach/mv78xx0.h>
13
14#define CPU_CONTROL (BRIDGE_VIRT_BASE | 0x0104)
15#define L2_WRITETHROUGH 0x00020000
16
17#define RSTOUTn_MASK (BRIDGE_VIRT_BASE | 0x0108)
18#define SOFT_RESET_OUT_EN 0x00000004
19
20#define SYSTEM_SOFT_RESET (BRIDGE_VIRT_BASE | 0x010c)
21#define SOFT_RESET 0x00000001
22
23#define BRIDGE_CAUSE (BRIDGE_VIRT_BASE | 0x0110)
24#define BRIDGE_MASK (BRIDGE_VIRT_BASE | 0x0114)
25#define BRIDGE_INT_TIMER0 0x0002
26#define BRIDGE_INT_TIMER1 0x0004
27#define BRIDGE_INT_TIMER1_CLR (~0x0004)
28
29#define IRQ_VIRT_BASE (BRIDGE_VIRT_BASE | 0x0200)
30#define IRQ_CAUSE_ERR_OFF 0x0000
31#define IRQ_CAUSE_LOW_OFF 0x0004
32#define IRQ_CAUSE_HIGH_OFF 0x0008
33#define IRQ_MASK_ERR_OFF 0x000c
34#define IRQ_MASK_LOW_OFF 0x0010
35#define IRQ_MASK_HIGH_OFF 0x0014
36
37#define TIMER_VIRT_BASE (BRIDGE_VIRT_BASE | 0x0300)
38
39#endif
diff --git a/arch/arm/mach-mv78xx0/include/mach/entry-macro.S b/arch/arm/mach-mv78xx0/include/mach/entry-macro.S
index fbfb2693ce6c..66ae2d29e773 100644
--- a/arch/arm/mach-mv78xx0/include/mach/entry-macro.S
+++ b/arch/arm/mach-mv78xx0/include/mach/entry-macro.S
@@ -8,7 +8,7 @@
8 * warranty of any kind, whether express or implied. 8 * warranty of any kind, whether express or implied.
9 */ 9 */
10 10
11#include <mach/mv78xx0.h> 11#include <mach/bridge-regs.h>
12 12
13 .macro disable_fiq 13 .macro disable_fiq
14 .endm 14 .endm
diff --git a/arch/arm/mach-mv78xx0/include/mach/mv78xx0.h b/arch/arm/mach-mv78xx0/include/mach/mv78xx0.h
index 582cffc733ad..d715b92b0908 100644
--- a/arch/arm/mach-mv78xx0/include/mach/mv78xx0.h
+++ b/arch/arm/mach-mv78xx0/include/mach/mv78xx0.h
@@ -59,37 +59,6 @@
59 * Core-specific peripheral registers. 59 * Core-specific peripheral registers.
60 */ 60 */
61#define BRIDGE_VIRT_BASE (MV78XX0_CORE_REGS_VIRT_BASE) 61#define BRIDGE_VIRT_BASE (MV78XX0_CORE_REGS_VIRT_BASE)
62#define CPU_CONTROL (BRIDGE_VIRT_BASE | 0x0104)
63#define L2_WRITETHROUGH 0x00020000
64#define RSTOUTn_MASK (BRIDGE_VIRT_BASE | 0x0108)
65#define SOFT_RESET_OUT_EN 0x00000004
66#define SYSTEM_SOFT_RESET (BRIDGE_VIRT_BASE | 0x010c)
67#define SOFT_RESET 0x00000001
68#define BRIDGE_CAUSE (BRIDGE_VIRT_BASE | 0x0110)
69#define BRIDGE_MASK (BRIDGE_VIRT_BASE | 0x0114)
70#define BRIDGE_INT_TIMER0 0x0002
71#define BRIDGE_INT_TIMER1 0x0004
72#define BRIDGE_INT_TIMER1_CLR (~0x0004)
73#define IRQ_VIRT_BASE (BRIDGE_VIRT_BASE | 0x0200)
74#define IRQ_CAUSE_ERR_OFF 0x0000
75#define IRQ_CAUSE_LOW_OFF 0x0004
76#define IRQ_CAUSE_HIGH_OFF 0x0008
77#define IRQ_MASK_ERR_OFF 0x000c
78#define IRQ_MASK_LOW_OFF 0x0010
79#define IRQ_MASK_HIGH_OFF 0x0014
80#define TIMER_VIRT_BASE (BRIDGE_VIRT_BASE | 0x0300)
81
82/*
83 * Supported devices and revisions.
84 */
85#define MV78X00_Z0_DEV_ID 0x6381
86#define MV78X00_REV_Z0 1
87
88#define MV78100_DEV_ID 0x7810
89#define MV78100_REV_A0 1
90
91#define MV78200_DEV_ID 0x7820
92#define MV78200_REV_A0 1
93 62
94/* 63/*
95 * Register Map 64 * Register Map
@@ -135,5 +104,16 @@
135 104
136#define SATA_PHYS_BASE (MV78XX0_REGS_PHYS_BASE | 0xa0000) 105#define SATA_PHYS_BASE (MV78XX0_REGS_PHYS_BASE | 0xa0000)
137 106
107/*
108 * Supported devices and revisions.
109 */
110#define MV78X00_Z0_DEV_ID 0x6381
111#define MV78X00_REV_Z0 1
112
113#define MV78100_DEV_ID 0x7810
114#define MV78100_REV_A0 1
115
116#define MV78200_DEV_ID 0x7820
117#define MV78200_REV_A0 1
138 118
139#endif 119#endif
diff --git a/arch/arm/mach-mv78xx0/include/mach/system.h b/arch/arm/mach-mv78xx0/include/mach/system.h
index 1d6350b22d0b..66e7ce4e90bd 100644
--- a/arch/arm/mach-mv78xx0/include/mach/system.h
+++ b/arch/arm/mach-mv78xx0/include/mach/system.h
@@ -9,8 +9,7 @@
9#ifndef __ASM_ARCH_SYSTEM_H 9#ifndef __ASM_ARCH_SYSTEM_H
10#define __ASM_ARCH_SYSTEM_H 10#define __ASM_ARCH_SYSTEM_H
11 11
12#include <mach/hardware.h> 12#include <mach/bridge-regs.h>
13#include <mach/mv78xx0.h>
14 13
15static inline void arch_idle(void) 14static inline void arch_idle(void)
16{ 15{
diff --git a/arch/arm/mach-mv78xx0/irq.c b/arch/arm/mach-mv78xx0/irq.c
index 30b7e4bcdbc7..f289b0ea7dcf 100644
--- a/arch/arm/mach-mv78xx0/irq.c
+++ b/arch/arm/mach-mv78xx0/irq.c
@@ -13,7 +13,7 @@
13#include <linux/pci.h> 13#include <linux/pci.h>
14#include <linux/irq.h> 14#include <linux/irq.h>
15#include <asm/gpio.h> 15#include <asm/gpio.h>
16#include <mach/mv78xx0.h> 16#include <mach/bridge-regs.h>
17#include <plat/irq.h> 17#include <plat/irq.h>
18#include "common.h" 18#include "common.h"
19 19
diff --git a/arch/arm/mach-orion5x/addr-map.c b/arch/arm/mach-orion5x/addr-map.c
index 719957e05d9e..c14d12137276 100644
--- a/arch/arm/mach-orion5x/addr-map.c
+++ b/arch/arm/mach-orion5x/addr-map.c
@@ -57,12 +57,14 @@
57/* 57/*
58 * Helpers to get DDR bank info 58 * Helpers to get DDR bank info
59 */ 59 */
60#define ORION5X_DDR_REG(x) (ORION5X_DDR_VIRT_BASE | (x))
60#define DDR_BASE_CS(n) ORION5X_DDR_REG(0x1500 + ((n) << 3)) 61#define DDR_BASE_CS(n) ORION5X_DDR_REG(0x1500 + ((n) << 3))
61#define DDR_SIZE_CS(n) ORION5X_DDR_REG(0x1504 + ((n) << 3)) 62#define DDR_SIZE_CS(n) ORION5X_DDR_REG(0x1504 + ((n) << 3))
62 63
63/* 64/*
64 * CPU Address Decode Windows registers 65 * CPU Address Decode Windows registers
65 */ 66 */
67#define ORION5X_BRIDGE_REG(x) (ORION5X_BRIDGE_VIRT_BASE | (x))
66#define CPU_WIN_CTRL(n) ORION5X_BRIDGE_REG(0x000 | ((n) << 4)) 68#define CPU_WIN_CTRL(n) ORION5X_BRIDGE_REG(0x000 | ((n) << 4))
67#define CPU_WIN_BASE(n) ORION5X_BRIDGE_REG(0x004 | ((n) << 4)) 69#define CPU_WIN_BASE(n) ORION5X_BRIDGE_REG(0x004 | ((n) << 4))
68#define CPU_WIN_REMAP_LO(n) ORION5X_BRIDGE_REG(0x008 | ((n) << 4)) 70#define CPU_WIN_REMAP_LO(n) ORION5X_BRIDGE_REG(0x008 | ((n) << 4))
diff --git a/arch/arm/mach-orion5x/include/mach/bridge-regs.h b/arch/arm/mach-orion5x/include/mach/bridge-regs.h
new file mode 100644
index 000000000000..be896e59d3e7
--- /dev/null
+++ b/arch/arm/mach-orion5x/include/mach/bridge-regs.h
@@ -0,0 +1,41 @@
1/*
2 * arch/arm/mach-orion5x/include/mach/bridge-regs.h
3 *
4 * Orion CPU Bridge Registers
5 *
6 * This file is licensed under the terms of the GNU General Public
7 * License version 2. This program is licensed "as is" without any
8 * warranty of any kind, whether express or implied.
9 */
10
11#ifndef __ASM_ARCH_BRIDGE_REGS_H
12#define __ASM_ARCH_BRIDGE_REGS_H
13
14#include <mach/orion5x.h>
15
16#define CPU_CONF (ORION5X_BRIDGE_VIRT_BASE | 0x100)
17
18#define CPU_CTRL (ORION5X_BRIDGE_VIRT_BASE | 0x104)
19
20#define CPU_RESET_MASK (ORION5X_BRIDGE_VIRT_BASE | 0x108)
21#define WDT_RESET 0x0002
22
23#define CPU_SOFT_RESET (ORION5X_BRIDGE_VIRT_BASE | 0x10c)
24
25#define POWER_MNG_CTRL_REG (ORION5X_BRIDGE_VIRT_BASE | 0x11C)
26
27#define BRIDGE_CAUSE (ORION5X_BRIDGE_VIRT_BASE | 0x110)
28#define WDT_INT_REQ 0x0008
29
30#define BRIDGE_MASK (ORION5X_BRIDGE_VIRT_BASE | 0x114)
31#define BRIDGE_INT_TIMER0 0x0002
32#define BRIDGE_INT_TIMER1 0x0004
33#define BRIDGE_INT_TIMER1_CLR (~0x0004)
34
35#define MAIN_IRQ_CAUSE (ORION5X_BRIDGE_VIRT_BASE | 0x200)
36
37#define MAIN_IRQ_MASK (ORION5X_BRIDGE_VIRT_BASE | 0x204)
38
39#define TIMER_VIRT_BASE (ORION5X_BRIDGE_VIRT_BASE | 0x300)
40
41#endif
diff --git a/arch/arm/mach-orion5x/include/mach/entry-macro.S b/arch/arm/mach-orion5x/include/mach/entry-macro.S
index 4351937035cd..d658992e5401 100644
--- a/arch/arm/mach-orion5x/include/mach/entry-macro.S
+++ b/arch/arm/mach-orion5x/include/mach/entry-macro.S
@@ -8,7 +8,7 @@
8 * warranty of any kind, whether express or implied. 8 * warranty of any kind, whether express or implied.
9 */ 9 */
10 10
11#include <mach/orion5x.h> 11#include <mach/bridge-regs.h>
12 12
13 .macro disable_fiq 13 .macro disable_fiq
14 .endm 14 .endm
diff --git a/arch/arm/mach-orion5x/include/mach/orion5x.h b/arch/arm/mach-orion5x/include/mach/orion5x.h
index 67bda31406dd..377a773ae53f 100644
--- a/arch/arm/mach-orion5x/include/mach/orion5x.h
+++ b/arch/arm/mach-orion5x/include/mach/orion5x.h
@@ -61,30 +61,10 @@
61#define ORION5X_PCI_MEM_SIZE SZ_128M 61#define ORION5X_PCI_MEM_SIZE SZ_128M
62 62
63/******************************************************************************* 63/*******************************************************************************
64 * Supported Devices & Revisions
65 ******************************************************************************/
66/* Orion-1 (88F5181) and Orion-VoIP (88F5181L) */
67#define MV88F5181_DEV_ID 0x5181
68#define MV88F5181_REV_B1 3
69#define MV88F5181L_REV_A0 8
70#define MV88F5181L_REV_A1 9
71/* Orion-NAS (88F5182) */
72#define MV88F5182_DEV_ID 0x5182
73#define MV88F5182_REV_A2 2
74/* Orion-2 (88F5281) */
75#define MV88F5281_DEV_ID 0x5281
76#define MV88F5281_REV_D0 4
77#define MV88F5281_REV_D1 5
78#define MV88F5281_REV_D2 6
79/* Orion-1-90 (88F6183) */
80#define MV88F6183_DEV_ID 0x6183
81#define MV88F6183_REV_B0 3
82
83/*******************************************************************************
84 * Orion Registers Map 64 * Orion Registers Map
85 ******************************************************************************/ 65 ******************************************************************************/
66
86#define ORION5X_DDR_VIRT_BASE (ORION5X_REGS_VIRT_BASE | 0x00000) 67#define ORION5X_DDR_VIRT_BASE (ORION5X_REGS_VIRT_BASE | 0x00000)
87#define ORION5X_DDR_REG(x) (ORION5X_DDR_VIRT_BASE | (x))
88 68
89#define ORION5X_DEV_BUS_PHYS_BASE (ORION5X_REGS_PHYS_BASE | 0x10000) 69#define ORION5X_DEV_BUS_PHYS_BASE (ORION5X_REGS_PHYS_BASE | 0x10000)
90#define ORION5X_DEV_BUS_VIRT_BASE (ORION5X_REGS_VIRT_BASE | 0x10000) 70#define ORION5X_DEV_BUS_VIRT_BASE (ORION5X_REGS_VIRT_BASE | 0x10000)
@@ -97,34 +77,25 @@
97#define UART1_VIRT_BASE (ORION5X_DEV_BUS_VIRT_BASE | 0x2100) 77#define UART1_VIRT_BASE (ORION5X_DEV_BUS_VIRT_BASE | 0x2100)
98 78
99#define ORION5X_BRIDGE_VIRT_BASE (ORION5X_REGS_VIRT_BASE | 0x20000) 79#define ORION5X_BRIDGE_VIRT_BASE (ORION5X_REGS_VIRT_BASE | 0x20000)
100#define ORION5X_BRIDGE_REG(x) (ORION5X_BRIDGE_VIRT_BASE | (x))
101#define TIMER_VIRT_BASE (ORION5X_BRIDGE_VIRT_BASE | 0x300)
102 80
103#define ORION5X_PCI_VIRT_BASE (ORION5X_REGS_VIRT_BASE | 0x30000) 81#define ORION5X_PCI_VIRT_BASE (ORION5X_REGS_VIRT_BASE | 0x30000)
104#define ORION5X_PCI_REG(x) (ORION5X_PCI_VIRT_BASE | (x))
105 82
106#define ORION5X_PCIE_VIRT_BASE (ORION5X_REGS_VIRT_BASE | 0x40000) 83#define ORION5X_PCIE_VIRT_BASE (ORION5X_REGS_VIRT_BASE | 0x40000)
107#define ORION5X_PCIE_REG(x) (ORION5X_PCIE_VIRT_BASE | (x))
108 84
109#define ORION5X_USB0_PHYS_BASE (ORION5X_REGS_PHYS_BASE | 0x50000) 85#define ORION5X_USB0_PHYS_BASE (ORION5X_REGS_PHYS_BASE | 0x50000)
110#define ORION5X_USB0_VIRT_BASE (ORION5X_REGS_VIRT_BASE | 0x50000) 86#define ORION5X_USB0_VIRT_BASE (ORION5X_REGS_VIRT_BASE | 0x50000)
111#define ORION5X_USB0_REG(x) (ORION5X_USB0_VIRT_BASE | (x))
112 87
113#define ORION5X_XOR_PHYS_BASE (ORION5X_REGS_PHYS_BASE | 0x60900) 88#define ORION5X_XOR_PHYS_BASE (ORION5X_REGS_PHYS_BASE | 0x60900)
114#define ORION5X_XOR_VIRT_BASE (ORION5X_REGS_VIRT_BASE | 0x60900) 89#define ORION5X_XOR_VIRT_BASE (ORION5X_REGS_VIRT_BASE | 0x60900)
115#define ORION5X_XOR_REG(x) (ORION5X_XOR_VIRT_BASE | (x))
116 90
117#define ORION5X_ETH_PHYS_BASE (ORION5X_REGS_PHYS_BASE | 0x70000) 91#define ORION5X_ETH_PHYS_BASE (ORION5X_REGS_PHYS_BASE | 0x70000)
118#define ORION5X_ETH_VIRT_BASE (ORION5X_REGS_VIRT_BASE | 0x70000) 92#define ORION5X_ETH_VIRT_BASE (ORION5X_REGS_VIRT_BASE | 0x70000)
119#define ORION5X_ETH_REG(x) (ORION5X_ETH_VIRT_BASE | (x))
120 93
121#define ORION5X_SATA_PHYS_BASE (ORION5X_REGS_PHYS_BASE | 0x80000) 94#define ORION5X_SATA_PHYS_BASE (ORION5X_REGS_PHYS_BASE | 0x80000)
122#define ORION5X_SATA_VIRT_BASE (ORION5X_REGS_VIRT_BASE | 0x80000) 95#define ORION5X_SATA_VIRT_BASE (ORION5X_REGS_VIRT_BASE | 0x80000)
123#define ORION5X_SATA_REG(x) (ORION5X_SATA_VIRT_BASE | (x))
124 96
125#define ORION5X_USB1_PHYS_BASE (ORION5X_REGS_PHYS_BASE | 0xa0000) 97#define ORION5X_USB1_PHYS_BASE (ORION5X_REGS_PHYS_BASE | 0xa0000)
126#define ORION5X_USB1_VIRT_BASE (ORION5X_REGS_VIRT_BASE | 0xa0000) 98#define ORION5X_USB1_VIRT_BASE (ORION5X_REGS_VIRT_BASE | 0xa0000)
127#define ORION5X_USB1_REG(x) (ORION5X_USB1_VIRT_BASE | (x))
128 99
129/******************************************************************************* 100/*******************************************************************************
130 * Device Bus Registers 101 * Device Bus Registers
@@ -142,23 +113,24 @@
142#define DEV_BUS_INT_CAUSE ORION5X_DEV_BUS_REG(0x4d0) 113#define DEV_BUS_INT_CAUSE ORION5X_DEV_BUS_REG(0x4d0)
143#define DEV_BUS_INT_MASK ORION5X_DEV_BUS_REG(0x4d4) 114#define DEV_BUS_INT_MASK ORION5X_DEV_BUS_REG(0x4d4)
144 115
145/*************************************************************************** 116/*******************************************************************************
146 * Orion CPU Bridge Registers 117 * Supported Devices & Revisions
147 **************************************************************************/ 118 ******************************************************************************/
148#define CPU_CONF ORION5X_BRIDGE_REG(0x100) 119/* Orion-1 (88F5181) and Orion-VoIP (88F5181L) */
149#define CPU_CTRL ORION5X_BRIDGE_REG(0x104) 120#define MV88F5181_DEV_ID 0x5181
150#define CPU_RESET_MASK ORION5X_BRIDGE_REG(0x108) 121#define MV88F5181_REV_B1 3
151#define WDT_RESET 0x0002 122#define MV88F5181L_REV_A0 8
152#define CPU_SOFT_RESET ORION5X_BRIDGE_REG(0x10c) 123#define MV88F5181L_REV_A1 9
153#define POWER_MNG_CTRL_REG ORION5X_BRIDGE_REG(0x11C) 124/* Orion-NAS (88F5182) */
154#define BRIDGE_CAUSE ORION5X_BRIDGE_REG(0x110) 125#define MV88F5182_DEV_ID 0x5182
155#define WDT_INT_REQ 0x0008 126#define MV88F5182_REV_A2 2
156#define BRIDGE_MASK ORION5X_BRIDGE_REG(0x114) 127/* Orion-2 (88F5281) */
157#define BRIDGE_INT_TIMER0 0x0002 128#define MV88F5281_DEV_ID 0x5281
158#define BRIDGE_INT_TIMER1 0x0004 129#define MV88F5281_REV_D0 4
159#define BRIDGE_INT_TIMER1_CLR (~0x0004) 130#define MV88F5281_REV_D1 5
160#define MAIN_IRQ_CAUSE ORION5X_BRIDGE_REG(0x200) 131#define MV88F5281_REV_D2 6
161#define MAIN_IRQ_MASK ORION5X_BRIDGE_REG(0x204) 132/* Orion-1-90 (88F6183) */
162 133#define MV88F6183_DEV_ID 0x6183
134#define MV88F6183_REV_B0 3
163 135
164#endif 136#endif
diff --git a/arch/arm/mach-orion5x/include/mach/system.h b/arch/arm/mach-orion5x/include/mach/system.h
index 9b8db1dcfa83..e912490fff23 100644
--- a/arch/arm/mach-orion5x/include/mach/system.h
+++ b/arch/arm/mach-orion5x/include/mach/system.h
@@ -11,8 +11,7 @@
11#ifndef __ASM_ARCH_SYSTEM_H 11#ifndef __ASM_ARCH_SYSTEM_H
12#define __ASM_ARCH_SYSTEM_H 12#define __ASM_ARCH_SYSTEM_H
13 13
14#include <mach/hardware.h> 14#include <mach/bridge-regs.h>
15#include <mach/orion5x.h>
16 15
17static inline void arch_idle(void) 16static inline void arch_idle(void)
18{ 17{
diff --git a/arch/arm/mach-orion5x/irq.c b/arch/arm/mach-orion5x/irq.c
index e03f7b45cb0d..d7512b925a85 100644
--- a/arch/arm/mach-orion5x/irq.c
+++ b/arch/arm/mach-orion5x/irq.c
@@ -15,7 +15,7 @@
15#include <linux/irq.h> 15#include <linux/irq.h>
16#include <linux/io.h> 16#include <linux/io.h>
17#include <asm/gpio.h> 17#include <asm/gpio.h>
18#include <mach/orion5x.h> 18#include <mach/bridge-regs.h>
19#include <plat/irq.h> 19#include <plat/irq.h>
20#include "common.h" 20#include "common.h"
21 21
diff --git a/arch/arm/mach-orion5x/mss2-setup.c b/arch/arm/mach-orion5x/mss2-setup.c
index 68acca98e638..41e6d5033d54 100644
--- a/arch/arm/mach-orion5x/mss2-setup.c
+++ b/arch/arm/mach-orion5x/mss2-setup.c
@@ -26,6 +26,7 @@
26#include <asm/mach/arch.h> 26#include <asm/mach/arch.h>
27#include <asm/mach/pci.h> 27#include <asm/mach/pci.h>
28#include <mach/orion5x.h> 28#include <mach/orion5x.h>
29#include <mach/bridge-regs.h>
29#include "common.h" 30#include "common.h"
30#include "mpp.h" 31#include "mpp.h"
31 32
diff --git a/arch/arm/mach-orion5x/pci.c b/arch/arm/mach-orion5x/pci.c
index d0a785a3b880..36dc5413cc97 100644
--- a/arch/arm/mach-orion5x/pci.c
+++ b/arch/arm/mach-orion5x/pci.c
@@ -196,6 +196,7 @@ static int __init pcie_setup(struct pci_sys_data *sys)
196/***************************************************************************** 196/*****************************************************************************
197 * PCI controller 197 * PCI controller
198 ****************************************************************************/ 198 ****************************************************************************/
199#define ORION5X_PCI_REG(x) (ORION5X_PCI_VIRT_BASE | (x))
199#define PCI_MODE ORION5X_PCI_REG(0xd00) 200#define PCI_MODE ORION5X_PCI_REG(0xd00)
200#define PCI_CMD ORION5X_PCI_REG(0xc00) 201#define PCI_CMD ORION5X_PCI_REG(0xc00)
201#define PCI_P2P_CONF ORION5X_PCI_REG(0x1d14) 202#define PCI_P2P_CONF ORION5X_PCI_REG(0x1d14)
diff --git a/arch/arm/mach-pxa/include/mach/audio.h b/arch/arm/mach-pxa/include/mach/audio.h
index f82f96dd1053..16eb02552d5d 100644
--- a/arch/arm/mach-pxa/include/mach/audio.h
+++ b/arch/arm/mach-pxa/include/mach/audio.h
@@ -4,12 +4,22 @@
4#include <sound/core.h> 4#include <sound/core.h>
5#include <sound/pcm.h> 5#include <sound/pcm.h>
6 6
7/*
8 * @reset_gpio: AC97 reset gpio (normally gpio113 or gpio95)
9 * a -1 value means no gpio will be used for reset
10
11 * reset_gpio should only be specified for pxa27x CPUs where a silicon
12 * bug prevents correct operation of the reset line. If not specified,
13 * the default behaviour on these CPUs is to consider gpio 113 as the
14 * AC97 reset line, which is the default on most boards.
15 */
7typedef struct { 16typedef struct {
8 int (*startup)(struct snd_pcm_substream *, void *); 17 int (*startup)(struct snd_pcm_substream *, void *);
9 void (*shutdown)(struct snd_pcm_substream *, void *); 18 void (*shutdown)(struct snd_pcm_substream *, void *);
10 void (*suspend)(void *); 19 void (*suspend)(void *);
11 void (*resume)(void *); 20 void (*resume)(void *);
12 void *priv; 21 void *priv;
22 int reset_gpio;
13} pxa2xx_audio_ops_t; 23} pxa2xx_audio_ops_t;
14 24
15extern void pxa_set_ac97_info(pxa2xx_audio_ops_t *ops); 25extern void pxa_set_ac97_info(pxa2xx_audio_ops_t *ops);
diff --git a/arch/arm/mach-pxa/include/mach/palmasoc.h b/arch/arm/mach-pxa/include/mach/palmasoc.h
index 6c4b1f7de20a..58afb30d5298 100644
--- a/arch/arm/mach-pxa/include/mach/palmasoc.h
+++ b/arch/arm/mach-pxa/include/mach/palmasoc.h
@@ -1,13 +1,8 @@
1#ifndef _INCLUDE_PALMASOC_H_ 1#ifndef _INCLUDE_PALMASOC_H_
2#define _INCLUDE_PALMASOC_H_ 2#define _INCLUDE_PALMASOC_H_
3
3struct palm27x_asoc_info { 4struct palm27x_asoc_info {
4 int jack_gpio; 5 int jack_gpio;
5}; 6};
6 7
7#ifdef CONFIG_SND_PXA2XX_SOC_PALM27X
8void __init palm27x_asoc_set_pdata(struct palm27x_asoc_info *data);
9#else
10static inline void palm27x_asoc_set_pdata(struct palm27x_asoc_info *data) {}
11#endif
12
13#endif 8#endif
diff --git a/arch/arm/mach-pxa/mioa701.c b/arch/arm/mach-pxa/mioa701.c
index 9203b069b35c..ff8052ce0a05 100644
--- a/arch/arm/mach-pxa/mioa701.c
+++ b/arch/arm/mach-pxa/mioa701.c
@@ -742,6 +742,10 @@ struct i2c_pxa_platform_data i2c_pdata = {
742 .fast_mode = 1, 742 .fast_mode = 1,
743}; 743};
744 744
745static pxa2xx_audio_ops_t mioa701_ac97_info = {
746 .reset_gpio = 95,
747};
748
745/* 749/*
746 * Mio global 750 * Mio global
747 */ 751 */
@@ -815,7 +819,7 @@ static void __init mioa701_machine_init(void)
815 pxa_set_keypad_info(&mioa701_keypad_info); 819 pxa_set_keypad_info(&mioa701_keypad_info);
816 wm97xx_bat_set_pdata(&mioa701_battery_data); 820 wm97xx_bat_set_pdata(&mioa701_battery_data);
817 pxa_set_udc_info(&mioa701_udc_info); 821 pxa_set_udc_info(&mioa701_udc_info);
818 pxa_set_ac97_info(NULL); 822 pxa_set_ac97_info(&mioa701_ac97_info);
819 pm_power_off = mioa701_poweroff; 823 pm_power_off = mioa701_poweroff;
820 arm_pm_restart = mioa701_restart; 824 arm_pm_restart = mioa701_restart;
821 platform_add_devices(devices, ARRAY_SIZE(devices)); 825 platform_add_devices(devices, ARRAY_SIZE(devices));
diff --git a/arch/arm/mach-pxa/palmld.c b/arch/arm/mach-pxa/palmld.c
index ecf5910e39d7..1cec1806f002 100644
--- a/arch/arm/mach-pxa/palmld.c
+++ b/arch/arm/mach-pxa/palmld.c
@@ -477,10 +477,22 @@ static struct wm97xx_batt_info wm97xx_batt_pdata = {
477/****************************************************************************** 477/******************************************************************************
478 * aSoC audio 478 * aSoC audio
479 ******************************************************************************/ 479 ******************************************************************************/
480static struct palm27x_asoc_info palm27x_asoc_pdata = { 480static struct palm27x_asoc_info palmld_asoc_pdata = {
481 .jack_gpio = GPIO_NR_PALMLD_EARPHONE_DETECT, 481 .jack_gpio = GPIO_NR_PALMLD_EARPHONE_DETECT,
482}; 482};
483 483
484static pxa2xx_audio_ops_t palmld_ac97_pdata = {
485 .reset_gpio = 95,
486};
487
488static struct platform_device palmld_asoc = {
489 .name = "palm27x-asoc",
490 .id = -1,
491 .dev = {
492 .platform_data = &palmld_asoc_pdata,
493 },
494};
495
484/****************************************************************************** 496/******************************************************************************
485 * Framebuffer 497 * Framebuffer
486 ******************************************************************************/ 498 ******************************************************************************/
@@ -544,6 +556,7 @@ static struct platform_device *devices[] __initdata = {
544 &palmld_backlight, 556 &palmld_backlight,
545 &palmld_leds, 557 &palmld_leds,
546 &power_supply, 558 &power_supply,
559 &palmld_asoc,
547}; 560};
548 561
549static struct map_desc palmld_io_desc[] __initdata = { 562static struct map_desc palmld_io_desc[] __initdata = {
@@ -573,11 +586,10 @@ static void __init palmld_init(void)
573 586
574 set_pxa_fb_info(&palmld_lcd_screen); 587 set_pxa_fb_info(&palmld_lcd_screen);
575 pxa_set_mci_info(&palmld_mci_platform_data); 588 pxa_set_mci_info(&palmld_mci_platform_data);
576 pxa_set_ac97_info(NULL); 589 pxa_set_ac97_info(&palmld_ac97_pdata);
577 pxa_set_ficp_info(&palmld_ficp_platform_data); 590 pxa_set_ficp_info(&palmld_ficp_platform_data);
578 pxa_set_keypad_info(&palmld_keypad_platform_data); 591 pxa_set_keypad_info(&palmld_keypad_platform_data);
579 wm97xx_bat_set_pdata(&wm97xx_batt_pdata); 592 wm97xx_bat_set_pdata(&wm97xx_batt_pdata);
580 palm27x_asoc_set_pdata(&palm27x_asoc_pdata);
581 593
582 platform_add_devices(devices, ARRAY_SIZE(devices)); 594 platform_add_devices(devices, ARRAY_SIZE(devices));
583} 595}
diff --git a/arch/arm/mach-pxa/palmt5.c b/arch/arm/mach-pxa/palmt5.c
index d7f81068c613..30662363907b 100644
--- a/arch/arm/mach-pxa/palmt5.c
+++ b/arch/arm/mach-pxa/palmt5.c
@@ -420,10 +420,22 @@ static struct wm97xx_batt_info wm97xx_batt_pdata = {
420/****************************************************************************** 420/******************************************************************************
421 * aSoC audio 421 * aSoC audio
422 ******************************************************************************/ 422 ******************************************************************************/
423static struct palm27x_asoc_info palm27x_asoc_pdata = { 423static struct palm27x_asoc_info palmt5_asoc_pdata = {
424 .jack_gpio = GPIO_NR_PALMT5_EARPHONE_DETECT, 424 .jack_gpio = GPIO_NR_PALMT5_EARPHONE_DETECT,
425}; 425};
426 426
427static pxa2xx_audio_ops_t palmt5_ac97_pdata = {
428 .reset_gpio = 95,
429};
430
431static struct platform_device palmt5_asoc = {
432 .name = "palm27x-asoc",
433 .id = -1,
434 .dev = {
435 .platform_data = &palmt5_asoc_pdata,
436 },
437};
438
427/****************************************************************************** 439/******************************************************************************
428 * Framebuffer 440 * Framebuffer
429 ******************************************************************************/ 441 ******************************************************************************/
@@ -486,6 +498,7 @@ static struct platform_device *devices[] __initdata = {
486#endif 498#endif
487 &palmt5_backlight, 499 &palmt5_backlight,
488 &power_supply, 500 &power_supply,
501 &palmt5_asoc,
489}; 502};
490 503
491/* setup udc GPIOs initial state */ 504/* setup udc GPIOs initial state */
@@ -504,12 +517,11 @@ static void __init palmt5_init(void)
504 set_pxa_fb_info(&palmt5_lcd_screen); 517 set_pxa_fb_info(&palmt5_lcd_screen);
505 pxa_set_mci_info(&palmt5_mci_platform_data); 518 pxa_set_mci_info(&palmt5_mci_platform_data);
506 palmt5_udc_init(); 519 palmt5_udc_init();
520 pxa_set_ac97_info(&palmt5_ac97_pdata);
507 pxa_set_udc_info(&palmt5_udc_info); 521 pxa_set_udc_info(&palmt5_udc_info);
508 pxa_set_ac97_info(NULL);
509 pxa_set_ficp_info(&palmt5_ficp_platform_data); 522 pxa_set_ficp_info(&palmt5_ficp_platform_data);
510 pxa_set_keypad_info(&palmt5_keypad_platform_data); 523 pxa_set_keypad_info(&palmt5_keypad_platform_data);
511 wm97xx_bat_set_pdata(&wm97xx_batt_pdata); 524 wm97xx_bat_set_pdata(&wm97xx_batt_pdata);
512 palm27x_asoc_set_pdata(&palm27x_asoc_pdata);
513 platform_add_devices(devices, ARRAY_SIZE(devices)); 525 platform_add_devices(devices, ARRAY_SIZE(devices));
514} 526}
515 527
diff --git a/arch/arm/mach-pxa/palmtx.c b/arch/arm/mach-pxa/palmtx.c
index 14393d0ad8b8..e2d44b1a8a9b 100644
--- a/arch/arm/mach-pxa/palmtx.c
+++ b/arch/arm/mach-pxa/palmtx.c
@@ -40,6 +40,7 @@
40#include <mach/irda.h> 40#include <mach/irda.h>
41#include <mach/pxa27x_keypad.h> 41#include <mach/pxa27x_keypad.h>
42#include <mach/udc.h> 42#include <mach/udc.h>
43#include <mach/palmasoc.h>
43 44
44#include "generic.h" 45#include "generic.h"
45#include "devices.h" 46#include "devices.h"
@@ -434,6 +435,25 @@ static struct wm97xx_batt_info wm97xx_batt_pdata = {
434}; 435};
435 436
436/****************************************************************************** 437/******************************************************************************
438 * aSoC audio
439 ******************************************************************************/
440static struct palm27x_asoc_info palmtx_asoc_pdata = {
441 .jack_gpio = GPIO_NR_PALMTX_EARPHONE_DETECT,
442};
443
444static pxa2xx_audio_ops_t palmtx_ac97_pdata = {
445 .reset_gpio = 95,
446};
447
448static struct platform_device palmtx_asoc = {
449 .name = "palm27x-asoc",
450 .id = -1,
451 .dev = {
452 .platform_data = &palmtx_asoc_pdata,
453 },
454};
455
456/******************************************************************************
437 * Framebuffer 457 * Framebuffer
438 ******************************************************************************/ 458 ******************************************************************************/
439static struct pxafb_mode_info palmtx_lcd_modes[] = { 459static struct pxafb_mode_info palmtx_lcd_modes[] = {
@@ -495,6 +515,7 @@ static struct platform_device *devices[] __initdata = {
495#endif 515#endif
496 &palmtx_backlight, 516 &palmtx_backlight,
497 &power_supply, 517 &power_supply,
518 &palmtx_asoc,
498}; 519};
499 520
500static struct map_desc palmtx_io_desc[] __initdata = { 521static struct map_desc palmtx_io_desc[] __initdata = {
@@ -529,8 +550,8 @@ static void __init palmtx_init(void)
529 set_pxa_fb_info(&palmtx_lcd_screen); 550 set_pxa_fb_info(&palmtx_lcd_screen);
530 pxa_set_mci_info(&palmtx_mci_platform_data); 551 pxa_set_mci_info(&palmtx_mci_platform_data);
531 palmtx_udc_init(); 552 palmtx_udc_init();
553 pxa_set_ac97_info(&palmtx_ac97_pdata);
532 pxa_set_udc_info(&palmtx_udc_info); 554 pxa_set_udc_info(&palmtx_udc_info);
533 pxa_set_ac97_info(NULL);
534 pxa_set_ficp_info(&palmtx_ficp_platform_data); 555 pxa_set_ficp_info(&palmtx_ficp_platform_data);
535 pxa_set_keypad_info(&palmtx_keypad_platform_data); 556 pxa_set_keypad_info(&palmtx_keypad_platform_data);
536 wm97xx_bat_set_pdata(&wm97xx_batt_pdata); 557 wm97xx_bat_set_pdata(&wm97xx_batt_pdata);
diff --git a/arch/arm/mach-pxa/pcm990-baseboard.c b/arch/arm/mach-pxa/pcm990-baseboard.c
index 6112740b4ae9..6c12b5a3132f 100644
--- a/arch/arm/mach-pxa/pcm990-baseboard.c
+++ b/arch/arm/mach-pxa/pcm990-baseboard.c
@@ -377,7 +377,7 @@ struct pxacamera_platform_data pcm990_pxacamera_platform_data = {
377#include <linux/i2c/pca953x.h> 377#include <linux/i2c/pca953x.h>
378 378
379static struct pca953x_platform_data pca9536_data = { 379static struct pca953x_platform_data pca9536_data = {
380 .gpio_base = NR_BUILTIN_GPIO + 1, 380 .gpio_base = NR_BUILTIN_GPIO,
381}; 381};
382 382
383static int gpio_bus_switch; 383static int gpio_bus_switch;
@@ -405,9 +405,9 @@ static unsigned long pcm990_camera_query_bus_param(struct soc_camera_link *link)
405 int ret; 405 int ret;
406 406
407 if (!gpio_bus_switch) { 407 if (!gpio_bus_switch) {
408 ret = gpio_request(NR_BUILTIN_GPIO + 1, "camera"); 408 ret = gpio_request(NR_BUILTIN_GPIO, "camera");
409 if (!ret) { 409 if (!ret) {
410 gpio_bus_switch = NR_BUILTIN_GPIO + 1; 410 gpio_bus_switch = NR_BUILTIN_GPIO;
411 gpio_direction_output(gpio_bus_switch, 0); 411 gpio_direction_output(gpio_bus_switch, 0);
412 } else 412 } else
413 gpio_bus_switch = -EINVAL; 413 gpio_bus_switch = -EINVAL;
diff --git a/arch/arm/plat-orion/time.c b/arch/arm/plat-orion/time.c
index 2faf9dba4ef7..de8a001fc3a9 100644
--- a/arch/arm/plat-orion/time.c
+++ b/arch/arm/plat-orion/time.c
@@ -16,7 +16,7 @@
16#include <linux/interrupt.h> 16#include <linux/interrupt.h>
17#include <linux/irq.h> 17#include <linux/irq.h>
18#include <asm/mach/time.h> 18#include <asm/mach/time.h>
19#include <mach/hardware.h> 19#include <mach/bridge-regs.h>
20 20
21/* 21/*
22 * Number of timer ticks per jiffy. 22 * Number of timer ticks per jiffy.
diff --git a/arch/frv/kernel/head.S b/arch/frv/kernel/head.S
index fecf751c5cae..b825ef3f2d54 100644
--- a/arch/frv/kernel/head.S
+++ b/arch/frv/kernel/head.S
@@ -9,6 +9,7 @@
9 * 2 of the License, or (at your option) any later version. 9 * 2 of the License, or (at your option) any later version.
10 */ 10 */
11 11
12#include <linux/init.h>
12#include <linux/threads.h> 13#include <linux/threads.h>
13#include <linux/linkage.h> 14#include <linux/linkage.h>
14#include <asm/thread_info.h> 15#include <asm/thread_info.h>
@@ -27,7 +28,7 @@
27# command line string 28# command line string
28# 29#
29############################################################################### 30###############################################################################
30 .section .text.head,"ax" 31 __HEAD
31 .balign 4 32 .balign 4
32 33
33 .globl _boot, __head_reference 34 .globl _boot, __head_reference
diff --git a/arch/frv/kernel/vmlinux.lds.S b/arch/frv/kernel/vmlinux.lds.S
index b95c4eace62f..22d9787406ed 100644
--- a/arch/frv/kernel/vmlinux.lds.S
+++ b/arch/frv/kernel/vmlinux.lds.S
@@ -26,7 +26,7 @@ SECTIONS
26 26
27 _sinittext = .; 27 _sinittext = .;
28 .init.text : { 28 .init.text : {
29 *(.text.head) 29 HEAD_TEXT
30#ifndef CONFIG_DEBUG_INFO 30#ifndef CONFIG_DEBUG_INFO
31 INIT_TEXT 31 INIT_TEXT
32 EXIT_TEXT 32 EXIT_TEXT
diff --git a/arch/ia64/include/asm/smp.h b/arch/ia64/include/asm/smp.h
index 598408336251..d217d1d4e051 100644
--- a/arch/ia64/include/asm/smp.h
+++ b/arch/ia64/include/asm/smp.h
@@ -58,7 +58,7 @@ extern struct smp_boot_data {
58extern char no_int_routing __devinitdata; 58extern char no_int_routing __devinitdata;
59 59
60extern cpumask_t cpu_core_map[NR_CPUS]; 60extern cpumask_t cpu_core_map[NR_CPUS];
61DECLARE_PER_CPU(cpumask_t, cpu_sibling_map); 61DECLARE_PER_CPU_SHARED_ALIGNED(cpumask_t, cpu_sibling_map);
62extern int smp_num_siblings; 62extern int smp_num_siblings;
63extern void __iomem *ipi_base_addr; 63extern void __iomem *ipi_base_addr;
64extern unsigned char smp_int_redirect; 64extern unsigned char smp_int_redirect;
diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c
index 28af6a731bb8..d20a5db4c4dd 100644
--- a/arch/ia64/kvm/kvm-ia64.c
+++ b/arch/ia64/kvm/kvm-ia64.c
@@ -610,20 +610,22 @@ static int __vcpu_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
610 int r; 610 int r;
611 611
612again: 612again:
613 preempt_disable();
614 local_irq_disable();
615
616 if (signal_pending(current)) { 613 if (signal_pending(current)) {
617 local_irq_enable();
618 preempt_enable();
619 r = -EINTR; 614 r = -EINTR;
620 kvm_run->exit_reason = KVM_EXIT_INTR; 615 kvm_run->exit_reason = KVM_EXIT_INTR;
621 goto out; 616 goto out;
622 } 617 }
623 618
619 /*
620 * down_read() may sleep and return with interrupts enabled
621 */
622 down_read(&vcpu->kvm->slots_lock);
623
624 preempt_disable();
625 local_irq_disable();
626
624 vcpu->guest_mode = 1; 627 vcpu->guest_mode = 1;
625 kvm_guest_enter(); 628 kvm_guest_enter();
626 down_read(&vcpu->kvm->slots_lock);
627 r = vti_vcpu_run(vcpu, kvm_run); 629 r = vti_vcpu_run(vcpu, kvm_run);
628 if (r < 0) { 630 if (r < 0) {
629 local_irq_enable(); 631 local_irq_enable();
diff --git a/arch/m32r/kernel/head.S b/arch/m32r/kernel/head.S
index 90916067b9c1..0a7194439eb1 100644
--- a/arch/m32r/kernel/head.S
+++ b/arch/m32r/kernel/head.S
@@ -23,7 +23,7 @@ __INITDATA
23/* 23/*
24 * References to members of the boot_cpu_data structure. 24 * References to members of the boot_cpu_data structure.
25 */ 25 */
26.section .text.head, "ax" 26__HEAD
27 .global start_kernel 27 .global start_kernel
28 .global __bss_start 28 .global __bss_start
29 .global _end 29 .global _end
diff --git a/arch/m32r/kernel/vmlinux.lds.S b/arch/m32r/kernel/vmlinux.lds.S
index 9db05df20c0e..4179adf6c624 100644
--- a/arch/m32r/kernel/vmlinux.lds.S
+++ b/arch/m32r/kernel/vmlinux.lds.S
@@ -27,7 +27,7 @@ SECTIONS
27 _text = .; /* Text and read-only data */ 27 _text = .; /* Text and read-only data */
28 .boot : { *(.boot) } = 0 28 .boot : { *(.boot) } = 0
29 .text : { 29 .text : {
30 *(.text.head) 30 HEAD_TEXT
31 TEXT_TEXT 31 TEXT_TEXT
32 SCHED_TEXT 32 SCHED_TEXT
33 LOCK_TEXT 33 LOCK_TEXT
diff --git a/arch/m68k/configs/amiga_defconfig b/arch/m68k/configs/amiga_defconfig
index 23597beb66c1..0f69fa5ddf26 100644
--- a/arch/m68k/configs/amiga_defconfig
+++ b/arch/m68k/configs/amiga_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc7 3# Linux kernel version: 2.6.30-rc3
4# Tue Dec 2 20:27:42 2008 4# Wed Apr 22 20:47:52 2009
5# 5#
6CONFIG_M68K=y 6CONFIG_M68K=y
7CONFIG_MMU=y 7CONFIG_MMU=y
@@ -29,14 +29,24 @@ CONFIG_SWAP=y
29CONFIG_SYSVIPC=y 29CONFIG_SYSVIPC=y
30CONFIG_SYSVIPC_SYSCTL=y 30CONFIG_SYSVIPC_SYSCTL=y
31CONFIG_POSIX_MQUEUE=y 31CONFIG_POSIX_MQUEUE=y
32CONFIG_POSIX_MQUEUE_SYSCTL=y
32CONFIG_BSD_PROCESS_ACCT=y 33CONFIG_BSD_PROCESS_ACCT=y
33# CONFIG_BSD_PROCESS_ACCT_V3 is not set 34# CONFIG_BSD_PROCESS_ACCT_V3 is not set
34# CONFIG_TASKSTATS is not set 35# CONFIG_TASKSTATS is not set
35# CONFIG_AUDIT is not set 36# CONFIG_AUDIT is not set
37
38#
39# RCU Subsystem
40#
41CONFIG_CLASSIC_RCU=y
42# CONFIG_TREE_RCU is not set
43# CONFIG_PREEMPT_RCU is not set
44# CONFIG_TREE_RCU_TRACE is not set
45# CONFIG_PREEMPT_RCU_TRACE is not set
36# CONFIG_IKCONFIG is not set 46# CONFIG_IKCONFIG is not set
37CONFIG_LOG_BUF_SHIFT=14 47CONFIG_LOG_BUF_SHIFT=14
38# CONFIG_CGROUPS is not set
39# CONFIG_GROUP_SCHED is not set 48# CONFIG_GROUP_SCHED is not set
49# CONFIG_CGROUPS is not set
40# CONFIG_SYSFS_DEPRECATED_V2 is not set 50# CONFIG_SYSFS_DEPRECATED_V2 is not set
41CONFIG_RELAY=y 51CONFIG_RELAY=y
42CONFIG_NAMESPACES=y 52CONFIG_NAMESPACES=y
@@ -44,23 +54,27 @@ CONFIG_NAMESPACES=y
44# CONFIG_IPC_NS is not set 54# CONFIG_IPC_NS is not set
45# CONFIG_USER_NS is not set 55# CONFIG_USER_NS is not set
46# CONFIG_PID_NS is not set 56# CONFIG_PID_NS is not set
57# CONFIG_NET_NS is not set
47CONFIG_BLK_DEV_INITRD=y 58CONFIG_BLK_DEV_INITRD=y
48CONFIG_INITRAMFS_SOURCE="" 59CONFIG_INITRAMFS_SOURCE=""
60CONFIG_RD_GZIP=y
61CONFIG_RD_BZIP2=y
62CONFIG_RD_LZMA=y
49# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 63# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
50CONFIG_SYSCTL=y 64CONFIG_SYSCTL=y
65CONFIG_ANON_INODES=y
51# CONFIG_EMBEDDED is not set 66# CONFIG_EMBEDDED is not set
52CONFIG_UID16=y 67CONFIG_UID16=y
53CONFIG_SYSCTL_SYSCALL=y 68CONFIG_SYSCTL_SYSCALL=y
54CONFIG_KALLSYMS=y 69CONFIG_KALLSYMS=y
55# CONFIG_KALLSYMS_EXTRA_PASS is not set 70# CONFIG_KALLSYMS_EXTRA_PASS is not set
71# CONFIG_STRIP_ASM_SYMS is not set
56CONFIG_HOTPLUG=y 72CONFIG_HOTPLUG=y
57CONFIG_PRINTK=y 73CONFIG_PRINTK=y
58CONFIG_BUG=y 74CONFIG_BUG=y
59CONFIG_ELF_CORE=y 75CONFIG_ELF_CORE=y
60CONFIG_COMPAT_BRK=y
61CONFIG_BASE_FULL=y 76CONFIG_BASE_FULL=y
62CONFIG_FUTEX=y 77CONFIG_FUTEX=y
63CONFIG_ANON_INODES=y
64CONFIG_EPOLL=y 78CONFIG_EPOLL=y
65CONFIG_SIGNALFD=y 79CONFIG_SIGNALFD=y
66CONFIG_TIMERFD=y 80CONFIG_TIMERFD=y
@@ -68,15 +82,16 @@ CONFIG_EVENTFD=y
68CONFIG_SHMEM=y 82CONFIG_SHMEM=y
69CONFIG_AIO=y 83CONFIG_AIO=y
70CONFIG_VM_EVENT_COUNTERS=y 84CONFIG_VM_EVENT_COUNTERS=y
85CONFIG_COMPAT_BRK=y
71CONFIG_SLAB=y 86CONFIG_SLAB=y
72# CONFIG_SLUB is not set 87# CONFIG_SLUB is not set
73# CONFIG_SLOB is not set 88# CONFIG_SLOB is not set
74# CONFIG_PROFILING is not set 89# CONFIG_PROFILING is not set
75# CONFIG_MARKERS is not set 90# CONFIG_MARKERS is not set
91# CONFIG_SLOW_WORK is not set
76# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 92# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
77CONFIG_SLABINFO=y 93CONFIG_SLABINFO=y
78CONFIG_RT_MUTEXES=y 94CONFIG_RT_MUTEXES=y
79# CONFIG_TINY_SHMEM is not set
80CONFIG_BASE_SMALL=0 95CONFIG_BASE_SMALL=0
81CONFIG_MODULES=y 96CONFIG_MODULES=y
82# CONFIG_MODULE_FORCE_LOAD is not set 97# CONFIG_MODULE_FORCE_LOAD is not set
@@ -84,11 +99,8 @@ CONFIG_MODULE_UNLOAD=y
84# CONFIG_MODULE_FORCE_UNLOAD is not set 99# CONFIG_MODULE_FORCE_UNLOAD is not set
85# CONFIG_MODVERSIONS is not set 100# CONFIG_MODVERSIONS is not set
86# CONFIG_MODULE_SRCVERSION_ALL is not set 101# CONFIG_MODULE_SRCVERSION_ALL is not set
87CONFIG_KMOD=y
88CONFIG_BLOCK=y 102CONFIG_BLOCK=y
89# CONFIG_LBD is not set 103# CONFIG_LBD is not set
90# CONFIG_BLK_DEV_IO_TRACE is not set
91# CONFIG_LSF is not set
92CONFIG_BLK_DEV_BSG=y 104CONFIG_BLK_DEV_BSG=y
93# CONFIG_BLK_DEV_INTEGRITY is not set 105# CONFIG_BLK_DEV_INTEGRITY is not set
94 106
@@ -104,7 +116,6 @@ CONFIG_DEFAULT_AS=y
104# CONFIG_DEFAULT_CFQ is not set 116# CONFIG_DEFAULT_CFQ is not set
105# CONFIG_DEFAULT_NOOP is not set 117# CONFIG_DEFAULT_NOOP is not set
106CONFIG_DEFAULT_IOSCHED="anticipatory" 118CONFIG_DEFAULT_IOSCHED="anticipatory"
107CONFIG_CLASSIC_RCU=y
108# CONFIG_FREEZER is not set 119# CONFIG_FREEZER is not set
109 120
110# 121#
@@ -140,12 +151,13 @@ CONFIG_FLAT_NODE_MEM_MAP=y
140CONFIG_NEED_MULTIPLE_NODES=y 151CONFIG_NEED_MULTIPLE_NODES=y
141CONFIG_PAGEFLAGS_EXTENDED=y 152CONFIG_PAGEFLAGS_EXTENDED=y
142CONFIG_SPLIT_PTLOCK_CPUS=4 153CONFIG_SPLIT_PTLOCK_CPUS=4
143# CONFIG_RESOURCES_64BIT is not set
144# CONFIG_PHYS_ADDR_T_64BIT is not set 154# CONFIG_PHYS_ADDR_T_64BIT is not set
145CONFIG_ZONE_DMA_FLAG=1 155CONFIG_ZONE_DMA_FLAG=1
146CONFIG_BOUNCE=y 156CONFIG_BOUNCE=y
147CONFIG_VIRT_TO_BUS=y 157CONFIG_VIRT_TO_BUS=y
148CONFIG_UNEVICTABLE_LRU=y 158CONFIG_UNEVICTABLE_LRU=y
159CONFIG_HAVE_MLOCK=y
160CONFIG_HAVE_MLOCKED_PAGE_BIT=y
149 161
150# 162#
151# General setup 163# General setup
@@ -157,7 +169,7 @@ CONFIG_BINFMT_AOUT=m
157CONFIG_BINFMT_MISC=m 169CONFIG_BINFMT_MISC=m
158CONFIG_ZORRO=y 170CONFIG_ZORRO=y
159CONFIG_AMIGA_PCMCIA=y 171CONFIG_AMIGA_PCMCIA=y
160# CONFIG_HEARTBEAT is not set 172CONFIG_HEARTBEAT=y
161CONFIG_PROC_HARDWARE=y 173CONFIG_PROC_HARDWARE=y
162CONFIG_ISA=y 174CONFIG_ISA=y
163CONFIG_GENERIC_ISA_DMA=y 175CONFIG_GENERIC_ISA_DMA=y
@@ -184,7 +196,10 @@ CONFIG_INET=y
184# CONFIG_IP_MULTICAST is not set 196# CONFIG_IP_MULTICAST is not set
185# CONFIG_IP_ADVANCED_ROUTER is not set 197# CONFIG_IP_ADVANCED_ROUTER is not set
186CONFIG_IP_FIB_HASH=y 198CONFIG_IP_FIB_HASH=y
187# CONFIG_IP_PNP is not set 199CONFIG_IP_PNP=y
200# CONFIG_IP_PNP_DHCP is not set
201# CONFIG_IP_PNP_BOOTP is not set
202# CONFIG_IP_PNP_RARP is not set
188CONFIG_NET_IPIP=m 203CONFIG_NET_IPIP=m
189CONFIG_NET_IPGRE=m 204CONFIG_NET_IPGRE=m
190# CONFIG_ARPD is not set 205# CONFIG_ARPD is not set
@@ -258,6 +273,7 @@ CONFIG_NETFILTER_XTABLES=m
258CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 273CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
259CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 274CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
260CONFIG_NETFILTER_XT_TARGET_DSCP=m 275CONFIG_NETFILTER_XT_TARGET_DSCP=m
276CONFIG_NETFILTER_XT_TARGET_HL=m
261CONFIG_NETFILTER_XT_TARGET_MARK=m 277CONFIG_NETFILTER_XT_TARGET_MARK=m
262CONFIG_NETFILTER_XT_TARGET_NFLOG=m 278CONFIG_NETFILTER_XT_TARGET_NFLOG=m
263CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 279CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
@@ -266,6 +282,7 @@ CONFIG_NETFILTER_XT_TARGET_RATEEST=m
266CONFIG_NETFILTER_XT_TARGET_TRACE=m 282CONFIG_NETFILTER_XT_TARGET_TRACE=m
267CONFIG_NETFILTER_XT_TARGET_TCPMSS=m 283CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
268CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m 284CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
285CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
269CONFIG_NETFILTER_XT_MATCH_COMMENT=m 286CONFIG_NETFILTER_XT_MATCH_COMMENT=m
270CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m 287CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
271CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m 288CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
@@ -276,6 +293,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m
276CONFIG_NETFILTER_XT_MATCH_ESP=m 293CONFIG_NETFILTER_XT_MATCH_ESP=m
277CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m 294CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
278CONFIG_NETFILTER_XT_MATCH_HELPER=m 295CONFIG_NETFILTER_XT_MATCH_HELPER=m
296CONFIG_NETFILTER_XT_MATCH_HL=m
279CONFIG_NETFILTER_XT_MATCH_IPRANGE=m 297CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
280CONFIG_NETFILTER_XT_MATCH_LENGTH=m 298CONFIG_NETFILTER_XT_MATCH_LENGTH=m
281CONFIG_NETFILTER_XT_MATCH_LIMIT=m 299CONFIG_NETFILTER_XT_MATCH_LIMIT=m
@@ -354,25 +372,20 @@ CONFIG_IP6_NF_MATCH_HL=m
354CONFIG_IP6_NF_MATCH_IPV6HEADER=m 372CONFIG_IP6_NF_MATCH_IPV6HEADER=m
355CONFIG_IP6_NF_MATCH_MH=m 373CONFIG_IP6_NF_MATCH_MH=m
356CONFIG_IP6_NF_MATCH_RT=m 374CONFIG_IP6_NF_MATCH_RT=m
375CONFIG_IP6_NF_TARGET_HL=m
357CONFIG_IP6_NF_TARGET_LOG=m 376CONFIG_IP6_NF_TARGET_LOG=m
358CONFIG_IP6_NF_FILTER=m 377CONFIG_IP6_NF_FILTER=m
359CONFIG_IP6_NF_TARGET_REJECT=m 378CONFIG_IP6_NF_TARGET_REJECT=m
360CONFIG_IP6_NF_MANGLE=m 379CONFIG_IP6_NF_MANGLE=m
361CONFIG_IP6_NF_TARGET_HL=m
362CONFIG_IP6_NF_RAW=m 380CONFIG_IP6_NF_RAW=m
363CONFIG_IP_DCCP=m 381CONFIG_IP_DCCP=m
364CONFIG_INET_DCCP_DIAG=m 382CONFIG_INET_DCCP_DIAG=m
365CONFIG_IP_DCCP_ACKVEC=y
366 383
367# 384#
368# DCCP CCIDs Configuration (EXPERIMENTAL) 385# DCCP CCIDs Configuration (EXPERIMENTAL)
369# 386#
370CONFIG_IP_DCCP_CCID2=m
371# CONFIG_IP_DCCP_CCID2_DEBUG is not set 387# CONFIG_IP_DCCP_CCID2_DEBUG is not set
372CONFIG_IP_DCCP_CCID3=m 388# CONFIG_IP_DCCP_CCID3 is not set
373# CONFIG_IP_DCCP_CCID3_DEBUG is not set
374CONFIG_IP_DCCP_CCID3_RTO=100
375CONFIG_IP_DCCP_TFRC_LIB=m
376CONFIG_IP_SCTP=m 389CONFIG_IP_SCTP=m
377# CONFIG_SCTP_DBG_MSG is not set 390# CONFIG_SCTP_DBG_MSG is not set
378# CONFIG_SCTP_DBG_OBJCNT is not set 391# CONFIG_SCTP_DBG_OBJCNT is not set
@@ -394,8 +407,10 @@ CONFIG_ATALK=m
394# CONFIG_LAPB is not set 407# CONFIG_LAPB is not set
395# CONFIG_ECONET is not set 408# CONFIG_ECONET is not set
396# CONFIG_WAN_ROUTER is not set 409# CONFIG_WAN_ROUTER is not set
410# CONFIG_PHONET is not set
397# CONFIG_NET_SCHED is not set 411# CONFIG_NET_SCHED is not set
398CONFIG_NET_CLS_ROUTE=y 412CONFIG_NET_CLS_ROUTE=y
413# CONFIG_DCB is not set
399 414
400# 415#
401# Network testing 416# Network testing
@@ -406,8 +421,8 @@ CONFIG_NET_CLS_ROUTE=y
406# CONFIG_IRDA is not set 421# CONFIG_IRDA is not set
407# CONFIG_BT is not set 422# CONFIG_BT is not set
408# CONFIG_AF_RXRPC is not set 423# CONFIG_AF_RXRPC is not set
409# CONFIG_PHONET is not set
410# CONFIG_WIRELESS is not set 424# CONFIG_WIRELESS is not set
425# CONFIG_WIMAX is not set
411# CONFIG_RFKILL is not set 426# CONFIG_RFKILL is not set
412# CONFIG_NET_9P is not set 427# CONFIG_NET_9P is not set
413 428
@@ -453,15 +468,20 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
453CONFIG_ATA_OVER_ETH=m 468CONFIG_ATA_OVER_ETH=m
454# CONFIG_BLK_DEV_HD is not set 469# CONFIG_BLK_DEV_HD is not set
455CONFIG_MISC_DEVICES=y 470CONFIG_MISC_DEVICES=y
456# CONFIG_EEPROM_93CX6 is not set
457# CONFIG_ENCLOSURE_SERVICES is not set 471# CONFIG_ENCLOSURE_SERVICES is not set
458# CONFIG_C2PORT is not set 472# CONFIG_C2PORT is not set
473
474#
475# EEPROM support
476#
477# CONFIG_EEPROM_93CX6 is not set
459CONFIG_HAVE_IDE=y 478CONFIG_HAVE_IDE=y
460CONFIG_IDE=y 479CONFIG_IDE=y
461 480
462# 481#
463# Please see Documentation/ide/ide.txt for help/info on IDE drives 482# Please see Documentation/ide/ide.txt for help/info on IDE drives
464# 483#
484CONFIG_IDE_ATAPI=y
465# CONFIG_BLK_DEV_IDE_SATA is not set 485# CONFIG_BLK_DEV_IDE_SATA is not set
466CONFIG_IDE_GD=y 486CONFIG_IDE_GD=y
467CONFIG_IDE_GD_ATA=y 487CONFIG_IDE_GD_ATA=y
@@ -469,7 +489,6 @@ CONFIG_IDE_GD_ATA=y
469CONFIG_BLK_DEV_IDECD=y 489CONFIG_BLK_DEV_IDECD=y
470CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y 490CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
471# CONFIG_BLK_DEV_IDETAPE is not set 491# CONFIG_BLK_DEV_IDETAPE is not set
472# CONFIG_BLK_DEV_IDESCSI is not set
473# CONFIG_IDE_TASK_IOCTL is not set 492# CONFIG_IDE_TASK_IOCTL is not set
474CONFIG_IDE_PROC_FS=y 493CONFIG_IDE_PROC_FS=y
475 494
@@ -478,7 +497,6 @@ CONFIG_IDE_PROC_FS=y
478# 497#
479# CONFIG_BLK_DEV_PLATFORM is not set 498# CONFIG_BLK_DEV_PLATFORM is not set
480CONFIG_BLK_DEV_GAYLE=y 499CONFIG_BLK_DEV_GAYLE=y
481CONFIG_BLK_DEV_IDEDOUBLER=y
482CONFIG_BLK_DEV_BUDDHA=y 500CONFIG_BLK_DEV_BUDDHA=y
483# CONFIG_BLK_DEV_IDEDMA is not set 501# CONFIG_BLK_DEV_IDEDMA is not set
484 502
@@ -530,6 +548,8 @@ CONFIG_ISCSI_TCP=m
530# CONFIG_SCSI_AIC7XXX_OLD is not set 548# CONFIG_SCSI_AIC7XXX_OLD is not set
531# CONFIG_SCSI_ADVANSYS is not set 549# CONFIG_SCSI_ADVANSYS is not set
532# CONFIG_SCSI_IN2000 is not set 550# CONFIG_SCSI_IN2000 is not set
551# CONFIG_LIBFC is not set
552# CONFIG_LIBFCOE is not set
533# CONFIG_SCSI_DTC3280 is not set 553# CONFIG_SCSI_DTC3280 is not set
534# CONFIG_SCSI_FUTURE_DOMAIN is not set 554# CONFIG_SCSI_FUTURE_DOMAIN is not set
535# CONFIG_SCSI_GENERIC_NCR5380 is not set 555# CONFIG_SCSI_GENERIC_NCR5380 is not set
@@ -547,6 +567,7 @@ CONFIG_GVP11_SCSI=y
547CONFIG_SCSI_A4000T=y 567CONFIG_SCSI_A4000T=y
548CONFIG_SCSI_ZORRO7XX=y 568CONFIG_SCSI_ZORRO7XX=y
549# CONFIG_SCSI_DH is not set 569# CONFIG_SCSI_DH is not set
570# CONFIG_SCSI_OSD_INITIATOR is not set
550CONFIG_MD=y 571CONFIG_MD=y
551CONFIG_BLK_DEV_MD=m 572CONFIG_BLK_DEV_MD=m
552CONFIG_MD_LINEAR=m 573CONFIG_MD_LINEAR=m
@@ -554,7 +575,7 @@ CONFIG_MD_RAID0=m
554CONFIG_MD_RAID1=m 575CONFIG_MD_RAID1=m
555# CONFIG_MD_RAID10 is not set 576# CONFIG_MD_RAID10 is not set
556CONFIG_MD_RAID456=m 577CONFIG_MD_RAID456=m
557CONFIG_MD_RAID5_RESHAPE=y 578CONFIG_MD_RAID6_PQ=m
558# CONFIG_MD_MULTIPATH is not set 579# CONFIG_MD_MULTIPATH is not set
559# CONFIG_MD_FAULTY is not set 580# CONFIG_MD_FAULTY is not set
560CONFIG_BLK_DEV_DM=m 581CONFIG_BLK_DEV_DM=m
@@ -567,6 +588,7 @@ CONFIG_DM_MULTIPATH=m
567# CONFIG_DM_DELAY is not set 588# CONFIG_DM_DELAY is not set
568CONFIG_DM_UEVENT=y 589CONFIG_DM_UEVENT=y
569CONFIG_NETDEVICES=y 590CONFIG_NETDEVICES=y
591CONFIG_COMPAT_NET_DEV_OPS=y
570CONFIG_DUMMY=m 592CONFIG_DUMMY=m
571# CONFIG_BONDING is not set 593# CONFIG_BONDING is not set
572CONFIG_MACVLAN=m 594CONFIG_MACVLAN=m
@@ -577,14 +599,16 @@ CONFIG_VETH=m
577# CONFIG_PHYLIB is not set 599# CONFIG_PHYLIB is not set
578CONFIG_NET_ETHERNET=y 600CONFIG_NET_ETHERNET=y
579# CONFIG_MII is not set 601# CONFIG_MII is not set
580CONFIG_ARIADNE=m 602CONFIG_ARIADNE=y
581CONFIG_A2065=m 603CONFIG_A2065=y
582CONFIG_HYDRA=m 604CONFIG_HYDRA=y
583CONFIG_ZORRO8390=m 605CONFIG_ZORRO8390=y
584CONFIG_APNE=m 606CONFIG_APNE=y
585# CONFIG_NET_VENDOR_3COM is not set 607# CONFIG_NET_VENDOR_3COM is not set
586# CONFIG_NET_VENDOR_SMC is not set 608# CONFIG_NET_VENDOR_SMC is not set
609# CONFIG_ETHOC is not set
587# CONFIG_NET_VENDOR_RACAL is not set 610# CONFIG_NET_VENDOR_RACAL is not set
611# CONFIG_DNET is not set
588# CONFIG_AT1700 is not set 612# CONFIG_AT1700 is not set
589# CONFIG_DEPCA is not set 613# CONFIG_DEPCA is not set
590# CONFIG_HP100 is not set 614# CONFIG_HP100 is not set
@@ -609,7 +633,10 @@ CONFIG_APNE=m
609# 633#
610# CONFIG_WLAN_PRE80211 is not set 634# CONFIG_WLAN_PRE80211 is not set
611# CONFIG_WLAN_80211 is not set 635# CONFIG_WLAN_80211 is not set
612# CONFIG_IWLWIFI_LEDS is not set 636
637#
638# Enable WiMAX (Networking options) to see the WiMAX drivers
639#
613# CONFIG_WAN is not set 640# CONFIG_WAN is not set
614# CONFIG_PLIP is not set 641# CONFIG_PLIP is not set
615CONFIG_PPP=m 642CONFIG_PPP=m
@@ -719,7 +746,7 @@ CONFIG_HW_CONSOLE=y
719CONFIG_VT_HW_CONSOLE_BINDING=y 746CONFIG_VT_HW_CONSOLE_BINDING=y
720# CONFIG_DEVKMEM is not set 747# CONFIG_DEVKMEM is not set
721# CONFIG_SERIAL_NONSTANDARD is not set 748# CONFIG_SERIAL_NONSTANDARD is not set
722CONFIG_A2232=m 749CONFIG_A2232=y
723 750
724# 751#
725# Serial drivers 752# Serial drivers
@@ -730,6 +757,7 @@ CONFIG_A2232=m
730# Non-8250 serial port support 757# Non-8250 serial port support
731# 758#
732CONFIG_UNIX98_PTYS=y 759CONFIG_UNIX98_PTYS=y
760# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
733CONFIG_LEGACY_PTYS=y 761CONFIG_LEGACY_PTYS=y
734CONFIG_LEGACY_PTY_COUNT=256 762CONFIG_LEGACY_PTY_COUNT=256
735CONFIG_PRINTER=m 763CONFIG_PRINTER=m
@@ -821,6 +849,7 @@ CONFIG_FB_FM2=y
821# CONFIG_FB_VIRTUAL is not set 849# CONFIG_FB_VIRTUAL is not set
822# CONFIG_FB_METRONOME is not set 850# CONFIG_FB_METRONOME is not set
823# CONFIG_FB_MB862XX is not set 851# CONFIG_FB_MB862XX is not set
852# CONFIG_FB_BROADSHEET is not set
824# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 853# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
825 854
826# 855#
@@ -856,7 +885,6 @@ CONFIG_HIDRAW=y
856# 885#
857# Special HID drivers 886# Special HID drivers
858# 887#
859CONFIG_HID_COMPAT=y
860# CONFIG_USB_SUPPORT is not set 888# CONFIG_USB_SUPPORT is not set
861# CONFIG_MMC is not set 889# CONFIG_MMC is not set
862# CONFIG_MEMSTICK is not set 890# CONFIG_MEMSTICK is not set
@@ -867,14 +895,13 @@ CONFIG_HID_COMPAT=y
867# CONFIG_AUXDISPLAY is not set 895# CONFIG_AUXDISPLAY is not set
868# CONFIG_UIO is not set 896# CONFIG_UIO is not set
869# CONFIG_STAGING is not set 897# CONFIG_STAGING is not set
870CONFIG_STAGING_EXCLUDE_BUILD=y
871 898
872# 899#
873# Character devices 900# Character devices
874# 901#
875CONFIG_AMIGA_BUILTIN_SERIAL=y 902CONFIG_AMIGA_BUILTIN_SERIAL=y
876CONFIG_MULTIFACE_III_TTY=m 903CONFIG_MULTIFACE_III_TTY=m
877# CONFIG_SERIAL_CONSOLE is not set 904CONFIG_SERIAL_CONSOLE=y
878 905
879# 906#
880# File systems 907# File systems
@@ -883,6 +910,7 @@ CONFIG_EXT2_FS=y
883# CONFIG_EXT2_FS_XATTR is not set 910# CONFIG_EXT2_FS_XATTR is not set
884# CONFIG_EXT2_FS_XIP is not set 911# CONFIG_EXT2_FS_XIP is not set
885CONFIG_EXT3_FS=y 912CONFIG_EXT3_FS=y
913# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
886# CONFIG_EXT3_FS_XATTR is not set 914# CONFIG_EXT3_FS_XATTR is not set
887# CONFIG_EXT4_FS is not set 915# CONFIG_EXT4_FS is not set
888CONFIG_JBD=y 916CONFIG_JBD=y
@@ -909,13 +937,15 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
909# CONFIG_OCFS2_FS_STATS is not set 937# CONFIG_OCFS2_FS_STATS is not set
910# CONFIG_OCFS2_DEBUG_MASKLOG is not set 938# CONFIG_OCFS2_DEBUG_MASKLOG is not set
911# CONFIG_OCFS2_DEBUG_FS is not set 939# CONFIG_OCFS2_DEBUG_FS is not set
912# CONFIG_OCFS2_COMPAT_JBD is not set 940# CONFIG_OCFS2_FS_POSIX_ACL is not set
941# CONFIG_BTRFS_FS is not set
913CONFIG_DNOTIFY=y 942CONFIG_DNOTIFY=y
914CONFIG_INOTIFY=y 943CONFIG_INOTIFY=y
915CONFIG_INOTIFY_USER=y 944CONFIG_INOTIFY_USER=y
916CONFIG_QUOTA=y 945CONFIG_QUOTA=y
917CONFIG_QUOTA_NETLINK_INTERFACE=y 946CONFIG_QUOTA_NETLINK_INTERFACE=y
918# CONFIG_PRINT_QUOTA_WARNING is not set 947# CONFIG_PRINT_QUOTA_WARNING is not set
948CONFIG_QUOTA_TREE=m
919# CONFIG_QFMT_V1 is not set 949# CONFIG_QFMT_V1 is not set
920# CONFIG_QFMT_V2 is not set 950# CONFIG_QFMT_V2 is not set
921CONFIG_QUOTACTL=y 951CONFIG_QUOTACTL=y
@@ -924,6 +954,11 @@ CONFIG_AUTOFS4_FS=m
924CONFIG_FUSE_FS=m 954CONFIG_FUSE_FS=m
925 955
926# 956#
957# Caches
958#
959# CONFIG_FSCACHE is not set
960
961#
927# CD-ROM/DVD Filesystems 962# CD-ROM/DVD Filesystems
928# 963#
929CONFIG_ISO9660_FS=y 964CONFIG_ISO9660_FS=y
@@ -935,8 +970,8 @@ CONFIG_UDF_NLS=y
935# 970#
936# DOS/FAT/NT Filesystems 971# DOS/FAT/NT Filesystems
937# 972#
938CONFIG_FAT_FS=m 973CONFIG_FAT_FS=y
939CONFIG_MSDOS_FS=m 974CONFIG_MSDOS_FS=y
940CONFIG_VFAT_FS=m 975CONFIG_VFAT_FS=m
941CONFIG_FAT_DEFAULT_CODEPAGE=437 976CONFIG_FAT_DEFAULT_CODEPAGE=437
942CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" 977CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
@@ -954,10 +989,7 @@ CONFIG_TMPFS=y
954# CONFIG_TMPFS_POSIX_ACL is not set 989# CONFIG_TMPFS_POSIX_ACL is not set
955# CONFIG_HUGETLB_PAGE is not set 990# CONFIG_HUGETLB_PAGE is not set
956CONFIG_CONFIGFS_FS=m 991CONFIG_CONFIGFS_FS=m
957 992CONFIG_MISC_FILESYSTEMS=y
958#
959# Miscellaneous filesystems
960#
961# CONFIG_ADFS_FS is not set 993# CONFIG_ADFS_FS is not set
962CONFIG_AFFS_FS=m 994CONFIG_AFFS_FS=m
963CONFIG_HFS_FS=m 995CONFIG_HFS_FS=m
@@ -966,6 +998,9 @@ CONFIG_HFSPLUS_FS=m
966# CONFIG_BFS_FS is not set 998# CONFIG_BFS_FS is not set
967# CONFIG_EFS_FS is not set 999# CONFIG_EFS_FS is not set
968CONFIG_CRAMFS=m 1000CONFIG_CRAMFS=m
1001CONFIG_SQUASHFS=m
1002# CONFIG_SQUASHFS_EMBEDDED is not set
1003CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
969# CONFIG_VXFS_FS is not set 1004# CONFIG_VXFS_FS is not set
970CONFIG_MINIX_FS=y 1005CONFIG_MINIX_FS=y
971# CONFIG_OMFS_FS is not set 1006# CONFIG_OMFS_FS is not set
@@ -976,23 +1011,24 @@ CONFIG_SYSV_FS=m
976CONFIG_UFS_FS=m 1011CONFIG_UFS_FS=m
977# CONFIG_UFS_FS_WRITE is not set 1012# CONFIG_UFS_FS_WRITE is not set
978# CONFIG_UFS_DEBUG is not set 1013# CONFIG_UFS_DEBUG is not set
1014# CONFIG_NILFS2_FS is not set
979CONFIG_NETWORK_FILESYSTEMS=y 1015CONFIG_NETWORK_FILESYSTEMS=y
980CONFIG_NFS_FS=m 1016CONFIG_NFS_FS=y
981CONFIG_NFS_V3=y 1017CONFIG_NFS_V3=y
982# CONFIG_NFS_V3_ACL is not set 1018# CONFIG_NFS_V3_ACL is not set
983CONFIG_NFS_V4=y 1019CONFIG_NFS_V4=y
1020# CONFIG_ROOT_NFS is not set
984CONFIG_NFSD=m 1021CONFIG_NFSD=m
985CONFIG_NFSD_V3=y 1022CONFIG_NFSD_V3=y
986# CONFIG_NFSD_V3_ACL is not set 1023# CONFIG_NFSD_V3_ACL is not set
987# CONFIG_NFSD_V4 is not set 1024# CONFIG_NFSD_V4 is not set
988CONFIG_LOCKD=m 1025CONFIG_LOCKD=y
989CONFIG_LOCKD_V4=y 1026CONFIG_LOCKD_V4=y
990CONFIG_EXPORTFS=m 1027CONFIG_EXPORTFS=m
991CONFIG_NFS_COMMON=y 1028CONFIG_NFS_COMMON=y
992CONFIG_SUNRPC=m 1029CONFIG_SUNRPC=y
993CONFIG_SUNRPC_GSS=m 1030CONFIG_SUNRPC_GSS=y
994# CONFIG_SUNRPC_REGISTER_V4 is not set 1031CONFIG_RPCSEC_GSS_KRB5=y
995CONFIG_RPCSEC_GSS_KRB5=m
996# CONFIG_RPCSEC_GSS_SPKM3 is not set 1032# CONFIG_RPCSEC_GSS_SPKM3 is not set
997CONFIG_SMB_FS=m 1033CONFIG_SMB_FS=m
998CONFIG_SMB_NLS_DEFAULT=y 1034CONFIG_SMB_NLS_DEFAULT=y
@@ -1067,11 +1103,6 @@ CONFIG_DEBUG_BUGVERBOSE=y
1067CONFIG_DEBUG_MEMORY_INIT=y 1103CONFIG_DEBUG_MEMORY_INIT=y
1068# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1104# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1069CONFIG_SYSCTL_SYSCALL_CHECK=y 1105CONFIG_SYSCTL_SYSCALL_CHECK=y
1070
1071#
1072# Tracers
1073#
1074# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1075# CONFIG_SAMPLES is not set 1106# CONFIG_SAMPLES is not set
1076 1107
1077# 1108#
@@ -1092,13 +1123,21 @@ CONFIG_CRYPTO=y
1092# 1123#
1093# CONFIG_CRYPTO_FIPS is not set 1124# CONFIG_CRYPTO_FIPS is not set
1094CONFIG_CRYPTO_ALGAPI=y 1125CONFIG_CRYPTO_ALGAPI=y
1095CONFIG_CRYPTO_AEAD=y 1126CONFIG_CRYPTO_ALGAPI2=y
1127CONFIG_CRYPTO_AEAD=m
1128CONFIG_CRYPTO_AEAD2=y
1096CONFIG_CRYPTO_BLKCIPHER=y 1129CONFIG_CRYPTO_BLKCIPHER=y
1130CONFIG_CRYPTO_BLKCIPHER2=y
1097CONFIG_CRYPTO_HASH=y 1131CONFIG_CRYPTO_HASH=y
1098CONFIG_CRYPTO_RNG=y 1132CONFIG_CRYPTO_HASH2=y
1133CONFIG_CRYPTO_RNG=m
1134CONFIG_CRYPTO_RNG2=y
1135CONFIG_CRYPTO_PCOMP=y
1099CONFIG_CRYPTO_MANAGER=y 1136CONFIG_CRYPTO_MANAGER=y
1137CONFIG_CRYPTO_MANAGER2=y
1100CONFIG_CRYPTO_GF128MUL=m 1138CONFIG_CRYPTO_GF128MUL=m
1101CONFIG_CRYPTO_NULL=m 1139CONFIG_CRYPTO_NULL=m
1140CONFIG_CRYPTO_WORKQUEUE=y
1102CONFIG_CRYPTO_CRYPTD=m 1141CONFIG_CRYPTO_CRYPTD=m
1103CONFIG_CRYPTO_AUTHENC=m 1142CONFIG_CRYPTO_AUTHENC=m
1104CONFIG_CRYPTO_TEST=m 1143CONFIG_CRYPTO_TEST=m
@@ -1113,7 +1152,7 @@ CONFIG_CRYPTO_SEQIV=m
1113# 1152#
1114# Block modes 1153# Block modes
1115# 1154#
1116CONFIG_CRYPTO_CBC=m 1155CONFIG_CRYPTO_CBC=y
1117CONFIG_CRYPTO_CTR=m 1156CONFIG_CRYPTO_CTR=m
1118CONFIG_CRYPTO_CTS=m 1157CONFIG_CRYPTO_CTS=m
1119CONFIG_CRYPTO_ECB=m 1158CONFIG_CRYPTO_ECB=m
@@ -1132,7 +1171,7 @@ CONFIG_CRYPTO_XCBC=m
1132# 1171#
1133CONFIG_CRYPTO_CRC32C=m 1172CONFIG_CRYPTO_CRC32C=m
1134CONFIG_CRYPTO_MD4=m 1173CONFIG_CRYPTO_MD4=m
1135CONFIG_CRYPTO_MD5=m 1174CONFIG_CRYPTO_MD5=y
1136CONFIG_CRYPTO_MICHAEL_MIC=m 1175CONFIG_CRYPTO_MICHAEL_MIC=m
1137CONFIG_CRYPTO_RMD128=m 1176CONFIG_CRYPTO_RMD128=m
1138CONFIG_CRYPTO_RMD160=m 1177CONFIG_CRYPTO_RMD160=m
@@ -1154,7 +1193,7 @@ CONFIG_CRYPTO_BLOWFISH=m
1154CONFIG_CRYPTO_CAMELLIA=m 1193CONFIG_CRYPTO_CAMELLIA=m
1155CONFIG_CRYPTO_CAST5=m 1194CONFIG_CRYPTO_CAST5=m
1156CONFIG_CRYPTO_CAST6=m 1195CONFIG_CRYPTO_CAST6=m
1157CONFIG_CRYPTO_DES=m 1196CONFIG_CRYPTO_DES=y
1158CONFIG_CRYPTO_FCRYPT=m 1197CONFIG_CRYPTO_FCRYPT=m
1159CONFIG_CRYPTO_KHAZAD=m 1198CONFIG_CRYPTO_KHAZAD=m
1160CONFIG_CRYPTO_SALSA20=m 1199CONFIG_CRYPTO_SALSA20=m
@@ -1168,6 +1207,7 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
1168# Compression 1207# Compression
1169# 1208#
1170CONFIG_CRYPTO_DEFLATE=m 1209CONFIG_CRYPTO_DEFLATE=m
1210CONFIG_CRYPTO_ZLIB=m
1171CONFIG_CRYPTO_LZO=m 1211CONFIG_CRYPTO_LZO=m
1172 1212
1173# 1213#
@@ -1175,11 +1215,13 @@ CONFIG_CRYPTO_LZO=m
1175# 1215#
1176# CONFIG_CRYPTO_ANSI_CPRNG is not set 1216# CONFIG_CRYPTO_ANSI_CPRNG is not set
1177# CONFIG_CRYPTO_HW is not set 1217# CONFIG_CRYPTO_HW is not set
1218# CONFIG_BINARY_PRINTF is not set
1178 1219
1179# 1220#
1180# Library routines 1221# Library routines
1181# 1222#
1182CONFIG_BITREVERSE=y 1223CONFIG_BITREVERSE=y
1224CONFIG_GENERIC_FIND_LAST_BIT=y
1183CONFIG_CRC_CCITT=m 1225CONFIG_CRC_CCITT=m
1184CONFIG_CRC16=m 1226CONFIG_CRC16=m
1185CONFIG_CRC_T10DIF=y 1227CONFIG_CRC_T10DIF=y
@@ -1191,10 +1233,13 @@ CONFIG_ZLIB_INFLATE=y
1191CONFIG_ZLIB_DEFLATE=m 1233CONFIG_ZLIB_DEFLATE=m
1192CONFIG_LZO_COMPRESS=m 1234CONFIG_LZO_COMPRESS=m
1193CONFIG_LZO_DECOMPRESS=m 1235CONFIG_LZO_DECOMPRESS=m
1236CONFIG_DECOMPRESS_GZIP=y
1237CONFIG_DECOMPRESS_BZIP2=y
1238CONFIG_DECOMPRESS_LZMA=y
1194CONFIG_TEXTSEARCH=y 1239CONFIG_TEXTSEARCH=y
1195CONFIG_TEXTSEARCH_KMP=m 1240CONFIG_TEXTSEARCH_KMP=m
1196CONFIG_TEXTSEARCH_BM=m 1241CONFIG_TEXTSEARCH_BM=m
1197CONFIG_TEXTSEARCH_FSM=m 1242CONFIG_TEXTSEARCH_FSM=m
1198CONFIG_PLIST=y
1199CONFIG_HAS_IOMEM=y 1243CONFIG_HAS_IOMEM=y
1200CONFIG_HAS_DMA=y 1244CONFIG_HAS_DMA=y
1245CONFIG_NLATTR=y
diff --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_defconfig
index 935108d115a0..5fff58196b3e 100644
--- a/arch/m68k/configs/apollo_defconfig
+++ b/arch/m68k/configs/apollo_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc7 3# Linux kernel version: 2.6.30-rc3
4# Tue Dec 2 20:27:43 2008 4# Wed Apr 22 20:47:54 2009
5# 5#
6CONFIG_M68K=y 6CONFIG_M68K=y
7CONFIG_MMU=y 7CONFIG_MMU=y
@@ -29,14 +29,24 @@ CONFIG_SWAP=y
29CONFIG_SYSVIPC=y 29CONFIG_SYSVIPC=y
30CONFIG_SYSVIPC_SYSCTL=y 30CONFIG_SYSVIPC_SYSCTL=y
31CONFIG_POSIX_MQUEUE=y 31CONFIG_POSIX_MQUEUE=y
32CONFIG_POSIX_MQUEUE_SYSCTL=y
32CONFIG_BSD_PROCESS_ACCT=y 33CONFIG_BSD_PROCESS_ACCT=y
33# CONFIG_BSD_PROCESS_ACCT_V3 is not set 34# CONFIG_BSD_PROCESS_ACCT_V3 is not set
34# CONFIG_TASKSTATS is not set 35# CONFIG_TASKSTATS is not set
35# CONFIG_AUDIT is not set 36# CONFIG_AUDIT is not set
37
38#
39# RCU Subsystem
40#
41CONFIG_CLASSIC_RCU=y
42# CONFIG_TREE_RCU is not set
43# CONFIG_PREEMPT_RCU is not set
44# CONFIG_TREE_RCU_TRACE is not set
45# CONFIG_PREEMPT_RCU_TRACE is not set
36# CONFIG_IKCONFIG is not set 46# CONFIG_IKCONFIG is not set
37CONFIG_LOG_BUF_SHIFT=14 47CONFIG_LOG_BUF_SHIFT=14
38# CONFIG_CGROUPS is not set
39# CONFIG_GROUP_SCHED is not set 48# CONFIG_GROUP_SCHED is not set
49# CONFIG_CGROUPS is not set
40# CONFIG_SYSFS_DEPRECATED_V2 is not set 50# CONFIG_SYSFS_DEPRECATED_V2 is not set
41CONFIG_RELAY=y 51CONFIG_RELAY=y
42CONFIG_NAMESPACES=y 52CONFIG_NAMESPACES=y
@@ -44,23 +54,27 @@ CONFIG_NAMESPACES=y
44# CONFIG_IPC_NS is not set 54# CONFIG_IPC_NS is not set
45# CONFIG_USER_NS is not set 55# CONFIG_USER_NS is not set
46# CONFIG_PID_NS is not set 56# CONFIG_PID_NS is not set
57# CONFIG_NET_NS is not set
47CONFIG_BLK_DEV_INITRD=y 58CONFIG_BLK_DEV_INITRD=y
48CONFIG_INITRAMFS_SOURCE="" 59CONFIG_INITRAMFS_SOURCE=""
60CONFIG_RD_GZIP=y
61CONFIG_RD_BZIP2=y
62CONFIG_RD_LZMA=y
49# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 63# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
50CONFIG_SYSCTL=y 64CONFIG_SYSCTL=y
65CONFIG_ANON_INODES=y
51# CONFIG_EMBEDDED is not set 66# CONFIG_EMBEDDED is not set
52CONFIG_UID16=y 67CONFIG_UID16=y
53CONFIG_SYSCTL_SYSCALL=y 68CONFIG_SYSCTL_SYSCALL=y
54CONFIG_KALLSYMS=y 69CONFIG_KALLSYMS=y
55# CONFIG_KALLSYMS_EXTRA_PASS is not set 70# CONFIG_KALLSYMS_EXTRA_PASS is not set
71# CONFIG_STRIP_ASM_SYMS is not set
56CONFIG_HOTPLUG=y 72CONFIG_HOTPLUG=y
57CONFIG_PRINTK=y 73CONFIG_PRINTK=y
58CONFIG_BUG=y 74CONFIG_BUG=y
59CONFIG_ELF_CORE=y 75CONFIG_ELF_CORE=y
60CONFIG_COMPAT_BRK=y
61CONFIG_BASE_FULL=y 76CONFIG_BASE_FULL=y
62CONFIG_FUTEX=y 77CONFIG_FUTEX=y
63CONFIG_ANON_INODES=y
64CONFIG_EPOLL=y 78CONFIG_EPOLL=y
65CONFIG_SIGNALFD=y 79CONFIG_SIGNALFD=y
66CONFIG_TIMERFD=y 80CONFIG_TIMERFD=y
@@ -68,15 +82,16 @@ CONFIG_EVENTFD=y
68CONFIG_SHMEM=y 82CONFIG_SHMEM=y
69CONFIG_AIO=y 83CONFIG_AIO=y
70CONFIG_VM_EVENT_COUNTERS=y 84CONFIG_VM_EVENT_COUNTERS=y
85CONFIG_COMPAT_BRK=y
71CONFIG_SLAB=y 86CONFIG_SLAB=y
72# CONFIG_SLUB is not set 87# CONFIG_SLUB is not set
73# CONFIG_SLOB is not set 88# CONFIG_SLOB is not set
74# CONFIG_PROFILING is not set 89# CONFIG_PROFILING is not set
75# CONFIG_MARKERS is not set 90# CONFIG_MARKERS is not set
91# CONFIG_SLOW_WORK is not set
76# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 92# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
77CONFIG_SLABINFO=y 93CONFIG_SLABINFO=y
78CONFIG_RT_MUTEXES=y 94CONFIG_RT_MUTEXES=y
79# CONFIG_TINY_SHMEM is not set
80CONFIG_BASE_SMALL=0 95CONFIG_BASE_SMALL=0
81CONFIG_MODULES=y 96CONFIG_MODULES=y
82# CONFIG_MODULE_FORCE_LOAD is not set 97# CONFIG_MODULE_FORCE_LOAD is not set
@@ -84,11 +99,8 @@ CONFIG_MODULE_UNLOAD=y
84# CONFIG_MODULE_FORCE_UNLOAD is not set 99# CONFIG_MODULE_FORCE_UNLOAD is not set
85# CONFIG_MODVERSIONS is not set 100# CONFIG_MODVERSIONS is not set
86# CONFIG_MODULE_SRCVERSION_ALL is not set 101# CONFIG_MODULE_SRCVERSION_ALL is not set
87CONFIG_KMOD=y
88CONFIG_BLOCK=y 102CONFIG_BLOCK=y
89# CONFIG_LBD is not set 103# CONFIG_LBD is not set
90# CONFIG_BLK_DEV_IO_TRACE is not set
91# CONFIG_LSF is not set
92CONFIG_BLK_DEV_BSG=y 104CONFIG_BLK_DEV_BSG=y
93# CONFIG_BLK_DEV_INTEGRITY is not set 105# CONFIG_BLK_DEV_INTEGRITY is not set
94 106
@@ -104,7 +116,6 @@ CONFIG_DEFAULT_AS=y
104# CONFIG_DEFAULT_CFQ is not set 116# CONFIG_DEFAULT_CFQ is not set
105# CONFIG_DEFAULT_NOOP is not set 117# CONFIG_DEFAULT_NOOP is not set
106CONFIG_DEFAULT_IOSCHED="anticipatory" 118CONFIG_DEFAULT_IOSCHED="anticipatory"
107CONFIG_CLASSIC_RCU=y
108# CONFIG_FREEZER is not set 119# CONFIG_FREEZER is not set
109 120
110# 121#
@@ -140,12 +151,13 @@ CONFIG_FLAT_NODE_MEM_MAP=y
140CONFIG_NEED_MULTIPLE_NODES=y 151CONFIG_NEED_MULTIPLE_NODES=y
141CONFIG_PAGEFLAGS_EXTENDED=y 152CONFIG_PAGEFLAGS_EXTENDED=y
142CONFIG_SPLIT_PTLOCK_CPUS=4 153CONFIG_SPLIT_PTLOCK_CPUS=4
143# CONFIG_RESOURCES_64BIT is not set
144# CONFIG_PHYS_ADDR_T_64BIT is not set 154# CONFIG_PHYS_ADDR_T_64BIT is not set
145CONFIG_ZONE_DMA_FLAG=1 155CONFIG_ZONE_DMA_FLAG=1
146CONFIG_BOUNCE=y 156CONFIG_BOUNCE=y
147CONFIG_VIRT_TO_BUS=y 157CONFIG_VIRT_TO_BUS=y
148CONFIG_UNEVICTABLE_LRU=y 158CONFIG_UNEVICTABLE_LRU=y
159CONFIG_HAVE_MLOCK=y
160CONFIG_HAVE_MLOCKED_PAGE_BIT=y
149 161
150# 162#
151# General setup 163# General setup
@@ -256,6 +268,7 @@ CONFIG_NETFILTER_XTABLES=m
256CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 268CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
257CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 269CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
258CONFIG_NETFILTER_XT_TARGET_DSCP=m 270CONFIG_NETFILTER_XT_TARGET_DSCP=m
271CONFIG_NETFILTER_XT_TARGET_HL=m
259CONFIG_NETFILTER_XT_TARGET_MARK=m 272CONFIG_NETFILTER_XT_TARGET_MARK=m
260CONFIG_NETFILTER_XT_TARGET_NFLOG=m 273CONFIG_NETFILTER_XT_TARGET_NFLOG=m
261CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 274CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
@@ -264,6 +277,7 @@ CONFIG_NETFILTER_XT_TARGET_RATEEST=m
264CONFIG_NETFILTER_XT_TARGET_TRACE=m 277CONFIG_NETFILTER_XT_TARGET_TRACE=m
265CONFIG_NETFILTER_XT_TARGET_TCPMSS=m 278CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
266CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m 279CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
280CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
267CONFIG_NETFILTER_XT_MATCH_COMMENT=m 281CONFIG_NETFILTER_XT_MATCH_COMMENT=m
268CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m 282CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
269CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m 283CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
@@ -274,6 +288,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m
274CONFIG_NETFILTER_XT_MATCH_ESP=m 288CONFIG_NETFILTER_XT_MATCH_ESP=m
275CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m 289CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
276CONFIG_NETFILTER_XT_MATCH_HELPER=m 290CONFIG_NETFILTER_XT_MATCH_HELPER=m
291CONFIG_NETFILTER_XT_MATCH_HL=m
277CONFIG_NETFILTER_XT_MATCH_IPRANGE=m 292CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
278CONFIG_NETFILTER_XT_MATCH_LENGTH=m 293CONFIG_NETFILTER_XT_MATCH_LENGTH=m
279CONFIG_NETFILTER_XT_MATCH_LIMIT=m 294CONFIG_NETFILTER_XT_MATCH_LIMIT=m
@@ -352,25 +367,20 @@ CONFIG_IP6_NF_MATCH_HL=m
352CONFIG_IP6_NF_MATCH_IPV6HEADER=m 367CONFIG_IP6_NF_MATCH_IPV6HEADER=m
353CONFIG_IP6_NF_MATCH_MH=m 368CONFIG_IP6_NF_MATCH_MH=m
354CONFIG_IP6_NF_MATCH_RT=m 369CONFIG_IP6_NF_MATCH_RT=m
370CONFIG_IP6_NF_TARGET_HL=m
355CONFIG_IP6_NF_TARGET_LOG=m 371CONFIG_IP6_NF_TARGET_LOG=m
356CONFIG_IP6_NF_FILTER=m 372CONFIG_IP6_NF_FILTER=m
357CONFIG_IP6_NF_TARGET_REJECT=m 373CONFIG_IP6_NF_TARGET_REJECT=m
358CONFIG_IP6_NF_MANGLE=m 374CONFIG_IP6_NF_MANGLE=m
359CONFIG_IP6_NF_TARGET_HL=m
360CONFIG_IP6_NF_RAW=m 375CONFIG_IP6_NF_RAW=m
361CONFIG_IP_DCCP=m 376CONFIG_IP_DCCP=m
362CONFIG_INET_DCCP_DIAG=m 377CONFIG_INET_DCCP_DIAG=m
363CONFIG_IP_DCCP_ACKVEC=y
364 378
365# 379#
366# DCCP CCIDs Configuration (EXPERIMENTAL) 380# DCCP CCIDs Configuration (EXPERIMENTAL)
367# 381#
368CONFIG_IP_DCCP_CCID2=m
369# CONFIG_IP_DCCP_CCID2_DEBUG is not set 382# CONFIG_IP_DCCP_CCID2_DEBUG is not set
370CONFIG_IP_DCCP_CCID3=m 383# CONFIG_IP_DCCP_CCID3 is not set
371# CONFIG_IP_DCCP_CCID3_DEBUG is not set
372CONFIG_IP_DCCP_CCID3_RTO=100
373CONFIG_IP_DCCP_TFRC_LIB=m
374CONFIG_IP_SCTP=m 384CONFIG_IP_SCTP=m
375# CONFIG_SCTP_DBG_MSG is not set 385# CONFIG_SCTP_DBG_MSG is not set
376# CONFIG_SCTP_DBG_OBJCNT is not set 386# CONFIG_SCTP_DBG_OBJCNT is not set
@@ -392,8 +402,10 @@ CONFIG_ATALK=m
392# CONFIG_LAPB is not set 402# CONFIG_LAPB is not set
393# CONFIG_ECONET is not set 403# CONFIG_ECONET is not set
394# CONFIG_WAN_ROUTER is not set 404# CONFIG_WAN_ROUTER is not set
405# CONFIG_PHONET is not set
395# CONFIG_NET_SCHED is not set 406# CONFIG_NET_SCHED is not set
396CONFIG_NET_CLS_ROUTE=y 407CONFIG_NET_CLS_ROUTE=y
408# CONFIG_DCB is not set
397 409
398# 410#
399# Network testing 411# Network testing
@@ -404,8 +416,8 @@ CONFIG_NET_CLS_ROUTE=y
404# CONFIG_IRDA is not set 416# CONFIG_IRDA is not set
405# CONFIG_BT is not set 417# CONFIG_BT is not set
406# CONFIG_AF_RXRPC is not set 418# CONFIG_AF_RXRPC is not set
407# CONFIG_PHONET is not set
408# CONFIG_WIRELESS is not set 419# CONFIG_WIRELESS is not set
420# CONFIG_WIMAX is not set
409# CONFIG_RFKILL is not set 421# CONFIG_RFKILL is not set
410# CONFIG_NET_9P is not set 422# CONFIG_NET_9P is not set
411 423
@@ -441,9 +453,13 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
441CONFIG_ATA_OVER_ETH=m 453CONFIG_ATA_OVER_ETH=m
442# CONFIG_BLK_DEV_HD is not set 454# CONFIG_BLK_DEV_HD is not set
443CONFIG_MISC_DEVICES=y 455CONFIG_MISC_DEVICES=y
444# CONFIG_EEPROM_93CX6 is not set
445# CONFIG_ENCLOSURE_SERVICES is not set 456# CONFIG_ENCLOSURE_SERVICES is not set
446# CONFIG_C2PORT is not set 457# CONFIG_C2PORT is not set
458
459#
460# EEPROM support
461#
462# CONFIG_EEPROM_93CX6 is not set
447CONFIG_HAVE_IDE=y 463CONFIG_HAVE_IDE=y
448# CONFIG_IDE is not set 464# CONFIG_IDE is not set
449 465
@@ -491,8 +507,11 @@ CONFIG_SCSI_SRP_ATTRS=m
491CONFIG_SCSI_SRP_TGT_ATTRS=y 507CONFIG_SCSI_SRP_TGT_ATTRS=y
492CONFIG_SCSI_LOWLEVEL=y 508CONFIG_SCSI_LOWLEVEL=y
493CONFIG_ISCSI_TCP=m 509CONFIG_ISCSI_TCP=m
510# CONFIG_LIBFC is not set
511# CONFIG_LIBFCOE is not set
494# CONFIG_SCSI_DEBUG is not set 512# CONFIG_SCSI_DEBUG is not set
495# CONFIG_SCSI_DH is not set 513# CONFIG_SCSI_DH is not set
514# CONFIG_SCSI_OSD_INITIATOR is not set
496CONFIG_MD=y 515CONFIG_MD=y
497CONFIG_BLK_DEV_MD=m 516CONFIG_BLK_DEV_MD=m
498CONFIG_MD_LINEAR=m 517CONFIG_MD_LINEAR=m
@@ -500,7 +519,7 @@ CONFIG_MD_RAID0=m
500CONFIG_MD_RAID1=m 519CONFIG_MD_RAID1=m
501# CONFIG_MD_RAID10 is not set 520# CONFIG_MD_RAID10 is not set
502CONFIG_MD_RAID456=m 521CONFIG_MD_RAID456=m
503CONFIG_MD_RAID5_RESHAPE=y 522CONFIG_MD_RAID6_PQ=m
504# CONFIG_MD_MULTIPATH is not set 523# CONFIG_MD_MULTIPATH is not set
505# CONFIG_MD_FAULTY is not set 524# CONFIG_MD_FAULTY is not set
506CONFIG_BLK_DEV_DM=m 525CONFIG_BLK_DEV_DM=m
@@ -513,6 +532,7 @@ CONFIG_DM_MULTIPATH=m
513# CONFIG_DM_DELAY is not set 532# CONFIG_DM_DELAY is not set
514CONFIG_DM_UEVENT=y 533CONFIG_DM_UEVENT=y
515CONFIG_NETDEVICES=y 534CONFIG_NETDEVICES=y
535CONFIG_COMPAT_NET_DEV_OPS=y
516CONFIG_DUMMY=m 536CONFIG_DUMMY=m
517# CONFIG_BONDING is not set 537# CONFIG_BONDING is not set
518CONFIG_MACVLAN=m 538CONFIG_MACVLAN=m
@@ -522,6 +542,8 @@ CONFIG_VETH=m
522# CONFIG_PHYLIB is not set 542# CONFIG_PHYLIB is not set
523CONFIG_NET_ETHERNET=y 543CONFIG_NET_ETHERNET=y
524# CONFIG_MII is not set 544# CONFIG_MII is not set
545# CONFIG_ETHOC is not set
546# CONFIG_DNET is not set
525# CONFIG_IBM_NEW_EMAC_ZMII is not set 547# CONFIG_IBM_NEW_EMAC_ZMII is not set
526# CONFIG_IBM_NEW_EMAC_RGMII is not set 548# CONFIG_IBM_NEW_EMAC_RGMII is not set
527# CONFIG_IBM_NEW_EMAC_TAH is not set 549# CONFIG_IBM_NEW_EMAC_TAH is not set
@@ -538,7 +560,10 @@ CONFIG_NET_ETHERNET=y
538# 560#
539# CONFIG_WLAN_PRE80211 is not set 561# CONFIG_WLAN_PRE80211 is not set
540# CONFIG_WLAN_80211 is not set 562# CONFIG_WLAN_80211 is not set
541# CONFIG_IWLWIFI_LEDS is not set 563
564#
565# Enable WiMAX (Networking options) to see the WiMAX drivers
566#
542# CONFIG_WAN is not set 567# CONFIG_WAN is not set
543CONFIG_PPP=m 568CONFIG_PPP=m
544# CONFIG_PPP_MULTILINK is not set 569# CONFIG_PPP_MULTILINK is not set
@@ -596,7 +621,6 @@ CONFIG_MOUSE_PS2=m
596CONFIG_MOUSE_PS2_ALPS=y 621CONFIG_MOUSE_PS2_ALPS=y
597CONFIG_MOUSE_PS2_LOGIPS2PP=y 622CONFIG_MOUSE_PS2_LOGIPS2PP=y
598CONFIG_MOUSE_PS2_SYNAPTICS=y 623CONFIG_MOUSE_PS2_SYNAPTICS=y
599CONFIG_MOUSE_PS2_LIFEBOOK=y
600CONFIG_MOUSE_PS2_TRACKPOINT=y 624CONFIG_MOUSE_PS2_TRACKPOINT=y
601# CONFIG_MOUSE_PS2_ELANTECH is not set 625# CONFIG_MOUSE_PS2_ELANTECH is not set
602# CONFIG_MOUSE_PS2_TOUCHKIT is not set 626# CONFIG_MOUSE_PS2_TOUCHKIT is not set
@@ -636,6 +660,7 @@ CONFIG_VT_HW_CONSOLE_BINDING=y
636# Non-8250 serial port support 660# Non-8250 serial port support
637# 661#
638CONFIG_UNIX98_PTYS=y 662CONFIG_UNIX98_PTYS=y
663# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
639CONFIG_LEGACY_PTYS=y 664CONFIG_LEGACY_PTYS=y
640CONFIG_LEGACY_PTY_COUNT=256 665CONFIG_LEGACY_PTY_COUNT=256
641# CONFIG_IPMI_HANDLER is not set 666# CONFIG_IPMI_HANDLER is not set
@@ -718,6 +743,7 @@ CONFIG_FB_APOLLO=y
718# CONFIG_FB_VIRTUAL is not set 743# CONFIG_FB_VIRTUAL is not set
719# CONFIG_FB_METRONOME is not set 744# CONFIG_FB_METRONOME is not set
720# CONFIG_FB_MB862XX is not set 745# CONFIG_FB_MB862XX is not set
746# CONFIG_FB_BROADSHEET is not set
721# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 747# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
722 748
723# 749#
@@ -749,7 +775,6 @@ CONFIG_HIDRAW=y
749# 775#
750# Special HID drivers 776# Special HID drivers
751# 777#
752CONFIG_HID_COMPAT=y
753# CONFIG_USB_SUPPORT is not set 778# CONFIG_USB_SUPPORT is not set
754# CONFIG_MMC is not set 779# CONFIG_MMC is not set
755# CONFIG_MEMSTICK is not set 780# CONFIG_MEMSTICK is not set
@@ -757,9 +782,9 @@ CONFIG_HID_COMPAT=y
757# CONFIG_ACCESSIBILITY is not set 782# CONFIG_ACCESSIBILITY is not set
758# CONFIG_RTC_CLASS is not set 783# CONFIG_RTC_CLASS is not set
759# CONFIG_DMADEVICES is not set 784# CONFIG_DMADEVICES is not set
785# CONFIG_AUXDISPLAY is not set
760# CONFIG_UIO is not set 786# CONFIG_UIO is not set
761# CONFIG_STAGING is not set 787# CONFIG_STAGING is not set
762CONFIG_STAGING_EXCLUDE_BUILD=y
763 788
764# 789#
765# Character devices 790# Character devices
@@ -774,6 +799,7 @@ CONFIG_EXT2_FS=y
774# CONFIG_EXT2_FS_XATTR is not set 799# CONFIG_EXT2_FS_XATTR is not set
775# CONFIG_EXT2_FS_XIP is not set 800# CONFIG_EXT2_FS_XIP is not set
776CONFIG_EXT3_FS=y 801CONFIG_EXT3_FS=y
802# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
777# CONFIG_EXT3_FS_XATTR is not set 803# CONFIG_EXT3_FS_XATTR is not set
778# CONFIG_EXT4_FS is not set 804# CONFIG_EXT4_FS is not set
779CONFIG_JBD=y 805CONFIG_JBD=y
@@ -800,13 +826,15 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
800# CONFIG_OCFS2_FS_STATS is not set 826# CONFIG_OCFS2_FS_STATS is not set
801# CONFIG_OCFS2_DEBUG_MASKLOG is not set 827# CONFIG_OCFS2_DEBUG_MASKLOG is not set
802# CONFIG_OCFS2_DEBUG_FS is not set 828# CONFIG_OCFS2_DEBUG_FS is not set
803# CONFIG_OCFS2_COMPAT_JBD is not set 829# CONFIG_OCFS2_FS_POSIX_ACL is not set
830# CONFIG_BTRFS_FS is not set
804CONFIG_DNOTIFY=y 831CONFIG_DNOTIFY=y
805CONFIG_INOTIFY=y 832CONFIG_INOTIFY=y
806CONFIG_INOTIFY_USER=y 833CONFIG_INOTIFY_USER=y
807CONFIG_QUOTA=y 834CONFIG_QUOTA=y
808CONFIG_QUOTA_NETLINK_INTERFACE=y 835CONFIG_QUOTA_NETLINK_INTERFACE=y
809# CONFIG_PRINT_QUOTA_WARNING is not set 836# CONFIG_PRINT_QUOTA_WARNING is not set
837CONFIG_QUOTA_TREE=m
810# CONFIG_QFMT_V1 is not set 838# CONFIG_QFMT_V1 is not set
811# CONFIG_QFMT_V2 is not set 839# CONFIG_QFMT_V2 is not set
812CONFIG_QUOTACTL=y 840CONFIG_QUOTACTL=y
@@ -815,6 +843,11 @@ CONFIG_AUTOFS4_FS=m
815CONFIG_FUSE_FS=m 843CONFIG_FUSE_FS=m
816 844
817# 845#
846# Caches
847#
848# CONFIG_FSCACHE is not set
849
850#
818# CD-ROM/DVD Filesystems 851# CD-ROM/DVD Filesystems
819# 852#
820CONFIG_ISO9660_FS=y 853CONFIG_ISO9660_FS=y
@@ -845,10 +878,7 @@ CONFIG_TMPFS=y
845# CONFIG_TMPFS_POSIX_ACL is not set 878# CONFIG_TMPFS_POSIX_ACL is not set
846# CONFIG_HUGETLB_PAGE is not set 879# CONFIG_HUGETLB_PAGE is not set
847CONFIG_CONFIGFS_FS=m 880CONFIG_CONFIGFS_FS=m
848 881CONFIG_MISC_FILESYSTEMS=y
849#
850# Miscellaneous filesystems
851#
852# CONFIG_ADFS_FS is not set 882# CONFIG_ADFS_FS is not set
853CONFIG_AFFS_FS=m 883CONFIG_AFFS_FS=m
854CONFIG_HFS_FS=m 884CONFIG_HFS_FS=m
@@ -857,6 +887,9 @@ CONFIG_HFSPLUS_FS=m
857# CONFIG_BFS_FS is not set 887# CONFIG_BFS_FS is not set
858# CONFIG_EFS_FS is not set 888# CONFIG_EFS_FS is not set
859CONFIG_CRAMFS=m 889CONFIG_CRAMFS=m
890CONFIG_SQUASHFS=m
891# CONFIG_SQUASHFS_EMBEDDED is not set
892CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
860# CONFIG_VXFS_FS is not set 893# CONFIG_VXFS_FS is not set
861CONFIG_MINIX_FS=y 894CONFIG_MINIX_FS=y
862# CONFIG_OMFS_FS is not set 895# CONFIG_OMFS_FS is not set
@@ -867,6 +900,7 @@ CONFIG_SYSV_FS=m
867CONFIG_UFS_FS=m 900CONFIG_UFS_FS=m
868# CONFIG_UFS_FS_WRITE is not set 901# CONFIG_UFS_FS_WRITE is not set
869# CONFIG_UFS_DEBUG is not set 902# CONFIG_UFS_DEBUG is not set
903# CONFIG_NILFS2_FS is not set
870CONFIG_NETWORK_FILESYSTEMS=y 904CONFIG_NETWORK_FILESYSTEMS=y
871CONFIG_NFS_FS=y 905CONFIG_NFS_FS=y
872CONFIG_NFS_V3=y 906CONFIG_NFS_V3=y
@@ -883,7 +917,6 @@ CONFIG_EXPORTFS=m
883CONFIG_NFS_COMMON=y 917CONFIG_NFS_COMMON=y
884CONFIG_SUNRPC=y 918CONFIG_SUNRPC=y
885CONFIG_SUNRPC_GSS=y 919CONFIG_SUNRPC_GSS=y
886# CONFIG_SUNRPC_REGISTER_V4 is not set
887CONFIG_RPCSEC_GSS_KRB5=y 920CONFIG_RPCSEC_GSS_KRB5=y
888# CONFIG_RPCSEC_GSS_SPKM3 is not set 921# CONFIG_RPCSEC_GSS_SPKM3 is not set
889CONFIG_SMB_FS=m 922CONFIG_SMB_FS=m
@@ -958,11 +991,6 @@ CONFIG_DEBUG_BUGVERBOSE=y
958CONFIG_DEBUG_MEMORY_INIT=y 991CONFIG_DEBUG_MEMORY_INIT=y
959# CONFIG_RCU_CPU_STALL_DETECTOR is not set 992# CONFIG_RCU_CPU_STALL_DETECTOR is not set
960CONFIG_SYSCTL_SYSCALL_CHECK=y 993CONFIG_SYSCTL_SYSCALL_CHECK=y
961
962#
963# Tracers
964#
965# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
966# CONFIG_SAMPLES is not set 994# CONFIG_SAMPLES is not set
967 995
968# 996#
@@ -983,13 +1011,21 @@ CONFIG_CRYPTO=y
983# 1011#
984# CONFIG_CRYPTO_FIPS is not set 1012# CONFIG_CRYPTO_FIPS is not set
985CONFIG_CRYPTO_ALGAPI=y 1013CONFIG_CRYPTO_ALGAPI=y
986CONFIG_CRYPTO_AEAD=y 1014CONFIG_CRYPTO_ALGAPI2=y
1015CONFIG_CRYPTO_AEAD=m
1016CONFIG_CRYPTO_AEAD2=y
987CONFIG_CRYPTO_BLKCIPHER=y 1017CONFIG_CRYPTO_BLKCIPHER=y
1018CONFIG_CRYPTO_BLKCIPHER2=y
988CONFIG_CRYPTO_HASH=y 1019CONFIG_CRYPTO_HASH=y
989CONFIG_CRYPTO_RNG=y 1020CONFIG_CRYPTO_HASH2=y
1021CONFIG_CRYPTO_RNG=m
1022CONFIG_CRYPTO_RNG2=y
1023CONFIG_CRYPTO_PCOMP=y
990CONFIG_CRYPTO_MANAGER=y 1024CONFIG_CRYPTO_MANAGER=y
1025CONFIG_CRYPTO_MANAGER2=y
991CONFIG_CRYPTO_GF128MUL=m 1026CONFIG_CRYPTO_GF128MUL=m
992CONFIG_CRYPTO_NULL=m 1027CONFIG_CRYPTO_NULL=m
1028CONFIG_CRYPTO_WORKQUEUE=y
993CONFIG_CRYPTO_CRYPTD=m 1029CONFIG_CRYPTO_CRYPTD=m
994CONFIG_CRYPTO_AUTHENC=m 1030CONFIG_CRYPTO_AUTHENC=m
995CONFIG_CRYPTO_TEST=m 1031CONFIG_CRYPTO_TEST=m
@@ -1059,6 +1095,7 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
1059# Compression 1095# Compression
1060# 1096#
1061CONFIG_CRYPTO_DEFLATE=m 1097CONFIG_CRYPTO_DEFLATE=m
1098CONFIG_CRYPTO_ZLIB=m
1062CONFIG_CRYPTO_LZO=m 1099CONFIG_CRYPTO_LZO=m
1063 1100
1064# 1101#
@@ -1066,11 +1103,13 @@ CONFIG_CRYPTO_LZO=m
1066# 1103#
1067# CONFIG_CRYPTO_ANSI_CPRNG is not set 1104# CONFIG_CRYPTO_ANSI_CPRNG is not set
1068# CONFIG_CRYPTO_HW is not set 1105# CONFIG_CRYPTO_HW is not set
1106# CONFIG_BINARY_PRINTF is not set
1069 1107
1070# 1108#
1071# Library routines 1109# Library routines
1072# 1110#
1073CONFIG_BITREVERSE=y 1111CONFIG_BITREVERSE=y
1112CONFIG_GENERIC_FIND_LAST_BIT=y
1074CONFIG_CRC_CCITT=m 1113CONFIG_CRC_CCITT=m
1075CONFIG_CRC16=m 1114CONFIG_CRC16=m
1076CONFIG_CRC_T10DIF=y 1115CONFIG_CRC_T10DIF=y
@@ -1082,10 +1121,13 @@ CONFIG_ZLIB_INFLATE=y
1082CONFIG_ZLIB_DEFLATE=m 1121CONFIG_ZLIB_DEFLATE=m
1083CONFIG_LZO_COMPRESS=m 1122CONFIG_LZO_COMPRESS=m
1084CONFIG_LZO_DECOMPRESS=m 1123CONFIG_LZO_DECOMPRESS=m
1124CONFIG_DECOMPRESS_GZIP=y
1125CONFIG_DECOMPRESS_BZIP2=y
1126CONFIG_DECOMPRESS_LZMA=y
1085CONFIG_TEXTSEARCH=y 1127CONFIG_TEXTSEARCH=y
1086CONFIG_TEXTSEARCH_KMP=m 1128CONFIG_TEXTSEARCH_KMP=m
1087CONFIG_TEXTSEARCH_BM=m 1129CONFIG_TEXTSEARCH_BM=m
1088CONFIG_TEXTSEARCH_FSM=m 1130CONFIG_TEXTSEARCH_FSM=m
1089CONFIG_PLIST=y
1090CONFIG_HAS_IOMEM=y 1131CONFIG_HAS_IOMEM=y
1091CONFIG_HAS_DMA=y 1132CONFIG_HAS_DMA=y
1133CONFIG_NLATTR=y
diff --git a/arch/m68k/configs/atari_defconfig b/arch/m68k/configs/atari_defconfig
index a594a1d47b62..d92a90e03ecb 100644
--- a/arch/m68k/configs/atari_defconfig
+++ b/arch/m68k/configs/atari_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc7 3# Linux kernel version: 2.6.30-rc3
4# Tue Dec 2 20:27:44 2008 4# Wed Apr 22 20:47:56 2009
5# 5#
6CONFIG_M68K=y 6CONFIG_M68K=y
7CONFIG_MMU=y 7CONFIG_MMU=y
@@ -29,14 +29,24 @@ CONFIG_SWAP=y
29CONFIG_SYSVIPC=y 29CONFIG_SYSVIPC=y
30CONFIG_SYSVIPC_SYSCTL=y 30CONFIG_SYSVIPC_SYSCTL=y
31CONFIG_POSIX_MQUEUE=y 31CONFIG_POSIX_MQUEUE=y
32CONFIG_POSIX_MQUEUE_SYSCTL=y
32CONFIG_BSD_PROCESS_ACCT=y 33CONFIG_BSD_PROCESS_ACCT=y
33# CONFIG_BSD_PROCESS_ACCT_V3 is not set 34# CONFIG_BSD_PROCESS_ACCT_V3 is not set
34# CONFIG_TASKSTATS is not set 35# CONFIG_TASKSTATS is not set
35# CONFIG_AUDIT is not set 36# CONFIG_AUDIT is not set
37
38#
39# RCU Subsystem
40#
41CONFIG_CLASSIC_RCU=y
42# CONFIG_TREE_RCU is not set
43# CONFIG_PREEMPT_RCU is not set
44# CONFIG_TREE_RCU_TRACE is not set
45# CONFIG_PREEMPT_RCU_TRACE is not set
36# CONFIG_IKCONFIG is not set 46# CONFIG_IKCONFIG is not set
37CONFIG_LOG_BUF_SHIFT=14 47CONFIG_LOG_BUF_SHIFT=14
38# CONFIG_CGROUPS is not set
39# CONFIG_GROUP_SCHED is not set 48# CONFIG_GROUP_SCHED is not set
49# CONFIG_CGROUPS is not set
40# CONFIG_SYSFS_DEPRECATED_V2 is not set 50# CONFIG_SYSFS_DEPRECATED_V2 is not set
41CONFIG_RELAY=y 51CONFIG_RELAY=y
42CONFIG_NAMESPACES=y 52CONFIG_NAMESPACES=y
@@ -44,23 +54,27 @@ CONFIG_NAMESPACES=y
44# CONFIG_IPC_NS is not set 54# CONFIG_IPC_NS is not set
45# CONFIG_USER_NS is not set 55# CONFIG_USER_NS is not set
46# CONFIG_PID_NS is not set 56# CONFIG_PID_NS is not set
57# CONFIG_NET_NS is not set
47CONFIG_BLK_DEV_INITRD=y 58CONFIG_BLK_DEV_INITRD=y
48CONFIG_INITRAMFS_SOURCE="" 59CONFIG_INITRAMFS_SOURCE=""
60CONFIG_RD_GZIP=y
61CONFIG_RD_BZIP2=y
62CONFIG_RD_LZMA=y
49# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 63# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
50CONFIG_SYSCTL=y 64CONFIG_SYSCTL=y
65CONFIG_ANON_INODES=y
51# CONFIG_EMBEDDED is not set 66# CONFIG_EMBEDDED is not set
52CONFIG_UID16=y 67CONFIG_UID16=y
53CONFIG_SYSCTL_SYSCALL=y 68CONFIG_SYSCTL_SYSCALL=y
54CONFIG_KALLSYMS=y 69CONFIG_KALLSYMS=y
55# CONFIG_KALLSYMS_EXTRA_PASS is not set 70# CONFIG_KALLSYMS_EXTRA_PASS is not set
71# CONFIG_STRIP_ASM_SYMS is not set
56CONFIG_HOTPLUG=y 72CONFIG_HOTPLUG=y
57CONFIG_PRINTK=y 73CONFIG_PRINTK=y
58CONFIG_BUG=y 74CONFIG_BUG=y
59CONFIG_ELF_CORE=y 75CONFIG_ELF_CORE=y
60CONFIG_COMPAT_BRK=y
61CONFIG_BASE_FULL=y 76CONFIG_BASE_FULL=y
62CONFIG_FUTEX=y 77CONFIG_FUTEX=y
63CONFIG_ANON_INODES=y
64CONFIG_EPOLL=y 78CONFIG_EPOLL=y
65CONFIG_SIGNALFD=y 79CONFIG_SIGNALFD=y
66CONFIG_TIMERFD=y 80CONFIG_TIMERFD=y
@@ -68,15 +82,16 @@ CONFIG_EVENTFD=y
68CONFIG_SHMEM=y 82CONFIG_SHMEM=y
69CONFIG_AIO=y 83CONFIG_AIO=y
70CONFIG_VM_EVENT_COUNTERS=y 84CONFIG_VM_EVENT_COUNTERS=y
85CONFIG_COMPAT_BRK=y
71CONFIG_SLAB=y 86CONFIG_SLAB=y
72# CONFIG_SLUB is not set 87# CONFIG_SLUB is not set
73# CONFIG_SLOB is not set 88# CONFIG_SLOB is not set
74# CONFIG_PROFILING is not set 89# CONFIG_PROFILING is not set
75# CONFIG_MARKERS is not set 90# CONFIG_MARKERS is not set
91# CONFIG_SLOW_WORK is not set
76# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 92# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
77CONFIG_SLABINFO=y 93CONFIG_SLABINFO=y
78CONFIG_RT_MUTEXES=y 94CONFIG_RT_MUTEXES=y
79# CONFIG_TINY_SHMEM is not set
80CONFIG_BASE_SMALL=0 95CONFIG_BASE_SMALL=0
81CONFIG_MODULES=y 96CONFIG_MODULES=y
82# CONFIG_MODULE_FORCE_LOAD is not set 97# CONFIG_MODULE_FORCE_LOAD is not set
@@ -84,11 +99,8 @@ CONFIG_MODULE_UNLOAD=y
84# CONFIG_MODULE_FORCE_UNLOAD is not set 99# CONFIG_MODULE_FORCE_UNLOAD is not set
85# CONFIG_MODVERSIONS is not set 100# CONFIG_MODVERSIONS is not set
86# CONFIG_MODULE_SRCVERSION_ALL is not set 101# CONFIG_MODULE_SRCVERSION_ALL is not set
87CONFIG_KMOD=y
88CONFIG_BLOCK=y 102CONFIG_BLOCK=y
89# CONFIG_LBD is not set 103# CONFIG_LBD is not set
90# CONFIG_BLK_DEV_IO_TRACE is not set
91# CONFIG_LSF is not set
92CONFIG_BLK_DEV_BSG=y 104CONFIG_BLK_DEV_BSG=y
93# CONFIG_BLK_DEV_INTEGRITY is not set 105# CONFIG_BLK_DEV_INTEGRITY is not set
94 106
@@ -104,7 +116,6 @@ CONFIG_DEFAULT_AS=y
104# CONFIG_DEFAULT_CFQ is not set 116# CONFIG_DEFAULT_CFQ is not set
105# CONFIG_DEFAULT_NOOP is not set 117# CONFIG_DEFAULT_NOOP is not set
106CONFIG_DEFAULT_IOSCHED="anticipatory" 118CONFIG_DEFAULT_IOSCHED="anticipatory"
107CONFIG_CLASSIC_RCU=y
108# CONFIG_FREEZER is not set 119# CONFIG_FREEZER is not set
109 120
110# 121#
@@ -140,12 +151,13 @@ CONFIG_FLAT_NODE_MEM_MAP=y
140CONFIG_NEED_MULTIPLE_NODES=y 151CONFIG_NEED_MULTIPLE_NODES=y
141CONFIG_PAGEFLAGS_EXTENDED=y 152CONFIG_PAGEFLAGS_EXTENDED=y
142CONFIG_SPLIT_PTLOCK_CPUS=4 153CONFIG_SPLIT_PTLOCK_CPUS=4
143# CONFIG_RESOURCES_64BIT is not set
144# CONFIG_PHYS_ADDR_T_64BIT is not set 154# CONFIG_PHYS_ADDR_T_64BIT is not set
145CONFIG_ZONE_DMA_FLAG=1 155CONFIG_ZONE_DMA_FLAG=1
146CONFIG_BOUNCE=y 156CONFIG_BOUNCE=y
147CONFIG_VIRT_TO_BUS=y 157CONFIG_VIRT_TO_BUS=y
148CONFIG_UNEVICTABLE_LRU=y 158CONFIG_UNEVICTABLE_LRU=y
159CONFIG_HAVE_MLOCK=y
160CONFIG_HAVE_MLOCKED_PAGE_BIT=y
149 161
150# 162#
151# General setup 163# General setup
@@ -180,7 +192,10 @@ CONFIG_INET=y
180# CONFIG_IP_MULTICAST is not set 192# CONFIG_IP_MULTICAST is not set
181# CONFIG_IP_ADVANCED_ROUTER is not set 193# CONFIG_IP_ADVANCED_ROUTER is not set
182CONFIG_IP_FIB_HASH=y 194CONFIG_IP_FIB_HASH=y
183# CONFIG_IP_PNP is not set 195CONFIG_IP_PNP=y
196# CONFIG_IP_PNP_DHCP is not set
197# CONFIG_IP_PNP_BOOTP is not set
198# CONFIG_IP_PNP_RARP is not set
184CONFIG_NET_IPIP=m 199CONFIG_NET_IPIP=m
185CONFIG_NET_IPGRE=m 200CONFIG_NET_IPGRE=m
186# CONFIG_ARPD is not set 201# CONFIG_ARPD is not set
@@ -254,6 +269,7 @@ CONFIG_NETFILTER_XTABLES=m
254CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 269CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
255CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 270CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
256CONFIG_NETFILTER_XT_TARGET_DSCP=m 271CONFIG_NETFILTER_XT_TARGET_DSCP=m
272CONFIG_NETFILTER_XT_TARGET_HL=m
257CONFIG_NETFILTER_XT_TARGET_MARK=m 273CONFIG_NETFILTER_XT_TARGET_MARK=m
258CONFIG_NETFILTER_XT_TARGET_NFLOG=m 274CONFIG_NETFILTER_XT_TARGET_NFLOG=m
259CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 275CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
@@ -262,6 +278,7 @@ CONFIG_NETFILTER_XT_TARGET_RATEEST=m
262CONFIG_NETFILTER_XT_TARGET_TRACE=m 278CONFIG_NETFILTER_XT_TARGET_TRACE=m
263CONFIG_NETFILTER_XT_TARGET_TCPMSS=m 279CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
264CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m 280CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
281CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
265CONFIG_NETFILTER_XT_MATCH_COMMENT=m 282CONFIG_NETFILTER_XT_MATCH_COMMENT=m
266CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m 283CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
267CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m 284CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
@@ -272,6 +289,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m
272CONFIG_NETFILTER_XT_MATCH_ESP=m 289CONFIG_NETFILTER_XT_MATCH_ESP=m
273CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m 290CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
274CONFIG_NETFILTER_XT_MATCH_HELPER=m 291CONFIG_NETFILTER_XT_MATCH_HELPER=m
292CONFIG_NETFILTER_XT_MATCH_HL=m
275CONFIG_NETFILTER_XT_MATCH_IPRANGE=m 293CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
276CONFIG_NETFILTER_XT_MATCH_LENGTH=m 294CONFIG_NETFILTER_XT_MATCH_LENGTH=m
277CONFIG_NETFILTER_XT_MATCH_LIMIT=m 295CONFIG_NETFILTER_XT_MATCH_LIMIT=m
@@ -350,25 +368,20 @@ CONFIG_IP6_NF_MATCH_HL=m
350CONFIG_IP6_NF_MATCH_IPV6HEADER=m 368CONFIG_IP6_NF_MATCH_IPV6HEADER=m
351CONFIG_IP6_NF_MATCH_MH=m 369CONFIG_IP6_NF_MATCH_MH=m
352CONFIG_IP6_NF_MATCH_RT=m 370CONFIG_IP6_NF_MATCH_RT=m
371CONFIG_IP6_NF_TARGET_HL=m
353CONFIG_IP6_NF_TARGET_LOG=m 372CONFIG_IP6_NF_TARGET_LOG=m
354CONFIG_IP6_NF_FILTER=m 373CONFIG_IP6_NF_FILTER=m
355CONFIG_IP6_NF_TARGET_REJECT=m 374CONFIG_IP6_NF_TARGET_REJECT=m
356CONFIG_IP6_NF_MANGLE=m 375CONFIG_IP6_NF_MANGLE=m
357CONFIG_IP6_NF_TARGET_HL=m
358CONFIG_IP6_NF_RAW=m 376CONFIG_IP6_NF_RAW=m
359CONFIG_IP_DCCP=m 377CONFIG_IP_DCCP=m
360CONFIG_INET_DCCP_DIAG=m 378CONFIG_INET_DCCP_DIAG=m
361CONFIG_IP_DCCP_ACKVEC=y
362 379
363# 380#
364# DCCP CCIDs Configuration (EXPERIMENTAL) 381# DCCP CCIDs Configuration (EXPERIMENTAL)
365# 382#
366CONFIG_IP_DCCP_CCID2=m
367# CONFIG_IP_DCCP_CCID2_DEBUG is not set 383# CONFIG_IP_DCCP_CCID2_DEBUG is not set
368CONFIG_IP_DCCP_CCID3=m 384# CONFIG_IP_DCCP_CCID3 is not set
369# CONFIG_IP_DCCP_CCID3_DEBUG is not set
370CONFIG_IP_DCCP_CCID3_RTO=100
371CONFIG_IP_DCCP_TFRC_LIB=m
372CONFIG_IP_SCTP=m 385CONFIG_IP_SCTP=m
373# CONFIG_SCTP_DBG_MSG is not set 386# CONFIG_SCTP_DBG_MSG is not set
374# CONFIG_SCTP_DBG_OBJCNT is not set 387# CONFIG_SCTP_DBG_OBJCNT is not set
@@ -390,8 +403,10 @@ CONFIG_ATALK=m
390# CONFIG_LAPB is not set 403# CONFIG_LAPB is not set
391# CONFIG_ECONET is not set 404# CONFIG_ECONET is not set
392# CONFIG_WAN_ROUTER is not set 405# CONFIG_WAN_ROUTER is not set
406# CONFIG_PHONET is not set
393# CONFIG_NET_SCHED is not set 407# CONFIG_NET_SCHED is not set
394CONFIG_NET_CLS_ROUTE=y 408CONFIG_NET_CLS_ROUTE=y
409# CONFIG_DCB is not set
395 410
396# 411#
397# Network testing 412# Network testing
@@ -402,8 +417,8 @@ CONFIG_NET_CLS_ROUTE=y
402# CONFIG_IRDA is not set 417# CONFIG_IRDA is not set
403# CONFIG_BT is not set 418# CONFIG_BT is not set
404# CONFIG_AF_RXRPC is not set 419# CONFIG_AF_RXRPC is not set
405# CONFIG_PHONET is not set
406# CONFIG_WIRELESS is not set 420# CONFIG_WIRELESS is not set
421# CONFIG_WIMAX is not set
407# CONFIG_RFKILL is not set 422# CONFIG_RFKILL is not set
408# CONFIG_NET_9P is not set 423# CONFIG_NET_9P is not set
409 424
@@ -445,15 +460,20 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
445CONFIG_ATA_OVER_ETH=m 460CONFIG_ATA_OVER_ETH=m
446# CONFIG_BLK_DEV_HD is not set 461# CONFIG_BLK_DEV_HD is not set
447CONFIG_MISC_DEVICES=y 462CONFIG_MISC_DEVICES=y
448# CONFIG_EEPROM_93CX6 is not set
449# CONFIG_ENCLOSURE_SERVICES is not set 463# CONFIG_ENCLOSURE_SERVICES is not set
450# CONFIG_C2PORT is not set 464# CONFIG_C2PORT is not set
465
466#
467# EEPROM support
468#
469# CONFIG_EEPROM_93CX6 is not set
451CONFIG_HAVE_IDE=y 470CONFIG_HAVE_IDE=y
452CONFIG_IDE=y 471CONFIG_IDE=y
453 472
454# 473#
455# Please see Documentation/ide/ide.txt for help/info on IDE drives 474# Please see Documentation/ide/ide.txt for help/info on IDE drives
456# 475#
476CONFIG_IDE_ATAPI=y
457# CONFIG_BLK_DEV_IDE_SATA is not set 477# CONFIG_BLK_DEV_IDE_SATA is not set
458CONFIG_IDE_GD=y 478CONFIG_IDE_GD=y
459CONFIG_IDE_GD_ATA=y 479CONFIG_IDE_GD_ATA=y
@@ -461,7 +481,6 @@ CONFIG_IDE_GD_ATA=y
461CONFIG_BLK_DEV_IDECD=y 481CONFIG_BLK_DEV_IDECD=y
462CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y 482CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
463# CONFIG_BLK_DEV_IDETAPE is not set 483# CONFIG_BLK_DEV_IDETAPE is not set
464# CONFIG_BLK_DEV_IDESCSI is not set
465# CONFIG_IDE_TASK_IOCTL is not set 484# CONFIG_IDE_TASK_IOCTL is not set
466CONFIG_IDE_PROC_FS=y 485CONFIG_IDE_PROC_FS=y
467 486
@@ -516,11 +535,14 @@ CONFIG_SCSI_SRP_ATTRS=m
516CONFIG_SCSI_SRP_TGT_ATTRS=y 535CONFIG_SCSI_SRP_TGT_ATTRS=y
517CONFIG_SCSI_LOWLEVEL=y 536CONFIG_SCSI_LOWLEVEL=y
518CONFIG_ISCSI_TCP=m 537CONFIG_ISCSI_TCP=m
538# CONFIG_LIBFC is not set
539# CONFIG_LIBFCOE is not set
519# CONFIG_SCSI_DEBUG is not set 540# CONFIG_SCSI_DEBUG is not set
520CONFIG_ATARI_SCSI=y 541CONFIG_ATARI_SCSI=y
521# CONFIG_ATARI_SCSI_TOSHIBA_DELAY is not set 542# CONFIG_ATARI_SCSI_TOSHIBA_DELAY is not set
522# CONFIG_ATARI_SCSI_RESET_BOOT is not set 543# CONFIG_ATARI_SCSI_RESET_BOOT is not set
523# CONFIG_SCSI_DH is not set 544# CONFIG_SCSI_DH is not set
545# CONFIG_SCSI_OSD_INITIATOR is not set
524CONFIG_MD=y 546CONFIG_MD=y
525CONFIG_BLK_DEV_MD=m 547CONFIG_BLK_DEV_MD=m
526CONFIG_MD_LINEAR=m 548CONFIG_MD_LINEAR=m
@@ -528,7 +550,7 @@ CONFIG_MD_RAID0=m
528CONFIG_MD_RAID1=m 550CONFIG_MD_RAID1=m
529# CONFIG_MD_RAID10 is not set 551# CONFIG_MD_RAID10 is not set
530CONFIG_MD_RAID456=m 552CONFIG_MD_RAID456=m
531CONFIG_MD_RAID5_RESHAPE=y 553CONFIG_MD_RAID6_PQ=m
532# CONFIG_MD_MULTIPATH is not set 554# CONFIG_MD_MULTIPATH is not set
533# CONFIG_MD_FAULTY is not set 555# CONFIG_MD_FAULTY is not set
534CONFIG_BLK_DEV_DM=m 556CONFIG_BLK_DEV_DM=m
@@ -541,6 +563,7 @@ CONFIG_DM_MULTIPATH=m
541# CONFIG_DM_DELAY is not set 563# CONFIG_DM_DELAY is not set
542CONFIG_DM_UEVENT=y 564CONFIG_DM_UEVENT=y
543CONFIG_NETDEVICES=y 565CONFIG_NETDEVICES=y
566CONFIG_COMPAT_NET_DEV_OPS=y
544CONFIG_DUMMY=m 567CONFIG_DUMMY=m
545# CONFIG_BONDING is not set 568# CONFIG_BONDING is not set
546CONFIG_MACVLAN=m 569CONFIG_MACVLAN=m
@@ -550,7 +573,9 @@ CONFIG_VETH=m
550# CONFIG_PHYLIB is not set 573# CONFIG_PHYLIB is not set
551CONFIG_NET_ETHERNET=y 574CONFIG_NET_ETHERNET=y
552CONFIG_MII=y 575CONFIG_MII=y
553CONFIG_ATARILANCE=m 576CONFIG_ATARILANCE=y
577# CONFIG_ETHOC is not set
578# CONFIG_DNET is not set
554# CONFIG_IBM_NEW_EMAC_ZMII is not set 579# CONFIG_IBM_NEW_EMAC_ZMII is not set
555# CONFIG_IBM_NEW_EMAC_RGMII is not set 580# CONFIG_IBM_NEW_EMAC_RGMII is not set
556# CONFIG_IBM_NEW_EMAC_TAH is not set 581# CONFIG_IBM_NEW_EMAC_TAH is not set
@@ -568,7 +593,10 @@ CONFIG_ATARILANCE=m
568# 593#
569# CONFIG_WLAN_PRE80211 is not set 594# CONFIG_WLAN_PRE80211 is not set
570# CONFIG_WLAN_80211 is not set 595# CONFIG_WLAN_80211 is not set
571# CONFIG_IWLWIFI_LEDS is not set 596
597#
598# Enable WiMAX (Networking options) to see the WiMAX drivers
599#
572# CONFIG_WAN is not set 600# CONFIG_WAN is not set
573# CONFIG_PLIP is not set 601# CONFIG_PLIP is not set
574CONFIG_PPP=m 602CONFIG_PPP=m
@@ -625,11 +653,10 @@ CONFIG_INPUT_KEYBOARD=y
625CONFIG_ATARI_KBD_CORE=y 653CONFIG_ATARI_KBD_CORE=y
626CONFIG_KEYBOARD_ATARI=y 654CONFIG_KEYBOARD_ATARI=y
627CONFIG_INPUT_MOUSE=y 655CONFIG_INPUT_MOUSE=y
628CONFIG_MOUSE_PS2=y 656CONFIG_MOUSE_PS2=m
629CONFIG_MOUSE_PS2_ALPS=y 657CONFIG_MOUSE_PS2_ALPS=y
630CONFIG_MOUSE_PS2_LOGIPS2PP=y 658CONFIG_MOUSE_PS2_LOGIPS2PP=y
631CONFIG_MOUSE_PS2_SYNAPTICS=y 659CONFIG_MOUSE_PS2_SYNAPTICS=y
632CONFIG_MOUSE_PS2_LIFEBOOK=y
633CONFIG_MOUSE_PS2_TRACKPOINT=y 660CONFIG_MOUSE_PS2_TRACKPOINT=y
634# CONFIG_MOUSE_PS2_ELANTECH is not set 661# CONFIG_MOUSE_PS2_ELANTECH is not set
635# CONFIG_MOUSE_PS2_TOUCHKIT is not set 662# CONFIG_MOUSE_PS2_TOUCHKIT is not set
@@ -649,7 +676,7 @@ CONFIG_INPUT_M68K_BEEP=m
649CONFIG_SERIO=y 676CONFIG_SERIO=y
650# CONFIG_SERIO_SERPORT is not set 677# CONFIG_SERIO_SERPORT is not set
651# CONFIG_SERIO_PARKBD is not set 678# CONFIG_SERIO_PARKBD is not set
652CONFIG_SERIO_LIBPS2=y 679CONFIG_SERIO_LIBPS2=m
653# CONFIG_SERIO_RAW is not set 680# CONFIG_SERIO_RAW is not set
654# CONFIG_GAMEPORT is not set 681# CONFIG_GAMEPORT is not set
655 682
@@ -673,6 +700,7 @@ CONFIG_VT_HW_CONSOLE_BINDING=y
673# Non-8250 serial port support 700# Non-8250 serial port support
674# 701#
675CONFIG_UNIX98_PTYS=y 702CONFIG_UNIX98_PTYS=y
703# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
676CONFIG_LEGACY_PTYS=y 704CONFIG_LEGACY_PTYS=y
677CONFIG_LEGACY_PTY_COUNT=256 705CONFIG_LEGACY_PTY_COUNT=256
678CONFIG_PRINTER=m 706CONFIG_PRINTER=m
@@ -760,6 +788,7 @@ CONFIG_FB_ATARI=y
760# CONFIG_FB_VIRTUAL is not set 788# CONFIG_FB_VIRTUAL is not set
761# CONFIG_FB_METRONOME is not set 789# CONFIG_FB_METRONOME is not set
762# CONFIG_FB_MB862XX is not set 790# CONFIG_FB_MB862XX is not set
791# CONFIG_FB_BROADSHEET is not set
763# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 792# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
764 793
765# 794#
@@ -794,7 +823,6 @@ CONFIG_HIDRAW=y
794# 823#
795# Special HID drivers 824# Special HID drivers
796# 825#
797CONFIG_HID_COMPAT=y
798# CONFIG_USB_SUPPORT is not set 826# CONFIG_USB_SUPPORT is not set
799# CONFIG_MMC is not set 827# CONFIG_MMC is not set
800# CONFIG_MEMSTICK is not set 828# CONFIG_MEMSTICK is not set
@@ -805,14 +833,14 @@ CONFIG_HID_COMPAT=y
805# CONFIG_AUXDISPLAY is not set 833# CONFIG_AUXDISPLAY is not set
806# CONFIG_UIO is not set 834# CONFIG_UIO is not set
807# CONFIG_STAGING is not set 835# CONFIG_STAGING is not set
808CONFIG_STAGING_EXCLUDE_BUILD=y
809 836
810# 837#
811# Character devices 838# Character devices
812# 839#
813CONFIG_ATARI_MFPSER=m 840CONFIG_ATARI_MFPSER=y
814CONFIG_ATARI_MIDI=m 841CONFIG_ATARI_MIDI=y
815CONFIG_ATARI_DSP56K=m 842CONFIG_ATARI_DSP56K=m
843CONFIG_SERIAL_CONSOLE=y
816 844
817# 845#
818# File systems 846# File systems
@@ -821,6 +849,7 @@ CONFIG_EXT2_FS=y
821# CONFIG_EXT2_FS_XATTR is not set 849# CONFIG_EXT2_FS_XATTR is not set
822# CONFIG_EXT2_FS_XIP is not set 850# CONFIG_EXT2_FS_XIP is not set
823CONFIG_EXT3_FS=y 851CONFIG_EXT3_FS=y
852# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
824# CONFIG_EXT3_FS_XATTR is not set 853# CONFIG_EXT3_FS_XATTR is not set
825# CONFIG_EXT4_FS is not set 854# CONFIG_EXT4_FS is not set
826CONFIG_JBD=y 855CONFIG_JBD=y
@@ -847,13 +876,15 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
847# CONFIG_OCFS2_FS_STATS is not set 876# CONFIG_OCFS2_FS_STATS is not set
848# CONFIG_OCFS2_DEBUG_MASKLOG is not set 877# CONFIG_OCFS2_DEBUG_MASKLOG is not set
849# CONFIG_OCFS2_DEBUG_FS is not set 878# CONFIG_OCFS2_DEBUG_FS is not set
850# CONFIG_OCFS2_COMPAT_JBD is not set 879# CONFIG_OCFS2_FS_POSIX_ACL is not set
880# CONFIG_BTRFS_FS is not set
851CONFIG_DNOTIFY=y 881CONFIG_DNOTIFY=y
852CONFIG_INOTIFY=y 882CONFIG_INOTIFY=y
853CONFIG_INOTIFY_USER=y 883CONFIG_INOTIFY_USER=y
854CONFIG_QUOTA=y 884CONFIG_QUOTA=y
855CONFIG_QUOTA_NETLINK_INTERFACE=y 885CONFIG_QUOTA_NETLINK_INTERFACE=y
856# CONFIG_PRINT_QUOTA_WARNING is not set 886# CONFIG_PRINT_QUOTA_WARNING is not set
887CONFIG_QUOTA_TREE=m
857# CONFIG_QFMT_V1 is not set 888# CONFIG_QFMT_V1 is not set
858# CONFIG_QFMT_V2 is not set 889# CONFIG_QFMT_V2 is not set
859CONFIG_QUOTACTL=y 890CONFIG_QUOTACTL=y
@@ -862,6 +893,11 @@ CONFIG_AUTOFS4_FS=m
862CONFIG_FUSE_FS=m 893CONFIG_FUSE_FS=m
863 894
864# 895#
896# Caches
897#
898# CONFIG_FSCACHE is not set
899
900#
865# CD-ROM/DVD Filesystems 901# CD-ROM/DVD Filesystems
866# 902#
867CONFIG_ISO9660_FS=y 903CONFIG_ISO9660_FS=y
@@ -892,10 +928,7 @@ CONFIG_TMPFS=y
892# CONFIG_TMPFS_POSIX_ACL is not set 928# CONFIG_TMPFS_POSIX_ACL is not set
893# CONFIG_HUGETLB_PAGE is not set 929# CONFIG_HUGETLB_PAGE is not set
894CONFIG_CONFIGFS_FS=m 930CONFIG_CONFIGFS_FS=m
895 931CONFIG_MISC_FILESYSTEMS=y
896#
897# Miscellaneous filesystems
898#
899# CONFIG_ADFS_FS is not set 932# CONFIG_ADFS_FS is not set
900CONFIG_AFFS_FS=m 933CONFIG_AFFS_FS=m
901CONFIG_HFS_FS=m 934CONFIG_HFS_FS=m
@@ -904,6 +937,9 @@ CONFIG_HFSPLUS_FS=m
904# CONFIG_BFS_FS is not set 937# CONFIG_BFS_FS is not set
905# CONFIG_EFS_FS is not set 938# CONFIG_EFS_FS is not set
906CONFIG_CRAMFS=m 939CONFIG_CRAMFS=m
940CONFIG_SQUASHFS=m
941# CONFIG_SQUASHFS_EMBEDDED is not set
942CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
907# CONFIG_VXFS_FS is not set 943# CONFIG_VXFS_FS is not set
908CONFIG_MINIX_FS=y 944CONFIG_MINIX_FS=y
909# CONFIG_OMFS_FS is not set 945# CONFIG_OMFS_FS is not set
@@ -914,22 +950,24 @@ CONFIG_SYSV_FS=m
914CONFIG_UFS_FS=m 950CONFIG_UFS_FS=m
915# CONFIG_UFS_FS_WRITE is not set 951# CONFIG_UFS_FS_WRITE is not set
916# CONFIG_UFS_DEBUG is not set 952# CONFIG_UFS_DEBUG is not set
953# CONFIG_NILFS2_FS is not set
917CONFIG_NETWORK_FILESYSTEMS=y 954CONFIG_NETWORK_FILESYSTEMS=y
918CONFIG_NFS_FS=m 955CONFIG_NFS_FS=y
919CONFIG_NFS_V3=y 956CONFIG_NFS_V3=y
920# CONFIG_NFS_V3_ACL is not set 957# CONFIG_NFS_V3_ACL is not set
921# CONFIG_NFS_V4 is not set 958CONFIG_NFS_V4=y
959# CONFIG_ROOT_NFS is not set
922CONFIG_NFSD=m 960CONFIG_NFSD=m
923CONFIG_NFSD_V3=y 961CONFIG_NFSD_V3=y
924# CONFIG_NFSD_V3_ACL is not set 962# CONFIG_NFSD_V3_ACL is not set
925# CONFIG_NFSD_V4 is not set 963# CONFIG_NFSD_V4 is not set
926CONFIG_LOCKD=m 964CONFIG_LOCKD=y
927CONFIG_LOCKD_V4=y 965CONFIG_LOCKD_V4=y
928CONFIG_EXPORTFS=m 966CONFIG_EXPORTFS=m
929CONFIG_NFS_COMMON=y 967CONFIG_NFS_COMMON=y
930CONFIG_SUNRPC=m 968CONFIG_SUNRPC=y
931# CONFIG_SUNRPC_REGISTER_V4 is not set 969CONFIG_SUNRPC_GSS=y
932# CONFIG_RPCSEC_GSS_KRB5 is not set 970CONFIG_RPCSEC_GSS_KRB5=y
933# CONFIG_RPCSEC_GSS_SPKM3 is not set 971# CONFIG_RPCSEC_GSS_SPKM3 is not set
934CONFIG_SMB_FS=m 972CONFIG_SMB_FS=m
935CONFIG_SMB_NLS_DEFAULT=y 973CONFIG_SMB_NLS_DEFAULT=y
@@ -1004,11 +1042,6 @@ CONFIG_DEBUG_BUGVERBOSE=y
1004CONFIG_DEBUG_MEMORY_INIT=y 1042CONFIG_DEBUG_MEMORY_INIT=y
1005# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1043# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1006CONFIG_SYSCTL_SYSCALL_CHECK=y 1044CONFIG_SYSCTL_SYSCALL_CHECK=y
1007
1008#
1009# Tracers
1010#
1011# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1012# CONFIG_SAMPLES is not set 1045# CONFIG_SAMPLES is not set
1013 1046
1014# 1047#
@@ -1029,13 +1062,21 @@ CONFIG_CRYPTO=y
1029# 1062#
1030# CONFIG_CRYPTO_FIPS is not set 1063# CONFIG_CRYPTO_FIPS is not set
1031CONFIG_CRYPTO_ALGAPI=y 1064CONFIG_CRYPTO_ALGAPI=y
1032CONFIG_CRYPTO_AEAD=y 1065CONFIG_CRYPTO_ALGAPI2=y
1066CONFIG_CRYPTO_AEAD=m
1067CONFIG_CRYPTO_AEAD2=y
1033CONFIG_CRYPTO_BLKCIPHER=y 1068CONFIG_CRYPTO_BLKCIPHER=y
1069CONFIG_CRYPTO_BLKCIPHER2=y
1034CONFIG_CRYPTO_HASH=y 1070CONFIG_CRYPTO_HASH=y
1035CONFIG_CRYPTO_RNG=y 1071CONFIG_CRYPTO_HASH2=y
1072CONFIG_CRYPTO_RNG=m
1073CONFIG_CRYPTO_RNG2=y
1074CONFIG_CRYPTO_PCOMP=y
1036CONFIG_CRYPTO_MANAGER=y 1075CONFIG_CRYPTO_MANAGER=y
1076CONFIG_CRYPTO_MANAGER2=y
1037CONFIG_CRYPTO_GF128MUL=m 1077CONFIG_CRYPTO_GF128MUL=m
1038CONFIG_CRYPTO_NULL=m 1078CONFIG_CRYPTO_NULL=m
1079CONFIG_CRYPTO_WORKQUEUE=y
1039CONFIG_CRYPTO_CRYPTD=m 1080CONFIG_CRYPTO_CRYPTD=m
1040CONFIG_CRYPTO_AUTHENC=m 1081CONFIG_CRYPTO_AUTHENC=m
1041CONFIG_CRYPTO_TEST=m 1082CONFIG_CRYPTO_TEST=m
@@ -1050,7 +1091,7 @@ CONFIG_CRYPTO_SEQIV=m
1050# 1091#
1051# Block modes 1092# Block modes
1052# 1093#
1053CONFIG_CRYPTO_CBC=m 1094CONFIG_CRYPTO_CBC=y
1054CONFIG_CRYPTO_CTR=m 1095CONFIG_CRYPTO_CTR=m
1055CONFIG_CRYPTO_CTS=m 1096CONFIG_CRYPTO_CTS=m
1056CONFIG_CRYPTO_ECB=m 1097CONFIG_CRYPTO_ECB=m
@@ -1069,7 +1110,7 @@ CONFIG_CRYPTO_XCBC=m
1069# 1110#
1070CONFIG_CRYPTO_CRC32C=m 1111CONFIG_CRYPTO_CRC32C=m
1071CONFIG_CRYPTO_MD4=m 1112CONFIG_CRYPTO_MD4=m
1072CONFIG_CRYPTO_MD5=m 1113CONFIG_CRYPTO_MD5=y
1073CONFIG_CRYPTO_MICHAEL_MIC=m 1114CONFIG_CRYPTO_MICHAEL_MIC=m
1074CONFIG_CRYPTO_RMD128=m 1115CONFIG_CRYPTO_RMD128=m
1075CONFIG_CRYPTO_RMD160=m 1116CONFIG_CRYPTO_RMD160=m
@@ -1091,7 +1132,7 @@ CONFIG_CRYPTO_BLOWFISH=m
1091CONFIG_CRYPTO_CAMELLIA=m 1132CONFIG_CRYPTO_CAMELLIA=m
1092CONFIG_CRYPTO_CAST5=m 1133CONFIG_CRYPTO_CAST5=m
1093CONFIG_CRYPTO_CAST6=m 1134CONFIG_CRYPTO_CAST6=m
1094CONFIG_CRYPTO_DES=m 1135CONFIG_CRYPTO_DES=y
1095CONFIG_CRYPTO_FCRYPT=m 1136CONFIG_CRYPTO_FCRYPT=m
1096CONFIG_CRYPTO_KHAZAD=m 1137CONFIG_CRYPTO_KHAZAD=m
1097CONFIG_CRYPTO_SALSA20=m 1138CONFIG_CRYPTO_SALSA20=m
@@ -1105,6 +1146,7 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
1105# Compression 1146# Compression
1106# 1147#
1107CONFIG_CRYPTO_DEFLATE=m 1148CONFIG_CRYPTO_DEFLATE=m
1149CONFIG_CRYPTO_ZLIB=m
1108CONFIG_CRYPTO_LZO=m 1150CONFIG_CRYPTO_LZO=m
1109 1151
1110# 1152#
@@ -1112,11 +1154,13 @@ CONFIG_CRYPTO_LZO=m
1112# 1154#
1113# CONFIG_CRYPTO_ANSI_CPRNG is not set 1155# CONFIG_CRYPTO_ANSI_CPRNG is not set
1114# CONFIG_CRYPTO_HW is not set 1156# CONFIG_CRYPTO_HW is not set
1157# CONFIG_BINARY_PRINTF is not set
1115 1158
1116# 1159#
1117# Library routines 1160# Library routines
1118# 1161#
1119CONFIG_BITREVERSE=y 1162CONFIG_BITREVERSE=y
1163CONFIG_GENERIC_FIND_LAST_BIT=y
1120CONFIG_CRC_CCITT=m 1164CONFIG_CRC_CCITT=m
1121CONFIG_CRC16=y 1165CONFIG_CRC16=y
1122CONFIG_CRC_T10DIF=y 1166CONFIG_CRC_T10DIF=y
@@ -1128,10 +1172,13 @@ CONFIG_ZLIB_INFLATE=y
1128CONFIG_ZLIB_DEFLATE=m 1172CONFIG_ZLIB_DEFLATE=m
1129CONFIG_LZO_COMPRESS=m 1173CONFIG_LZO_COMPRESS=m
1130CONFIG_LZO_DECOMPRESS=m 1174CONFIG_LZO_DECOMPRESS=m
1175CONFIG_DECOMPRESS_GZIP=y
1176CONFIG_DECOMPRESS_BZIP2=y
1177CONFIG_DECOMPRESS_LZMA=y
1131CONFIG_TEXTSEARCH=y 1178CONFIG_TEXTSEARCH=y
1132CONFIG_TEXTSEARCH_KMP=m 1179CONFIG_TEXTSEARCH_KMP=m
1133CONFIG_TEXTSEARCH_BM=m 1180CONFIG_TEXTSEARCH_BM=m
1134CONFIG_TEXTSEARCH_FSM=m 1181CONFIG_TEXTSEARCH_FSM=m
1135CONFIG_PLIST=y
1136CONFIG_HAS_IOMEM=y 1182CONFIG_HAS_IOMEM=y
1137CONFIG_HAS_DMA=y 1183CONFIG_HAS_DMA=y
1184CONFIG_NLATTR=y
diff --git a/arch/m68k/configs/bvme6000_defconfig b/arch/m68k/configs/bvme6000_defconfig
index d3d9814a91de..6e6b1aa66682 100644
--- a/arch/m68k/configs/bvme6000_defconfig
+++ b/arch/m68k/configs/bvme6000_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc7 3# Linux kernel version: 2.6.30-rc3
4# Tue Dec 2 20:27:45 2008 4# Wed Apr 22 20:47:59 2009
5# 5#
6CONFIG_M68K=y 6CONFIG_M68K=y
7CONFIG_MMU=y 7CONFIG_MMU=y
@@ -29,14 +29,24 @@ CONFIG_SWAP=y
29CONFIG_SYSVIPC=y 29CONFIG_SYSVIPC=y
30CONFIG_SYSVIPC_SYSCTL=y 30CONFIG_SYSVIPC_SYSCTL=y
31CONFIG_POSIX_MQUEUE=y 31CONFIG_POSIX_MQUEUE=y
32CONFIG_POSIX_MQUEUE_SYSCTL=y
32CONFIG_BSD_PROCESS_ACCT=y 33CONFIG_BSD_PROCESS_ACCT=y
33# CONFIG_BSD_PROCESS_ACCT_V3 is not set 34# CONFIG_BSD_PROCESS_ACCT_V3 is not set
34# CONFIG_TASKSTATS is not set 35# CONFIG_TASKSTATS is not set
35# CONFIG_AUDIT is not set 36# CONFIG_AUDIT is not set
37
38#
39# RCU Subsystem
40#
41CONFIG_CLASSIC_RCU=y
42# CONFIG_TREE_RCU is not set
43# CONFIG_PREEMPT_RCU is not set
44# CONFIG_TREE_RCU_TRACE is not set
45# CONFIG_PREEMPT_RCU_TRACE is not set
36# CONFIG_IKCONFIG is not set 46# CONFIG_IKCONFIG is not set
37CONFIG_LOG_BUF_SHIFT=14 47CONFIG_LOG_BUF_SHIFT=14
38# CONFIG_CGROUPS is not set
39# CONFIG_GROUP_SCHED is not set 48# CONFIG_GROUP_SCHED is not set
49# CONFIG_CGROUPS is not set
40# CONFIG_SYSFS_DEPRECATED_V2 is not set 50# CONFIG_SYSFS_DEPRECATED_V2 is not set
41CONFIG_RELAY=y 51CONFIG_RELAY=y
42CONFIG_NAMESPACES=y 52CONFIG_NAMESPACES=y
@@ -44,23 +54,27 @@ CONFIG_NAMESPACES=y
44# CONFIG_IPC_NS is not set 54# CONFIG_IPC_NS is not set
45# CONFIG_USER_NS is not set 55# CONFIG_USER_NS is not set
46# CONFIG_PID_NS is not set 56# CONFIG_PID_NS is not set
57# CONFIG_NET_NS is not set
47CONFIG_BLK_DEV_INITRD=y 58CONFIG_BLK_DEV_INITRD=y
48CONFIG_INITRAMFS_SOURCE="" 59CONFIG_INITRAMFS_SOURCE=""
60CONFIG_RD_GZIP=y
61CONFIG_RD_BZIP2=y
62CONFIG_RD_LZMA=y
49# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 63# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
50CONFIG_SYSCTL=y 64CONFIG_SYSCTL=y
65CONFIG_ANON_INODES=y
51# CONFIG_EMBEDDED is not set 66# CONFIG_EMBEDDED is not set
52CONFIG_UID16=y 67CONFIG_UID16=y
53CONFIG_SYSCTL_SYSCALL=y 68CONFIG_SYSCTL_SYSCALL=y
54CONFIG_KALLSYMS=y 69CONFIG_KALLSYMS=y
55# CONFIG_KALLSYMS_EXTRA_PASS is not set 70# CONFIG_KALLSYMS_EXTRA_PASS is not set
71# CONFIG_STRIP_ASM_SYMS is not set
56CONFIG_HOTPLUG=y 72CONFIG_HOTPLUG=y
57CONFIG_PRINTK=y 73CONFIG_PRINTK=y
58CONFIG_BUG=y 74CONFIG_BUG=y
59CONFIG_ELF_CORE=y 75CONFIG_ELF_CORE=y
60CONFIG_COMPAT_BRK=y
61CONFIG_BASE_FULL=y 76CONFIG_BASE_FULL=y
62CONFIG_FUTEX=y 77CONFIG_FUTEX=y
63CONFIG_ANON_INODES=y
64CONFIG_EPOLL=y 78CONFIG_EPOLL=y
65CONFIG_SIGNALFD=y 79CONFIG_SIGNALFD=y
66CONFIG_TIMERFD=y 80CONFIG_TIMERFD=y
@@ -68,15 +82,16 @@ CONFIG_EVENTFD=y
68CONFIG_SHMEM=y 82CONFIG_SHMEM=y
69CONFIG_AIO=y 83CONFIG_AIO=y
70CONFIG_VM_EVENT_COUNTERS=y 84CONFIG_VM_EVENT_COUNTERS=y
85CONFIG_COMPAT_BRK=y
71CONFIG_SLAB=y 86CONFIG_SLAB=y
72# CONFIG_SLUB is not set 87# CONFIG_SLUB is not set
73# CONFIG_SLOB is not set 88# CONFIG_SLOB is not set
74# CONFIG_PROFILING is not set 89# CONFIG_PROFILING is not set
75# CONFIG_MARKERS is not set 90# CONFIG_MARKERS is not set
91# CONFIG_SLOW_WORK is not set
76# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 92# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
77CONFIG_SLABINFO=y 93CONFIG_SLABINFO=y
78CONFIG_RT_MUTEXES=y 94CONFIG_RT_MUTEXES=y
79# CONFIG_TINY_SHMEM is not set
80CONFIG_BASE_SMALL=0 95CONFIG_BASE_SMALL=0
81CONFIG_MODULES=y 96CONFIG_MODULES=y
82# CONFIG_MODULE_FORCE_LOAD is not set 97# CONFIG_MODULE_FORCE_LOAD is not set
@@ -84,11 +99,8 @@ CONFIG_MODULE_UNLOAD=y
84# CONFIG_MODULE_FORCE_UNLOAD is not set 99# CONFIG_MODULE_FORCE_UNLOAD is not set
85# CONFIG_MODVERSIONS is not set 100# CONFIG_MODVERSIONS is not set
86# CONFIG_MODULE_SRCVERSION_ALL is not set 101# CONFIG_MODULE_SRCVERSION_ALL is not set
87CONFIG_KMOD=y
88CONFIG_BLOCK=y 102CONFIG_BLOCK=y
89# CONFIG_LBD is not set 103# CONFIG_LBD is not set
90# CONFIG_BLK_DEV_IO_TRACE is not set
91# CONFIG_LSF is not set
92CONFIG_BLK_DEV_BSG=y 104CONFIG_BLK_DEV_BSG=y
93# CONFIG_BLK_DEV_INTEGRITY is not set 105# CONFIG_BLK_DEV_INTEGRITY is not set
94 106
@@ -104,7 +116,6 @@ CONFIG_DEFAULT_AS=y
104# CONFIG_DEFAULT_CFQ is not set 116# CONFIG_DEFAULT_CFQ is not set
105# CONFIG_DEFAULT_NOOP is not set 117# CONFIG_DEFAULT_NOOP is not set
106CONFIG_DEFAULT_IOSCHED="anticipatory" 118CONFIG_DEFAULT_IOSCHED="anticipatory"
107CONFIG_CLASSIC_RCU=y
108# CONFIG_FREEZER is not set 119# CONFIG_FREEZER is not set
109 120
110# 121#
@@ -143,12 +154,13 @@ CONFIG_FLAT_NODE_MEM_MAP=y
143CONFIG_NEED_MULTIPLE_NODES=y 154CONFIG_NEED_MULTIPLE_NODES=y
144CONFIG_PAGEFLAGS_EXTENDED=y 155CONFIG_PAGEFLAGS_EXTENDED=y
145CONFIG_SPLIT_PTLOCK_CPUS=4 156CONFIG_SPLIT_PTLOCK_CPUS=4
146# CONFIG_RESOURCES_64BIT is not set
147# CONFIG_PHYS_ADDR_T_64BIT is not set 157# CONFIG_PHYS_ADDR_T_64BIT is not set
148CONFIG_ZONE_DMA_FLAG=1 158CONFIG_ZONE_DMA_FLAG=1
149CONFIG_BOUNCE=y 159CONFIG_BOUNCE=y
150CONFIG_VIRT_TO_BUS=y 160CONFIG_VIRT_TO_BUS=y
151CONFIG_UNEVICTABLE_LRU=y 161CONFIG_UNEVICTABLE_LRU=y
162CONFIG_HAVE_MLOCK=y
163CONFIG_HAVE_MLOCKED_PAGE_BIT=y
152 164
153# 165#
154# General setup 166# General setup
@@ -258,6 +270,7 @@ CONFIG_NETFILTER_XTABLES=m
258CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 270CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
259CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 271CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
260CONFIG_NETFILTER_XT_TARGET_DSCP=m 272CONFIG_NETFILTER_XT_TARGET_DSCP=m
273CONFIG_NETFILTER_XT_TARGET_HL=m
261CONFIG_NETFILTER_XT_TARGET_MARK=m 274CONFIG_NETFILTER_XT_TARGET_MARK=m
262CONFIG_NETFILTER_XT_TARGET_NFLOG=m 275CONFIG_NETFILTER_XT_TARGET_NFLOG=m
263CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 276CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
@@ -266,6 +279,7 @@ CONFIG_NETFILTER_XT_TARGET_RATEEST=m
266CONFIG_NETFILTER_XT_TARGET_TRACE=m 279CONFIG_NETFILTER_XT_TARGET_TRACE=m
267CONFIG_NETFILTER_XT_TARGET_TCPMSS=m 280CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
268CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m 281CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
282CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
269CONFIG_NETFILTER_XT_MATCH_COMMENT=m 283CONFIG_NETFILTER_XT_MATCH_COMMENT=m
270CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m 284CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
271CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m 285CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
@@ -276,6 +290,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m
276CONFIG_NETFILTER_XT_MATCH_ESP=m 290CONFIG_NETFILTER_XT_MATCH_ESP=m
277CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m 291CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
278CONFIG_NETFILTER_XT_MATCH_HELPER=m 292CONFIG_NETFILTER_XT_MATCH_HELPER=m
293CONFIG_NETFILTER_XT_MATCH_HL=m
279CONFIG_NETFILTER_XT_MATCH_IPRANGE=m 294CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
280CONFIG_NETFILTER_XT_MATCH_LENGTH=m 295CONFIG_NETFILTER_XT_MATCH_LENGTH=m
281CONFIG_NETFILTER_XT_MATCH_LIMIT=m 296CONFIG_NETFILTER_XT_MATCH_LIMIT=m
@@ -354,25 +369,20 @@ CONFIG_IP6_NF_MATCH_HL=m
354CONFIG_IP6_NF_MATCH_IPV6HEADER=m 369CONFIG_IP6_NF_MATCH_IPV6HEADER=m
355CONFIG_IP6_NF_MATCH_MH=m 370CONFIG_IP6_NF_MATCH_MH=m
356CONFIG_IP6_NF_MATCH_RT=m 371CONFIG_IP6_NF_MATCH_RT=m
372CONFIG_IP6_NF_TARGET_HL=m
357CONFIG_IP6_NF_TARGET_LOG=m 373CONFIG_IP6_NF_TARGET_LOG=m
358CONFIG_IP6_NF_FILTER=m 374CONFIG_IP6_NF_FILTER=m
359CONFIG_IP6_NF_TARGET_REJECT=m 375CONFIG_IP6_NF_TARGET_REJECT=m
360CONFIG_IP6_NF_MANGLE=m 376CONFIG_IP6_NF_MANGLE=m
361CONFIG_IP6_NF_TARGET_HL=m
362CONFIG_IP6_NF_RAW=m 377CONFIG_IP6_NF_RAW=m
363CONFIG_IP_DCCP=m 378CONFIG_IP_DCCP=m
364CONFIG_INET_DCCP_DIAG=m 379CONFIG_INET_DCCP_DIAG=m
365CONFIG_IP_DCCP_ACKVEC=y
366 380
367# 381#
368# DCCP CCIDs Configuration (EXPERIMENTAL) 382# DCCP CCIDs Configuration (EXPERIMENTAL)
369# 383#
370CONFIG_IP_DCCP_CCID2=m
371# CONFIG_IP_DCCP_CCID2_DEBUG is not set 384# CONFIG_IP_DCCP_CCID2_DEBUG is not set
372CONFIG_IP_DCCP_CCID3=m 385# CONFIG_IP_DCCP_CCID3 is not set
373# CONFIG_IP_DCCP_CCID3_DEBUG is not set
374CONFIG_IP_DCCP_CCID3_RTO=100
375CONFIG_IP_DCCP_TFRC_LIB=m
376CONFIG_IP_SCTP=m 386CONFIG_IP_SCTP=m
377# CONFIG_SCTP_DBG_MSG is not set 387# CONFIG_SCTP_DBG_MSG is not set
378# CONFIG_SCTP_DBG_OBJCNT is not set 388# CONFIG_SCTP_DBG_OBJCNT is not set
@@ -394,8 +404,10 @@ CONFIG_ATALK=m
394# CONFIG_LAPB is not set 404# CONFIG_LAPB is not set
395# CONFIG_ECONET is not set 405# CONFIG_ECONET is not set
396# CONFIG_WAN_ROUTER is not set 406# CONFIG_WAN_ROUTER is not set
407# CONFIG_PHONET is not set
397# CONFIG_NET_SCHED is not set 408# CONFIG_NET_SCHED is not set
398CONFIG_NET_CLS_ROUTE=y 409CONFIG_NET_CLS_ROUTE=y
410# CONFIG_DCB is not set
399 411
400# 412#
401# Network testing 413# Network testing
@@ -406,8 +418,8 @@ CONFIG_NET_CLS_ROUTE=y
406# CONFIG_IRDA is not set 418# CONFIG_IRDA is not set
407# CONFIG_BT is not set 419# CONFIG_BT is not set
408# CONFIG_AF_RXRPC is not set 420# CONFIG_AF_RXRPC is not set
409# CONFIG_PHONET is not set
410# CONFIG_WIRELESS is not set 421# CONFIG_WIRELESS is not set
422# CONFIG_WIMAX is not set
411# CONFIG_RFKILL is not set 423# CONFIG_RFKILL is not set
412# CONFIG_NET_9P is not set 424# CONFIG_NET_9P is not set
413 425
@@ -443,9 +455,13 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
443CONFIG_ATA_OVER_ETH=m 455CONFIG_ATA_OVER_ETH=m
444# CONFIG_BLK_DEV_HD is not set 456# CONFIG_BLK_DEV_HD is not set
445CONFIG_MISC_DEVICES=y 457CONFIG_MISC_DEVICES=y
446# CONFIG_EEPROM_93CX6 is not set
447# CONFIG_ENCLOSURE_SERVICES is not set 458# CONFIG_ENCLOSURE_SERVICES is not set
448# CONFIG_C2PORT is not set 459# CONFIG_C2PORT is not set
460
461#
462# EEPROM support
463#
464# CONFIG_EEPROM_93CX6 is not set
449CONFIG_HAVE_IDE=y 465CONFIG_HAVE_IDE=y
450# CONFIG_IDE is not set 466# CONFIG_IDE is not set
451 467
@@ -493,10 +509,13 @@ CONFIG_SCSI_SRP_ATTRS=m
493CONFIG_SCSI_SRP_TGT_ATTRS=y 509CONFIG_SCSI_SRP_TGT_ATTRS=y
494CONFIG_SCSI_LOWLEVEL=y 510CONFIG_SCSI_LOWLEVEL=y
495CONFIG_ISCSI_TCP=m 511CONFIG_ISCSI_TCP=m
512# CONFIG_LIBFC is not set
513# CONFIG_LIBFCOE is not set
496CONFIG_53C700_BE_BUS=y 514CONFIG_53C700_BE_BUS=y
497# CONFIG_SCSI_DEBUG is not set 515# CONFIG_SCSI_DEBUG is not set
498CONFIG_BVME6000_SCSI=y 516CONFIG_BVME6000_SCSI=y
499# CONFIG_SCSI_DH is not set 517# CONFIG_SCSI_DH is not set
518# CONFIG_SCSI_OSD_INITIATOR is not set
500CONFIG_MD=y 519CONFIG_MD=y
501CONFIG_BLK_DEV_MD=m 520CONFIG_BLK_DEV_MD=m
502CONFIG_MD_LINEAR=m 521CONFIG_MD_LINEAR=m
@@ -504,7 +523,7 @@ CONFIG_MD_RAID0=m
504CONFIG_MD_RAID1=m 523CONFIG_MD_RAID1=m
505# CONFIG_MD_RAID10 is not set 524# CONFIG_MD_RAID10 is not set
506CONFIG_MD_RAID456=m 525CONFIG_MD_RAID456=m
507CONFIG_MD_RAID5_RESHAPE=y 526CONFIG_MD_RAID6_PQ=m
508# CONFIG_MD_MULTIPATH is not set 527# CONFIG_MD_MULTIPATH is not set
509# CONFIG_MD_FAULTY is not set 528# CONFIG_MD_FAULTY is not set
510CONFIG_BLK_DEV_DM=m 529CONFIG_BLK_DEV_DM=m
@@ -517,6 +536,7 @@ CONFIG_DM_MULTIPATH=m
517# CONFIG_DM_DELAY is not set 536# CONFIG_DM_DELAY is not set
518CONFIG_DM_UEVENT=y 537CONFIG_DM_UEVENT=y
519CONFIG_NETDEVICES=y 538CONFIG_NETDEVICES=y
539CONFIG_COMPAT_NET_DEV_OPS=y
520CONFIG_DUMMY=m 540CONFIG_DUMMY=m
521# CONFIG_BONDING is not set 541# CONFIG_BONDING is not set
522CONFIG_MACVLAN=m 542CONFIG_MACVLAN=m
@@ -527,6 +547,8 @@ CONFIG_VETH=m
527CONFIG_NET_ETHERNET=y 547CONFIG_NET_ETHERNET=y
528# CONFIG_MII is not set 548# CONFIG_MII is not set
529CONFIG_BVME6000_NET=y 549CONFIG_BVME6000_NET=y
550# CONFIG_ETHOC is not set
551# CONFIG_DNET is not set
530# CONFIG_IBM_NEW_EMAC_ZMII is not set 552# CONFIG_IBM_NEW_EMAC_ZMII is not set
531# CONFIG_IBM_NEW_EMAC_RGMII is not set 553# CONFIG_IBM_NEW_EMAC_RGMII is not set
532# CONFIG_IBM_NEW_EMAC_TAH is not set 554# CONFIG_IBM_NEW_EMAC_TAH is not set
@@ -543,7 +565,10 @@ CONFIG_BVME6000_NET=y
543# 565#
544# CONFIG_WLAN_PRE80211 is not set 566# CONFIG_WLAN_PRE80211 is not set
545# CONFIG_WLAN_80211 is not set 567# CONFIG_WLAN_80211 is not set
546# CONFIG_IWLWIFI_LEDS is not set 568
569#
570# Enable WiMAX (Networking options) to see the WiMAX drivers
571#
547# CONFIG_WAN is not set 572# CONFIG_WAN is not set
548CONFIG_PPP=m 573CONFIG_PPP=m
549# CONFIG_PPP_MULTILINK is not set 574# CONFIG_PPP_MULTILINK is not set
@@ -601,7 +626,6 @@ CONFIG_MOUSE_PS2=m
601CONFIG_MOUSE_PS2_ALPS=y 626CONFIG_MOUSE_PS2_ALPS=y
602CONFIG_MOUSE_PS2_LOGIPS2PP=y 627CONFIG_MOUSE_PS2_LOGIPS2PP=y
603CONFIG_MOUSE_PS2_SYNAPTICS=y 628CONFIG_MOUSE_PS2_SYNAPTICS=y
604CONFIG_MOUSE_PS2_LIFEBOOK=y
605CONFIG_MOUSE_PS2_TRACKPOINT=y 629CONFIG_MOUSE_PS2_TRACKPOINT=y
606# CONFIG_MOUSE_PS2_ELANTECH is not set 630# CONFIG_MOUSE_PS2_ELANTECH is not set
607# CONFIG_MOUSE_PS2_TOUCHKIT is not set 631# CONFIG_MOUSE_PS2_TOUCHKIT is not set
@@ -641,6 +665,7 @@ CONFIG_VT_HW_CONSOLE_BINDING=y
641# Non-8250 serial port support 665# Non-8250 serial port support
642# 666#
643CONFIG_UNIX98_PTYS=y 667CONFIG_UNIX98_PTYS=y
668# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
644CONFIG_LEGACY_PTYS=y 669CONFIG_LEGACY_PTYS=y
645CONFIG_LEGACY_PTY_COUNT=256 670CONFIG_LEGACY_PTY_COUNT=256
646# CONFIG_IPMI_HANDLER is not set 671# CONFIG_IPMI_HANDLER is not set
@@ -717,7 +742,6 @@ CONFIG_HIDRAW=y
717# 742#
718# Special HID drivers 743# Special HID drivers
719# 744#
720CONFIG_HID_COMPAT=y
721# CONFIG_USB_SUPPORT is not set 745# CONFIG_USB_SUPPORT is not set
722# CONFIG_MMC is not set 746# CONFIG_MMC is not set
723# CONFIG_MEMSTICK is not set 747# CONFIG_MEMSTICK is not set
@@ -725,9 +749,9 @@ CONFIG_HID_COMPAT=y
725# CONFIG_ACCESSIBILITY is not set 749# CONFIG_ACCESSIBILITY is not set
726# CONFIG_RTC_CLASS is not set 750# CONFIG_RTC_CLASS is not set
727# CONFIG_DMADEVICES is not set 751# CONFIG_DMADEVICES is not set
752# CONFIG_AUXDISPLAY is not set
728# CONFIG_UIO is not set 753# CONFIG_UIO is not set
729# CONFIG_STAGING is not set 754# CONFIG_STAGING is not set
730CONFIG_STAGING_EXCLUDE_BUILD=y
731 755
732# 756#
733# Character devices 757# Character devices
@@ -742,6 +766,7 @@ CONFIG_EXT2_FS=y
742# CONFIG_EXT2_FS_XATTR is not set 766# CONFIG_EXT2_FS_XATTR is not set
743# CONFIG_EXT2_FS_XIP is not set 767# CONFIG_EXT2_FS_XIP is not set
744CONFIG_EXT3_FS=y 768CONFIG_EXT3_FS=y
769# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
745# CONFIG_EXT3_FS_XATTR is not set 770# CONFIG_EXT3_FS_XATTR is not set
746# CONFIG_EXT4_FS is not set 771# CONFIG_EXT4_FS is not set
747CONFIG_JBD=y 772CONFIG_JBD=y
@@ -768,13 +793,15 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
768# CONFIG_OCFS2_FS_STATS is not set 793# CONFIG_OCFS2_FS_STATS is not set
769# CONFIG_OCFS2_DEBUG_MASKLOG is not set 794# CONFIG_OCFS2_DEBUG_MASKLOG is not set
770# CONFIG_OCFS2_DEBUG_FS is not set 795# CONFIG_OCFS2_DEBUG_FS is not set
771# CONFIG_OCFS2_COMPAT_JBD is not set 796# CONFIG_OCFS2_FS_POSIX_ACL is not set
797# CONFIG_BTRFS_FS is not set
772CONFIG_DNOTIFY=y 798CONFIG_DNOTIFY=y
773CONFIG_INOTIFY=y 799CONFIG_INOTIFY=y
774CONFIG_INOTIFY_USER=y 800CONFIG_INOTIFY_USER=y
775CONFIG_QUOTA=y 801CONFIG_QUOTA=y
776CONFIG_QUOTA_NETLINK_INTERFACE=y 802CONFIG_QUOTA_NETLINK_INTERFACE=y
777# CONFIG_PRINT_QUOTA_WARNING is not set 803# CONFIG_PRINT_QUOTA_WARNING is not set
804CONFIG_QUOTA_TREE=m
778# CONFIG_QFMT_V1 is not set 805# CONFIG_QFMT_V1 is not set
779# CONFIG_QFMT_V2 is not set 806# CONFIG_QFMT_V2 is not set
780CONFIG_QUOTACTL=y 807CONFIG_QUOTACTL=y
@@ -783,6 +810,11 @@ CONFIG_AUTOFS4_FS=m
783CONFIG_FUSE_FS=m 810CONFIG_FUSE_FS=m
784 811
785# 812#
813# Caches
814#
815# CONFIG_FSCACHE is not set
816
817#
786# CD-ROM/DVD Filesystems 818# CD-ROM/DVD Filesystems
787# 819#
788CONFIG_ISO9660_FS=y 820CONFIG_ISO9660_FS=y
@@ -813,10 +845,7 @@ CONFIG_TMPFS=y
813# CONFIG_TMPFS_POSIX_ACL is not set 845# CONFIG_TMPFS_POSIX_ACL is not set
814# CONFIG_HUGETLB_PAGE is not set 846# CONFIG_HUGETLB_PAGE is not set
815CONFIG_CONFIGFS_FS=m 847CONFIG_CONFIGFS_FS=m
816 848CONFIG_MISC_FILESYSTEMS=y
817#
818# Miscellaneous filesystems
819#
820# CONFIG_ADFS_FS is not set 849# CONFIG_ADFS_FS is not set
821CONFIG_AFFS_FS=m 850CONFIG_AFFS_FS=m
822CONFIG_HFS_FS=m 851CONFIG_HFS_FS=m
@@ -825,6 +854,9 @@ CONFIG_HFSPLUS_FS=m
825# CONFIG_BFS_FS is not set 854# CONFIG_BFS_FS is not set
826# CONFIG_EFS_FS is not set 855# CONFIG_EFS_FS is not set
827CONFIG_CRAMFS=m 856CONFIG_CRAMFS=m
857CONFIG_SQUASHFS=m
858# CONFIG_SQUASHFS_EMBEDDED is not set
859CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
828# CONFIG_VXFS_FS is not set 860# CONFIG_VXFS_FS is not set
829CONFIG_MINIX_FS=y 861CONFIG_MINIX_FS=y
830# CONFIG_OMFS_FS is not set 862# CONFIG_OMFS_FS is not set
@@ -835,6 +867,7 @@ CONFIG_SYSV_FS=m
835CONFIG_UFS_FS=m 867CONFIG_UFS_FS=m
836# CONFIG_UFS_FS_WRITE is not set 868# CONFIG_UFS_FS_WRITE is not set
837# CONFIG_UFS_DEBUG is not set 869# CONFIG_UFS_DEBUG is not set
870# CONFIG_NILFS2_FS is not set
838CONFIG_NETWORK_FILESYSTEMS=y 871CONFIG_NETWORK_FILESYSTEMS=y
839CONFIG_NFS_FS=y 872CONFIG_NFS_FS=y
840CONFIG_NFS_V3=y 873CONFIG_NFS_V3=y
@@ -851,7 +884,6 @@ CONFIG_EXPORTFS=m
851CONFIG_NFS_COMMON=y 884CONFIG_NFS_COMMON=y
852CONFIG_SUNRPC=y 885CONFIG_SUNRPC=y
853CONFIG_SUNRPC_GSS=y 886CONFIG_SUNRPC_GSS=y
854# CONFIG_SUNRPC_REGISTER_V4 is not set
855CONFIG_RPCSEC_GSS_KRB5=y 887CONFIG_RPCSEC_GSS_KRB5=y
856# CONFIG_RPCSEC_GSS_SPKM3 is not set 888# CONFIG_RPCSEC_GSS_SPKM3 is not set
857CONFIG_SMB_FS=m 889CONFIG_SMB_FS=m
@@ -927,11 +959,6 @@ CONFIG_DEBUG_BUGVERBOSE=y
927CONFIG_DEBUG_MEMORY_INIT=y 959CONFIG_DEBUG_MEMORY_INIT=y
928# CONFIG_RCU_CPU_STALL_DETECTOR is not set 960# CONFIG_RCU_CPU_STALL_DETECTOR is not set
929CONFIG_SYSCTL_SYSCALL_CHECK=y 961CONFIG_SYSCTL_SYSCALL_CHECK=y
930
931#
932# Tracers
933#
934# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
935# CONFIG_SAMPLES is not set 962# CONFIG_SAMPLES is not set
936 963
937# 964#
@@ -952,13 +979,21 @@ CONFIG_CRYPTO=y
952# 979#
953# CONFIG_CRYPTO_FIPS is not set 980# CONFIG_CRYPTO_FIPS is not set
954CONFIG_CRYPTO_ALGAPI=y 981CONFIG_CRYPTO_ALGAPI=y
955CONFIG_CRYPTO_AEAD=y 982CONFIG_CRYPTO_ALGAPI2=y
983CONFIG_CRYPTO_AEAD=m
984CONFIG_CRYPTO_AEAD2=y
956CONFIG_CRYPTO_BLKCIPHER=y 985CONFIG_CRYPTO_BLKCIPHER=y
986CONFIG_CRYPTO_BLKCIPHER2=y
957CONFIG_CRYPTO_HASH=y 987CONFIG_CRYPTO_HASH=y
958CONFIG_CRYPTO_RNG=y 988CONFIG_CRYPTO_HASH2=y
989CONFIG_CRYPTO_RNG=m
990CONFIG_CRYPTO_RNG2=y
991CONFIG_CRYPTO_PCOMP=y
959CONFIG_CRYPTO_MANAGER=y 992CONFIG_CRYPTO_MANAGER=y
993CONFIG_CRYPTO_MANAGER2=y
960CONFIG_CRYPTO_GF128MUL=m 994CONFIG_CRYPTO_GF128MUL=m
961CONFIG_CRYPTO_NULL=m 995CONFIG_CRYPTO_NULL=m
996CONFIG_CRYPTO_WORKQUEUE=y
962CONFIG_CRYPTO_CRYPTD=m 997CONFIG_CRYPTO_CRYPTD=m
963CONFIG_CRYPTO_AUTHENC=m 998CONFIG_CRYPTO_AUTHENC=m
964CONFIG_CRYPTO_TEST=m 999CONFIG_CRYPTO_TEST=m
@@ -1028,6 +1063,7 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
1028# Compression 1063# Compression
1029# 1064#
1030CONFIG_CRYPTO_DEFLATE=m 1065CONFIG_CRYPTO_DEFLATE=m
1066CONFIG_CRYPTO_ZLIB=m
1031CONFIG_CRYPTO_LZO=m 1067CONFIG_CRYPTO_LZO=m
1032 1068
1033# 1069#
@@ -1035,11 +1071,13 @@ CONFIG_CRYPTO_LZO=m
1035# 1071#
1036# CONFIG_CRYPTO_ANSI_CPRNG is not set 1072# CONFIG_CRYPTO_ANSI_CPRNG is not set
1037# CONFIG_CRYPTO_HW is not set 1073# CONFIG_CRYPTO_HW is not set
1074# CONFIG_BINARY_PRINTF is not set
1038 1075
1039# 1076#
1040# Library routines 1077# Library routines
1041# 1078#
1042CONFIG_BITREVERSE=m 1079CONFIG_BITREVERSE=m
1080CONFIG_GENERIC_FIND_LAST_BIT=y
1043CONFIG_CRC_CCITT=m 1081CONFIG_CRC_CCITT=m
1044CONFIG_CRC16=m 1082CONFIG_CRC16=m
1045CONFIG_CRC_T10DIF=y 1083CONFIG_CRC_T10DIF=y
@@ -1051,10 +1089,13 @@ CONFIG_ZLIB_INFLATE=y
1051CONFIG_ZLIB_DEFLATE=m 1089CONFIG_ZLIB_DEFLATE=m
1052CONFIG_LZO_COMPRESS=m 1090CONFIG_LZO_COMPRESS=m
1053CONFIG_LZO_DECOMPRESS=m 1091CONFIG_LZO_DECOMPRESS=m
1092CONFIG_DECOMPRESS_GZIP=y
1093CONFIG_DECOMPRESS_BZIP2=y
1094CONFIG_DECOMPRESS_LZMA=y
1054CONFIG_TEXTSEARCH=y 1095CONFIG_TEXTSEARCH=y
1055CONFIG_TEXTSEARCH_KMP=m 1096CONFIG_TEXTSEARCH_KMP=m
1056CONFIG_TEXTSEARCH_BM=m 1097CONFIG_TEXTSEARCH_BM=m
1057CONFIG_TEXTSEARCH_FSM=m 1098CONFIG_TEXTSEARCH_FSM=m
1058CONFIG_PLIST=y
1059CONFIG_HAS_IOMEM=y 1099CONFIG_HAS_IOMEM=y
1060CONFIG_HAS_DMA=y 1100CONFIG_HAS_DMA=y
1101CONFIG_NLATTR=y
diff --git a/arch/m68k/configs/hp300_defconfig b/arch/m68k/configs/hp300_defconfig
index 5556ef088d04..bc0565f63a15 100644
--- a/arch/m68k/configs/hp300_defconfig
+++ b/arch/m68k/configs/hp300_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc7 3# Linux kernel version: 2.6.30-rc3
4# Tue Dec 2 20:27:46 2008 4# Wed Apr 22 20:48:01 2009
5# 5#
6CONFIG_M68K=y 6CONFIG_M68K=y
7CONFIG_MMU=y 7CONFIG_MMU=y
@@ -29,14 +29,24 @@ CONFIG_SWAP=y
29CONFIG_SYSVIPC=y 29CONFIG_SYSVIPC=y
30CONFIG_SYSVIPC_SYSCTL=y 30CONFIG_SYSVIPC_SYSCTL=y
31CONFIG_POSIX_MQUEUE=y 31CONFIG_POSIX_MQUEUE=y
32CONFIG_POSIX_MQUEUE_SYSCTL=y
32CONFIG_BSD_PROCESS_ACCT=y 33CONFIG_BSD_PROCESS_ACCT=y
33# CONFIG_BSD_PROCESS_ACCT_V3 is not set 34# CONFIG_BSD_PROCESS_ACCT_V3 is not set
34# CONFIG_TASKSTATS is not set 35# CONFIG_TASKSTATS is not set
35# CONFIG_AUDIT is not set 36# CONFIG_AUDIT is not set
37
38#
39# RCU Subsystem
40#
41CONFIG_CLASSIC_RCU=y
42# CONFIG_TREE_RCU is not set
43# CONFIG_PREEMPT_RCU is not set
44# CONFIG_TREE_RCU_TRACE is not set
45# CONFIG_PREEMPT_RCU_TRACE is not set
36# CONFIG_IKCONFIG is not set 46# CONFIG_IKCONFIG is not set
37CONFIG_LOG_BUF_SHIFT=14 47CONFIG_LOG_BUF_SHIFT=14
38# CONFIG_CGROUPS is not set
39# CONFIG_GROUP_SCHED is not set 48# CONFIG_GROUP_SCHED is not set
49# CONFIG_CGROUPS is not set
40# CONFIG_SYSFS_DEPRECATED_V2 is not set 50# CONFIG_SYSFS_DEPRECATED_V2 is not set
41CONFIG_RELAY=y 51CONFIG_RELAY=y
42CONFIG_NAMESPACES=y 52CONFIG_NAMESPACES=y
@@ -44,23 +54,27 @@ CONFIG_NAMESPACES=y
44# CONFIG_IPC_NS is not set 54# CONFIG_IPC_NS is not set
45# CONFIG_USER_NS is not set 55# CONFIG_USER_NS is not set
46# CONFIG_PID_NS is not set 56# CONFIG_PID_NS is not set
57# CONFIG_NET_NS is not set
47CONFIG_BLK_DEV_INITRD=y 58CONFIG_BLK_DEV_INITRD=y
48CONFIG_INITRAMFS_SOURCE="" 59CONFIG_INITRAMFS_SOURCE=""
60CONFIG_RD_GZIP=y
61CONFIG_RD_BZIP2=y
62CONFIG_RD_LZMA=y
49# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 63# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
50CONFIG_SYSCTL=y 64CONFIG_SYSCTL=y
65CONFIG_ANON_INODES=y
51# CONFIG_EMBEDDED is not set 66# CONFIG_EMBEDDED is not set
52CONFIG_UID16=y 67CONFIG_UID16=y
53CONFIG_SYSCTL_SYSCALL=y 68CONFIG_SYSCTL_SYSCALL=y
54CONFIG_KALLSYMS=y 69CONFIG_KALLSYMS=y
55# CONFIG_KALLSYMS_EXTRA_PASS is not set 70# CONFIG_KALLSYMS_EXTRA_PASS is not set
71# CONFIG_STRIP_ASM_SYMS is not set
56CONFIG_HOTPLUG=y 72CONFIG_HOTPLUG=y
57CONFIG_PRINTK=y 73CONFIG_PRINTK=y
58CONFIG_BUG=y 74CONFIG_BUG=y
59CONFIG_ELF_CORE=y 75CONFIG_ELF_CORE=y
60CONFIG_COMPAT_BRK=y
61CONFIG_BASE_FULL=y 76CONFIG_BASE_FULL=y
62CONFIG_FUTEX=y 77CONFIG_FUTEX=y
63CONFIG_ANON_INODES=y
64CONFIG_EPOLL=y 78CONFIG_EPOLL=y
65CONFIG_SIGNALFD=y 79CONFIG_SIGNALFD=y
66CONFIG_TIMERFD=y 80CONFIG_TIMERFD=y
@@ -68,15 +82,16 @@ CONFIG_EVENTFD=y
68CONFIG_SHMEM=y 82CONFIG_SHMEM=y
69CONFIG_AIO=y 83CONFIG_AIO=y
70CONFIG_VM_EVENT_COUNTERS=y 84CONFIG_VM_EVENT_COUNTERS=y
85CONFIG_COMPAT_BRK=y
71CONFIG_SLAB=y 86CONFIG_SLAB=y
72# CONFIG_SLUB is not set 87# CONFIG_SLUB is not set
73# CONFIG_SLOB is not set 88# CONFIG_SLOB is not set
74# CONFIG_PROFILING is not set 89# CONFIG_PROFILING is not set
75# CONFIG_MARKERS is not set 90# CONFIG_MARKERS is not set
91# CONFIG_SLOW_WORK is not set
76# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 92# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
77CONFIG_SLABINFO=y 93CONFIG_SLABINFO=y
78CONFIG_RT_MUTEXES=y 94CONFIG_RT_MUTEXES=y
79# CONFIG_TINY_SHMEM is not set
80CONFIG_BASE_SMALL=0 95CONFIG_BASE_SMALL=0
81CONFIG_MODULES=y 96CONFIG_MODULES=y
82# CONFIG_MODULE_FORCE_LOAD is not set 97# CONFIG_MODULE_FORCE_LOAD is not set
@@ -84,11 +99,8 @@ CONFIG_MODULE_UNLOAD=y
84# CONFIG_MODULE_FORCE_UNLOAD is not set 99# CONFIG_MODULE_FORCE_UNLOAD is not set
85# CONFIG_MODVERSIONS is not set 100# CONFIG_MODVERSIONS is not set
86# CONFIG_MODULE_SRCVERSION_ALL is not set 101# CONFIG_MODULE_SRCVERSION_ALL is not set
87CONFIG_KMOD=y
88CONFIG_BLOCK=y 102CONFIG_BLOCK=y
89# CONFIG_LBD is not set 103# CONFIG_LBD is not set
90# CONFIG_BLK_DEV_IO_TRACE is not set
91# CONFIG_LSF is not set
92CONFIG_BLK_DEV_BSG=y 104CONFIG_BLK_DEV_BSG=y
93# CONFIG_BLK_DEV_INTEGRITY is not set 105# CONFIG_BLK_DEV_INTEGRITY is not set
94 106
@@ -104,7 +116,6 @@ CONFIG_DEFAULT_AS=y
104# CONFIG_DEFAULT_CFQ is not set 116# CONFIG_DEFAULT_CFQ is not set
105# CONFIG_DEFAULT_NOOP is not set 117# CONFIG_DEFAULT_NOOP is not set
106CONFIG_DEFAULT_IOSCHED="anticipatory" 118CONFIG_DEFAULT_IOSCHED="anticipatory"
107CONFIG_CLASSIC_RCU=y
108# CONFIG_FREEZER is not set 119# CONFIG_FREEZER is not set
109 120
110# 121#
@@ -141,12 +152,13 @@ CONFIG_FLAT_NODE_MEM_MAP=y
141CONFIG_NEED_MULTIPLE_NODES=y 152CONFIG_NEED_MULTIPLE_NODES=y
142CONFIG_PAGEFLAGS_EXTENDED=y 153CONFIG_PAGEFLAGS_EXTENDED=y
143CONFIG_SPLIT_PTLOCK_CPUS=4 154CONFIG_SPLIT_PTLOCK_CPUS=4
144# CONFIG_RESOURCES_64BIT is not set
145# CONFIG_PHYS_ADDR_T_64BIT is not set 155# CONFIG_PHYS_ADDR_T_64BIT is not set
146CONFIG_ZONE_DMA_FLAG=1 156CONFIG_ZONE_DMA_FLAG=1
147CONFIG_BOUNCE=y 157CONFIG_BOUNCE=y
148CONFIG_VIRT_TO_BUS=y 158CONFIG_VIRT_TO_BUS=y
149CONFIG_UNEVICTABLE_LRU=y 159CONFIG_UNEVICTABLE_LRU=y
160CONFIG_HAVE_MLOCK=y
161CONFIG_HAVE_MLOCKED_PAGE_BIT=y
150 162
151# 163#
152# General setup 164# General setup
@@ -257,6 +269,7 @@ CONFIG_NETFILTER_XTABLES=m
257CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 269CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
258CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 270CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
259CONFIG_NETFILTER_XT_TARGET_DSCP=m 271CONFIG_NETFILTER_XT_TARGET_DSCP=m
272CONFIG_NETFILTER_XT_TARGET_HL=m
260CONFIG_NETFILTER_XT_TARGET_MARK=m 273CONFIG_NETFILTER_XT_TARGET_MARK=m
261CONFIG_NETFILTER_XT_TARGET_NFLOG=m 274CONFIG_NETFILTER_XT_TARGET_NFLOG=m
262CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 275CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
@@ -265,6 +278,7 @@ CONFIG_NETFILTER_XT_TARGET_RATEEST=m
265CONFIG_NETFILTER_XT_TARGET_TRACE=m 278CONFIG_NETFILTER_XT_TARGET_TRACE=m
266CONFIG_NETFILTER_XT_TARGET_TCPMSS=m 279CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
267CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m 280CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
281CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
268CONFIG_NETFILTER_XT_MATCH_COMMENT=m 282CONFIG_NETFILTER_XT_MATCH_COMMENT=m
269CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m 283CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
270CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m 284CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
@@ -275,6 +289,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m
275CONFIG_NETFILTER_XT_MATCH_ESP=m 289CONFIG_NETFILTER_XT_MATCH_ESP=m
276CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m 290CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
277CONFIG_NETFILTER_XT_MATCH_HELPER=m 291CONFIG_NETFILTER_XT_MATCH_HELPER=m
292CONFIG_NETFILTER_XT_MATCH_HL=m
278CONFIG_NETFILTER_XT_MATCH_IPRANGE=m 293CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
279CONFIG_NETFILTER_XT_MATCH_LENGTH=m 294CONFIG_NETFILTER_XT_MATCH_LENGTH=m
280CONFIG_NETFILTER_XT_MATCH_LIMIT=m 295CONFIG_NETFILTER_XT_MATCH_LIMIT=m
@@ -353,25 +368,20 @@ CONFIG_IP6_NF_MATCH_HL=m
353CONFIG_IP6_NF_MATCH_IPV6HEADER=m 368CONFIG_IP6_NF_MATCH_IPV6HEADER=m
354CONFIG_IP6_NF_MATCH_MH=m 369CONFIG_IP6_NF_MATCH_MH=m
355CONFIG_IP6_NF_MATCH_RT=m 370CONFIG_IP6_NF_MATCH_RT=m
371CONFIG_IP6_NF_TARGET_HL=m
356CONFIG_IP6_NF_TARGET_LOG=m 372CONFIG_IP6_NF_TARGET_LOG=m
357CONFIG_IP6_NF_FILTER=m 373CONFIG_IP6_NF_FILTER=m
358CONFIG_IP6_NF_TARGET_REJECT=m 374CONFIG_IP6_NF_TARGET_REJECT=m
359CONFIG_IP6_NF_MANGLE=m 375CONFIG_IP6_NF_MANGLE=m
360CONFIG_IP6_NF_TARGET_HL=m
361CONFIG_IP6_NF_RAW=m 376CONFIG_IP6_NF_RAW=m
362CONFIG_IP_DCCP=m 377CONFIG_IP_DCCP=m
363CONFIG_INET_DCCP_DIAG=m 378CONFIG_INET_DCCP_DIAG=m
364CONFIG_IP_DCCP_ACKVEC=y
365 379
366# 380#
367# DCCP CCIDs Configuration (EXPERIMENTAL) 381# DCCP CCIDs Configuration (EXPERIMENTAL)
368# 382#
369CONFIG_IP_DCCP_CCID2=m
370# CONFIG_IP_DCCP_CCID2_DEBUG is not set 383# CONFIG_IP_DCCP_CCID2_DEBUG is not set
371CONFIG_IP_DCCP_CCID3=m 384# CONFIG_IP_DCCP_CCID3 is not set
372# CONFIG_IP_DCCP_CCID3_DEBUG is not set
373CONFIG_IP_DCCP_CCID3_RTO=100
374CONFIG_IP_DCCP_TFRC_LIB=m
375CONFIG_IP_SCTP=m 385CONFIG_IP_SCTP=m
376# CONFIG_SCTP_DBG_MSG is not set 386# CONFIG_SCTP_DBG_MSG is not set
377# CONFIG_SCTP_DBG_OBJCNT is not set 387# CONFIG_SCTP_DBG_OBJCNT is not set
@@ -393,8 +403,10 @@ CONFIG_ATALK=m
393# CONFIG_LAPB is not set 403# CONFIG_LAPB is not set
394# CONFIG_ECONET is not set 404# CONFIG_ECONET is not set
395# CONFIG_WAN_ROUTER is not set 405# CONFIG_WAN_ROUTER is not set
406# CONFIG_PHONET is not set
396# CONFIG_NET_SCHED is not set 407# CONFIG_NET_SCHED is not set
397CONFIG_NET_CLS_ROUTE=y 408CONFIG_NET_CLS_ROUTE=y
409# CONFIG_DCB is not set
398 410
399# 411#
400# Network testing 412# Network testing
@@ -405,8 +417,8 @@ CONFIG_NET_CLS_ROUTE=y
405# CONFIG_IRDA is not set 417# CONFIG_IRDA is not set
406# CONFIG_BT is not set 418# CONFIG_BT is not set
407# CONFIG_AF_RXRPC is not set 419# CONFIG_AF_RXRPC is not set
408# CONFIG_PHONET is not set
409# CONFIG_WIRELESS is not set 420# CONFIG_WIRELESS is not set
421# CONFIG_WIMAX is not set
410# CONFIG_RFKILL is not set 422# CONFIG_RFKILL is not set
411# CONFIG_NET_9P is not set 423# CONFIG_NET_9P is not set
412 424
@@ -442,9 +454,13 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
442CONFIG_ATA_OVER_ETH=m 454CONFIG_ATA_OVER_ETH=m
443# CONFIG_BLK_DEV_HD is not set 455# CONFIG_BLK_DEV_HD is not set
444CONFIG_MISC_DEVICES=y 456CONFIG_MISC_DEVICES=y
445# CONFIG_EEPROM_93CX6 is not set
446# CONFIG_ENCLOSURE_SERVICES is not set 457# CONFIG_ENCLOSURE_SERVICES is not set
447# CONFIG_C2PORT is not set 458# CONFIG_C2PORT is not set
459
460#
461# EEPROM support
462#
463# CONFIG_EEPROM_93CX6 is not set
448CONFIG_HAVE_IDE=y 464CONFIG_HAVE_IDE=y
449# CONFIG_IDE is not set 465# CONFIG_IDE is not set
450 466
@@ -492,8 +508,11 @@ CONFIG_SCSI_SRP_ATTRS=m
492CONFIG_SCSI_SRP_TGT_ATTRS=y 508CONFIG_SCSI_SRP_TGT_ATTRS=y
493CONFIG_SCSI_LOWLEVEL=y 509CONFIG_SCSI_LOWLEVEL=y
494CONFIG_ISCSI_TCP=m 510CONFIG_ISCSI_TCP=m
511# CONFIG_LIBFC is not set
512# CONFIG_LIBFCOE is not set
495# CONFIG_SCSI_DEBUG is not set 513# CONFIG_SCSI_DEBUG is not set
496# CONFIG_SCSI_DH is not set 514# CONFIG_SCSI_DH is not set
515# CONFIG_SCSI_OSD_INITIATOR is not set
497CONFIG_MD=y 516CONFIG_MD=y
498CONFIG_BLK_DEV_MD=m 517CONFIG_BLK_DEV_MD=m
499CONFIG_MD_LINEAR=m 518CONFIG_MD_LINEAR=m
@@ -501,7 +520,7 @@ CONFIG_MD_RAID0=m
501CONFIG_MD_RAID1=m 520CONFIG_MD_RAID1=m
502# CONFIG_MD_RAID10 is not set 521# CONFIG_MD_RAID10 is not set
503CONFIG_MD_RAID456=m 522CONFIG_MD_RAID456=m
504CONFIG_MD_RAID5_RESHAPE=y 523CONFIG_MD_RAID6_PQ=m
505# CONFIG_MD_MULTIPATH is not set 524# CONFIG_MD_MULTIPATH is not set
506# CONFIG_MD_FAULTY is not set 525# CONFIG_MD_FAULTY is not set
507CONFIG_BLK_DEV_DM=m 526CONFIG_BLK_DEV_DM=m
@@ -514,6 +533,7 @@ CONFIG_DM_MULTIPATH=m
514# CONFIG_DM_DELAY is not set 533# CONFIG_DM_DELAY is not set
515CONFIG_DM_UEVENT=y 534CONFIG_DM_UEVENT=y
516CONFIG_NETDEVICES=y 535CONFIG_NETDEVICES=y
536CONFIG_COMPAT_NET_DEV_OPS=y
517CONFIG_DUMMY=m 537CONFIG_DUMMY=m
518# CONFIG_BONDING is not set 538# CONFIG_BONDING is not set
519CONFIG_MACVLAN=m 539CONFIG_MACVLAN=m
@@ -524,6 +544,8 @@ CONFIG_VETH=m
524CONFIG_NET_ETHERNET=y 544CONFIG_NET_ETHERNET=y
525# CONFIG_MII is not set 545# CONFIG_MII is not set
526CONFIG_HPLANCE=y 546CONFIG_HPLANCE=y
547# CONFIG_ETHOC is not set
548# CONFIG_DNET is not set
527# CONFIG_IBM_NEW_EMAC_ZMII is not set 549# CONFIG_IBM_NEW_EMAC_ZMII is not set
528# CONFIG_IBM_NEW_EMAC_RGMII is not set 550# CONFIG_IBM_NEW_EMAC_RGMII is not set
529# CONFIG_IBM_NEW_EMAC_TAH is not set 551# CONFIG_IBM_NEW_EMAC_TAH is not set
@@ -540,7 +562,10 @@ CONFIG_HPLANCE=y
540# 562#
541# CONFIG_WLAN_PRE80211 is not set 563# CONFIG_WLAN_PRE80211 is not set
542# CONFIG_WLAN_80211 is not set 564# CONFIG_WLAN_80211 is not set
543# CONFIG_IWLWIFI_LEDS is not set 565
566#
567# Enable WiMAX (Networking options) to see the WiMAX drivers
568#
544# CONFIG_WAN is not set 569# CONFIG_WAN is not set
545CONFIG_PPP=m 570CONFIG_PPP=m
546# CONFIG_PPP_MULTILINK is not set 571# CONFIG_PPP_MULTILINK is not set
@@ -600,7 +625,6 @@ CONFIG_MOUSE_PS2=m
600CONFIG_MOUSE_PS2_ALPS=y 625CONFIG_MOUSE_PS2_ALPS=y
601CONFIG_MOUSE_PS2_LOGIPS2PP=y 626CONFIG_MOUSE_PS2_LOGIPS2PP=y
602CONFIG_MOUSE_PS2_SYNAPTICS=y 627CONFIG_MOUSE_PS2_SYNAPTICS=y
603CONFIG_MOUSE_PS2_LIFEBOOK=y
604CONFIG_MOUSE_PS2_TRACKPOINT=y 628CONFIG_MOUSE_PS2_TRACKPOINT=y
605# CONFIG_MOUSE_PS2_ELANTECH is not set 629# CONFIG_MOUSE_PS2_ELANTECH is not set
606# CONFIG_MOUSE_PS2_TOUCHKIT is not set 630# CONFIG_MOUSE_PS2_TOUCHKIT is not set
@@ -646,6 +670,7 @@ CONFIG_VT_HW_CONSOLE_BINDING=y
646# Non-8250 serial port support 670# Non-8250 serial port support
647# 671#
648CONFIG_UNIX98_PTYS=y 672CONFIG_UNIX98_PTYS=y
673# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
649CONFIG_LEGACY_PTYS=y 674CONFIG_LEGACY_PTYS=y
650CONFIG_LEGACY_PTY_COUNT=256 675CONFIG_LEGACY_PTY_COUNT=256
651# CONFIG_IPMI_HANDLER is not set 676# CONFIG_IPMI_HANDLER is not set
@@ -728,6 +753,7 @@ CONFIG_FB_HP300=y
728# CONFIG_FB_VIRTUAL is not set 753# CONFIG_FB_VIRTUAL is not set
729# CONFIG_FB_METRONOME is not set 754# CONFIG_FB_METRONOME is not set
730# CONFIG_FB_MB862XX is not set 755# CONFIG_FB_MB862XX is not set
756# CONFIG_FB_BROADSHEET is not set
731# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 757# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
732 758
733# 759#
@@ -759,7 +785,6 @@ CONFIG_HIDRAW=y
759# 785#
760# Special HID drivers 786# Special HID drivers
761# 787#
762CONFIG_HID_COMPAT=y
763# CONFIG_USB_SUPPORT is not set 788# CONFIG_USB_SUPPORT is not set
764# CONFIG_MMC is not set 789# CONFIG_MMC is not set
765# CONFIG_MEMSTICK is not set 790# CONFIG_MEMSTICK is not set
@@ -767,9 +792,9 @@ CONFIG_HID_COMPAT=y
767# CONFIG_ACCESSIBILITY is not set 792# CONFIG_ACCESSIBILITY is not set
768# CONFIG_RTC_CLASS is not set 793# CONFIG_RTC_CLASS is not set
769# CONFIG_DMADEVICES is not set 794# CONFIG_DMADEVICES is not set
795# CONFIG_AUXDISPLAY is not set
770# CONFIG_UIO is not set 796# CONFIG_UIO is not set
771# CONFIG_STAGING is not set 797# CONFIG_STAGING is not set
772CONFIG_STAGING_EXCLUDE_BUILD=y
773 798
774# 799#
775# Character devices 800# Character devices
@@ -782,6 +807,7 @@ CONFIG_EXT2_FS=y
782# CONFIG_EXT2_FS_XATTR is not set 807# CONFIG_EXT2_FS_XATTR is not set
783# CONFIG_EXT2_FS_XIP is not set 808# CONFIG_EXT2_FS_XIP is not set
784CONFIG_EXT3_FS=y 809CONFIG_EXT3_FS=y
810# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
785# CONFIG_EXT3_FS_XATTR is not set 811# CONFIG_EXT3_FS_XATTR is not set
786# CONFIG_EXT4_FS is not set 812# CONFIG_EXT4_FS is not set
787CONFIG_JBD=y 813CONFIG_JBD=y
@@ -808,13 +834,15 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
808# CONFIG_OCFS2_FS_STATS is not set 834# CONFIG_OCFS2_FS_STATS is not set
809# CONFIG_OCFS2_DEBUG_MASKLOG is not set 835# CONFIG_OCFS2_DEBUG_MASKLOG is not set
810# CONFIG_OCFS2_DEBUG_FS is not set 836# CONFIG_OCFS2_DEBUG_FS is not set
811# CONFIG_OCFS2_COMPAT_JBD is not set 837# CONFIG_OCFS2_FS_POSIX_ACL is not set
838# CONFIG_BTRFS_FS is not set
812CONFIG_DNOTIFY=y 839CONFIG_DNOTIFY=y
813CONFIG_INOTIFY=y 840CONFIG_INOTIFY=y
814CONFIG_INOTIFY_USER=y 841CONFIG_INOTIFY_USER=y
815CONFIG_QUOTA=y 842CONFIG_QUOTA=y
816CONFIG_QUOTA_NETLINK_INTERFACE=y 843CONFIG_QUOTA_NETLINK_INTERFACE=y
817# CONFIG_PRINT_QUOTA_WARNING is not set 844# CONFIG_PRINT_QUOTA_WARNING is not set
845CONFIG_QUOTA_TREE=m
818# CONFIG_QFMT_V1 is not set 846# CONFIG_QFMT_V1 is not set
819# CONFIG_QFMT_V2 is not set 847# CONFIG_QFMT_V2 is not set
820CONFIG_QUOTACTL=y 848CONFIG_QUOTACTL=y
@@ -823,6 +851,11 @@ CONFIG_AUTOFS4_FS=m
823CONFIG_FUSE_FS=m 851CONFIG_FUSE_FS=m
824 852
825# 853#
854# Caches
855#
856# CONFIG_FSCACHE is not set
857
858#
826# CD-ROM/DVD Filesystems 859# CD-ROM/DVD Filesystems
827# 860#
828CONFIG_ISO9660_FS=y 861CONFIG_ISO9660_FS=y
@@ -853,10 +886,7 @@ CONFIG_TMPFS=y
853# CONFIG_TMPFS_POSIX_ACL is not set 886# CONFIG_TMPFS_POSIX_ACL is not set
854# CONFIG_HUGETLB_PAGE is not set 887# CONFIG_HUGETLB_PAGE is not set
855CONFIG_CONFIGFS_FS=m 888CONFIG_CONFIGFS_FS=m
856 889CONFIG_MISC_FILESYSTEMS=y
857#
858# Miscellaneous filesystems
859#
860# CONFIG_ADFS_FS is not set 890# CONFIG_ADFS_FS is not set
861CONFIG_AFFS_FS=m 891CONFIG_AFFS_FS=m
862CONFIG_HFS_FS=m 892CONFIG_HFS_FS=m
@@ -865,6 +895,9 @@ CONFIG_HFSPLUS_FS=m
865# CONFIG_BFS_FS is not set 895# CONFIG_BFS_FS is not set
866# CONFIG_EFS_FS is not set 896# CONFIG_EFS_FS is not set
867CONFIG_CRAMFS=m 897CONFIG_CRAMFS=m
898CONFIG_SQUASHFS=m
899# CONFIG_SQUASHFS_EMBEDDED is not set
900CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
868# CONFIG_VXFS_FS is not set 901# CONFIG_VXFS_FS is not set
869CONFIG_MINIX_FS=y 902CONFIG_MINIX_FS=y
870# CONFIG_OMFS_FS is not set 903# CONFIG_OMFS_FS is not set
@@ -875,6 +908,7 @@ CONFIG_SYSV_FS=m
875CONFIG_UFS_FS=m 908CONFIG_UFS_FS=m
876# CONFIG_UFS_FS_WRITE is not set 909# CONFIG_UFS_FS_WRITE is not set
877# CONFIG_UFS_DEBUG is not set 910# CONFIG_UFS_DEBUG is not set
911# CONFIG_NILFS2_FS is not set
878CONFIG_NETWORK_FILESYSTEMS=y 912CONFIG_NETWORK_FILESYSTEMS=y
879CONFIG_NFS_FS=y 913CONFIG_NFS_FS=y
880CONFIG_NFS_V3=y 914CONFIG_NFS_V3=y
@@ -891,7 +925,6 @@ CONFIG_EXPORTFS=m
891CONFIG_NFS_COMMON=y 925CONFIG_NFS_COMMON=y
892CONFIG_SUNRPC=y 926CONFIG_SUNRPC=y
893CONFIG_SUNRPC_GSS=y 927CONFIG_SUNRPC_GSS=y
894# CONFIG_SUNRPC_REGISTER_V4 is not set
895CONFIG_RPCSEC_GSS_KRB5=y 928CONFIG_RPCSEC_GSS_KRB5=y
896# CONFIG_RPCSEC_GSS_SPKM3 is not set 929# CONFIG_RPCSEC_GSS_SPKM3 is not set
897CONFIG_SMB_FS=m 930CONFIG_SMB_FS=m
@@ -966,11 +999,6 @@ CONFIG_DEBUG_BUGVERBOSE=y
966CONFIG_DEBUG_MEMORY_INIT=y 999CONFIG_DEBUG_MEMORY_INIT=y
967# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1000# CONFIG_RCU_CPU_STALL_DETECTOR is not set
968CONFIG_SYSCTL_SYSCALL_CHECK=y 1001CONFIG_SYSCTL_SYSCALL_CHECK=y
969
970#
971# Tracers
972#
973# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
974# CONFIG_SAMPLES is not set 1002# CONFIG_SAMPLES is not set
975 1003
976# 1004#
@@ -991,13 +1019,21 @@ CONFIG_CRYPTO=y
991# 1019#
992# CONFIG_CRYPTO_FIPS is not set 1020# CONFIG_CRYPTO_FIPS is not set
993CONFIG_CRYPTO_ALGAPI=y 1021CONFIG_CRYPTO_ALGAPI=y
994CONFIG_CRYPTO_AEAD=y 1022CONFIG_CRYPTO_ALGAPI2=y
1023CONFIG_CRYPTO_AEAD=m
1024CONFIG_CRYPTO_AEAD2=y
995CONFIG_CRYPTO_BLKCIPHER=y 1025CONFIG_CRYPTO_BLKCIPHER=y
1026CONFIG_CRYPTO_BLKCIPHER2=y
996CONFIG_CRYPTO_HASH=y 1027CONFIG_CRYPTO_HASH=y
997CONFIG_CRYPTO_RNG=y 1028CONFIG_CRYPTO_HASH2=y
1029CONFIG_CRYPTO_RNG=m
1030CONFIG_CRYPTO_RNG2=y
1031CONFIG_CRYPTO_PCOMP=y
998CONFIG_CRYPTO_MANAGER=y 1032CONFIG_CRYPTO_MANAGER=y
1033CONFIG_CRYPTO_MANAGER2=y
999CONFIG_CRYPTO_GF128MUL=m 1034CONFIG_CRYPTO_GF128MUL=m
1000CONFIG_CRYPTO_NULL=m 1035CONFIG_CRYPTO_NULL=m
1036CONFIG_CRYPTO_WORKQUEUE=y
1001CONFIG_CRYPTO_CRYPTD=m 1037CONFIG_CRYPTO_CRYPTD=m
1002CONFIG_CRYPTO_AUTHENC=m 1038CONFIG_CRYPTO_AUTHENC=m
1003CONFIG_CRYPTO_TEST=m 1039CONFIG_CRYPTO_TEST=m
@@ -1067,6 +1103,7 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
1067# Compression 1103# Compression
1068# 1104#
1069CONFIG_CRYPTO_DEFLATE=m 1105CONFIG_CRYPTO_DEFLATE=m
1106CONFIG_CRYPTO_ZLIB=m
1070CONFIG_CRYPTO_LZO=m 1107CONFIG_CRYPTO_LZO=m
1071 1108
1072# 1109#
@@ -1074,11 +1111,13 @@ CONFIG_CRYPTO_LZO=m
1074# 1111#
1075# CONFIG_CRYPTO_ANSI_CPRNG is not set 1112# CONFIG_CRYPTO_ANSI_CPRNG is not set
1076# CONFIG_CRYPTO_HW is not set 1113# CONFIG_CRYPTO_HW is not set
1114# CONFIG_BINARY_PRINTF is not set
1077 1115
1078# 1116#
1079# Library routines 1117# Library routines
1080# 1118#
1081CONFIG_BITREVERSE=y 1119CONFIG_BITREVERSE=y
1120CONFIG_GENERIC_FIND_LAST_BIT=y
1082CONFIG_CRC_CCITT=m 1121CONFIG_CRC_CCITT=m
1083CONFIG_CRC16=m 1122CONFIG_CRC16=m
1084CONFIG_CRC_T10DIF=y 1123CONFIG_CRC_T10DIF=y
@@ -1090,10 +1129,13 @@ CONFIG_ZLIB_INFLATE=y
1090CONFIG_ZLIB_DEFLATE=m 1129CONFIG_ZLIB_DEFLATE=m
1091CONFIG_LZO_COMPRESS=m 1130CONFIG_LZO_COMPRESS=m
1092CONFIG_LZO_DECOMPRESS=m 1131CONFIG_LZO_DECOMPRESS=m
1132CONFIG_DECOMPRESS_GZIP=y
1133CONFIG_DECOMPRESS_BZIP2=y
1134CONFIG_DECOMPRESS_LZMA=y
1093CONFIG_TEXTSEARCH=y 1135CONFIG_TEXTSEARCH=y
1094CONFIG_TEXTSEARCH_KMP=m 1136CONFIG_TEXTSEARCH_KMP=m
1095CONFIG_TEXTSEARCH_BM=m 1137CONFIG_TEXTSEARCH_BM=m
1096CONFIG_TEXTSEARCH_FSM=m 1138CONFIG_TEXTSEARCH_FSM=m
1097CONFIG_PLIST=y
1098CONFIG_HAS_IOMEM=y 1139CONFIG_HAS_IOMEM=y
1099CONFIG_HAS_DMA=y 1140CONFIG_HAS_DMA=y
1141CONFIG_NLATTR=y
diff --git a/arch/m68k/configs/mac_defconfig b/arch/m68k/configs/mac_defconfig
index c6de25724a25..9991b64fea57 100644
--- a/arch/m68k/configs/mac_defconfig
+++ b/arch/m68k/configs/mac_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc7 3# Linux kernel version: 2.6.30-rc3
4# Tue Dec 2 20:27:47 2008 4# Wed Apr 22 20:48:03 2009
5# 5#
6CONFIG_M68K=y 6CONFIG_M68K=y
7CONFIG_MMU=y 7CONFIG_MMU=y
@@ -29,14 +29,24 @@ CONFIG_SWAP=y
29CONFIG_SYSVIPC=y 29CONFIG_SYSVIPC=y
30CONFIG_SYSVIPC_SYSCTL=y 30CONFIG_SYSVIPC_SYSCTL=y
31CONFIG_POSIX_MQUEUE=y 31CONFIG_POSIX_MQUEUE=y
32CONFIG_POSIX_MQUEUE_SYSCTL=y
32CONFIG_BSD_PROCESS_ACCT=y 33CONFIG_BSD_PROCESS_ACCT=y
33# CONFIG_BSD_PROCESS_ACCT_V3 is not set 34# CONFIG_BSD_PROCESS_ACCT_V3 is not set
34# CONFIG_TASKSTATS is not set 35# CONFIG_TASKSTATS is not set
35# CONFIG_AUDIT is not set 36# CONFIG_AUDIT is not set
37
38#
39# RCU Subsystem
40#
41CONFIG_CLASSIC_RCU=y
42# CONFIG_TREE_RCU is not set
43# CONFIG_PREEMPT_RCU is not set
44# CONFIG_TREE_RCU_TRACE is not set
45# CONFIG_PREEMPT_RCU_TRACE is not set
36# CONFIG_IKCONFIG is not set 46# CONFIG_IKCONFIG is not set
37CONFIG_LOG_BUF_SHIFT=14 47CONFIG_LOG_BUF_SHIFT=14
38# CONFIG_CGROUPS is not set
39# CONFIG_GROUP_SCHED is not set 48# CONFIG_GROUP_SCHED is not set
49# CONFIG_CGROUPS is not set
40# CONFIG_SYSFS_DEPRECATED_V2 is not set 50# CONFIG_SYSFS_DEPRECATED_V2 is not set
41CONFIG_RELAY=y 51CONFIG_RELAY=y
42CONFIG_NAMESPACES=y 52CONFIG_NAMESPACES=y
@@ -44,23 +54,27 @@ CONFIG_NAMESPACES=y
44# CONFIG_IPC_NS is not set 54# CONFIG_IPC_NS is not set
45# CONFIG_USER_NS is not set 55# CONFIG_USER_NS is not set
46# CONFIG_PID_NS is not set 56# CONFIG_PID_NS is not set
57# CONFIG_NET_NS is not set
47CONFIG_BLK_DEV_INITRD=y 58CONFIG_BLK_DEV_INITRD=y
48CONFIG_INITRAMFS_SOURCE="" 59CONFIG_INITRAMFS_SOURCE=""
60CONFIG_RD_GZIP=y
61CONFIG_RD_BZIP2=y
62CONFIG_RD_LZMA=y
49# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 63# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
50CONFIG_SYSCTL=y 64CONFIG_SYSCTL=y
65CONFIG_ANON_INODES=y
51# CONFIG_EMBEDDED is not set 66# CONFIG_EMBEDDED is not set
52CONFIG_UID16=y 67CONFIG_UID16=y
53CONFIG_SYSCTL_SYSCALL=y 68CONFIG_SYSCTL_SYSCALL=y
54CONFIG_KALLSYMS=y 69CONFIG_KALLSYMS=y
55# CONFIG_KALLSYMS_EXTRA_PASS is not set 70# CONFIG_KALLSYMS_EXTRA_PASS is not set
71# CONFIG_STRIP_ASM_SYMS is not set
56CONFIG_HOTPLUG=y 72CONFIG_HOTPLUG=y
57CONFIG_PRINTK=y 73CONFIG_PRINTK=y
58CONFIG_BUG=y 74CONFIG_BUG=y
59CONFIG_ELF_CORE=y 75CONFIG_ELF_CORE=y
60CONFIG_COMPAT_BRK=y
61CONFIG_BASE_FULL=y 76CONFIG_BASE_FULL=y
62CONFIG_FUTEX=y 77CONFIG_FUTEX=y
63CONFIG_ANON_INODES=y
64CONFIG_EPOLL=y 78CONFIG_EPOLL=y
65CONFIG_SIGNALFD=y 79CONFIG_SIGNALFD=y
66CONFIG_TIMERFD=y 80CONFIG_TIMERFD=y
@@ -68,15 +82,16 @@ CONFIG_EVENTFD=y
68CONFIG_SHMEM=y 82CONFIG_SHMEM=y
69CONFIG_AIO=y 83CONFIG_AIO=y
70CONFIG_VM_EVENT_COUNTERS=y 84CONFIG_VM_EVENT_COUNTERS=y
85CONFIG_COMPAT_BRK=y
71CONFIG_SLAB=y 86CONFIG_SLAB=y
72# CONFIG_SLUB is not set 87# CONFIG_SLUB is not set
73# CONFIG_SLOB is not set 88# CONFIG_SLOB is not set
74# CONFIG_PROFILING is not set 89# CONFIG_PROFILING is not set
75# CONFIG_MARKERS is not set 90# CONFIG_MARKERS is not set
91# CONFIG_SLOW_WORK is not set
76# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 92# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
77CONFIG_SLABINFO=y 93CONFIG_SLABINFO=y
78CONFIG_RT_MUTEXES=y 94CONFIG_RT_MUTEXES=y
79# CONFIG_TINY_SHMEM is not set
80CONFIG_BASE_SMALL=0 95CONFIG_BASE_SMALL=0
81CONFIG_MODULES=y 96CONFIG_MODULES=y
82# CONFIG_MODULE_FORCE_LOAD is not set 97# CONFIG_MODULE_FORCE_LOAD is not set
@@ -84,11 +99,8 @@ CONFIG_MODULE_UNLOAD=y
84# CONFIG_MODULE_FORCE_UNLOAD is not set 99# CONFIG_MODULE_FORCE_UNLOAD is not set
85# CONFIG_MODVERSIONS is not set 100# CONFIG_MODVERSIONS is not set
86# CONFIG_MODULE_SRCVERSION_ALL is not set 101# CONFIG_MODULE_SRCVERSION_ALL is not set
87CONFIG_KMOD=y
88CONFIG_BLOCK=y 102CONFIG_BLOCK=y
89# CONFIG_LBD is not set 103# CONFIG_LBD is not set
90# CONFIG_BLK_DEV_IO_TRACE is not set
91# CONFIG_LSF is not set
92CONFIG_BLK_DEV_BSG=y 104CONFIG_BLK_DEV_BSG=y
93# CONFIG_BLK_DEV_INTEGRITY is not set 105# CONFIG_BLK_DEV_INTEGRITY is not set
94 106
@@ -104,7 +116,6 @@ CONFIG_DEFAULT_AS=y
104# CONFIG_DEFAULT_CFQ is not set 116# CONFIG_DEFAULT_CFQ is not set
105# CONFIG_DEFAULT_NOOP is not set 117# CONFIG_DEFAULT_NOOP is not set
106CONFIG_DEFAULT_IOSCHED="anticipatory" 118CONFIG_DEFAULT_IOSCHED="anticipatory"
107CONFIG_CLASSIC_RCU=y
108# CONFIG_FREEZER is not set 119# CONFIG_FREEZER is not set
109 120
110# 121#
@@ -142,12 +153,13 @@ CONFIG_FLAT_NODE_MEM_MAP=y
142CONFIG_NEED_MULTIPLE_NODES=y 153CONFIG_NEED_MULTIPLE_NODES=y
143CONFIG_PAGEFLAGS_EXTENDED=y 154CONFIG_PAGEFLAGS_EXTENDED=y
144CONFIG_SPLIT_PTLOCK_CPUS=4 155CONFIG_SPLIT_PTLOCK_CPUS=4
145# CONFIG_RESOURCES_64BIT is not set
146# CONFIG_PHYS_ADDR_T_64BIT is not set 156# CONFIG_PHYS_ADDR_T_64BIT is not set
147CONFIG_ZONE_DMA_FLAG=1 157CONFIG_ZONE_DMA_FLAG=1
148CONFIG_BOUNCE=y 158CONFIG_BOUNCE=y
149CONFIG_VIRT_TO_BUS=y 159CONFIG_VIRT_TO_BUS=y
150CONFIG_UNEVICTABLE_LRU=y 160CONFIG_UNEVICTABLE_LRU=y
161CONFIG_HAVE_MLOCK=y
162CONFIG_HAVE_MLOCKED_PAGE_BIT=y
151 163
152# 164#
153# General setup 165# General setup
@@ -255,6 +267,7 @@ CONFIG_NETFILTER_XTABLES=m
255CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 267CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
256CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 268CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
257CONFIG_NETFILTER_XT_TARGET_DSCP=m 269CONFIG_NETFILTER_XT_TARGET_DSCP=m
270CONFIG_NETFILTER_XT_TARGET_HL=m
258CONFIG_NETFILTER_XT_TARGET_MARK=m 271CONFIG_NETFILTER_XT_TARGET_MARK=m
259CONFIG_NETFILTER_XT_TARGET_NFLOG=m 272CONFIG_NETFILTER_XT_TARGET_NFLOG=m
260CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 273CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
@@ -263,6 +276,7 @@ CONFIG_NETFILTER_XT_TARGET_RATEEST=m
263CONFIG_NETFILTER_XT_TARGET_TRACE=m 276CONFIG_NETFILTER_XT_TARGET_TRACE=m
264CONFIG_NETFILTER_XT_TARGET_TCPMSS=m 277CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
265CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m 278CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
279CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
266CONFIG_NETFILTER_XT_MATCH_COMMENT=m 280CONFIG_NETFILTER_XT_MATCH_COMMENT=m
267CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m 281CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
268CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m 282CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
@@ -273,6 +287,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m
273CONFIG_NETFILTER_XT_MATCH_ESP=m 287CONFIG_NETFILTER_XT_MATCH_ESP=m
274CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m 288CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
275CONFIG_NETFILTER_XT_MATCH_HELPER=m 289CONFIG_NETFILTER_XT_MATCH_HELPER=m
290CONFIG_NETFILTER_XT_MATCH_HL=m
276CONFIG_NETFILTER_XT_MATCH_IPRANGE=m 291CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
277CONFIG_NETFILTER_XT_MATCH_LENGTH=m 292CONFIG_NETFILTER_XT_MATCH_LENGTH=m
278CONFIG_NETFILTER_XT_MATCH_LIMIT=m 293CONFIG_NETFILTER_XT_MATCH_LIMIT=m
@@ -351,25 +366,20 @@ CONFIG_IP6_NF_MATCH_HL=m
351CONFIG_IP6_NF_MATCH_IPV6HEADER=m 366CONFIG_IP6_NF_MATCH_IPV6HEADER=m
352CONFIG_IP6_NF_MATCH_MH=m 367CONFIG_IP6_NF_MATCH_MH=m
353CONFIG_IP6_NF_MATCH_RT=m 368CONFIG_IP6_NF_MATCH_RT=m
369CONFIG_IP6_NF_TARGET_HL=m
354CONFIG_IP6_NF_TARGET_LOG=m 370CONFIG_IP6_NF_TARGET_LOG=m
355CONFIG_IP6_NF_FILTER=m 371CONFIG_IP6_NF_FILTER=m
356CONFIG_IP6_NF_TARGET_REJECT=m 372CONFIG_IP6_NF_TARGET_REJECT=m
357CONFIG_IP6_NF_MANGLE=m 373CONFIG_IP6_NF_MANGLE=m
358CONFIG_IP6_NF_TARGET_HL=m
359CONFIG_IP6_NF_RAW=m 374CONFIG_IP6_NF_RAW=m
360CONFIG_IP_DCCP=m 375CONFIG_IP_DCCP=m
361CONFIG_INET_DCCP_DIAG=m 376CONFIG_INET_DCCP_DIAG=m
362CONFIG_IP_DCCP_ACKVEC=y
363 377
364# 378#
365# DCCP CCIDs Configuration (EXPERIMENTAL) 379# DCCP CCIDs Configuration (EXPERIMENTAL)
366# 380#
367CONFIG_IP_DCCP_CCID2=m
368# CONFIG_IP_DCCP_CCID2_DEBUG is not set 381# CONFIG_IP_DCCP_CCID2_DEBUG is not set
369CONFIG_IP_DCCP_CCID3=m 382# CONFIG_IP_DCCP_CCID3 is not set
370# CONFIG_IP_DCCP_CCID3_DEBUG is not set
371CONFIG_IP_DCCP_CCID3_RTO=100
372CONFIG_IP_DCCP_TFRC_LIB=m
373CONFIG_IP_SCTP=m 383CONFIG_IP_SCTP=m
374# CONFIG_SCTP_DBG_MSG is not set 384# CONFIG_SCTP_DBG_MSG is not set
375# CONFIG_SCTP_DBG_OBJCNT is not set 385# CONFIG_SCTP_DBG_OBJCNT is not set
@@ -394,8 +404,10 @@ CONFIG_IPDDP_DECAP=y
394# CONFIG_LAPB is not set 404# CONFIG_LAPB is not set
395# CONFIG_ECONET is not set 405# CONFIG_ECONET is not set
396# CONFIG_WAN_ROUTER is not set 406# CONFIG_WAN_ROUTER is not set
407# CONFIG_PHONET is not set
397# CONFIG_NET_SCHED is not set 408# CONFIG_NET_SCHED is not set
398CONFIG_NET_CLS_ROUTE=y 409CONFIG_NET_CLS_ROUTE=y
410# CONFIG_DCB is not set
399 411
400# 412#
401# Network testing 413# Network testing
@@ -406,8 +418,8 @@ CONFIG_NET_CLS_ROUTE=y
406# CONFIG_IRDA is not set 418# CONFIG_IRDA is not set
407# CONFIG_BT is not set 419# CONFIG_BT is not set
408# CONFIG_AF_RXRPC is not set 420# CONFIG_AF_RXRPC is not set
409# CONFIG_PHONET is not set
410# CONFIG_WIRELESS is not set 421# CONFIG_WIRELESS is not set
422# CONFIG_WIMAX is not set
411# CONFIG_RFKILL is not set 423# CONFIG_RFKILL is not set
412# CONFIG_NET_9P is not set 424# CONFIG_NET_9P is not set
413 425
@@ -429,6 +441,7 @@ CONFIG_CONNECTOR=m
429# CONFIG_MTD is not set 441# CONFIG_MTD is not set
430# CONFIG_PARPORT is not set 442# CONFIG_PARPORT is not set
431CONFIG_BLK_DEV=y 443CONFIG_BLK_DEV=y
444CONFIG_BLK_DEV_SWIM=y
432# CONFIG_BLK_DEV_COW_COMMON is not set 445# CONFIG_BLK_DEV_COW_COMMON is not set
433CONFIG_BLK_DEV_LOOP=y 446CONFIG_BLK_DEV_LOOP=y
434CONFIG_BLK_DEV_CRYPTOLOOP=m 447CONFIG_BLK_DEV_CRYPTOLOOP=m
@@ -443,15 +456,20 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
443CONFIG_ATA_OVER_ETH=m 456CONFIG_ATA_OVER_ETH=m
444# CONFIG_BLK_DEV_HD is not set 457# CONFIG_BLK_DEV_HD is not set
445CONFIG_MISC_DEVICES=y 458CONFIG_MISC_DEVICES=y
446# CONFIG_EEPROM_93CX6 is not set
447# CONFIG_ENCLOSURE_SERVICES is not set 459# CONFIG_ENCLOSURE_SERVICES is not set
448# CONFIG_C2PORT is not set 460# CONFIG_C2PORT is not set
461
462#
463# EEPROM support
464#
465# CONFIG_EEPROM_93CX6 is not set
449CONFIG_HAVE_IDE=y 466CONFIG_HAVE_IDE=y
450CONFIG_IDE=y 467CONFIG_IDE=y
451 468
452# 469#
453# Please see Documentation/ide/ide.txt for help/info on IDE drives 470# Please see Documentation/ide/ide.txt for help/info on IDE drives
454# 471#
472CONFIG_IDE_ATAPI=y
455# CONFIG_BLK_DEV_IDE_SATA is not set 473# CONFIG_BLK_DEV_IDE_SATA is not set
456CONFIG_IDE_GD=y 474CONFIG_IDE_GD=y
457CONFIG_IDE_GD_ATA=y 475CONFIG_IDE_GD_ATA=y
@@ -459,7 +477,6 @@ CONFIG_IDE_GD_ATA=y
459CONFIG_BLK_DEV_IDECD=y 477CONFIG_BLK_DEV_IDECD=y
460CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y 478CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
461# CONFIG_BLK_DEV_IDETAPE is not set 479# CONFIG_BLK_DEV_IDETAPE is not set
462# CONFIG_BLK_DEV_IDESCSI is not set
463# CONFIG_IDE_TASK_IOCTL is not set 480# CONFIG_IDE_TASK_IOCTL is not set
464CONFIG_IDE_PROC_FS=y 481CONFIG_IDE_PROC_FS=y
465 482
@@ -514,10 +531,13 @@ CONFIG_SCSI_SRP_ATTRS=m
514CONFIG_SCSI_SRP_TGT_ATTRS=y 531CONFIG_SCSI_SRP_TGT_ATTRS=y
515CONFIG_SCSI_LOWLEVEL=y 532CONFIG_SCSI_LOWLEVEL=y
516CONFIG_ISCSI_TCP=m 533CONFIG_ISCSI_TCP=m
534# CONFIG_LIBFC is not set
535# CONFIG_LIBFCOE is not set
517# CONFIG_SCSI_DEBUG is not set 536# CONFIG_SCSI_DEBUG is not set
518CONFIG_MAC_SCSI=y 537CONFIG_MAC_SCSI=y
519CONFIG_SCSI_MAC_ESP=y 538CONFIG_SCSI_MAC_ESP=y
520# CONFIG_SCSI_DH is not set 539# CONFIG_SCSI_DH is not set
540# CONFIG_SCSI_OSD_INITIATOR is not set
521CONFIG_MD=y 541CONFIG_MD=y
522CONFIG_BLK_DEV_MD=m 542CONFIG_BLK_DEV_MD=m
523CONFIG_MD_LINEAR=m 543CONFIG_MD_LINEAR=m
@@ -525,7 +545,7 @@ CONFIG_MD_RAID0=m
525CONFIG_MD_RAID1=m 545CONFIG_MD_RAID1=m
526# CONFIG_MD_RAID10 is not set 546# CONFIG_MD_RAID10 is not set
527CONFIG_MD_RAID456=m 547CONFIG_MD_RAID456=m
528CONFIG_MD_RAID5_RESHAPE=y 548CONFIG_MD_RAID6_PQ=m
529# CONFIG_MD_MULTIPATH is not set 549# CONFIG_MD_MULTIPATH is not set
530# CONFIG_MD_FAULTY is not set 550# CONFIG_MD_FAULTY is not set
531CONFIG_BLK_DEV_DM=m 551CONFIG_BLK_DEV_DM=m
@@ -547,6 +567,7 @@ CONFIG_ADB_CUDA=y
547CONFIG_INPUT_ADBHID=y 567CONFIG_INPUT_ADBHID=y
548CONFIG_MAC_EMUMOUSEBTN=y 568CONFIG_MAC_EMUMOUSEBTN=y
549CONFIG_NETDEVICES=y 569CONFIG_NETDEVICES=y
570CONFIG_COMPAT_NET_DEV_OPS=y
550CONFIG_DUMMY=m 571CONFIG_DUMMY=m
551# CONFIG_BONDING is not set 572# CONFIG_BONDING is not set
552CONFIG_MACVLAN=m 573CONFIG_MACVLAN=m
@@ -561,6 +582,8 @@ CONFIG_MAC89x0=m
561CONFIG_MACSONIC=m 582CONFIG_MACSONIC=m
562CONFIG_MACMACE=y 583CONFIG_MACMACE=y
563# CONFIG_NET_VENDOR_SMC is not set 584# CONFIG_NET_VENDOR_SMC is not set
585# CONFIG_ETHOC is not set
586# CONFIG_DNET is not set
564# CONFIG_IBM_NEW_EMAC_ZMII is not set 587# CONFIG_IBM_NEW_EMAC_ZMII is not set
565# CONFIG_IBM_NEW_EMAC_RGMII is not set 588# CONFIG_IBM_NEW_EMAC_RGMII is not set
566# CONFIG_IBM_NEW_EMAC_TAH is not set 589# CONFIG_IBM_NEW_EMAC_TAH is not set
@@ -577,7 +600,10 @@ CONFIG_MACMACE=y
577# 600#
578# CONFIG_WLAN_PRE80211 is not set 601# CONFIG_WLAN_PRE80211 is not set
579# CONFIG_WLAN_80211 is not set 602# CONFIG_WLAN_80211 is not set
580# CONFIG_IWLWIFI_LEDS is not set 603
604#
605# Enable WiMAX (Networking options) to see the WiMAX drivers
606#
581# CONFIG_WAN is not set 607# CONFIG_WAN is not set
582CONFIG_PPP=m 608CONFIG_PPP=m
583# CONFIG_PPP_MULTILINK is not set 609# CONFIG_PPP_MULTILINK is not set
@@ -635,7 +661,6 @@ CONFIG_MOUSE_PS2=m
635CONFIG_MOUSE_PS2_ALPS=y 661CONFIG_MOUSE_PS2_ALPS=y
636CONFIG_MOUSE_PS2_LOGIPS2PP=y 662CONFIG_MOUSE_PS2_LOGIPS2PP=y
637CONFIG_MOUSE_PS2_SYNAPTICS=y 663CONFIG_MOUSE_PS2_SYNAPTICS=y
638CONFIG_MOUSE_PS2_LIFEBOOK=y
639CONFIG_MOUSE_PS2_TRACKPOINT=y 664CONFIG_MOUSE_PS2_TRACKPOINT=y
640# CONFIG_MOUSE_PS2_ELANTECH is not set 665# CONFIG_MOUSE_PS2_ELANTECH is not set
641# CONFIG_MOUSE_PS2_TOUCHKIT is not set 666# CONFIG_MOUSE_PS2_TOUCHKIT is not set
@@ -677,6 +702,7 @@ CONFIG_VT_HW_CONSOLE_BINDING=y
677# Non-8250 serial port support 702# Non-8250 serial port support
678# 703#
679CONFIG_UNIX98_PTYS=y 704CONFIG_UNIX98_PTYS=y
705# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
680CONFIG_LEGACY_PTYS=y 706CONFIG_LEGACY_PTYS=y
681CONFIG_LEGACY_PTY_COUNT=256 707CONFIG_LEGACY_PTY_COUNT=256
682# CONFIG_IPMI_HANDLER is not set 708# CONFIG_IPMI_HANDLER is not set
@@ -760,6 +786,7 @@ CONFIG_FB_MAC=y
760# CONFIG_FB_VIRTUAL is not set 786# CONFIG_FB_VIRTUAL is not set
761# CONFIG_FB_METRONOME is not set 787# CONFIG_FB_METRONOME is not set
762# CONFIG_FB_MB862XX is not set 788# CONFIG_FB_MB862XX is not set
789# CONFIG_FB_BROADSHEET is not set
763# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 790# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
764 791
765# 792#
@@ -793,7 +820,6 @@ CONFIG_HIDRAW=y
793# 820#
794# Special HID drivers 821# Special HID drivers
795# 822#
796CONFIG_HID_COMPAT=y
797# CONFIG_USB_SUPPORT is not set 823# CONFIG_USB_SUPPORT is not set
798# CONFIG_MMC is not set 824# CONFIG_MMC is not set
799# CONFIG_MEMSTICK is not set 825# CONFIG_MEMSTICK is not set
@@ -801,9 +827,9 @@ CONFIG_HID_COMPAT=y
801# CONFIG_ACCESSIBILITY is not set 827# CONFIG_ACCESSIBILITY is not set
802# CONFIG_RTC_CLASS is not set 828# CONFIG_RTC_CLASS is not set
803# CONFIG_DMADEVICES is not set 829# CONFIG_DMADEVICES is not set
830# CONFIG_AUXDISPLAY is not set
804# CONFIG_UIO is not set 831# CONFIG_UIO is not set
805# CONFIG_STAGING is not set 832# CONFIG_STAGING is not set
806CONFIG_STAGING_EXCLUDE_BUILD=y
807 833
808# 834#
809# Character devices 835# Character devices
@@ -819,6 +845,7 @@ CONFIG_EXT2_FS=y
819# CONFIG_EXT2_FS_XATTR is not set 845# CONFIG_EXT2_FS_XATTR is not set
820# CONFIG_EXT2_FS_XIP is not set 846# CONFIG_EXT2_FS_XIP is not set
821CONFIG_EXT3_FS=y 847CONFIG_EXT3_FS=y
848# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
822# CONFIG_EXT3_FS_XATTR is not set 849# CONFIG_EXT3_FS_XATTR is not set
823# CONFIG_EXT4_FS is not set 850# CONFIG_EXT4_FS is not set
824CONFIG_JBD=y 851CONFIG_JBD=y
@@ -845,13 +872,15 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
845# CONFIG_OCFS2_FS_STATS is not set 872# CONFIG_OCFS2_FS_STATS is not set
846# CONFIG_OCFS2_DEBUG_MASKLOG is not set 873# CONFIG_OCFS2_DEBUG_MASKLOG is not set
847# CONFIG_OCFS2_DEBUG_FS is not set 874# CONFIG_OCFS2_DEBUG_FS is not set
848# CONFIG_OCFS2_COMPAT_JBD is not set 875# CONFIG_OCFS2_FS_POSIX_ACL is not set
876# CONFIG_BTRFS_FS is not set
849CONFIG_DNOTIFY=y 877CONFIG_DNOTIFY=y
850CONFIG_INOTIFY=y 878CONFIG_INOTIFY=y
851CONFIG_INOTIFY_USER=y 879CONFIG_INOTIFY_USER=y
852CONFIG_QUOTA=y 880CONFIG_QUOTA=y
853CONFIG_QUOTA_NETLINK_INTERFACE=y 881CONFIG_QUOTA_NETLINK_INTERFACE=y
854# CONFIG_PRINT_QUOTA_WARNING is not set 882# CONFIG_PRINT_QUOTA_WARNING is not set
883CONFIG_QUOTA_TREE=m
855# CONFIG_QFMT_V1 is not set 884# CONFIG_QFMT_V1 is not set
856# CONFIG_QFMT_V2 is not set 885# CONFIG_QFMT_V2 is not set
857CONFIG_QUOTACTL=y 886CONFIG_QUOTACTL=y
@@ -860,6 +889,11 @@ CONFIG_AUTOFS4_FS=m
860CONFIG_FUSE_FS=m 889CONFIG_FUSE_FS=m
861 890
862# 891#
892# Caches
893#
894# CONFIG_FSCACHE is not set
895
896#
863# CD-ROM/DVD Filesystems 897# CD-ROM/DVD Filesystems
864# 898#
865CONFIG_ISO9660_FS=y 899CONFIG_ISO9660_FS=y
@@ -890,10 +924,7 @@ CONFIG_TMPFS=y
890# CONFIG_TMPFS_POSIX_ACL is not set 924# CONFIG_TMPFS_POSIX_ACL is not set
891# CONFIG_HUGETLB_PAGE is not set 925# CONFIG_HUGETLB_PAGE is not set
892CONFIG_CONFIGFS_FS=m 926CONFIG_CONFIGFS_FS=m
893 927CONFIG_MISC_FILESYSTEMS=y
894#
895# Miscellaneous filesystems
896#
897# CONFIG_ADFS_FS is not set 928# CONFIG_ADFS_FS is not set
898CONFIG_AFFS_FS=m 929CONFIG_AFFS_FS=m
899CONFIG_HFS_FS=y 930CONFIG_HFS_FS=y
@@ -902,6 +933,9 @@ CONFIG_HFSPLUS_FS=y
902# CONFIG_BFS_FS is not set 933# CONFIG_BFS_FS is not set
903# CONFIG_EFS_FS is not set 934# CONFIG_EFS_FS is not set
904CONFIG_CRAMFS=m 935CONFIG_CRAMFS=m
936CONFIG_SQUASHFS=m
937# CONFIG_SQUASHFS_EMBEDDED is not set
938CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
905# CONFIG_VXFS_FS is not set 939# CONFIG_VXFS_FS is not set
906CONFIG_MINIX_FS=y 940CONFIG_MINIX_FS=y
907# CONFIG_OMFS_FS is not set 941# CONFIG_OMFS_FS is not set
@@ -912,6 +946,7 @@ CONFIG_SYSV_FS=m
912CONFIG_UFS_FS=m 946CONFIG_UFS_FS=m
913# CONFIG_UFS_FS_WRITE is not set 947# CONFIG_UFS_FS_WRITE is not set
914# CONFIG_UFS_DEBUG is not set 948# CONFIG_UFS_DEBUG is not set
949# CONFIG_NILFS2_FS is not set
915CONFIG_NETWORK_FILESYSTEMS=y 950CONFIG_NETWORK_FILESYSTEMS=y
916CONFIG_NFS_FS=m 951CONFIG_NFS_FS=m
917CONFIG_NFS_V3=y 952CONFIG_NFS_V3=y
@@ -927,7 +962,6 @@ CONFIG_EXPORTFS=m
927CONFIG_NFS_COMMON=y 962CONFIG_NFS_COMMON=y
928CONFIG_SUNRPC=m 963CONFIG_SUNRPC=m
929CONFIG_SUNRPC_GSS=m 964CONFIG_SUNRPC_GSS=m
930# CONFIG_SUNRPC_REGISTER_V4 is not set
931CONFIG_RPCSEC_GSS_KRB5=m 965CONFIG_RPCSEC_GSS_KRB5=m
932# CONFIG_RPCSEC_GSS_SPKM3 is not set 966# CONFIG_RPCSEC_GSS_SPKM3 is not set
933CONFIG_SMB_FS=m 967CONFIG_SMB_FS=m
@@ -1003,11 +1037,6 @@ CONFIG_DEBUG_BUGVERBOSE=y
1003CONFIG_DEBUG_MEMORY_INIT=y 1037CONFIG_DEBUG_MEMORY_INIT=y
1004# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1038# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1005CONFIG_SYSCTL_SYSCALL_CHECK=y 1039CONFIG_SYSCTL_SYSCALL_CHECK=y
1006
1007#
1008# Tracers
1009#
1010# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1011# CONFIG_SAMPLES is not set 1040# CONFIG_SAMPLES is not set
1012 1041
1013# 1042#
@@ -1028,13 +1057,21 @@ CONFIG_CRYPTO=y
1028# 1057#
1029# CONFIG_CRYPTO_FIPS is not set 1058# CONFIG_CRYPTO_FIPS is not set
1030CONFIG_CRYPTO_ALGAPI=y 1059CONFIG_CRYPTO_ALGAPI=y
1031CONFIG_CRYPTO_AEAD=y 1060CONFIG_CRYPTO_ALGAPI2=y
1032CONFIG_CRYPTO_BLKCIPHER=y 1061CONFIG_CRYPTO_AEAD=m
1062CONFIG_CRYPTO_AEAD2=y
1063CONFIG_CRYPTO_BLKCIPHER=m
1064CONFIG_CRYPTO_BLKCIPHER2=y
1033CONFIG_CRYPTO_HASH=y 1065CONFIG_CRYPTO_HASH=y
1034CONFIG_CRYPTO_RNG=y 1066CONFIG_CRYPTO_HASH2=y
1067CONFIG_CRYPTO_RNG=m
1068CONFIG_CRYPTO_RNG2=y
1069CONFIG_CRYPTO_PCOMP=y
1035CONFIG_CRYPTO_MANAGER=y 1070CONFIG_CRYPTO_MANAGER=y
1071CONFIG_CRYPTO_MANAGER2=y
1036CONFIG_CRYPTO_GF128MUL=m 1072CONFIG_CRYPTO_GF128MUL=m
1037CONFIG_CRYPTO_NULL=m 1073CONFIG_CRYPTO_NULL=m
1074CONFIG_CRYPTO_WORKQUEUE=y
1038CONFIG_CRYPTO_CRYPTD=m 1075CONFIG_CRYPTO_CRYPTD=m
1039CONFIG_CRYPTO_AUTHENC=m 1076CONFIG_CRYPTO_AUTHENC=m
1040CONFIG_CRYPTO_TEST=m 1077CONFIG_CRYPTO_TEST=m
@@ -1104,6 +1141,7 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
1104# Compression 1141# Compression
1105# 1142#
1106CONFIG_CRYPTO_DEFLATE=m 1143CONFIG_CRYPTO_DEFLATE=m
1144CONFIG_CRYPTO_ZLIB=m
1107CONFIG_CRYPTO_LZO=m 1145CONFIG_CRYPTO_LZO=m
1108 1146
1109# 1147#
@@ -1111,11 +1149,13 @@ CONFIG_CRYPTO_LZO=m
1111# 1149#
1112# CONFIG_CRYPTO_ANSI_CPRNG is not set 1150# CONFIG_CRYPTO_ANSI_CPRNG is not set
1113# CONFIG_CRYPTO_HW is not set 1151# CONFIG_CRYPTO_HW is not set
1152# CONFIG_BINARY_PRINTF is not set
1114 1153
1115# 1154#
1116# Library routines 1155# Library routines
1117# 1156#
1118CONFIG_BITREVERSE=y 1157CONFIG_BITREVERSE=y
1158CONFIG_GENERIC_FIND_LAST_BIT=y
1119CONFIG_CRC_CCITT=m 1159CONFIG_CRC_CCITT=m
1120CONFIG_CRC16=m 1160CONFIG_CRC16=m
1121CONFIG_CRC_T10DIF=y 1161CONFIG_CRC_T10DIF=y
@@ -1127,10 +1167,13 @@ CONFIG_ZLIB_INFLATE=y
1127CONFIG_ZLIB_DEFLATE=m 1167CONFIG_ZLIB_DEFLATE=m
1128CONFIG_LZO_COMPRESS=m 1168CONFIG_LZO_COMPRESS=m
1129CONFIG_LZO_DECOMPRESS=m 1169CONFIG_LZO_DECOMPRESS=m
1170CONFIG_DECOMPRESS_GZIP=y
1171CONFIG_DECOMPRESS_BZIP2=y
1172CONFIG_DECOMPRESS_LZMA=y
1130CONFIG_TEXTSEARCH=y 1173CONFIG_TEXTSEARCH=y
1131CONFIG_TEXTSEARCH_KMP=m 1174CONFIG_TEXTSEARCH_KMP=m
1132CONFIG_TEXTSEARCH_BM=m 1175CONFIG_TEXTSEARCH_BM=m
1133CONFIG_TEXTSEARCH_FSM=m 1176CONFIG_TEXTSEARCH_FSM=m
1134CONFIG_PLIST=y
1135CONFIG_HAS_IOMEM=y 1177CONFIG_HAS_IOMEM=y
1136CONFIG_HAS_DMA=y 1178CONFIG_HAS_DMA=y
1179CONFIG_NLATTR=y
diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_defconfig
index 70693588031e..69c43e2d8b45 100644
--- a/arch/m68k/configs/multi_defconfig
+++ b/arch/m68k/configs/multi_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc7 3# Linux kernel version: 2.6.30-rc3
4# Tue Dec 2 20:27:48 2008 4# Wed Apr 22 20:48:06 2009
5# 5#
6CONFIG_M68K=y 6CONFIG_M68K=y
7CONFIG_MMU=y 7CONFIG_MMU=y
@@ -29,14 +29,24 @@ CONFIG_SWAP=y
29CONFIG_SYSVIPC=y 29CONFIG_SYSVIPC=y
30CONFIG_SYSVIPC_SYSCTL=y 30CONFIG_SYSVIPC_SYSCTL=y
31CONFIG_POSIX_MQUEUE=y 31CONFIG_POSIX_MQUEUE=y
32CONFIG_POSIX_MQUEUE_SYSCTL=y
32CONFIG_BSD_PROCESS_ACCT=y 33CONFIG_BSD_PROCESS_ACCT=y
33# CONFIG_BSD_PROCESS_ACCT_V3 is not set 34# CONFIG_BSD_PROCESS_ACCT_V3 is not set
34# CONFIG_TASKSTATS is not set 35# CONFIG_TASKSTATS is not set
35# CONFIG_AUDIT is not set 36# CONFIG_AUDIT is not set
37
38#
39# RCU Subsystem
40#
41CONFIG_CLASSIC_RCU=y
42# CONFIG_TREE_RCU is not set
43# CONFIG_PREEMPT_RCU is not set
44# CONFIG_TREE_RCU_TRACE is not set
45# CONFIG_PREEMPT_RCU_TRACE is not set
36# CONFIG_IKCONFIG is not set 46# CONFIG_IKCONFIG is not set
37CONFIG_LOG_BUF_SHIFT=14 47CONFIG_LOG_BUF_SHIFT=14
38# CONFIG_CGROUPS is not set
39# CONFIG_GROUP_SCHED is not set 48# CONFIG_GROUP_SCHED is not set
49# CONFIG_CGROUPS is not set
40# CONFIG_SYSFS_DEPRECATED_V2 is not set 50# CONFIG_SYSFS_DEPRECATED_V2 is not set
41CONFIG_RELAY=y 51CONFIG_RELAY=y
42CONFIG_NAMESPACES=y 52CONFIG_NAMESPACES=y
@@ -44,23 +54,27 @@ CONFIG_NAMESPACES=y
44# CONFIG_IPC_NS is not set 54# CONFIG_IPC_NS is not set
45# CONFIG_USER_NS is not set 55# CONFIG_USER_NS is not set
46# CONFIG_PID_NS is not set 56# CONFIG_PID_NS is not set
57# CONFIG_NET_NS is not set
47CONFIG_BLK_DEV_INITRD=y 58CONFIG_BLK_DEV_INITRD=y
48CONFIG_INITRAMFS_SOURCE="" 59CONFIG_INITRAMFS_SOURCE=""
60CONFIG_RD_GZIP=y
61CONFIG_RD_BZIP2=y
62CONFIG_RD_LZMA=y
49# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 63# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
50CONFIG_SYSCTL=y 64CONFIG_SYSCTL=y
65CONFIG_ANON_INODES=y
51# CONFIG_EMBEDDED is not set 66# CONFIG_EMBEDDED is not set
52CONFIG_UID16=y 67CONFIG_UID16=y
53CONFIG_SYSCTL_SYSCALL=y 68CONFIG_SYSCTL_SYSCALL=y
54CONFIG_KALLSYMS=y 69CONFIG_KALLSYMS=y
55# CONFIG_KALLSYMS_EXTRA_PASS is not set 70# CONFIG_KALLSYMS_EXTRA_PASS is not set
71# CONFIG_STRIP_ASM_SYMS is not set
56CONFIG_HOTPLUG=y 72CONFIG_HOTPLUG=y
57CONFIG_PRINTK=y 73CONFIG_PRINTK=y
58CONFIG_BUG=y 74CONFIG_BUG=y
59CONFIG_ELF_CORE=y 75CONFIG_ELF_CORE=y
60CONFIG_COMPAT_BRK=y
61CONFIG_BASE_FULL=y 76CONFIG_BASE_FULL=y
62CONFIG_FUTEX=y 77CONFIG_FUTEX=y
63CONFIG_ANON_INODES=y
64CONFIG_EPOLL=y 78CONFIG_EPOLL=y
65CONFIG_SIGNALFD=y 79CONFIG_SIGNALFD=y
66CONFIG_TIMERFD=y 80CONFIG_TIMERFD=y
@@ -68,15 +82,16 @@ CONFIG_EVENTFD=y
68CONFIG_SHMEM=y 82CONFIG_SHMEM=y
69CONFIG_AIO=y 83CONFIG_AIO=y
70CONFIG_VM_EVENT_COUNTERS=y 84CONFIG_VM_EVENT_COUNTERS=y
85CONFIG_COMPAT_BRK=y
71CONFIG_SLAB=y 86CONFIG_SLAB=y
72# CONFIG_SLUB is not set 87# CONFIG_SLUB is not set
73# CONFIG_SLOB is not set 88# CONFIG_SLOB is not set
74# CONFIG_PROFILING is not set 89# CONFIG_PROFILING is not set
75# CONFIG_MARKERS is not set 90# CONFIG_MARKERS is not set
91# CONFIG_SLOW_WORK is not set
76# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 92# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
77CONFIG_SLABINFO=y 93CONFIG_SLABINFO=y
78CONFIG_RT_MUTEXES=y 94CONFIG_RT_MUTEXES=y
79# CONFIG_TINY_SHMEM is not set
80CONFIG_BASE_SMALL=0 95CONFIG_BASE_SMALL=0
81CONFIG_MODULES=y 96CONFIG_MODULES=y
82# CONFIG_MODULE_FORCE_LOAD is not set 97# CONFIG_MODULE_FORCE_LOAD is not set
@@ -84,11 +99,8 @@ CONFIG_MODULE_UNLOAD=y
84# CONFIG_MODULE_FORCE_UNLOAD is not set 99# CONFIG_MODULE_FORCE_UNLOAD is not set
85# CONFIG_MODVERSIONS is not set 100# CONFIG_MODVERSIONS is not set
86# CONFIG_MODULE_SRCVERSION_ALL is not set 101# CONFIG_MODULE_SRCVERSION_ALL is not set
87CONFIG_KMOD=y
88CONFIG_BLOCK=y 102CONFIG_BLOCK=y
89# CONFIG_LBD is not set 103# CONFIG_LBD is not set
90# CONFIG_BLK_DEV_IO_TRACE is not set
91# CONFIG_LSF is not set
92CONFIG_BLK_DEV_BSG=y 104CONFIG_BLK_DEV_BSG=y
93# CONFIG_BLK_DEV_INTEGRITY is not set 105# CONFIG_BLK_DEV_INTEGRITY is not set
94 106
@@ -104,7 +116,6 @@ CONFIG_DEFAULT_AS=y
104# CONFIG_DEFAULT_CFQ is not set 116# CONFIG_DEFAULT_CFQ is not set
105# CONFIG_DEFAULT_NOOP is not set 117# CONFIG_DEFAULT_NOOP is not set
106CONFIG_DEFAULT_IOSCHED="anticipatory" 118CONFIG_DEFAULT_IOSCHED="anticipatory"
107CONFIG_CLASSIC_RCU=y
108# CONFIG_FREEZER is not set 119# CONFIG_FREEZER is not set
109 120
110# 121#
@@ -146,12 +157,13 @@ CONFIG_FLAT_NODE_MEM_MAP=y
146CONFIG_NEED_MULTIPLE_NODES=y 157CONFIG_NEED_MULTIPLE_NODES=y
147CONFIG_PAGEFLAGS_EXTENDED=y 158CONFIG_PAGEFLAGS_EXTENDED=y
148CONFIG_SPLIT_PTLOCK_CPUS=4 159CONFIG_SPLIT_PTLOCK_CPUS=4
149# CONFIG_RESOURCES_64BIT is not set
150# CONFIG_PHYS_ADDR_T_64BIT is not set 160# CONFIG_PHYS_ADDR_T_64BIT is not set
151CONFIG_ZONE_DMA_FLAG=1 161CONFIG_ZONE_DMA_FLAG=1
152CONFIG_BOUNCE=y 162CONFIG_BOUNCE=y
153CONFIG_VIRT_TO_BUS=y 163CONFIG_VIRT_TO_BUS=y
154CONFIG_UNEVICTABLE_LRU=y 164CONFIG_UNEVICTABLE_LRU=y
165CONFIG_HAVE_MLOCK=y
166CONFIG_HAVE_MLOCKED_PAGE_BIT=y
155 167
156# 168#
157# General setup 169# General setup
@@ -268,6 +280,7 @@ CONFIG_NETFILTER_XTABLES=m
268CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 280CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
269CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 281CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
270CONFIG_NETFILTER_XT_TARGET_DSCP=m 282CONFIG_NETFILTER_XT_TARGET_DSCP=m
283CONFIG_NETFILTER_XT_TARGET_HL=m
271CONFIG_NETFILTER_XT_TARGET_MARK=m 284CONFIG_NETFILTER_XT_TARGET_MARK=m
272CONFIG_NETFILTER_XT_TARGET_NFLOG=m 285CONFIG_NETFILTER_XT_TARGET_NFLOG=m
273CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 286CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
@@ -276,6 +289,7 @@ CONFIG_NETFILTER_XT_TARGET_RATEEST=m
276CONFIG_NETFILTER_XT_TARGET_TRACE=m 289CONFIG_NETFILTER_XT_TARGET_TRACE=m
277CONFIG_NETFILTER_XT_TARGET_TCPMSS=m 290CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
278CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m 291CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
292CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
279CONFIG_NETFILTER_XT_MATCH_COMMENT=m 293CONFIG_NETFILTER_XT_MATCH_COMMENT=m
280CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m 294CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
281CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m 295CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
@@ -286,6 +300,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m
286CONFIG_NETFILTER_XT_MATCH_ESP=m 300CONFIG_NETFILTER_XT_MATCH_ESP=m
287CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m 301CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
288CONFIG_NETFILTER_XT_MATCH_HELPER=m 302CONFIG_NETFILTER_XT_MATCH_HELPER=m
303CONFIG_NETFILTER_XT_MATCH_HL=m
289CONFIG_NETFILTER_XT_MATCH_IPRANGE=m 304CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
290CONFIG_NETFILTER_XT_MATCH_LENGTH=m 305CONFIG_NETFILTER_XT_MATCH_LENGTH=m
291CONFIG_NETFILTER_XT_MATCH_LIMIT=m 306CONFIG_NETFILTER_XT_MATCH_LIMIT=m
@@ -364,25 +379,20 @@ CONFIG_IP6_NF_MATCH_HL=m
364CONFIG_IP6_NF_MATCH_IPV6HEADER=m 379CONFIG_IP6_NF_MATCH_IPV6HEADER=m
365CONFIG_IP6_NF_MATCH_MH=m 380CONFIG_IP6_NF_MATCH_MH=m
366CONFIG_IP6_NF_MATCH_RT=m 381CONFIG_IP6_NF_MATCH_RT=m
382CONFIG_IP6_NF_TARGET_HL=m
367CONFIG_IP6_NF_TARGET_LOG=m 383CONFIG_IP6_NF_TARGET_LOG=m
368CONFIG_IP6_NF_FILTER=m 384CONFIG_IP6_NF_FILTER=m
369CONFIG_IP6_NF_TARGET_REJECT=m 385CONFIG_IP6_NF_TARGET_REJECT=m
370CONFIG_IP6_NF_MANGLE=m 386CONFIG_IP6_NF_MANGLE=m
371CONFIG_IP6_NF_TARGET_HL=m
372CONFIG_IP6_NF_RAW=m 387CONFIG_IP6_NF_RAW=m
373CONFIG_IP_DCCP=m 388CONFIG_IP_DCCP=m
374CONFIG_INET_DCCP_DIAG=m 389CONFIG_INET_DCCP_DIAG=m
375CONFIG_IP_DCCP_ACKVEC=y
376 390
377# 391#
378# DCCP CCIDs Configuration (EXPERIMENTAL) 392# DCCP CCIDs Configuration (EXPERIMENTAL)
379# 393#
380CONFIG_IP_DCCP_CCID2=m
381# CONFIG_IP_DCCP_CCID2_DEBUG is not set 394# CONFIG_IP_DCCP_CCID2_DEBUG is not set
382CONFIG_IP_DCCP_CCID3=m 395# CONFIG_IP_DCCP_CCID3 is not set
383# CONFIG_IP_DCCP_CCID3_DEBUG is not set
384CONFIG_IP_DCCP_CCID3_RTO=100
385CONFIG_IP_DCCP_TFRC_LIB=m
386CONFIG_IP_SCTP=m 396CONFIG_IP_SCTP=m
387# CONFIG_SCTP_DBG_MSG is not set 397# CONFIG_SCTP_DBG_MSG is not set
388# CONFIG_SCTP_DBG_OBJCNT is not set 398# CONFIG_SCTP_DBG_OBJCNT is not set
@@ -408,8 +418,10 @@ CONFIG_IPDDP_DECAP=y
408# CONFIG_LAPB is not set 418# CONFIG_LAPB is not set
409# CONFIG_ECONET is not set 419# CONFIG_ECONET is not set
410# CONFIG_WAN_ROUTER is not set 420# CONFIG_WAN_ROUTER is not set
421# CONFIG_PHONET is not set
411# CONFIG_NET_SCHED is not set 422# CONFIG_NET_SCHED is not set
412CONFIG_NET_CLS_ROUTE=y 423CONFIG_NET_CLS_ROUTE=y
424# CONFIG_DCB is not set
413 425
414# 426#
415# Network testing 427# Network testing
@@ -420,8 +432,8 @@ CONFIG_NET_CLS_ROUTE=y
420# CONFIG_IRDA is not set 432# CONFIG_IRDA is not set
421# CONFIG_BT is not set 433# CONFIG_BT is not set
422# CONFIG_AF_RXRPC is not set 434# CONFIG_AF_RXRPC is not set
423# CONFIG_PHONET is not set
424# CONFIG_WIRELESS is not set 435# CONFIG_WIRELESS is not set
436# CONFIG_WIMAX is not set
425# CONFIG_RFKILL is not set 437# CONFIG_RFKILL is not set
426# CONFIG_NET_9P is not set 438# CONFIG_NET_9P is not set
427 439
@@ -454,6 +466,7 @@ CONFIG_PARPORT_NOT_PC=y
454CONFIG_BLK_DEV=y 466CONFIG_BLK_DEV=y
455CONFIG_AMIGA_FLOPPY=y 467CONFIG_AMIGA_FLOPPY=y
456CONFIG_ATARI_FLOPPY=y 468CONFIG_ATARI_FLOPPY=y
469CONFIG_BLK_DEV_SWIM=y
457CONFIG_AMIGA_Z2RAM=y 470CONFIG_AMIGA_Z2RAM=y
458# CONFIG_BLK_DEV_COW_COMMON is not set 471# CONFIG_BLK_DEV_COW_COMMON is not set
459CONFIG_BLK_DEV_LOOP=y 472CONFIG_BLK_DEV_LOOP=y
@@ -469,15 +482,20 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
469CONFIG_ATA_OVER_ETH=m 482CONFIG_ATA_OVER_ETH=m
470# CONFIG_BLK_DEV_HD is not set 483# CONFIG_BLK_DEV_HD is not set
471CONFIG_MISC_DEVICES=y 484CONFIG_MISC_DEVICES=y
472# CONFIG_EEPROM_93CX6 is not set
473# CONFIG_ENCLOSURE_SERVICES is not set 485# CONFIG_ENCLOSURE_SERVICES is not set
474# CONFIG_C2PORT is not set 486# CONFIG_C2PORT is not set
487
488#
489# EEPROM support
490#
491# CONFIG_EEPROM_93CX6 is not set
475CONFIG_HAVE_IDE=y 492CONFIG_HAVE_IDE=y
476CONFIG_IDE=y 493CONFIG_IDE=y
477 494
478# 495#
479# Please see Documentation/ide/ide.txt for help/info on IDE drives 496# Please see Documentation/ide/ide.txt for help/info on IDE drives
480# 497#
498CONFIG_IDE_ATAPI=y
481# CONFIG_BLK_DEV_IDE_SATA is not set 499# CONFIG_BLK_DEV_IDE_SATA is not set
482CONFIG_IDE_GD=y 500CONFIG_IDE_GD=y
483CONFIG_IDE_GD_ATA=y 501CONFIG_IDE_GD_ATA=y
@@ -485,7 +503,6 @@ CONFIG_IDE_GD_ATA=y
485CONFIG_BLK_DEV_IDECD=y 503CONFIG_BLK_DEV_IDECD=y
486CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y 504CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
487# CONFIG_BLK_DEV_IDETAPE is not set 505# CONFIG_BLK_DEV_IDETAPE is not set
488# CONFIG_BLK_DEV_IDESCSI is not set
489# CONFIG_IDE_TASK_IOCTL is not set 506# CONFIG_IDE_TASK_IOCTL is not set
490CONFIG_IDE_PROC_FS=y 507CONFIG_IDE_PROC_FS=y
491 508
@@ -494,7 +511,6 @@ CONFIG_IDE_PROC_FS=y
494# 511#
495# CONFIG_BLK_DEV_PLATFORM is not set 512# CONFIG_BLK_DEV_PLATFORM is not set
496CONFIG_BLK_DEV_GAYLE=y 513CONFIG_BLK_DEV_GAYLE=y
497CONFIG_BLK_DEV_IDEDOUBLER=y
498CONFIG_BLK_DEV_BUDDHA=y 514CONFIG_BLK_DEV_BUDDHA=y
499CONFIG_BLK_DEV_FALCON_IDE=y 515CONFIG_BLK_DEV_FALCON_IDE=y
500CONFIG_BLK_DEV_MAC_IDE=y 516CONFIG_BLK_DEV_MAC_IDE=y
@@ -549,6 +565,8 @@ CONFIG_ISCSI_TCP=m
549# CONFIG_SCSI_AIC7XXX_OLD is not set 565# CONFIG_SCSI_AIC7XXX_OLD is not set
550# CONFIG_SCSI_ADVANSYS is not set 566# CONFIG_SCSI_ADVANSYS is not set
551# CONFIG_SCSI_IN2000 is not set 567# CONFIG_SCSI_IN2000 is not set
568# CONFIG_LIBFC is not set
569# CONFIG_LIBFCOE is not set
552# CONFIG_SCSI_DTC3280 is not set 570# CONFIG_SCSI_DTC3280 is not set
553# CONFIG_SCSI_FUTURE_DOMAIN is not set 571# CONFIG_SCSI_FUTURE_DOMAIN is not set
554# CONFIG_SCSI_GENERIC_NCR5380 is not set 572# CONFIG_SCSI_GENERIC_NCR5380 is not set
@@ -575,6 +593,7 @@ CONFIG_MVME16x_SCSI=y
575CONFIG_BVME6000_SCSI=y 593CONFIG_BVME6000_SCSI=y
576CONFIG_SUN3X_ESP=y 594CONFIG_SUN3X_ESP=y
577# CONFIG_SCSI_DH is not set 595# CONFIG_SCSI_DH is not set
596# CONFIG_SCSI_OSD_INITIATOR is not set
578CONFIG_MD=y 597CONFIG_MD=y
579CONFIG_BLK_DEV_MD=m 598CONFIG_BLK_DEV_MD=m
580CONFIG_MD_LINEAR=m 599CONFIG_MD_LINEAR=m
@@ -582,7 +601,7 @@ CONFIG_MD_RAID0=m
582CONFIG_MD_RAID1=m 601CONFIG_MD_RAID1=m
583# CONFIG_MD_RAID10 is not set 602# CONFIG_MD_RAID10 is not set
584CONFIG_MD_RAID456=m 603CONFIG_MD_RAID456=m
585CONFIG_MD_RAID5_RESHAPE=y 604CONFIG_MD_RAID6_PQ=m
586# CONFIG_MD_MULTIPATH is not set 605# CONFIG_MD_MULTIPATH is not set
587# CONFIG_MD_FAULTY is not set 606# CONFIG_MD_FAULTY is not set
588CONFIG_BLK_DEV_DM=m 607CONFIG_BLK_DEV_DM=m
@@ -604,6 +623,7 @@ CONFIG_ADB_CUDA=y
604CONFIG_INPUT_ADBHID=y 623CONFIG_INPUT_ADBHID=y
605CONFIG_MAC_EMUMOUSEBTN=y 624CONFIG_MAC_EMUMOUSEBTN=y
606CONFIG_NETDEVICES=y 625CONFIG_NETDEVICES=y
626CONFIG_COMPAT_NET_DEV_OPS=y
607CONFIG_DUMMY=m 627CONFIG_DUMMY=m
608# CONFIG_BONDING is not set 628# CONFIG_BONDING is not set
609CONFIG_MACVLAN=m 629CONFIG_MACVLAN=m
@@ -614,24 +634,26 @@ CONFIG_VETH=m
614# CONFIG_PHYLIB is not set 634# CONFIG_PHYLIB is not set
615CONFIG_NET_ETHERNET=y 635CONFIG_NET_ETHERNET=y
616CONFIG_MII=y 636CONFIG_MII=y
617CONFIG_ARIADNE=m 637CONFIG_ARIADNE=y
618CONFIG_A2065=m 638CONFIG_A2065=y
619CONFIG_HYDRA=m 639CONFIG_HYDRA=y
620CONFIG_ZORRO8390=m 640CONFIG_ZORRO8390=y
621CONFIG_APNE=m 641CONFIG_APNE=y
622CONFIG_MAC8390=y 642CONFIG_MAC8390=y
623CONFIG_MAC89x0=m 643CONFIG_MAC89x0=y
624CONFIG_MACSONIC=m 644CONFIG_MACSONIC=y
625CONFIG_MACMACE=y 645CONFIG_MACMACE=y
626CONFIG_MVME147_NET=y 646CONFIG_MVME147_NET=y
627CONFIG_MVME16x_NET=y 647CONFIG_MVME16x_NET=y
628CONFIG_BVME6000_NET=y 648CONFIG_BVME6000_NET=y
629CONFIG_ATARILANCE=m 649CONFIG_ATARILANCE=y
630CONFIG_SUN3LANCE=y 650CONFIG_SUN3LANCE=y
631CONFIG_HPLANCE=y 651CONFIG_HPLANCE=y
632# CONFIG_NET_VENDOR_3COM is not set 652# CONFIG_NET_VENDOR_3COM is not set
633# CONFIG_NET_VENDOR_SMC is not set 653# CONFIG_NET_VENDOR_SMC is not set
654# CONFIG_ETHOC is not set
634# CONFIG_NET_VENDOR_RACAL is not set 655# CONFIG_NET_VENDOR_RACAL is not set
656# CONFIG_DNET is not set
635# CONFIG_AT1700 is not set 657# CONFIG_AT1700 is not set
636# CONFIG_DEPCA is not set 658# CONFIG_DEPCA is not set
637# CONFIG_HP100 is not set 659# CONFIG_HP100 is not set
@@ -657,7 +679,10 @@ CONFIG_NE2000=m
657# 679#
658# CONFIG_WLAN_PRE80211 is not set 680# CONFIG_WLAN_PRE80211 is not set
659# CONFIG_WLAN_80211 is not set 681# CONFIG_WLAN_80211 is not set
660# CONFIG_IWLWIFI_LEDS is not set 682
683#
684# Enable WiMAX (Networking options) to see the WiMAX drivers
685#
661# CONFIG_WAN is not set 686# CONFIG_WAN is not set
662# CONFIG_PLIP is not set 687# CONFIG_PLIP is not set
663CONFIG_PPP=m 688CONFIG_PPP=m
@@ -717,11 +742,10 @@ CONFIG_KEYBOARD_ATARI=y
717CONFIG_KEYBOARD_HIL_OLD=y 742CONFIG_KEYBOARD_HIL_OLD=y
718CONFIG_KEYBOARD_HIL=y 743CONFIG_KEYBOARD_HIL=y
719CONFIG_INPUT_MOUSE=y 744CONFIG_INPUT_MOUSE=y
720CONFIG_MOUSE_PS2=y 745CONFIG_MOUSE_PS2=m
721CONFIG_MOUSE_PS2_ALPS=y 746CONFIG_MOUSE_PS2_ALPS=y
722CONFIG_MOUSE_PS2_LOGIPS2PP=y 747CONFIG_MOUSE_PS2_LOGIPS2PP=y
723CONFIG_MOUSE_PS2_SYNAPTICS=y 748CONFIG_MOUSE_PS2_SYNAPTICS=y
724CONFIG_MOUSE_PS2_LIFEBOOK=y
725CONFIG_MOUSE_PS2_TRACKPOINT=y 749CONFIG_MOUSE_PS2_TRACKPOINT=y
726# CONFIG_MOUSE_PS2_ELANTECH is not set 750# CONFIG_MOUSE_PS2_ELANTECH is not set
727# CONFIG_MOUSE_PS2_TOUCHKIT is not set 751# CONFIG_MOUSE_PS2_TOUCHKIT is not set
@@ -732,7 +756,7 @@ CONFIG_MOUSE_SERIAL=m
732CONFIG_MOUSE_AMIGA=m 756CONFIG_MOUSE_AMIGA=m
733CONFIG_MOUSE_ATARI=m 757CONFIG_MOUSE_ATARI=m
734# CONFIG_MOUSE_VSXXXAA is not set 758# CONFIG_MOUSE_VSXXXAA is not set
735CONFIG_MOUSE_HIL=m 759CONFIG_MOUSE_HIL=y
736CONFIG_INPUT_JOYSTICK=y 760CONFIG_INPUT_JOYSTICK=y
737# CONFIG_JOYSTICK_ANALOG is not set 761# CONFIG_JOYSTICK_ANALOG is not set
738# CONFIG_JOYSTICK_A3D is not set 762# CONFIG_JOYSTICK_A3D is not set
@@ -763,18 +787,18 @@ CONFIG_JOYSTICK_AMIGA=m
763CONFIG_INPUT_MISC=y 787CONFIG_INPUT_MISC=y
764CONFIG_INPUT_M68K_BEEP=m 788CONFIG_INPUT_M68K_BEEP=m
765# CONFIG_INPUT_UINPUT is not set 789# CONFIG_INPUT_UINPUT is not set
766CONFIG_HP_SDC_RTC=m 790CONFIG_HP_SDC_RTC=y
767 791
768# 792#
769# Hardware I/O ports 793# Hardware I/O ports
770# 794#
771CONFIG_SERIO=y 795CONFIG_SERIO=y
772# CONFIG_SERIO_SERPORT is not set 796# CONFIG_SERIO_SERPORT is not set
773CONFIG_SERIO_Q40KBD=m 797CONFIG_SERIO_Q40KBD=y
774# CONFIG_SERIO_PARKBD is not set 798# CONFIG_SERIO_PARKBD is not set
775CONFIG_HP_SDC=y 799CONFIG_HP_SDC=y
776CONFIG_HIL_MLC=y 800CONFIG_HIL_MLC=y
777CONFIG_SERIO_LIBPS2=y 801CONFIG_SERIO_LIBPS2=m
778# CONFIG_SERIO_RAW is not set 802# CONFIG_SERIO_RAW is not set
779# CONFIG_GAMEPORT is not set 803# CONFIG_GAMEPORT is not set
780 804
@@ -788,7 +812,7 @@ CONFIG_HW_CONSOLE=y
788CONFIG_VT_HW_CONSOLE_BINDING=y 812CONFIG_VT_HW_CONSOLE_BINDING=y
789# CONFIG_DEVKMEM is not set 813# CONFIG_DEVKMEM is not set
790# CONFIG_SERIAL_NONSTANDARD is not set 814# CONFIG_SERIAL_NONSTANDARD is not set
791CONFIG_A2232=m 815CONFIG_A2232=y
792 816
793# 817#
794# Serial drivers 818# Serial drivers
@@ -799,6 +823,7 @@ CONFIG_A2232=m
799# Non-8250 serial port support 823# Non-8250 serial port support
800# 824#
801CONFIG_UNIX98_PTYS=y 825CONFIG_UNIX98_PTYS=y
826# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
802CONFIG_LEGACY_PTYS=y 827CONFIG_LEGACY_PTYS=y
803CONFIG_LEGACY_PTY_COUNT=256 828CONFIG_LEGACY_PTY_COUNT=256
804CONFIG_PRINTER=m 829CONFIG_PRINTER=m
@@ -807,7 +832,7 @@ CONFIG_PRINTER=m
807# CONFIG_IPMI_HANDLER is not set 832# CONFIG_IPMI_HANDLER is not set
808# CONFIG_HW_RANDOM is not set 833# CONFIG_HW_RANDOM is not set
809CONFIG_NVRAM=y 834CONFIG_NVRAM=y
810CONFIG_GEN_RTC=m 835CONFIG_GEN_RTC=y
811CONFIG_GEN_RTC_X=y 836CONFIG_GEN_RTC_X=y
812# CONFIG_DTLK is not set 837# CONFIG_DTLK is not set
813# CONFIG_R3964 is not set 838# CONFIG_R3964 is not set
@@ -898,6 +923,7 @@ CONFIG_FB_HP300=y
898# CONFIG_FB_VIRTUAL is not set 923# CONFIG_FB_VIRTUAL is not set
899# CONFIG_FB_METRONOME is not set 924# CONFIG_FB_METRONOME is not set
900# CONFIG_FB_MB862XX is not set 925# CONFIG_FB_MB862XX is not set
926# CONFIG_FB_BROADSHEET is not set
901# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 927# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
902 928
903# 929#
@@ -937,7 +963,6 @@ CONFIG_HIDRAW=y
937# 963#
938# Special HID drivers 964# Special HID drivers
939# 965#
940CONFIG_HID_COMPAT=y
941# CONFIG_USB_SUPPORT is not set 966# CONFIG_USB_SUPPORT is not set
942# CONFIG_MMC is not set 967# CONFIG_MMC is not set
943# CONFIG_MEMSTICK is not set 968# CONFIG_MEMSTICK is not set
@@ -948,13 +973,12 @@ CONFIG_HID_COMPAT=y
948# CONFIG_AUXDISPLAY is not set 973# CONFIG_AUXDISPLAY is not set
949# CONFIG_UIO is not set 974# CONFIG_UIO is not set
950# CONFIG_STAGING is not set 975# CONFIG_STAGING is not set
951CONFIG_STAGING_EXCLUDE_BUILD=y
952 976
953# 977#
954# Character devices 978# Character devices
955# 979#
956CONFIG_ATARI_MFPSER=m 980CONFIG_ATARI_MFPSER=y
957CONFIG_ATARI_MIDI=m 981CONFIG_ATARI_MIDI=y
958CONFIG_ATARI_DSP56K=m 982CONFIG_ATARI_DSP56K=m
959CONFIG_AMIGA_BUILTIN_SERIAL=y 983CONFIG_AMIGA_BUILTIN_SERIAL=y
960CONFIG_MULTIFACE_III_TTY=m 984CONFIG_MULTIFACE_III_TTY=m
@@ -974,6 +998,7 @@ CONFIG_EXT2_FS=y
974# CONFIG_EXT2_FS_XATTR is not set 998# CONFIG_EXT2_FS_XATTR is not set
975# CONFIG_EXT2_FS_XIP is not set 999# CONFIG_EXT2_FS_XIP is not set
976CONFIG_EXT3_FS=y 1000CONFIG_EXT3_FS=y
1001# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
977# CONFIG_EXT3_FS_XATTR is not set 1002# CONFIG_EXT3_FS_XATTR is not set
978# CONFIG_EXT4_FS is not set 1003# CONFIG_EXT4_FS is not set
979CONFIG_JBD=y 1004CONFIG_JBD=y
@@ -1000,13 +1025,15 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
1000# CONFIG_OCFS2_FS_STATS is not set 1025# CONFIG_OCFS2_FS_STATS is not set
1001# CONFIG_OCFS2_DEBUG_MASKLOG is not set 1026# CONFIG_OCFS2_DEBUG_MASKLOG is not set
1002# CONFIG_OCFS2_DEBUG_FS is not set 1027# CONFIG_OCFS2_DEBUG_FS is not set
1003# CONFIG_OCFS2_COMPAT_JBD is not set 1028# CONFIG_OCFS2_FS_POSIX_ACL is not set
1029# CONFIG_BTRFS_FS is not set
1004CONFIG_DNOTIFY=y 1030CONFIG_DNOTIFY=y
1005CONFIG_INOTIFY=y 1031CONFIG_INOTIFY=y
1006CONFIG_INOTIFY_USER=y 1032CONFIG_INOTIFY_USER=y
1007CONFIG_QUOTA=y 1033CONFIG_QUOTA=y
1008CONFIG_QUOTA_NETLINK_INTERFACE=y 1034CONFIG_QUOTA_NETLINK_INTERFACE=y
1009# CONFIG_PRINT_QUOTA_WARNING is not set 1035# CONFIG_PRINT_QUOTA_WARNING is not set
1036CONFIG_QUOTA_TREE=m
1010# CONFIG_QFMT_V1 is not set 1037# CONFIG_QFMT_V1 is not set
1011# CONFIG_QFMT_V2 is not set 1038# CONFIG_QFMT_V2 is not set
1012CONFIG_QUOTACTL=y 1039CONFIG_QUOTACTL=y
@@ -1015,6 +1042,11 @@ CONFIG_AUTOFS4_FS=m
1015CONFIG_FUSE_FS=m 1042CONFIG_FUSE_FS=m
1016 1043
1017# 1044#
1045# Caches
1046#
1047# CONFIG_FSCACHE is not set
1048
1049#
1018# CD-ROM/DVD Filesystems 1050# CD-ROM/DVD Filesystems
1019# 1051#
1020CONFIG_ISO9660_FS=y 1052CONFIG_ISO9660_FS=y
@@ -1045,10 +1077,7 @@ CONFIG_TMPFS=y
1045# CONFIG_TMPFS_POSIX_ACL is not set 1077# CONFIG_TMPFS_POSIX_ACL is not set
1046# CONFIG_HUGETLB_PAGE is not set 1078# CONFIG_HUGETLB_PAGE is not set
1047CONFIG_CONFIGFS_FS=m 1079CONFIG_CONFIGFS_FS=m
1048 1080CONFIG_MISC_FILESYSTEMS=y
1049#
1050# Miscellaneous filesystems
1051#
1052# CONFIG_ADFS_FS is not set 1081# CONFIG_ADFS_FS is not set
1053CONFIG_AFFS_FS=m 1082CONFIG_AFFS_FS=m
1054CONFIG_HFS_FS=y 1083CONFIG_HFS_FS=y
@@ -1057,6 +1086,9 @@ CONFIG_HFSPLUS_FS=y
1057# CONFIG_BFS_FS is not set 1086# CONFIG_BFS_FS is not set
1058# CONFIG_EFS_FS is not set 1087# CONFIG_EFS_FS is not set
1059CONFIG_CRAMFS=m 1088CONFIG_CRAMFS=m
1089CONFIG_SQUASHFS=m
1090# CONFIG_SQUASHFS_EMBEDDED is not set
1091CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
1060# CONFIG_VXFS_FS is not set 1092# CONFIG_VXFS_FS is not set
1061CONFIG_MINIX_FS=y 1093CONFIG_MINIX_FS=y
1062# CONFIG_OMFS_FS is not set 1094# CONFIG_OMFS_FS is not set
@@ -1067,6 +1099,7 @@ CONFIG_SYSV_FS=m
1067CONFIG_UFS_FS=m 1099CONFIG_UFS_FS=m
1068# CONFIG_UFS_FS_WRITE is not set 1100# CONFIG_UFS_FS_WRITE is not set
1069# CONFIG_UFS_DEBUG is not set 1101# CONFIG_UFS_DEBUG is not set
1102# CONFIG_NILFS2_FS is not set
1070CONFIG_NETWORK_FILESYSTEMS=y 1103CONFIG_NETWORK_FILESYSTEMS=y
1071CONFIG_NFS_FS=y 1104CONFIG_NFS_FS=y
1072CONFIG_NFS_V3=y 1105CONFIG_NFS_V3=y
@@ -1083,7 +1116,6 @@ CONFIG_EXPORTFS=m
1083CONFIG_NFS_COMMON=y 1116CONFIG_NFS_COMMON=y
1084CONFIG_SUNRPC=y 1117CONFIG_SUNRPC=y
1085CONFIG_SUNRPC_GSS=y 1118CONFIG_SUNRPC_GSS=y
1086# CONFIG_SUNRPC_REGISTER_V4 is not set
1087CONFIG_RPCSEC_GSS_KRB5=y 1119CONFIG_RPCSEC_GSS_KRB5=y
1088# CONFIG_RPCSEC_GSS_SPKM3 is not set 1120# CONFIG_RPCSEC_GSS_SPKM3 is not set
1089CONFIG_SMB_FS=m 1121CONFIG_SMB_FS=m
@@ -1163,11 +1195,6 @@ CONFIG_DEBUG_BUGVERBOSE=y
1163CONFIG_DEBUG_MEMORY_INIT=y 1195CONFIG_DEBUG_MEMORY_INIT=y
1164# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1196# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1165CONFIG_SYSCTL_SYSCALL_CHECK=y 1197CONFIG_SYSCTL_SYSCALL_CHECK=y
1166
1167#
1168# Tracers
1169#
1170# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1171# CONFIG_SAMPLES is not set 1198# CONFIG_SAMPLES is not set
1172 1199
1173# 1200#
@@ -1188,13 +1215,21 @@ CONFIG_CRYPTO=y
1188# 1215#
1189# CONFIG_CRYPTO_FIPS is not set 1216# CONFIG_CRYPTO_FIPS is not set
1190CONFIG_CRYPTO_ALGAPI=y 1217CONFIG_CRYPTO_ALGAPI=y
1191CONFIG_CRYPTO_AEAD=y 1218CONFIG_CRYPTO_ALGAPI2=y
1219CONFIG_CRYPTO_AEAD=m
1220CONFIG_CRYPTO_AEAD2=y
1192CONFIG_CRYPTO_BLKCIPHER=y 1221CONFIG_CRYPTO_BLKCIPHER=y
1222CONFIG_CRYPTO_BLKCIPHER2=y
1193CONFIG_CRYPTO_HASH=y 1223CONFIG_CRYPTO_HASH=y
1194CONFIG_CRYPTO_RNG=y 1224CONFIG_CRYPTO_HASH2=y
1225CONFIG_CRYPTO_RNG=m
1226CONFIG_CRYPTO_RNG2=y
1227CONFIG_CRYPTO_PCOMP=y
1195CONFIG_CRYPTO_MANAGER=y 1228CONFIG_CRYPTO_MANAGER=y
1229CONFIG_CRYPTO_MANAGER2=y
1196CONFIG_CRYPTO_GF128MUL=m 1230CONFIG_CRYPTO_GF128MUL=m
1197CONFIG_CRYPTO_NULL=m 1231CONFIG_CRYPTO_NULL=m
1232CONFIG_CRYPTO_WORKQUEUE=y
1198CONFIG_CRYPTO_CRYPTD=m 1233CONFIG_CRYPTO_CRYPTD=m
1199CONFIG_CRYPTO_AUTHENC=m 1234CONFIG_CRYPTO_AUTHENC=m
1200CONFIG_CRYPTO_TEST=m 1235CONFIG_CRYPTO_TEST=m
@@ -1264,6 +1299,7 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
1264# Compression 1299# Compression
1265# 1300#
1266CONFIG_CRYPTO_DEFLATE=m 1301CONFIG_CRYPTO_DEFLATE=m
1302CONFIG_CRYPTO_ZLIB=m
1267CONFIG_CRYPTO_LZO=m 1303CONFIG_CRYPTO_LZO=m
1268 1304
1269# 1305#
@@ -1271,11 +1307,13 @@ CONFIG_CRYPTO_LZO=m
1271# 1307#
1272# CONFIG_CRYPTO_ANSI_CPRNG is not set 1308# CONFIG_CRYPTO_ANSI_CPRNG is not set
1273# CONFIG_CRYPTO_HW is not set 1309# CONFIG_CRYPTO_HW is not set
1310# CONFIG_BINARY_PRINTF is not set
1274 1311
1275# 1312#
1276# Library routines 1313# Library routines
1277# 1314#
1278CONFIG_BITREVERSE=y 1315CONFIG_BITREVERSE=y
1316CONFIG_GENERIC_FIND_LAST_BIT=y
1279CONFIG_CRC_CCITT=m 1317CONFIG_CRC_CCITT=m
1280CONFIG_CRC16=y 1318CONFIG_CRC16=y
1281CONFIG_CRC_T10DIF=y 1319CONFIG_CRC_T10DIF=y
@@ -1287,10 +1325,13 @@ CONFIG_ZLIB_INFLATE=y
1287CONFIG_ZLIB_DEFLATE=m 1325CONFIG_ZLIB_DEFLATE=m
1288CONFIG_LZO_COMPRESS=m 1326CONFIG_LZO_COMPRESS=m
1289CONFIG_LZO_DECOMPRESS=m 1327CONFIG_LZO_DECOMPRESS=m
1328CONFIG_DECOMPRESS_GZIP=y
1329CONFIG_DECOMPRESS_BZIP2=y
1330CONFIG_DECOMPRESS_LZMA=y
1290CONFIG_TEXTSEARCH=y 1331CONFIG_TEXTSEARCH=y
1291CONFIG_TEXTSEARCH_KMP=m 1332CONFIG_TEXTSEARCH_KMP=m
1292CONFIG_TEXTSEARCH_BM=m 1333CONFIG_TEXTSEARCH_BM=m
1293CONFIG_TEXTSEARCH_FSM=m 1334CONFIG_TEXTSEARCH_FSM=m
1294CONFIG_PLIST=y
1295CONFIG_HAS_IOMEM=y 1335CONFIG_HAS_IOMEM=y
1296CONFIG_HAS_DMA=y 1336CONFIG_HAS_DMA=y
1337CONFIG_NLATTR=y
diff --git a/arch/m68k/configs/mvme147_defconfig b/arch/m68k/configs/mvme147_defconfig
index 52d42715bd0b..7dceb5d71223 100644
--- a/arch/m68k/configs/mvme147_defconfig
+++ b/arch/m68k/configs/mvme147_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc7 3# Linux kernel version: 2.6.30-rc3
4# Tue Dec 2 20:27:50 2008 4# Wed Apr 22 20:48:08 2009
5# 5#
6CONFIG_M68K=y 6CONFIG_M68K=y
7CONFIG_MMU=y 7CONFIG_MMU=y
@@ -29,14 +29,24 @@ CONFIG_SWAP=y
29CONFIG_SYSVIPC=y 29CONFIG_SYSVIPC=y
30CONFIG_SYSVIPC_SYSCTL=y 30CONFIG_SYSVIPC_SYSCTL=y
31CONFIG_POSIX_MQUEUE=y 31CONFIG_POSIX_MQUEUE=y
32CONFIG_POSIX_MQUEUE_SYSCTL=y
32CONFIG_BSD_PROCESS_ACCT=y 33CONFIG_BSD_PROCESS_ACCT=y
33# CONFIG_BSD_PROCESS_ACCT_V3 is not set 34# CONFIG_BSD_PROCESS_ACCT_V3 is not set
34# CONFIG_TASKSTATS is not set 35# CONFIG_TASKSTATS is not set
35# CONFIG_AUDIT is not set 36# CONFIG_AUDIT is not set
37
38#
39# RCU Subsystem
40#
41CONFIG_CLASSIC_RCU=y
42# CONFIG_TREE_RCU is not set
43# CONFIG_PREEMPT_RCU is not set
44# CONFIG_TREE_RCU_TRACE is not set
45# CONFIG_PREEMPT_RCU_TRACE is not set
36# CONFIG_IKCONFIG is not set 46# CONFIG_IKCONFIG is not set
37CONFIG_LOG_BUF_SHIFT=14 47CONFIG_LOG_BUF_SHIFT=14
38# CONFIG_CGROUPS is not set
39# CONFIG_GROUP_SCHED is not set 48# CONFIG_GROUP_SCHED is not set
49# CONFIG_CGROUPS is not set
40# CONFIG_SYSFS_DEPRECATED_V2 is not set 50# CONFIG_SYSFS_DEPRECATED_V2 is not set
41CONFIG_RELAY=y 51CONFIG_RELAY=y
42CONFIG_NAMESPACES=y 52CONFIG_NAMESPACES=y
@@ -44,23 +54,27 @@ CONFIG_NAMESPACES=y
44# CONFIG_IPC_NS is not set 54# CONFIG_IPC_NS is not set
45# CONFIG_USER_NS is not set 55# CONFIG_USER_NS is not set
46# CONFIG_PID_NS is not set 56# CONFIG_PID_NS is not set
57# CONFIG_NET_NS is not set
47CONFIG_BLK_DEV_INITRD=y 58CONFIG_BLK_DEV_INITRD=y
48CONFIG_INITRAMFS_SOURCE="" 59CONFIG_INITRAMFS_SOURCE=""
60CONFIG_RD_GZIP=y
61CONFIG_RD_BZIP2=y
62CONFIG_RD_LZMA=y
49# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 63# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
50CONFIG_SYSCTL=y 64CONFIG_SYSCTL=y
65CONFIG_ANON_INODES=y
51# CONFIG_EMBEDDED is not set 66# CONFIG_EMBEDDED is not set
52CONFIG_UID16=y 67CONFIG_UID16=y
53CONFIG_SYSCTL_SYSCALL=y 68CONFIG_SYSCTL_SYSCALL=y
54CONFIG_KALLSYMS=y 69CONFIG_KALLSYMS=y
55# CONFIG_KALLSYMS_EXTRA_PASS is not set 70# CONFIG_KALLSYMS_EXTRA_PASS is not set
71# CONFIG_STRIP_ASM_SYMS is not set
56CONFIG_HOTPLUG=y 72CONFIG_HOTPLUG=y
57CONFIG_PRINTK=y 73CONFIG_PRINTK=y
58CONFIG_BUG=y 74CONFIG_BUG=y
59CONFIG_ELF_CORE=y 75CONFIG_ELF_CORE=y
60CONFIG_COMPAT_BRK=y
61CONFIG_BASE_FULL=y 76CONFIG_BASE_FULL=y
62CONFIG_FUTEX=y 77CONFIG_FUTEX=y
63CONFIG_ANON_INODES=y
64CONFIG_EPOLL=y 78CONFIG_EPOLL=y
65CONFIG_SIGNALFD=y 79CONFIG_SIGNALFD=y
66CONFIG_TIMERFD=y 80CONFIG_TIMERFD=y
@@ -68,15 +82,16 @@ CONFIG_EVENTFD=y
68CONFIG_SHMEM=y 82CONFIG_SHMEM=y
69CONFIG_AIO=y 83CONFIG_AIO=y
70CONFIG_VM_EVENT_COUNTERS=y 84CONFIG_VM_EVENT_COUNTERS=y
85CONFIG_COMPAT_BRK=y
71CONFIG_SLAB=y 86CONFIG_SLAB=y
72# CONFIG_SLUB is not set 87# CONFIG_SLUB is not set
73# CONFIG_SLOB is not set 88# CONFIG_SLOB is not set
74# CONFIG_PROFILING is not set 89# CONFIG_PROFILING is not set
75# CONFIG_MARKERS is not set 90# CONFIG_MARKERS is not set
91# CONFIG_SLOW_WORK is not set
76# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 92# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
77CONFIG_SLABINFO=y 93CONFIG_SLABINFO=y
78CONFIG_RT_MUTEXES=y 94CONFIG_RT_MUTEXES=y
79# CONFIG_TINY_SHMEM is not set
80CONFIG_BASE_SMALL=0 95CONFIG_BASE_SMALL=0
81CONFIG_MODULES=y 96CONFIG_MODULES=y
82# CONFIG_MODULE_FORCE_LOAD is not set 97# CONFIG_MODULE_FORCE_LOAD is not set
@@ -84,11 +99,8 @@ CONFIG_MODULE_UNLOAD=y
84# CONFIG_MODULE_FORCE_UNLOAD is not set 99# CONFIG_MODULE_FORCE_UNLOAD is not set
85# CONFIG_MODVERSIONS is not set 100# CONFIG_MODVERSIONS is not set
86# CONFIG_MODULE_SRCVERSION_ALL is not set 101# CONFIG_MODULE_SRCVERSION_ALL is not set
87CONFIG_KMOD=y
88CONFIG_BLOCK=y 102CONFIG_BLOCK=y
89# CONFIG_LBD is not set 103# CONFIG_LBD is not set
90# CONFIG_BLK_DEV_IO_TRACE is not set
91# CONFIG_LSF is not set
92CONFIG_BLK_DEV_BSG=y 104CONFIG_BLK_DEV_BSG=y
93# CONFIG_BLK_DEV_INTEGRITY is not set 105# CONFIG_BLK_DEV_INTEGRITY is not set
94 106
@@ -104,7 +116,6 @@ CONFIG_DEFAULT_AS=y
104# CONFIG_DEFAULT_CFQ is not set 116# CONFIG_DEFAULT_CFQ is not set
105# CONFIG_DEFAULT_NOOP is not set 117# CONFIG_DEFAULT_NOOP is not set
106CONFIG_DEFAULT_IOSCHED="anticipatory" 118CONFIG_DEFAULT_IOSCHED="anticipatory"
107CONFIG_CLASSIC_RCU=y
108# CONFIG_FREEZER is not set 119# CONFIG_FREEZER is not set
109 120
110# 121#
@@ -143,12 +154,13 @@ CONFIG_FLAT_NODE_MEM_MAP=y
143CONFIG_NEED_MULTIPLE_NODES=y 154CONFIG_NEED_MULTIPLE_NODES=y
144CONFIG_PAGEFLAGS_EXTENDED=y 155CONFIG_PAGEFLAGS_EXTENDED=y
145CONFIG_SPLIT_PTLOCK_CPUS=4 156CONFIG_SPLIT_PTLOCK_CPUS=4
146# CONFIG_RESOURCES_64BIT is not set
147# CONFIG_PHYS_ADDR_T_64BIT is not set 157# CONFIG_PHYS_ADDR_T_64BIT is not set
148CONFIG_ZONE_DMA_FLAG=1 158CONFIG_ZONE_DMA_FLAG=1
149CONFIG_BOUNCE=y 159CONFIG_BOUNCE=y
150CONFIG_VIRT_TO_BUS=y 160CONFIG_VIRT_TO_BUS=y
151CONFIG_UNEVICTABLE_LRU=y 161CONFIG_UNEVICTABLE_LRU=y
162CONFIG_HAVE_MLOCK=y
163CONFIG_HAVE_MLOCKED_PAGE_BIT=y
152 164
153# 165#
154# General setup 166# General setup
@@ -258,6 +270,7 @@ CONFIG_NETFILTER_XTABLES=m
258CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 270CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
259CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 271CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
260CONFIG_NETFILTER_XT_TARGET_DSCP=m 272CONFIG_NETFILTER_XT_TARGET_DSCP=m
273CONFIG_NETFILTER_XT_TARGET_HL=m
261CONFIG_NETFILTER_XT_TARGET_MARK=m 274CONFIG_NETFILTER_XT_TARGET_MARK=m
262CONFIG_NETFILTER_XT_TARGET_NFLOG=m 275CONFIG_NETFILTER_XT_TARGET_NFLOG=m
263CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 276CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
@@ -266,6 +279,7 @@ CONFIG_NETFILTER_XT_TARGET_RATEEST=m
266CONFIG_NETFILTER_XT_TARGET_TRACE=m 279CONFIG_NETFILTER_XT_TARGET_TRACE=m
267CONFIG_NETFILTER_XT_TARGET_TCPMSS=m 280CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
268CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m 281CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
282CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
269CONFIG_NETFILTER_XT_MATCH_COMMENT=m 283CONFIG_NETFILTER_XT_MATCH_COMMENT=m
270CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m 284CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
271CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m 285CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
@@ -276,6 +290,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m
276CONFIG_NETFILTER_XT_MATCH_ESP=m 290CONFIG_NETFILTER_XT_MATCH_ESP=m
277CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m 291CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
278CONFIG_NETFILTER_XT_MATCH_HELPER=m 292CONFIG_NETFILTER_XT_MATCH_HELPER=m
293CONFIG_NETFILTER_XT_MATCH_HL=m
279CONFIG_NETFILTER_XT_MATCH_IPRANGE=m 294CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
280CONFIG_NETFILTER_XT_MATCH_LENGTH=m 295CONFIG_NETFILTER_XT_MATCH_LENGTH=m
281CONFIG_NETFILTER_XT_MATCH_LIMIT=m 296CONFIG_NETFILTER_XT_MATCH_LIMIT=m
@@ -354,25 +369,20 @@ CONFIG_IP6_NF_MATCH_HL=m
354CONFIG_IP6_NF_MATCH_IPV6HEADER=m 369CONFIG_IP6_NF_MATCH_IPV6HEADER=m
355CONFIG_IP6_NF_MATCH_MH=m 370CONFIG_IP6_NF_MATCH_MH=m
356CONFIG_IP6_NF_MATCH_RT=m 371CONFIG_IP6_NF_MATCH_RT=m
372CONFIG_IP6_NF_TARGET_HL=m
357CONFIG_IP6_NF_TARGET_LOG=m 373CONFIG_IP6_NF_TARGET_LOG=m
358CONFIG_IP6_NF_FILTER=m 374CONFIG_IP6_NF_FILTER=m
359CONFIG_IP6_NF_TARGET_REJECT=m 375CONFIG_IP6_NF_TARGET_REJECT=m
360CONFIG_IP6_NF_MANGLE=m 376CONFIG_IP6_NF_MANGLE=m
361CONFIG_IP6_NF_TARGET_HL=m
362CONFIG_IP6_NF_RAW=m 377CONFIG_IP6_NF_RAW=m
363CONFIG_IP_DCCP=m 378CONFIG_IP_DCCP=m
364CONFIG_INET_DCCP_DIAG=m 379CONFIG_INET_DCCP_DIAG=m
365CONFIG_IP_DCCP_ACKVEC=y
366 380
367# 381#
368# DCCP CCIDs Configuration (EXPERIMENTAL) 382# DCCP CCIDs Configuration (EXPERIMENTAL)
369# 383#
370CONFIG_IP_DCCP_CCID2=m
371# CONFIG_IP_DCCP_CCID2_DEBUG is not set 384# CONFIG_IP_DCCP_CCID2_DEBUG is not set
372CONFIG_IP_DCCP_CCID3=m 385# CONFIG_IP_DCCP_CCID3 is not set
373# CONFIG_IP_DCCP_CCID3_DEBUG is not set
374CONFIG_IP_DCCP_CCID3_RTO=100
375CONFIG_IP_DCCP_TFRC_LIB=m
376CONFIG_IP_SCTP=m 386CONFIG_IP_SCTP=m
377# CONFIG_SCTP_DBG_MSG is not set 387# CONFIG_SCTP_DBG_MSG is not set
378# CONFIG_SCTP_DBG_OBJCNT is not set 388# CONFIG_SCTP_DBG_OBJCNT is not set
@@ -394,8 +404,10 @@ CONFIG_ATALK=m
394# CONFIG_LAPB is not set 404# CONFIG_LAPB is not set
395# CONFIG_ECONET is not set 405# CONFIG_ECONET is not set
396# CONFIG_WAN_ROUTER is not set 406# CONFIG_WAN_ROUTER is not set
407# CONFIG_PHONET is not set
397# CONFIG_NET_SCHED is not set 408# CONFIG_NET_SCHED is not set
398CONFIG_NET_CLS_ROUTE=y 409CONFIG_NET_CLS_ROUTE=y
410# CONFIG_DCB is not set
399 411
400# 412#
401# Network testing 413# Network testing
@@ -406,8 +418,8 @@ CONFIG_NET_CLS_ROUTE=y
406# CONFIG_IRDA is not set 418# CONFIG_IRDA is not set
407# CONFIG_BT is not set 419# CONFIG_BT is not set
408# CONFIG_AF_RXRPC is not set 420# CONFIG_AF_RXRPC is not set
409# CONFIG_PHONET is not set
410# CONFIG_WIRELESS is not set 421# CONFIG_WIRELESS is not set
422# CONFIG_WIMAX is not set
411# CONFIG_RFKILL is not set 423# CONFIG_RFKILL is not set
412# CONFIG_NET_9P is not set 424# CONFIG_NET_9P is not set
413 425
@@ -443,9 +455,13 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
443CONFIG_ATA_OVER_ETH=m 455CONFIG_ATA_OVER_ETH=m
444# CONFIG_BLK_DEV_HD is not set 456# CONFIG_BLK_DEV_HD is not set
445CONFIG_MISC_DEVICES=y 457CONFIG_MISC_DEVICES=y
446# CONFIG_EEPROM_93CX6 is not set
447# CONFIG_ENCLOSURE_SERVICES is not set 458# CONFIG_ENCLOSURE_SERVICES is not set
448# CONFIG_C2PORT is not set 459# CONFIG_C2PORT is not set
460
461#
462# EEPROM support
463#
464# CONFIG_EEPROM_93CX6 is not set
449CONFIG_HAVE_IDE=y 465CONFIG_HAVE_IDE=y
450# CONFIG_IDE is not set 466# CONFIG_IDE is not set
451 467
@@ -493,9 +509,12 @@ CONFIG_SCSI_SRP_ATTRS=m
493CONFIG_SCSI_SRP_TGT_ATTRS=y 509CONFIG_SCSI_SRP_TGT_ATTRS=y
494CONFIG_SCSI_LOWLEVEL=y 510CONFIG_SCSI_LOWLEVEL=y
495CONFIG_ISCSI_TCP=m 511CONFIG_ISCSI_TCP=m
512# CONFIG_LIBFC is not set
513# CONFIG_LIBFCOE is not set
496# CONFIG_SCSI_DEBUG is not set 514# CONFIG_SCSI_DEBUG is not set
497CONFIG_MVME147_SCSI=y 515CONFIG_MVME147_SCSI=y
498# CONFIG_SCSI_DH is not set 516# CONFIG_SCSI_DH is not set
517# CONFIG_SCSI_OSD_INITIATOR is not set
499CONFIG_MD=y 518CONFIG_MD=y
500CONFIG_BLK_DEV_MD=m 519CONFIG_BLK_DEV_MD=m
501CONFIG_MD_LINEAR=m 520CONFIG_MD_LINEAR=m
@@ -503,7 +522,7 @@ CONFIG_MD_RAID0=m
503CONFIG_MD_RAID1=m 522CONFIG_MD_RAID1=m
504# CONFIG_MD_RAID10 is not set 523# CONFIG_MD_RAID10 is not set
505CONFIG_MD_RAID456=m 524CONFIG_MD_RAID456=m
506CONFIG_MD_RAID5_RESHAPE=y 525CONFIG_MD_RAID6_PQ=m
507# CONFIG_MD_MULTIPATH is not set 526# CONFIG_MD_MULTIPATH is not set
508# CONFIG_MD_FAULTY is not set 527# CONFIG_MD_FAULTY is not set
509CONFIG_BLK_DEV_DM=m 528CONFIG_BLK_DEV_DM=m
@@ -516,6 +535,7 @@ CONFIG_DM_MULTIPATH=m
516# CONFIG_DM_DELAY is not set 535# CONFIG_DM_DELAY is not set
517CONFIG_DM_UEVENT=y 536CONFIG_DM_UEVENT=y
518CONFIG_NETDEVICES=y 537CONFIG_NETDEVICES=y
538CONFIG_COMPAT_NET_DEV_OPS=y
519CONFIG_DUMMY=m 539CONFIG_DUMMY=m
520# CONFIG_BONDING is not set 540# CONFIG_BONDING is not set
521CONFIG_MACVLAN=m 541CONFIG_MACVLAN=m
@@ -526,6 +546,8 @@ CONFIG_VETH=m
526CONFIG_NET_ETHERNET=y 546CONFIG_NET_ETHERNET=y
527# CONFIG_MII is not set 547# CONFIG_MII is not set
528CONFIG_MVME147_NET=y 548CONFIG_MVME147_NET=y
549# CONFIG_ETHOC is not set
550# CONFIG_DNET is not set
529# CONFIG_IBM_NEW_EMAC_ZMII is not set 551# CONFIG_IBM_NEW_EMAC_ZMII is not set
530# CONFIG_IBM_NEW_EMAC_RGMII is not set 552# CONFIG_IBM_NEW_EMAC_RGMII is not set
531# CONFIG_IBM_NEW_EMAC_TAH is not set 553# CONFIG_IBM_NEW_EMAC_TAH is not set
@@ -542,7 +564,10 @@ CONFIG_MVME147_NET=y
542# 564#
543# CONFIG_WLAN_PRE80211 is not set 565# CONFIG_WLAN_PRE80211 is not set
544# CONFIG_WLAN_80211 is not set 566# CONFIG_WLAN_80211 is not set
545# CONFIG_IWLWIFI_LEDS is not set 567
568#
569# Enable WiMAX (Networking options) to see the WiMAX drivers
570#
546# CONFIG_WAN is not set 571# CONFIG_WAN is not set
547CONFIG_PPP=m 572CONFIG_PPP=m
548# CONFIG_PPP_MULTILINK is not set 573# CONFIG_PPP_MULTILINK is not set
@@ -600,7 +625,6 @@ CONFIG_MOUSE_PS2=m
600CONFIG_MOUSE_PS2_ALPS=y 625CONFIG_MOUSE_PS2_ALPS=y
601CONFIG_MOUSE_PS2_LOGIPS2PP=y 626CONFIG_MOUSE_PS2_LOGIPS2PP=y
602CONFIG_MOUSE_PS2_SYNAPTICS=y 627CONFIG_MOUSE_PS2_SYNAPTICS=y
603CONFIG_MOUSE_PS2_LIFEBOOK=y
604CONFIG_MOUSE_PS2_TRACKPOINT=y 628CONFIG_MOUSE_PS2_TRACKPOINT=y
605# CONFIG_MOUSE_PS2_ELANTECH is not set 629# CONFIG_MOUSE_PS2_ELANTECH is not set
606# CONFIG_MOUSE_PS2_TOUCHKIT is not set 630# CONFIG_MOUSE_PS2_TOUCHKIT is not set
@@ -640,6 +664,7 @@ CONFIG_VT_HW_CONSOLE_BINDING=y
640# Non-8250 serial port support 664# Non-8250 serial port support
641# 665#
642CONFIG_UNIX98_PTYS=y 666CONFIG_UNIX98_PTYS=y
667# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
643CONFIG_LEGACY_PTYS=y 668CONFIG_LEGACY_PTYS=y
644CONFIG_LEGACY_PTY_COUNT=256 669CONFIG_LEGACY_PTY_COUNT=256
645# CONFIG_IPMI_HANDLER is not set 670# CONFIG_IPMI_HANDLER is not set
@@ -716,7 +741,6 @@ CONFIG_HIDRAW=y
716# 741#
717# Special HID drivers 742# Special HID drivers
718# 743#
719CONFIG_HID_COMPAT=y
720# CONFIG_USB_SUPPORT is not set 744# CONFIG_USB_SUPPORT is not set
721# CONFIG_MMC is not set 745# CONFIG_MMC is not set
722# CONFIG_MEMSTICK is not set 746# CONFIG_MEMSTICK is not set
@@ -724,9 +748,9 @@ CONFIG_HID_COMPAT=y
724# CONFIG_ACCESSIBILITY is not set 748# CONFIG_ACCESSIBILITY is not set
725# CONFIG_RTC_CLASS is not set 749# CONFIG_RTC_CLASS is not set
726# CONFIG_DMADEVICES is not set 750# CONFIG_DMADEVICES is not set
751# CONFIG_AUXDISPLAY is not set
727# CONFIG_UIO is not set 752# CONFIG_UIO is not set
728# CONFIG_STAGING is not set 753# CONFIG_STAGING is not set
729CONFIG_STAGING_EXCLUDE_BUILD=y
730 754
731# 755#
732# Character devices 756# Character devices
@@ -741,6 +765,7 @@ CONFIG_EXT2_FS=y
741# CONFIG_EXT2_FS_XATTR is not set 765# CONFIG_EXT2_FS_XATTR is not set
742# CONFIG_EXT2_FS_XIP is not set 766# CONFIG_EXT2_FS_XIP is not set
743CONFIG_EXT3_FS=y 767CONFIG_EXT3_FS=y
768# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
744# CONFIG_EXT3_FS_XATTR is not set 769# CONFIG_EXT3_FS_XATTR is not set
745# CONFIG_EXT4_FS is not set 770# CONFIG_EXT4_FS is not set
746CONFIG_JBD=y 771CONFIG_JBD=y
@@ -767,13 +792,15 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
767# CONFIG_OCFS2_FS_STATS is not set 792# CONFIG_OCFS2_FS_STATS is not set
768# CONFIG_OCFS2_DEBUG_MASKLOG is not set 793# CONFIG_OCFS2_DEBUG_MASKLOG is not set
769# CONFIG_OCFS2_DEBUG_FS is not set 794# CONFIG_OCFS2_DEBUG_FS is not set
770# CONFIG_OCFS2_COMPAT_JBD is not set 795# CONFIG_OCFS2_FS_POSIX_ACL is not set
796# CONFIG_BTRFS_FS is not set
771CONFIG_DNOTIFY=y 797CONFIG_DNOTIFY=y
772CONFIG_INOTIFY=y 798CONFIG_INOTIFY=y
773CONFIG_INOTIFY_USER=y 799CONFIG_INOTIFY_USER=y
774CONFIG_QUOTA=y 800CONFIG_QUOTA=y
775CONFIG_QUOTA_NETLINK_INTERFACE=y 801CONFIG_QUOTA_NETLINK_INTERFACE=y
776# CONFIG_PRINT_QUOTA_WARNING is not set 802# CONFIG_PRINT_QUOTA_WARNING is not set
803CONFIG_QUOTA_TREE=m
777# CONFIG_QFMT_V1 is not set 804# CONFIG_QFMT_V1 is not set
778# CONFIG_QFMT_V2 is not set 805# CONFIG_QFMT_V2 is not set
779CONFIG_QUOTACTL=y 806CONFIG_QUOTACTL=y
@@ -782,6 +809,11 @@ CONFIG_AUTOFS4_FS=m
782CONFIG_FUSE_FS=m 809CONFIG_FUSE_FS=m
783 810
784# 811#
812# Caches
813#
814# CONFIG_FSCACHE is not set
815
816#
785# CD-ROM/DVD Filesystems 817# CD-ROM/DVD Filesystems
786# 818#
787CONFIG_ISO9660_FS=y 819CONFIG_ISO9660_FS=y
@@ -812,10 +844,7 @@ CONFIG_TMPFS=y
812# CONFIG_TMPFS_POSIX_ACL is not set 844# CONFIG_TMPFS_POSIX_ACL is not set
813# CONFIG_HUGETLB_PAGE is not set 845# CONFIG_HUGETLB_PAGE is not set
814CONFIG_CONFIGFS_FS=m 846CONFIG_CONFIGFS_FS=m
815 847CONFIG_MISC_FILESYSTEMS=y
816#
817# Miscellaneous filesystems
818#
819# CONFIG_ADFS_FS is not set 848# CONFIG_ADFS_FS is not set
820CONFIG_AFFS_FS=m 849CONFIG_AFFS_FS=m
821CONFIG_HFS_FS=m 850CONFIG_HFS_FS=m
@@ -824,6 +853,9 @@ CONFIG_HFSPLUS_FS=m
824# CONFIG_BFS_FS is not set 853# CONFIG_BFS_FS is not set
825# CONFIG_EFS_FS is not set 854# CONFIG_EFS_FS is not set
826CONFIG_CRAMFS=m 855CONFIG_CRAMFS=m
856CONFIG_SQUASHFS=m
857# CONFIG_SQUASHFS_EMBEDDED is not set
858CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
827# CONFIG_VXFS_FS is not set 859# CONFIG_VXFS_FS is not set
828CONFIG_MINIX_FS=y 860CONFIG_MINIX_FS=y
829# CONFIG_OMFS_FS is not set 861# CONFIG_OMFS_FS is not set
@@ -834,6 +866,7 @@ CONFIG_SYSV_FS=m
834CONFIG_UFS_FS=m 866CONFIG_UFS_FS=m
835# CONFIG_UFS_FS_WRITE is not set 867# CONFIG_UFS_FS_WRITE is not set
836# CONFIG_UFS_DEBUG is not set 868# CONFIG_UFS_DEBUG is not set
869# CONFIG_NILFS2_FS is not set
837CONFIG_NETWORK_FILESYSTEMS=y 870CONFIG_NETWORK_FILESYSTEMS=y
838CONFIG_NFS_FS=y 871CONFIG_NFS_FS=y
839CONFIG_NFS_V3=y 872CONFIG_NFS_V3=y
@@ -850,7 +883,6 @@ CONFIG_EXPORTFS=m
850CONFIG_NFS_COMMON=y 883CONFIG_NFS_COMMON=y
851CONFIG_SUNRPC=y 884CONFIG_SUNRPC=y
852CONFIG_SUNRPC_GSS=y 885CONFIG_SUNRPC_GSS=y
853# CONFIG_SUNRPC_REGISTER_V4 is not set
854CONFIG_RPCSEC_GSS_KRB5=y 886CONFIG_RPCSEC_GSS_KRB5=y
855# CONFIG_RPCSEC_GSS_SPKM3 is not set 887# CONFIG_RPCSEC_GSS_SPKM3 is not set
856CONFIG_SMB_FS=m 888CONFIG_SMB_FS=m
@@ -926,11 +958,6 @@ CONFIG_DEBUG_BUGVERBOSE=y
926CONFIG_DEBUG_MEMORY_INIT=y 958CONFIG_DEBUG_MEMORY_INIT=y
927# CONFIG_RCU_CPU_STALL_DETECTOR is not set 959# CONFIG_RCU_CPU_STALL_DETECTOR is not set
928CONFIG_SYSCTL_SYSCALL_CHECK=y 960CONFIG_SYSCTL_SYSCALL_CHECK=y
929
930#
931# Tracers
932#
933# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
934# CONFIG_SAMPLES is not set 961# CONFIG_SAMPLES is not set
935 962
936# 963#
@@ -951,13 +978,21 @@ CONFIG_CRYPTO=y
951# 978#
952# CONFIG_CRYPTO_FIPS is not set 979# CONFIG_CRYPTO_FIPS is not set
953CONFIG_CRYPTO_ALGAPI=y 980CONFIG_CRYPTO_ALGAPI=y
954CONFIG_CRYPTO_AEAD=y 981CONFIG_CRYPTO_ALGAPI2=y
982CONFIG_CRYPTO_AEAD=m
983CONFIG_CRYPTO_AEAD2=y
955CONFIG_CRYPTO_BLKCIPHER=y 984CONFIG_CRYPTO_BLKCIPHER=y
985CONFIG_CRYPTO_BLKCIPHER2=y
956CONFIG_CRYPTO_HASH=y 986CONFIG_CRYPTO_HASH=y
957CONFIG_CRYPTO_RNG=y 987CONFIG_CRYPTO_HASH2=y
988CONFIG_CRYPTO_RNG=m
989CONFIG_CRYPTO_RNG2=y
990CONFIG_CRYPTO_PCOMP=y
958CONFIG_CRYPTO_MANAGER=y 991CONFIG_CRYPTO_MANAGER=y
992CONFIG_CRYPTO_MANAGER2=y
959CONFIG_CRYPTO_GF128MUL=m 993CONFIG_CRYPTO_GF128MUL=m
960CONFIG_CRYPTO_NULL=m 994CONFIG_CRYPTO_NULL=m
995CONFIG_CRYPTO_WORKQUEUE=y
961CONFIG_CRYPTO_CRYPTD=m 996CONFIG_CRYPTO_CRYPTD=m
962CONFIG_CRYPTO_AUTHENC=m 997CONFIG_CRYPTO_AUTHENC=m
963CONFIG_CRYPTO_TEST=m 998CONFIG_CRYPTO_TEST=m
@@ -1027,6 +1062,7 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
1027# Compression 1062# Compression
1028# 1063#
1029CONFIG_CRYPTO_DEFLATE=m 1064CONFIG_CRYPTO_DEFLATE=m
1065CONFIG_CRYPTO_ZLIB=m
1030CONFIG_CRYPTO_LZO=m 1066CONFIG_CRYPTO_LZO=m
1031 1067
1032# 1068#
@@ -1034,11 +1070,13 @@ CONFIG_CRYPTO_LZO=m
1034# 1070#
1035# CONFIG_CRYPTO_ANSI_CPRNG is not set 1071# CONFIG_CRYPTO_ANSI_CPRNG is not set
1036# CONFIG_CRYPTO_HW is not set 1072# CONFIG_CRYPTO_HW is not set
1073# CONFIG_BINARY_PRINTF is not set
1037 1074
1038# 1075#
1039# Library routines 1076# Library routines
1040# 1077#
1041CONFIG_BITREVERSE=y 1078CONFIG_BITREVERSE=y
1079CONFIG_GENERIC_FIND_LAST_BIT=y
1042CONFIG_CRC_CCITT=m 1080CONFIG_CRC_CCITT=m
1043CONFIG_CRC16=m 1081CONFIG_CRC16=m
1044CONFIG_CRC_T10DIF=y 1082CONFIG_CRC_T10DIF=y
@@ -1050,10 +1088,13 @@ CONFIG_ZLIB_INFLATE=y
1050CONFIG_ZLIB_DEFLATE=m 1088CONFIG_ZLIB_DEFLATE=m
1051CONFIG_LZO_COMPRESS=m 1089CONFIG_LZO_COMPRESS=m
1052CONFIG_LZO_DECOMPRESS=m 1090CONFIG_LZO_DECOMPRESS=m
1091CONFIG_DECOMPRESS_GZIP=y
1092CONFIG_DECOMPRESS_BZIP2=y
1093CONFIG_DECOMPRESS_LZMA=y
1053CONFIG_TEXTSEARCH=y 1094CONFIG_TEXTSEARCH=y
1054CONFIG_TEXTSEARCH_KMP=m 1095CONFIG_TEXTSEARCH_KMP=m
1055CONFIG_TEXTSEARCH_BM=m 1096CONFIG_TEXTSEARCH_BM=m
1056CONFIG_TEXTSEARCH_FSM=m 1097CONFIG_TEXTSEARCH_FSM=m
1057CONFIG_PLIST=y
1058CONFIG_HAS_IOMEM=y 1098CONFIG_HAS_IOMEM=y
1059CONFIG_HAS_DMA=y 1099CONFIG_HAS_DMA=y
1100CONFIG_NLATTR=y
diff --git a/arch/m68k/configs/mvme16x_defconfig b/arch/m68k/configs/mvme16x_defconfig
index 3403ed2eda79..890594fcacb3 100644
--- a/arch/m68k/configs/mvme16x_defconfig
+++ b/arch/m68k/configs/mvme16x_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc7 3# Linux kernel version: 2.6.30-rc3
4# Tue Dec 2 20:27:51 2008 4# Wed Apr 22 20:48:10 2009
5# 5#
6CONFIG_M68K=y 6CONFIG_M68K=y
7CONFIG_MMU=y 7CONFIG_MMU=y
@@ -29,14 +29,24 @@ CONFIG_SWAP=y
29CONFIG_SYSVIPC=y 29CONFIG_SYSVIPC=y
30CONFIG_SYSVIPC_SYSCTL=y 30CONFIG_SYSVIPC_SYSCTL=y
31CONFIG_POSIX_MQUEUE=y 31CONFIG_POSIX_MQUEUE=y
32CONFIG_POSIX_MQUEUE_SYSCTL=y
32CONFIG_BSD_PROCESS_ACCT=y 33CONFIG_BSD_PROCESS_ACCT=y
33# CONFIG_BSD_PROCESS_ACCT_V3 is not set 34# CONFIG_BSD_PROCESS_ACCT_V3 is not set
34# CONFIG_TASKSTATS is not set 35# CONFIG_TASKSTATS is not set
35# CONFIG_AUDIT is not set 36# CONFIG_AUDIT is not set
37
38#
39# RCU Subsystem
40#
41CONFIG_CLASSIC_RCU=y
42# CONFIG_TREE_RCU is not set
43# CONFIG_PREEMPT_RCU is not set
44# CONFIG_TREE_RCU_TRACE is not set
45# CONFIG_PREEMPT_RCU_TRACE is not set
36# CONFIG_IKCONFIG is not set 46# CONFIG_IKCONFIG is not set
37CONFIG_LOG_BUF_SHIFT=14 47CONFIG_LOG_BUF_SHIFT=14
38# CONFIG_CGROUPS is not set
39# CONFIG_GROUP_SCHED is not set 48# CONFIG_GROUP_SCHED is not set
49# CONFIG_CGROUPS is not set
40# CONFIG_SYSFS_DEPRECATED_V2 is not set 50# CONFIG_SYSFS_DEPRECATED_V2 is not set
41CONFIG_RELAY=y 51CONFIG_RELAY=y
42CONFIG_NAMESPACES=y 52CONFIG_NAMESPACES=y
@@ -44,23 +54,27 @@ CONFIG_NAMESPACES=y
44# CONFIG_IPC_NS is not set 54# CONFIG_IPC_NS is not set
45# CONFIG_USER_NS is not set 55# CONFIG_USER_NS is not set
46# CONFIG_PID_NS is not set 56# CONFIG_PID_NS is not set
57# CONFIG_NET_NS is not set
47CONFIG_BLK_DEV_INITRD=y 58CONFIG_BLK_DEV_INITRD=y
48CONFIG_INITRAMFS_SOURCE="" 59CONFIG_INITRAMFS_SOURCE=""
60CONFIG_RD_GZIP=y
61CONFIG_RD_BZIP2=y
62CONFIG_RD_LZMA=y
49# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 63# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
50CONFIG_SYSCTL=y 64CONFIG_SYSCTL=y
65CONFIG_ANON_INODES=y
51# CONFIG_EMBEDDED is not set 66# CONFIG_EMBEDDED is not set
52CONFIG_UID16=y 67CONFIG_UID16=y
53CONFIG_SYSCTL_SYSCALL=y 68CONFIG_SYSCTL_SYSCALL=y
54CONFIG_KALLSYMS=y 69CONFIG_KALLSYMS=y
55# CONFIG_KALLSYMS_EXTRA_PASS is not set 70# CONFIG_KALLSYMS_EXTRA_PASS is not set
71# CONFIG_STRIP_ASM_SYMS is not set
56CONFIG_HOTPLUG=y 72CONFIG_HOTPLUG=y
57CONFIG_PRINTK=y 73CONFIG_PRINTK=y
58CONFIG_BUG=y 74CONFIG_BUG=y
59CONFIG_ELF_CORE=y 75CONFIG_ELF_CORE=y
60CONFIG_COMPAT_BRK=y
61CONFIG_BASE_FULL=y 76CONFIG_BASE_FULL=y
62CONFIG_FUTEX=y 77CONFIG_FUTEX=y
63CONFIG_ANON_INODES=y
64CONFIG_EPOLL=y 78CONFIG_EPOLL=y
65CONFIG_SIGNALFD=y 79CONFIG_SIGNALFD=y
66CONFIG_TIMERFD=y 80CONFIG_TIMERFD=y
@@ -68,15 +82,16 @@ CONFIG_EVENTFD=y
68CONFIG_SHMEM=y 82CONFIG_SHMEM=y
69CONFIG_AIO=y 83CONFIG_AIO=y
70CONFIG_VM_EVENT_COUNTERS=y 84CONFIG_VM_EVENT_COUNTERS=y
85CONFIG_COMPAT_BRK=y
71CONFIG_SLAB=y 86CONFIG_SLAB=y
72# CONFIG_SLUB is not set 87# CONFIG_SLUB is not set
73# CONFIG_SLOB is not set 88# CONFIG_SLOB is not set
74# CONFIG_PROFILING is not set 89# CONFIG_PROFILING is not set
75# CONFIG_MARKERS is not set 90# CONFIG_MARKERS is not set
91# CONFIG_SLOW_WORK is not set
76# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 92# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
77CONFIG_SLABINFO=y 93CONFIG_SLABINFO=y
78CONFIG_RT_MUTEXES=y 94CONFIG_RT_MUTEXES=y
79# CONFIG_TINY_SHMEM is not set
80CONFIG_BASE_SMALL=0 95CONFIG_BASE_SMALL=0
81CONFIG_MODULES=y 96CONFIG_MODULES=y
82# CONFIG_MODULE_FORCE_LOAD is not set 97# CONFIG_MODULE_FORCE_LOAD is not set
@@ -84,11 +99,8 @@ CONFIG_MODULE_UNLOAD=y
84# CONFIG_MODULE_FORCE_UNLOAD is not set 99# CONFIG_MODULE_FORCE_UNLOAD is not set
85# CONFIG_MODVERSIONS is not set 100# CONFIG_MODVERSIONS is not set
86# CONFIG_MODULE_SRCVERSION_ALL is not set 101# CONFIG_MODULE_SRCVERSION_ALL is not set
87CONFIG_KMOD=y
88CONFIG_BLOCK=y 102CONFIG_BLOCK=y
89# CONFIG_LBD is not set 103# CONFIG_LBD is not set
90# CONFIG_BLK_DEV_IO_TRACE is not set
91# CONFIG_LSF is not set
92CONFIG_BLK_DEV_BSG=y 104CONFIG_BLK_DEV_BSG=y
93# CONFIG_BLK_DEV_INTEGRITY is not set 105# CONFIG_BLK_DEV_INTEGRITY is not set
94 106
@@ -104,7 +116,6 @@ CONFIG_DEFAULT_AS=y
104# CONFIG_DEFAULT_CFQ is not set 116# CONFIG_DEFAULT_CFQ is not set
105# CONFIG_DEFAULT_NOOP is not set 117# CONFIG_DEFAULT_NOOP is not set
106CONFIG_DEFAULT_IOSCHED="anticipatory" 118CONFIG_DEFAULT_IOSCHED="anticipatory"
107CONFIG_CLASSIC_RCU=y
108# CONFIG_FREEZER is not set 119# CONFIG_FREEZER is not set
109 120
110# 121#
@@ -143,12 +154,13 @@ CONFIG_FLAT_NODE_MEM_MAP=y
143CONFIG_NEED_MULTIPLE_NODES=y 154CONFIG_NEED_MULTIPLE_NODES=y
144CONFIG_PAGEFLAGS_EXTENDED=y 155CONFIG_PAGEFLAGS_EXTENDED=y
145CONFIG_SPLIT_PTLOCK_CPUS=4 156CONFIG_SPLIT_PTLOCK_CPUS=4
146# CONFIG_RESOURCES_64BIT is not set
147# CONFIG_PHYS_ADDR_T_64BIT is not set 157# CONFIG_PHYS_ADDR_T_64BIT is not set
148CONFIG_ZONE_DMA_FLAG=1 158CONFIG_ZONE_DMA_FLAG=1
149CONFIG_BOUNCE=y 159CONFIG_BOUNCE=y
150CONFIG_VIRT_TO_BUS=y 160CONFIG_VIRT_TO_BUS=y
151CONFIG_UNEVICTABLE_LRU=y 161CONFIG_UNEVICTABLE_LRU=y
162CONFIG_HAVE_MLOCK=y
163CONFIG_HAVE_MLOCKED_PAGE_BIT=y
152 164
153# 165#
154# General setup 166# General setup
@@ -258,6 +270,7 @@ CONFIG_NETFILTER_XTABLES=m
258CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 270CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
259CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 271CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
260CONFIG_NETFILTER_XT_TARGET_DSCP=m 272CONFIG_NETFILTER_XT_TARGET_DSCP=m
273CONFIG_NETFILTER_XT_TARGET_HL=m
261CONFIG_NETFILTER_XT_TARGET_MARK=m 274CONFIG_NETFILTER_XT_TARGET_MARK=m
262CONFIG_NETFILTER_XT_TARGET_NFLOG=m 275CONFIG_NETFILTER_XT_TARGET_NFLOG=m
263CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 276CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
@@ -266,6 +279,7 @@ CONFIG_NETFILTER_XT_TARGET_RATEEST=m
266CONFIG_NETFILTER_XT_TARGET_TRACE=m 279CONFIG_NETFILTER_XT_TARGET_TRACE=m
267CONFIG_NETFILTER_XT_TARGET_TCPMSS=m 280CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
268CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m 281CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
282CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
269CONFIG_NETFILTER_XT_MATCH_COMMENT=m 283CONFIG_NETFILTER_XT_MATCH_COMMENT=m
270CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m 284CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
271CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m 285CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
@@ -276,6 +290,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m
276CONFIG_NETFILTER_XT_MATCH_ESP=m 290CONFIG_NETFILTER_XT_MATCH_ESP=m
277CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m 291CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
278CONFIG_NETFILTER_XT_MATCH_HELPER=m 292CONFIG_NETFILTER_XT_MATCH_HELPER=m
293CONFIG_NETFILTER_XT_MATCH_HL=m
279CONFIG_NETFILTER_XT_MATCH_IPRANGE=m 294CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
280CONFIG_NETFILTER_XT_MATCH_LENGTH=m 295CONFIG_NETFILTER_XT_MATCH_LENGTH=m
281CONFIG_NETFILTER_XT_MATCH_LIMIT=m 296CONFIG_NETFILTER_XT_MATCH_LIMIT=m
@@ -354,25 +369,20 @@ CONFIG_IP6_NF_MATCH_HL=m
354CONFIG_IP6_NF_MATCH_IPV6HEADER=m 369CONFIG_IP6_NF_MATCH_IPV6HEADER=m
355CONFIG_IP6_NF_MATCH_MH=m 370CONFIG_IP6_NF_MATCH_MH=m
356CONFIG_IP6_NF_MATCH_RT=m 371CONFIG_IP6_NF_MATCH_RT=m
372CONFIG_IP6_NF_TARGET_HL=m
357CONFIG_IP6_NF_TARGET_LOG=m 373CONFIG_IP6_NF_TARGET_LOG=m
358CONFIG_IP6_NF_FILTER=m 374CONFIG_IP6_NF_FILTER=m
359CONFIG_IP6_NF_TARGET_REJECT=m 375CONFIG_IP6_NF_TARGET_REJECT=m
360CONFIG_IP6_NF_MANGLE=m 376CONFIG_IP6_NF_MANGLE=m
361CONFIG_IP6_NF_TARGET_HL=m
362CONFIG_IP6_NF_RAW=m 377CONFIG_IP6_NF_RAW=m
363CONFIG_IP_DCCP=m 378CONFIG_IP_DCCP=m
364CONFIG_INET_DCCP_DIAG=m 379CONFIG_INET_DCCP_DIAG=m
365CONFIG_IP_DCCP_ACKVEC=y
366 380
367# 381#
368# DCCP CCIDs Configuration (EXPERIMENTAL) 382# DCCP CCIDs Configuration (EXPERIMENTAL)
369# 383#
370CONFIG_IP_DCCP_CCID2=m
371# CONFIG_IP_DCCP_CCID2_DEBUG is not set 384# CONFIG_IP_DCCP_CCID2_DEBUG is not set
372CONFIG_IP_DCCP_CCID3=m 385# CONFIG_IP_DCCP_CCID3 is not set
373# CONFIG_IP_DCCP_CCID3_DEBUG is not set
374CONFIG_IP_DCCP_CCID3_RTO=100
375CONFIG_IP_DCCP_TFRC_LIB=m
376CONFIG_IP_SCTP=m 386CONFIG_IP_SCTP=m
377# CONFIG_SCTP_DBG_MSG is not set 387# CONFIG_SCTP_DBG_MSG is not set
378# CONFIG_SCTP_DBG_OBJCNT is not set 388# CONFIG_SCTP_DBG_OBJCNT is not set
@@ -394,8 +404,10 @@ CONFIG_ATALK=m
394# CONFIG_LAPB is not set 404# CONFIG_LAPB is not set
395# CONFIG_ECONET is not set 405# CONFIG_ECONET is not set
396# CONFIG_WAN_ROUTER is not set 406# CONFIG_WAN_ROUTER is not set
407# CONFIG_PHONET is not set
397# CONFIG_NET_SCHED is not set 408# CONFIG_NET_SCHED is not set
398CONFIG_NET_CLS_ROUTE=y 409CONFIG_NET_CLS_ROUTE=y
410# CONFIG_DCB is not set
399 411
400# 412#
401# Network testing 413# Network testing
@@ -406,8 +418,8 @@ CONFIG_NET_CLS_ROUTE=y
406# CONFIG_IRDA is not set 418# CONFIG_IRDA is not set
407# CONFIG_BT is not set 419# CONFIG_BT is not set
408# CONFIG_AF_RXRPC is not set 420# CONFIG_AF_RXRPC is not set
409# CONFIG_PHONET is not set
410# CONFIG_WIRELESS is not set 421# CONFIG_WIRELESS is not set
422# CONFIG_WIMAX is not set
411# CONFIG_RFKILL is not set 423# CONFIG_RFKILL is not set
412# CONFIG_NET_9P is not set 424# CONFIG_NET_9P is not set
413 425
@@ -443,9 +455,13 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
443CONFIG_ATA_OVER_ETH=m 455CONFIG_ATA_OVER_ETH=m
444# CONFIG_BLK_DEV_HD is not set 456# CONFIG_BLK_DEV_HD is not set
445CONFIG_MISC_DEVICES=y 457CONFIG_MISC_DEVICES=y
446# CONFIG_EEPROM_93CX6 is not set
447# CONFIG_ENCLOSURE_SERVICES is not set 458# CONFIG_ENCLOSURE_SERVICES is not set
448# CONFIG_C2PORT is not set 459# CONFIG_C2PORT is not set
460
461#
462# EEPROM support
463#
464# CONFIG_EEPROM_93CX6 is not set
449CONFIG_HAVE_IDE=y 465CONFIG_HAVE_IDE=y
450# CONFIG_IDE is not set 466# CONFIG_IDE is not set
451 467
@@ -493,10 +509,13 @@ CONFIG_SCSI_SRP_ATTRS=m
493CONFIG_SCSI_SRP_TGT_ATTRS=y 509CONFIG_SCSI_SRP_TGT_ATTRS=y
494CONFIG_SCSI_LOWLEVEL=y 510CONFIG_SCSI_LOWLEVEL=y
495CONFIG_ISCSI_TCP=m 511CONFIG_ISCSI_TCP=m
512# CONFIG_LIBFC is not set
513# CONFIG_LIBFCOE is not set
496CONFIG_53C700_BE_BUS=y 514CONFIG_53C700_BE_BUS=y
497# CONFIG_SCSI_DEBUG is not set 515# CONFIG_SCSI_DEBUG is not set
498CONFIG_MVME16x_SCSI=y 516CONFIG_MVME16x_SCSI=y
499# CONFIG_SCSI_DH is not set 517# CONFIG_SCSI_DH is not set
518# CONFIG_SCSI_OSD_INITIATOR is not set
500CONFIG_MD=y 519CONFIG_MD=y
501CONFIG_BLK_DEV_MD=m 520CONFIG_BLK_DEV_MD=m
502CONFIG_MD_LINEAR=m 521CONFIG_MD_LINEAR=m
@@ -504,7 +523,7 @@ CONFIG_MD_RAID0=m
504CONFIG_MD_RAID1=m 523CONFIG_MD_RAID1=m
505# CONFIG_MD_RAID10 is not set 524# CONFIG_MD_RAID10 is not set
506CONFIG_MD_RAID456=m 525CONFIG_MD_RAID456=m
507CONFIG_MD_RAID5_RESHAPE=y 526CONFIG_MD_RAID6_PQ=m
508# CONFIG_MD_MULTIPATH is not set 527# CONFIG_MD_MULTIPATH is not set
509# CONFIG_MD_FAULTY is not set 528# CONFIG_MD_FAULTY is not set
510CONFIG_BLK_DEV_DM=m 529CONFIG_BLK_DEV_DM=m
@@ -517,6 +536,7 @@ CONFIG_DM_MULTIPATH=m
517# CONFIG_DM_DELAY is not set 536# CONFIG_DM_DELAY is not set
518CONFIG_DM_UEVENT=y 537CONFIG_DM_UEVENT=y
519CONFIG_NETDEVICES=y 538CONFIG_NETDEVICES=y
539CONFIG_COMPAT_NET_DEV_OPS=y
520CONFIG_DUMMY=m 540CONFIG_DUMMY=m
521# CONFIG_BONDING is not set 541# CONFIG_BONDING is not set
522CONFIG_MACVLAN=m 542CONFIG_MACVLAN=m
@@ -527,6 +547,8 @@ CONFIG_VETH=m
527CONFIG_NET_ETHERNET=y 547CONFIG_NET_ETHERNET=y
528# CONFIG_MII is not set 548# CONFIG_MII is not set
529CONFIG_MVME16x_NET=y 549CONFIG_MVME16x_NET=y
550# CONFIG_ETHOC is not set
551# CONFIG_DNET is not set
530# CONFIG_IBM_NEW_EMAC_ZMII is not set 552# CONFIG_IBM_NEW_EMAC_ZMII is not set
531# CONFIG_IBM_NEW_EMAC_RGMII is not set 553# CONFIG_IBM_NEW_EMAC_RGMII is not set
532# CONFIG_IBM_NEW_EMAC_TAH is not set 554# CONFIG_IBM_NEW_EMAC_TAH is not set
@@ -543,7 +565,10 @@ CONFIG_MVME16x_NET=y
543# 565#
544# CONFIG_WLAN_PRE80211 is not set 566# CONFIG_WLAN_PRE80211 is not set
545# CONFIG_WLAN_80211 is not set 567# CONFIG_WLAN_80211 is not set
546# CONFIG_IWLWIFI_LEDS is not set 568
569#
570# Enable WiMAX (Networking options) to see the WiMAX drivers
571#
547# CONFIG_WAN is not set 572# CONFIG_WAN is not set
548CONFIG_PPP=m 573CONFIG_PPP=m
549# CONFIG_PPP_MULTILINK is not set 574# CONFIG_PPP_MULTILINK is not set
@@ -601,7 +626,6 @@ CONFIG_MOUSE_PS2=m
601CONFIG_MOUSE_PS2_ALPS=y 626CONFIG_MOUSE_PS2_ALPS=y
602CONFIG_MOUSE_PS2_LOGIPS2PP=y 627CONFIG_MOUSE_PS2_LOGIPS2PP=y
603CONFIG_MOUSE_PS2_SYNAPTICS=y 628CONFIG_MOUSE_PS2_SYNAPTICS=y
604CONFIG_MOUSE_PS2_LIFEBOOK=y
605CONFIG_MOUSE_PS2_TRACKPOINT=y 629CONFIG_MOUSE_PS2_TRACKPOINT=y
606# CONFIG_MOUSE_PS2_ELANTECH is not set 630# CONFIG_MOUSE_PS2_ELANTECH is not set
607# CONFIG_MOUSE_PS2_TOUCHKIT is not set 631# CONFIG_MOUSE_PS2_TOUCHKIT is not set
@@ -641,6 +665,7 @@ CONFIG_VT_HW_CONSOLE_BINDING=y
641# Non-8250 serial port support 665# Non-8250 serial port support
642# 666#
643CONFIG_UNIX98_PTYS=y 667CONFIG_UNIX98_PTYS=y
668# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
644CONFIG_LEGACY_PTYS=y 669CONFIG_LEGACY_PTYS=y
645CONFIG_LEGACY_PTY_COUNT=256 670CONFIG_LEGACY_PTY_COUNT=256
646# CONFIG_IPMI_HANDLER is not set 671# CONFIG_IPMI_HANDLER is not set
@@ -717,7 +742,6 @@ CONFIG_HIDRAW=y
717# 742#
718# Special HID drivers 743# Special HID drivers
719# 744#
720CONFIG_HID_COMPAT=y
721# CONFIG_USB_SUPPORT is not set 745# CONFIG_USB_SUPPORT is not set
722# CONFIG_MMC is not set 746# CONFIG_MMC is not set
723# CONFIG_MEMSTICK is not set 747# CONFIG_MEMSTICK is not set
@@ -725,9 +749,9 @@ CONFIG_HID_COMPAT=y
725# CONFIG_ACCESSIBILITY is not set 749# CONFIG_ACCESSIBILITY is not set
726# CONFIG_RTC_CLASS is not set 750# CONFIG_RTC_CLASS is not set
727# CONFIG_DMADEVICES is not set 751# CONFIG_DMADEVICES is not set
752# CONFIG_AUXDISPLAY is not set
728# CONFIG_UIO is not set 753# CONFIG_UIO is not set
729# CONFIG_STAGING is not set 754# CONFIG_STAGING is not set
730CONFIG_STAGING_EXCLUDE_BUILD=y
731 755
732# 756#
733# Character devices 757# Character devices
@@ -743,6 +767,7 @@ CONFIG_EXT2_FS=y
743# CONFIG_EXT2_FS_XATTR is not set 767# CONFIG_EXT2_FS_XATTR is not set
744# CONFIG_EXT2_FS_XIP is not set 768# CONFIG_EXT2_FS_XIP is not set
745CONFIG_EXT3_FS=y 769CONFIG_EXT3_FS=y
770# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
746# CONFIG_EXT3_FS_XATTR is not set 771# CONFIG_EXT3_FS_XATTR is not set
747# CONFIG_EXT4_FS is not set 772# CONFIG_EXT4_FS is not set
748CONFIG_JBD=y 773CONFIG_JBD=y
@@ -769,13 +794,15 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
769# CONFIG_OCFS2_FS_STATS is not set 794# CONFIG_OCFS2_FS_STATS is not set
770# CONFIG_OCFS2_DEBUG_MASKLOG is not set 795# CONFIG_OCFS2_DEBUG_MASKLOG is not set
771# CONFIG_OCFS2_DEBUG_FS is not set 796# CONFIG_OCFS2_DEBUG_FS is not set
772# CONFIG_OCFS2_COMPAT_JBD is not set 797# CONFIG_OCFS2_FS_POSIX_ACL is not set
798# CONFIG_BTRFS_FS is not set
773CONFIG_DNOTIFY=y 799CONFIG_DNOTIFY=y
774CONFIG_INOTIFY=y 800CONFIG_INOTIFY=y
775CONFIG_INOTIFY_USER=y 801CONFIG_INOTIFY_USER=y
776CONFIG_QUOTA=y 802CONFIG_QUOTA=y
777CONFIG_QUOTA_NETLINK_INTERFACE=y 803CONFIG_QUOTA_NETLINK_INTERFACE=y
778# CONFIG_PRINT_QUOTA_WARNING is not set 804# CONFIG_PRINT_QUOTA_WARNING is not set
805CONFIG_QUOTA_TREE=m
779# CONFIG_QFMT_V1 is not set 806# CONFIG_QFMT_V1 is not set
780# CONFIG_QFMT_V2 is not set 807# CONFIG_QFMT_V2 is not set
781CONFIG_QUOTACTL=y 808CONFIG_QUOTACTL=y
@@ -784,6 +811,11 @@ CONFIG_AUTOFS4_FS=m
784CONFIG_FUSE_FS=m 811CONFIG_FUSE_FS=m
785 812
786# 813#
814# Caches
815#
816# CONFIG_FSCACHE is not set
817
818#
787# CD-ROM/DVD Filesystems 819# CD-ROM/DVD Filesystems
788# 820#
789CONFIG_ISO9660_FS=y 821CONFIG_ISO9660_FS=y
@@ -814,10 +846,7 @@ CONFIG_TMPFS=y
814# CONFIG_TMPFS_POSIX_ACL is not set 846# CONFIG_TMPFS_POSIX_ACL is not set
815# CONFIG_HUGETLB_PAGE is not set 847# CONFIG_HUGETLB_PAGE is not set
816CONFIG_CONFIGFS_FS=m 848CONFIG_CONFIGFS_FS=m
817 849CONFIG_MISC_FILESYSTEMS=y
818#
819# Miscellaneous filesystems
820#
821# CONFIG_ADFS_FS is not set 850# CONFIG_ADFS_FS is not set
822CONFIG_AFFS_FS=m 851CONFIG_AFFS_FS=m
823CONFIG_HFS_FS=m 852CONFIG_HFS_FS=m
@@ -826,6 +855,9 @@ CONFIG_HFSPLUS_FS=m
826# CONFIG_BFS_FS is not set 855# CONFIG_BFS_FS is not set
827# CONFIG_EFS_FS is not set 856# CONFIG_EFS_FS is not set
828CONFIG_CRAMFS=m 857CONFIG_CRAMFS=m
858CONFIG_SQUASHFS=m
859# CONFIG_SQUASHFS_EMBEDDED is not set
860CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
829# CONFIG_VXFS_FS is not set 861# CONFIG_VXFS_FS is not set
830CONFIG_MINIX_FS=y 862CONFIG_MINIX_FS=y
831# CONFIG_OMFS_FS is not set 863# CONFIG_OMFS_FS is not set
@@ -836,6 +868,7 @@ CONFIG_SYSV_FS=m
836CONFIG_UFS_FS=m 868CONFIG_UFS_FS=m
837# CONFIG_UFS_FS_WRITE is not set 869# CONFIG_UFS_FS_WRITE is not set
838# CONFIG_UFS_DEBUG is not set 870# CONFIG_UFS_DEBUG is not set
871# CONFIG_NILFS2_FS is not set
839CONFIG_NETWORK_FILESYSTEMS=y 872CONFIG_NETWORK_FILESYSTEMS=y
840CONFIG_NFS_FS=y 873CONFIG_NFS_FS=y
841CONFIG_NFS_V3=y 874CONFIG_NFS_V3=y
@@ -852,7 +885,6 @@ CONFIG_EXPORTFS=m
852CONFIG_NFS_COMMON=y 885CONFIG_NFS_COMMON=y
853CONFIG_SUNRPC=y 886CONFIG_SUNRPC=y
854CONFIG_SUNRPC_GSS=y 887CONFIG_SUNRPC_GSS=y
855# CONFIG_SUNRPC_REGISTER_V4 is not set
856CONFIG_RPCSEC_GSS_KRB5=y 888CONFIG_RPCSEC_GSS_KRB5=y
857# CONFIG_RPCSEC_GSS_SPKM3 is not set 889# CONFIG_RPCSEC_GSS_SPKM3 is not set
858CONFIG_SMB_FS=m 890CONFIG_SMB_FS=m
@@ -928,11 +960,6 @@ CONFIG_DEBUG_BUGVERBOSE=y
928CONFIG_DEBUG_MEMORY_INIT=y 960CONFIG_DEBUG_MEMORY_INIT=y
929# CONFIG_RCU_CPU_STALL_DETECTOR is not set 961# CONFIG_RCU_CPU_STALL_DETECTOR is not set
930CONFIG_SYSCTL_SYSCALL_CHECK=y 962CONFIG_SYSCTL_SYSCALL_CHECK=y
931
932#
933# Tracers
934#
935# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
936# CONFIG_SAMPLES is not set 963# CONFIG_SAMPLES is not set
937 964
938# 965#
@@ -953,13 +980,21 @@ CONFIG_CRYPTO=y
953# 980#
954# CONFIG_CRYPTO_FIPS is not set 981# CONFIG_CRYPTO_FIPS is not set
955CONFIG_CRYPTO_ALGAPI=y 982CONFIG_CRYPTO_ALGAPI=y
956CONFIG_CRYPTO_AEAD=y 983CONFIG_CRYPTO_ALGAPI2=y
984CONFIG_CRYPTO_AEAD=m
985CONFIG_CRYPTO_AEAD2=y
957CONFIG_CRYPTO_BLKCIPHER=y 986CONFIG_CRYPTO_BLKCIPHER=y
987CONFIG_CRYPTO_BLKCIPHER2=y
958CONFIG_CRYPTO_HASH=y 988CONFIG_CRYPTO_HASH=y
959CONFIG_CRYPTO_RNG=y 989CONFIG_CRYPTO_HASH2=y
990CONFIG_CRYPTO_RNG=m
991CONFIG_CRYPTO_RNG2=y
992CONFIG_CRYPTO_PCOMP=y
960CONFIG_CRYPTO_MANAGER=y 993CONFIG_CRYPTO_MANAGER=y
994CONFIG_CRYPTO_MANAGER2=y
961CONFIG_CRYPTO_GF128MUL=m 995CONFIG_CRYPTO_GF128MUL=m
962CONFIG_CRYPTO_NULL=m 996CONFIG_CRYPTO_NULL=m
997CONFIG_CRYPTO_WORKQUEUE=y
963CONFIG_CRYPTO_CRYPTD=m 998CONFIG_CRYPTO_CRYPTD=m
964CONFIG_CRYPTO_AUTHENC=m 999CONFIG_CRYPTO_AUTHENC=m
965CONFIG_CRYPTO_TEST=m 1000CONFIG_CRYPTO_TEST=m
@@ -1029,6 +1064,7 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
1029# Compression 1064# Compression
1030# 1065#
1031CONFIG_CRYPTO_DEFLATE=m 1066CONFIG_CRYPTO_DEFLATE=m
1067CONFIG_CRYPTO_ZLIB=m
1032CONFIG_CRYPTO_LZO=m 1068CONFIG_CRYPTO_LZO=m
1033 1069
1034# 1070#
@@ -1036,11 +1072,13 @@ CONFIG_CRYPTO_LZO=m
1036# 1072#
1037# CONFIG_CRYPTO_ANSI_CPRNG is not set 1073# CONFIG_CRYPTO_ANSI_CPRNG is not set
1038# CONFIG_CRYPTO_HW is not set 1074# CONFIG_CRYPTO_HW is not set
1075# CONFIG_BINARY_PRINTF is not set
1039 1076
1040# 1077#
1041# Library routines 1078# Library routines
1042# 1079#
1043CONFIG_BITREVERSE=y 1080CONFIG_BITREVERSE=y
1081CONFIG_GENERIC_FIND_LAST_BIT=y
1044CONFIG_CRC_CCITT=m 1082CONFIG_CRC_CCITT=m
1045CONFIG_CRC16=m 1083CONFIG_CRC16=m
1046CONFIG_CRC_T10DIF=y 1084CONFIG_CRC_T10DIF=y
@@ -1052,10 +1090,13 @@ CONFIG_ZLIB_INFLATE=y
1052CONFIG_ZLIB_DEFLATE=m 1090CONFIG_ZLIB_DEFLATE=m
1053CONFIG_LZO_COMPRESS=m 1091CONFIG_LZO_COMPRESS=m
1054CONFIG_LZO_DECOMPRESS=m 1092CONFIG_LZO_DECOMPRESS=m
1093CONFIG_DECOMPRESS_GZIP=y
1094CONFIG_DECOMPRESS_BZIP2=y
1095CONFIG_DECOMPRESS_LZMA=y
1055CONFIG_TEXTSEARCH=y 1096CONFIG_TEXTSEARCH=y
1056CONFIG_TEXTSEARCH_KMP=m 1097CONFIG_TEXTSEARCH_KMP=m
1057CONFIG_TEXTSEARCH_BM=m 1098CONFIG_TEXTSEARCH_BM=m
1058CONFIG_TEXTSEARCH_FSM=m 1099CONFIG_TEXTSEARCH_FSM=m
1059CONFIG_PLIST=y
1060CONFIG_HAS_IOMEM=y 1100CONFIG_HAS_IOMEM=y
1061CONFIG_HAS_DMA=y 1101CONFIG_HAS_DMA=y
1102CONFIG_NLATTR=y
diff --git a/arch/m68k/configs/q40_defconfig b/arch/m68k/configs/q40_defconfig
index 3459c594194b..7cf58c27ff84 100644
--- a/arch/m68k/configs/q40_defconfig
+++ b/arch/m68k/configs/q40_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc7 3# Linux kernel version: 2.6.30-rc3
4# Tue Dec 2 20:27:52 2008 4# Wed Apr 22 20:48:13 2009
5# 5#
6CONFIG_M68K=y 6CONFIG_M68K=y
7CONFIG_MMU=y 7CONFIG_MMU=y
@@ -29,14 +29,24 @@ CONFIG_SWAP=y
29CONFIG_SYSVIPC=y 29CONFIG_SYSVIPC=y
30CONFIG_SYSVIPC_SYSCTL=y 30CONFIG_SYSVIPC_SYSCTL=y
31CONFIG_POSIX_MQUEUE=y 31CONFIG_POSIX_MQUEUE=y
32CONFIG_POSIX_MQUEUE_SYSCTL=y
32CONFIG_BSD_PROCESS_ACCT=y 33CONFIG_BSD_PROCESS_ACCT=y
33# CONFIG_BSD_PROCESS_ACCT_V3 is not set 34# CONFIG_BSD_PROCESS_ACCT_V3 is not set
34# CONFIG_TASKSTATS is not set 35# CONFIG_TASKSTATS is not set
35# CONFIG_AUDIT is not set 36# CONFIG_AUDIT is not set
37
38#
39# RCU Subsystem
40#
41CONFIG_CLASSIC_RCU=y
42# CONFIG_TREE_RCU is not set
43# CONFIG_PREEMPT_RCU is not set
44# CONFIG_TREE_RCU_TRACE is not set
45# CONFIG_PREEMPT_RCU_TRACE is not set
36# CONFIG_IKCONFIG is not set 46# CONFIG_IKCONFIG is not set
37CONFIG_LOG_BUF_SHIFT=14 47CONFIG_LOG_BUF_SHIFT=14
38# CONFIG_CGROUPS is not set
39# CONFIG_GROUP_SCHED is not set 48# CONFIG_GROUP_SCHED is not set
49# CONFIG_CGROUPS is not set
40# CONFIG_SYSFS_DEPRECATED_V2 is not set 50# CONFIG_SYSFS_DEPRECATED_V2 is not set
41CONFIG_RELAY=y 51CONFIG_RELAY=y
42CONFIG_NAMESPACES=y 52CONFIG_NAMESPACES=y
@@ -44,23 +54,27 @@ CONFIG_NAMESPACES=y
44# CONFIG_IPC_NS is not set 54# CONFIG_IPC_NS is not set
45# CONFIG_USER_NS is not set 55# CONFIG_USER_NS is not set
46# CONFIG_PID_NS is not set 56# CONFIG_PID_NS is not set
57# CONFIG_NET_NS is not set
47CONFIG_BLK_DEV_INITRD=y 58CONFIG_BLK_DEV_INITRD=y
48CONFIG_INITRAMFS_SOURCE="" 59CONFIG_INITRAMFS_SOURCE=""
60CONFIG_RD_GZIP=y
61CONFIG_RD_BZIP2=y
62CONFIG_RD_LZMA=y
49# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 63# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
50CONFIG_SYSCTL=y 64CONFIG_SYSCTL=y
65CONFIG_ANON_INODES=y
51# CONFIG_EMBEDDED is not set 66# CONFIG_EMBEDDED is not set
52CONFIG_UID16=y 67CONFIG_UID16=y
53CONFIG_SYSCTL_SYSCALL=y 68CONFIG_SYSCTL_SYSCALL=y
54CONFIG_KALLSYMS=y 69CONFIG_KALLSYMS=y
55# CONFIG_KALLSYMS_EXTRA_PASS is not set 70# CONFIG_KALLSYMS_EXTRA_PASS is not set
71# CONFIG_STRIP_ASM_SYMS is not set
56CONFIG_HOTPLUG=y 72CONFIG_HOTPLUG=y
57CONFIG_PRINTK=y 73CONFIG_PRINTK=y
58CONFIG_BUG=y 74CONFIG_BUG=y
59CONFIG_ELF_CORE=y 75CONFIG_ELF_CORE=y
60CONFIG_COMPAT_BRK=y
61CONFIG_BASE_FULL=y 76CONFIG_BASE_FULL=y
62CONFIG_FUTEX=y 77CONFIG_FUTEX=y
63CONFIG_ANON_INODES=y
64CONFIG_EPOLL=y 78CONFIG_EPOLL=y
65CONFIG_SIGNALFD=y 79CONFIG_SIGNALFD=y
66CONFIG_TIMERFD=y 80CONFIG_TIMERFD=y
@@ -68,15 +82,16 @@ CONFIG_EVENTFD=y
68CONFIG_SHMEM=y 82CONFIG_SHMEM=y
69CONFIG_AIO=y 83CONFIG_AIO=y
70CONFIG_VM_EVENT_COUNTERS=y 84CONFIG_VM_EVENT_COUNTERS=y
85CONFIG_COMPAT_BRK=y
71CONFIG_SLAB=y 86CONFIG_SLAB=y
72# CONFIG_SLUB is not set 87# CONFIG_SLUB is not set
73# CONFIG_SLOB is not set 88# CONFIG_SLOB is not set
74# CONFIG_PROFILING is not set 89# CONFIG_PROFILING is not set
75# CONFIG_MARKERS is not set 90# CONFIG_MARKERS is not set
91# CONFIG_SLOW_WORK is not set
76# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 92# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
77CONFIG_SLABINFO=y 93CONFIG_SLABINFO=y
78CONFIG_RT_MUTEXES=y 94CONFIG_RT_MUTEXES=y
79# CONFIG_TINY_SHMEM is not set
80CONFIG_BASE_SMALL=0 95CONFIG_BASE_SMALL=0
81CONFIG_MODULES=y 96CONFIG_MODULES=y
82# CONFIG_MODULE_FORCE_LOAD is not set 97# CONFIG_MODULE_FORCE_LOAD is not set
@@ -84,11 +99,8 @@ CONFIG_MODULE_UNLOAD=y
84# CONFIG_MODULE_FORCE_UNLOAD is not set 99# CONFIG_MODULE_FORCE_UNLOAD is not set
85# CONFIG_MODVERSIONS is not set 100# CONFIG_MODVERSIONS is not set
86# CONFIG_MODULE_SRCVERSION_ALL is not set 101# CONFIG_MODULE_SRCVERSION_ALL is not set
87CONFIG_KMOD=y
88CONFIG_BLOCK=y 102CONFIG_BLOCK=y
89# CONFIG_LBD is not set 103# CONFIG_LBD is not set
90# CONFIG_BLK_DEV_IO_TRACE is not set
91# CONFIG_LSF is not set
92CONFIG_BLK_DEV_BSG=y 104CONFIG_BLK_DEV_BSG=y
93# CONFIG_BLK_DEV_INTEGRITY is not set 105# CONFIG_BLK_DEV_INTEGRITY is not set
94 106
@@ -104,7 +116,6 @@ CONFIG_DEFAULT_AS=y
104# CONFIG_DEFAULT_CFQ is not set 116# CONFIG_DEFAULT_CFQ is not set
105# CONFIG_DEFAULT_NOOP is not set 117# CONFIG_DEFAULT_NOOP is not set
106CONFIG_DEFAULT_IOSCHED="anticipatory" 118CONFIG_DEFAULT_IOSCHED="anticipatory"
107CONFIG_CLASSIC_RCU=y
108# CONFIG_FREEZER is not set 119# CONFIG_FREEZER is not set
109 120
110# 121#
@@ -140,12 +151,13 @@ CONFIG_FLAT_NODE_MEM_MAP=y
140CONFIG_NEED_MULTIPLE_NODES=y 151CONFIG_NEED_MULTIPLE_NODES=y
141CONFIG_PAGEFLAGS_EXTENDED=y 152CONFIG_PAGEFLAGS_EXTENDED=y
142CONFIG_SPLIT_PTLOCK_CPUS=4 153CONFIG_SPLIT_PTLOCK_CPUS=4
143# CONFIG_RESOURCES_64BIT is not set
144# CONFIG_PHYS_ADDR_T_64BIT is not set 154# CONFIG_PHYS_ADDR_T_64BIT is not set
145CONFIG_ZONE_DMA_FLAG=1 155CONFIG_ZONE_DMA_FLAG=1
146CONFIG_BOUNCE=y 156CONFIG_BOUNCE=y
147CONFIG_VIRT_TO_BUS=y 157CONFIG_VIRT_TO_BUS=y
148CONFIG_UNEVICTABLE_LRU=y 158CONFIG_UNEVICTABLE_LRU=y
159CONFIG_HAVE_MLOCK=y
160CONFIG_HAVE_MLOCKED_PAGE_BIT=y
149 161
150# 162#
151# General setup 163# General setup
@@ -255,6 +267,7 @@ CONFIG_NETFILTER_XTABLES=m
255CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 267CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
256CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 268CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
257CONFIG_NETFILTER_XT_TARGET_DSCP=m 269CONFIG_NETFILTER_XT_TARGET_DSCP=m
270CONFIG_NETFILTER_XT_TARGET_HL=m
258CONFIG_NETFILTER_XT_TARGET_MARK=m 271CONFIG_NETFILTER_XT_TARGET_MARK=m
259CONFIG_NETFILTER_XT_TARGET_NFLOG=m 272CONFIG_NETFILTER_XT_TARGET_NFLOG=m
260CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 273CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
@@ -263,6 +276,7 @@ CONFIG_NETFILTER_XT_TARGET_RATEEST=m
263CONFIG_NETFILTER_XT_TARGET_TRACE=m 276CONFIG_NETFILTER_XT_TARGET_TRACE=m
264CONFIG_NETFILTER_XT_TARGET_TCPMSS=m 277CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
265CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m 278CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
279CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
266CONFIG_NETFILTER_XT_MATCH_COMMENT=m 280CONFIG_NETFILTER_XT_MATCH_COMMENT=m
267CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m 281CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
268CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m 282CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
@@ -273,6 +287,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m
273CONFIG_NETFILTER_XT_MATCH_ESP=m 287CONFIG_NETFILTER_XT_MATCH_ESP=m
274CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m 288CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
275CONFIG_NETFILTER_XT_MATCH_HELPER=m 289CONFIG_NETFILTER_XT_MATCH_HELPER=m
290CONFIG_NETFILTER_XT_MATCH_HL=m
276CONFIG_NETFILTER_XT_MATCH_IPRANGE=m 291CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
277CONFIG_NETFILTER_XT_MATCH_LENGTH=m 292CONFIG_NETFILTER_XT_MATCH_LENGTH=m
278CONFIG_NETFILTER_XT_MATCH_LIMIT=m 293CONFIG_NETFILTER_XT_MATCH_LIMIT=m
@@ -351,25 +366,20 @@ CONFIG_IP6_NF_MATCH_HL=m
351CONFIG_IP6_NF_MATCH_IPV6HEADER=m 366CONFIG_IP6_NF_MATCH_IPV6HEADER=m
352CONFIG_IP6_NF_MATCH_MH=m 367CONFIG_IP6_NF_MATCH_MH=m
353CONFIG_IP6_NF_MATCH_RT=m 368CONFIG_IP6_NF_MATCH_RT=m
369CONFIG_IP6_NF_TARGET_HL=m
354CONFIG_IP6_NF_TARGET_LOG=m 370CONFIG_IP6_NF_TARGET_LOG=m
355CONFIG_IP6_NF_FILTER=m 371CONFIG_IP6_NF_FILTER=m
356CONFIG_IP6_NF_TARGET_REJECT=m 372CONFIG_IP6_NF_TARGET_REJECT=m
357CONFIG_IP6_NF_MANGLE=m 373CONFIG_IP6_NF_MANGLE=m
358CONFIG_IP6_NF_TARGET_HL=m
359CONFIG_IP6_NF_RAW=m 374CONFIG_IP6_NF_RAW=m
360CONFIG_IP_DCCP=m 375CONFIG_IP_DCCP=m
361CONFIG_INET_DCCP_DIAG=m 376CONFIG_INET_DCCP_DIAG=m
362CONFIG_IP_DCCP_ACKVEC=y
363 377
364# 378#
365# DCCP CCIDs Configuration (EXPERIMENTAL) 379# DCCP CCIDs Configuration (EXPERIMENTAL)
366# 380#
367CONFIG_IP_DCCP_CCID2=m
368# CONFIG_IP_DCCP_CCID2_DEBUG is not set 381# CONFIG_IP_DCCP_CCID2_DEBUG is not set
369CONFIG_IP_DCCP_CCID3=m 382# CONFIG_IP_DCCP_CCID3 is not set
370# CONFIG_IP_DCCP_CCID3_DEBUG is not set
371CONFIG_IP_DCCP_CCID3_RTO=100
372CONFIG_IP_DCCP_TFRC_LIB=m
373CONFIG_IP_SCTP=m 383CONFIG_IP_SCTP=m
374# CONFIG_SCTP_DBG_MSG is not set 384# CONFIG_SCTP_DBG_MSG is not set
375# CONFIG_SCTP_DBG_OBJCNT is not set 385# CONFIG_SCTP_DBG_OBJCNT is not set
@@ -391,8 +401,10 @@ CONFIG_ATALK=m
391# CONFIG_LAPB is not set 401# CONFIG_LAPB is not set
392# CONFIG_ECONET is not set 402# CONFIG_ECONET is not set
393# CONFIG_WAN_ROUTER is not set 403# CONFIG_WAN_ROUTER is not set
404# CONFIG_PHONET is not set
394# CONFIG_NET_SCHED is not set 405# CONFIG_NET_SCHED is not set
395CONFIG_NET_CLS_ROUTE=y 406CONFIG_NET_CLS_ROUTE=y
407# CONFIG_DCB is not set
396 408
397# 409#
398# Network testing 410# Network testing
@@ -403,8 +415,8 @@ CONFIG_NET_CLS_ROUTE=y
403# CONFIG_IRDA is not set 415# CONFIG_IRDA is not set
404# CONFIG_BT is not set 416# CONFIG_BT is not set
405# CONFIG_AF_RXRPC is not set 417# CONFIG_AF_RXRPC is not set
406# CONFIG_PHONET is not set
407# CONFIG_WIRELESS is not set 418# CONFIG_WIRELESS is not set
419# CONFIG_WIMAX is not set
408# CONFIG_RFKILL is not set 420# CONFIG_RFKILL is not set
409# CONFIG_NET_9P is not set 421# CONFIG_NET_9P is not set
410 422
@@ -441,15 +453,20 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
441CONFIG_ATA_OVER_ETH=m 453CONFIG_ATA_OVER_ETH=m
442# CONFIG_BLK_DEV_HD is not set 454# CONFIG_BLK_DEV_HD is not set
443CONFIG_MISC_DEVICES=y 455CONFIG_MISC_DEVICES=y
444# CONFIG_EEPROM_93CX6 is not set
445# CONFIG_ENCLOSURE_SERVICES is not set 456# CONFIG_ENCLOSURE_SERVICES is not set
446# CONFIG_C2PORT is not set 457# CONFIG_C2PORT is not set
458
459#
460# EEPROM support
461#
462# CONFIG_EEPROM_93CX6 is not set
447CONFIG_HAVE_IDE=y 463CONFIG_HAVE_IDE=y
448CONFIG_IDE=y 464CONFIG_IDE=y
449 465
450# 466#
451# Please see Documentation/ide/ide.txt for help/info on IDE drives 467# Please see Documentation/ide/ide.txt for help/info on IDE drives
452# 468#
469CONFIG_IDE_ATAPI=y
453# CONFIG_BLK_DEV_IDE_SATA is not set 470# CONFIG_BLK_DEV_IDE_SATA is not set
454CONFIG_IDE_GD=y 471CONFIG_IDE_GD=y
455CONFIG_IDE_GD_ATA=y 472CONFIG_IDE_GD_ATA=y
@@ -457,7 +474,6 @@ CONFIG_IDE_GD_ATA=y
457CONFIG_BLK_DEV_IDECD=y 474CONFIG_BLK_DEV_IDECD=y
458CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y 475CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
459# CONFIG_BLK_DEV_IDETAPE is not set 476# CONFIG_BLK_DEV_IDETAPE is not set
460# CONFIG_BLK_DEV_IDESCSI is not set
461# CONFIG_IDE_TASK_IOCTL is not set 477# CONFIG_IDE_TASK_IOCTL is not set
462CONFIG_IDE_PROC_FS=y 478CONFIG_IDE_PROC_FS=y
463 479
@@ -516,6 +532,8 @@ CONFIG_ISCSI_TCP=m
516# CONFIG_SCSI_AIC7XXX_OLD is not set 532# CONFIG_SCSI_AIC7XXX_OLD is not set
517# CONFIG_SCSI_ADVANSYS is not set 533# CONFIG_SCSI_ADVANSYS is not set
518# CONFIG_SCSI_IN2000 is not set 534# CONFIG_SCSI_IN2000 is not set
535# CONFIG_LIBFC is not set
536# CONFIG_LIBFCOE is not set
519# CONFIG_SCSI_DTC3280 is not set 537# CONFIG_SCSI_DTC3280 is not set
520# CONFIG_SCSI_FUTURE_DOMAIN is not set 538# CONFIG_SCSI_FUTURE_DOMAIN is not set
521# CONFIG_SCSI_GENERIC_NCR5380 is not set 539# CONFIG_SCSI_GENERIC_NCR5380 is not set
@@ -527,6 +545,7 @@ CONFIG_ISCSI_TCP=m
527# CONFIG_SCSI_T128 is not set 545# CONFIG_SCSI_T128 is not set
528# CONFIG_SCSI_DEBUG is not set 546# CONFIG_SCSI_DEBUG is not set
529# CONFIG_SCSI_DH is not set 547# CONFIG_SCSI_DH is not set
548# CONFIG_SCSI_OSD_INITIATOR is not set
530CONFIG_MD=y 549CONFIG_MD=y
531CONFIG_BLK_DEV_MD=m 550CONFIG_BLK_DEV_MD=m
532CONFIG_MD_LINEAR=m 551CONFIG_MD_LINEAR=m
@@ -534,7 +553,7 @@ CONFIG_MD_RAID0=m
534CONFIG_MD_RAID1=m 553CONFIG_MD_RAID1=m
535# CONFIG_MD_RAID10 is not set 554# CONFIG_MD_RAID10 is not set
536CONFIG_MD_RAID456=m 555CONFIG_MD_RAID456=m
537CONFIG_MD_RAID5_RESHAPE=y 556CONFIG_MD_RAID6_PQ=m
538# CONFIG_MD_MULTIPATH is not set 557# CONFIG_MD_MULTIPATH is not set
539# CONFIG_MD_FAULTY is not set 558# CONFIG_MD_FAULTY is not set
540CONFIG_BLK_DEV_DM=m 559CONFIG_BLK_DEV_DM=m
@@ -547,6 +566,7 @@ CONFIG_DM_MULTIPATH=m
547# CONFIG_DM_DELAY is not set 566# CONFIG_DM_DELAY is not set
548CONFIG_DM_UEVENT=y 567CONFIG_DM_UEVENT=y
549CONFIG_NETDEVICES=y 568CONFIG_NETDEVICES=y
569CONFIG_COMPAT_NET_DEV_OPS=y
550CONFIG_DUMMY=m 570CONFIG_DUMMY=m
551# CONFIG_BONDING is not set 571# CONFIG_BONDING is not set
552CONFIG_MACVLAN=m 572CONFIG_MACVLAN=m
@@ -559,7 +579,9 @@ CONFIG_NET_ETHERNET=y
559# CONFIG_MII is not set 579# CONFIG_MII is not set
560# CONFIG_NET_VENDOR_3COM is not set 580# CONFIG_NET_VENDOR_3COM is not set
561# CONFIG_NET_VENDOR_SMC is not set 581# CONFIG_NET_VENDOR_SMC is not set
582# CONFIG_ETHOC is not set
562# CONFIG_NET_VENDOR_RACAL is not set 583# CONFIG_NET_VENDOR_RACAL is not set
584# CONFIG_DNET is not set
563# CONFIG_AT1700 is not set 585# CONFIG_AT1700 is not set
564# CONFIG_DEPCA is not set 586# CONFIG_DEPCA is not set
565# CONFIG_HP100 is not set 587# CONFIG_HP100 is not set
@@ -584,7 +606,10 @@ CONFIG_NE2000=m
584# 606#
585# CONFIG_WLAN_PRE80211 is not set 607# CONFIG_WLAN_PRE80211 is not set
586# CONFIG_WLAN_80211 is not set 608# CONFIG_WLAN_80211 is not set
587# CONFIG_IWLWIFI_LEDS is not set 609
610#
611# Enable WiMAX (Networking options) to see the WiMAX drivers
612#
588# CONFIG_WAN is not set 613# CONFIG_WAN is not set
589CONFIG_PPP=m 614CONFIG_PPP=m
590# CONFIG_PPP_MULTILINK is not set 615# CONFIG_PPP_MULTILINK is not set
@@ -642,7 +667,6 @@ CONFIG_MOUSE_PS2=m
642CONFIG_MOUSE_PS2_ALPS=y 667CONFIG_MOUSE_PS2_ALPS=y
643CONFIG_MOUSE_PS2_LOGIPS2PP=y 668CONFIG_MOUSE_PS2_LOGIPS2PP=y
644CONFIG_MOUSE_PS2_SYNAPTICS=y 669CONFIG_MOUSE_PS2_SYNAPTICS=y
645CONFIG_MOUSE_PS2_LIFEBOOK=y
646CONFIG_MOUSE_PS2_TRACKPOINT=y 670CONFIG_MOUSE_PS2_TRACKPOINT=y
647# CONFIG_MOUSE_PS2_ELANTECH is not set 671# CONFIG_MOUSE_PS2_ELANTECH is not set
648# CONFIG_MOUSE_PS2_TOUCHKIT is not set 672# CONFIG_MOUSE_PS2_TOUCHKIT is not set
@@ -688,6 +712,7 @@ CONFIG_VT_HW_CONSOLE_BINDING=y
688# Non-8250 serial port support 712# Non-8250 serial port support
689# 713#
690CONFIG_UNIX98_PTYS=y 714CONFIG_UNIX98_PTYS=y
715# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
691CONFIG_LEGACY_PTYS=y 716CONFIG_LEGACY_PTYS=y
692CONFIG_LEGACY_PTY_COUNT=256 717CONFIG_LEGACY_PTY_COUNT=256
693# CONFIG_IPMI_HANDLER is not set 718# CONFIG_IPMI_HANDLER is not set
@@ -771,6 +796,7 @@ CONFIG_FB_Q40=y
771# CONFIG_FB_VIRTUAL is not set 796# CONFIG_FB_VIRTUAL is not set
772# CONFIG_FB_METRONOME is not set 797# CONFIG_FB_METRONOME is not set
773# CONFIG_FB_MB862XX is not set 798# CONFIG_FB_MB862XX is not set
799# CONFIG_FB_BROADSHEET is not set
774# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 800# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
775 801
776# 802#
@@ -805,7 +831,6 @@ CONFIG_HIDRAW=y
805# 831#
806# Special HID drivers 832# Special HID drivers
807# 833#
808CONFIG_HID_COMPAT=y
809# CONFIG_USB_SUPPORT is not set 834# CONFIG_USB_SUPPORT is not set
810# CONFIG_MMC is not set 835# CONFIG_MMC is not set
811# CONFIG_MEMSTICK is not set 836# CONFIG_MEMSTICK is not set
@@ -813,9 +838,9 @@ CONFIG_HID_COMPAT=y
813# CONFIG_ACCESSIBILITY is not set 838# CONFIG_ACCESSIBILITY is not set
814# CONFIG_RTC_CLASS is not set 839# CONFIG_RTC_CLASS is not set
815# CONFIG_DMADEVICES is not set 840# CONFIG_DMADEVICES is not set
841# CONFIG_AUXDISPLAY is not set
816# CONFIG_UIO is not set 842# CONFIG_UIO is not set
817# CONFIG_STAGING is not set 843# CONFIG_STAGING is not set
818CONFIG_STAGING_EXCLUDE_BUILD=y
819 844
820# 845#
821# Character devices 846# Character devices
@@ -828,6 +853,7 @@ CONFIG_EXT2_FS=y
828# CONFIG_EXT2_FS_XATTR is not set 853# CONFIG_EXT2_FS_XATTR is not set
829# CONFIG_EXT2_FS_XIP is not set 854# CONFIG_EXT2_FS_XIP is not set
830CONFIG_EXT3_FS=y 855CONFIG_EXT3_FS=y
856# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
831# CONFIG_EXT3_FS_XATTR is not set 857# CONFIG_EXT3_FS_XATTR is not set
832# CONFIG_EXT4_FS is not set 858# CONFIG_EXT4_FS is not set
833CONFIG_JBD=y 859CONFIG_JBD=y
@@ -854,13 +880,15 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
854# CONFIG_OCFS2_FS_STATS is not set 880# CONFIG_OCFS2_FS_STATS is not set
855# CONFIG_OCFS2_DEBUG_MASKLOG is not set 881# CONFIG_OCFS2_DEBUG_MASKLOG is not set
856# CONFIG_OCFS2_DEBUG_FS is not set 882# CONFIG_OCFS2_DEBUG_FS is not set
857# CONFIG_OCFS2_COMPAT_JBD is not set 883# CONFIG_OCFS2_FS_POSIX_ACL is not set
884# CONFIG_BTRFS_FS is not set
858CONFIG_DNOTIFY=y 885CONFIG_DNOTIFY=y
859CONFIG_INOTIFY=y 886CONFIG_INOTIFY=y
860CONFIG_INOTIFY_USER=y 887CONFIG_INOTIFY_USER=y
861CONFIG_QUOTA=y 888CONFIG_QUOTA=y
862CONFIG_QUOTA_NETLINK_INTERFACE=y 889CONFIG_QUOTA_NETLINK_INTERFACE=y
863# CONFIG_PRINT_QUOTA_WARNING is not set 890# CONFIG_PRINT_QUOTA_WARNING is not set
891CONFIG_QUOTA_TREE=m
864# CONFIG_QFMT_V1 is not set 892# CONFIG_QFMT_V1 is not set
865# CONFIG_QFMT_V2 is not set 893# CONFIG_QFMT_V2 is not set
866CONFIG_QUOTACTL=y 894CONFIG_QUOTACTL=y
@@ -869,6 +897,11 @@ CONFIG_AUTOFS4_FS=m
869CONFIG_FUSE_FS=m 897CONFIG_FUSE_FS=m
870 898
871# 899#
900# Caches
901#
902# CONFIG_FSCACHE is not set
903
904#
872# CD-ROM/DVD Filesystems 905# CD-ROM/DVD Filesystems
873# 906#
874CONFIG_ISO9660_FS=y 907CONFIG_ISO9660_FS=y
@@ -899,10 +932,7 @@ CONFIG_TMPFS=y
899# CONFIG_TMPFS_POSIX_ACL is not set 932# CONFIG_TMPFS_POSIX_ACL is not set
900# CONFIG_HUGETLB_PAGE is not set 933# CONFIG_HUGETLB_PAGE is not set
901CONFIG_CONFIGFS_FS=m 934CONFIG_CONFIGFS_FS=m
902 935CONFIG_MISC_FILESYSTEMS=y
903#
904# Miscellaneous filesystems
905#
906# CONFIG_ADFS_FS is not set 936# CONFIG_ADFS_FS is not set
907CONFIG_AFFS_FS=m 937CONFIG_AFFS_FS=m
908CONFIG_HFS_FS=m 938CONFIG_HFS_FS=m
@@ -911,6 +941,9 @@ CONFIG_HFSPLUS_FS=m
911# CONFIG_BFS_FS is not set 941# CONFIG_BFS_FS is not set
912# CONFIG_EFS_FS is not set 942# CONFIG_EFS_FS is not set
913CONFIG_CRAMFS=m 943CONFIG_CRAMFS=m
944CONFIG_SQUASHFS=m
945# CONFIG_SQUASHFS_EMBEDDED is not set
946CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
914# CONFIG_VXFS_FS is not set 947# CONFIG_VXFS_FS is not set
915CONFIG_MINIX_FS=y 948CONFIG_MINIX_FS=y
916# CONFIG_OMFS_FS is not set 949# CONFIG_OMFS_FS is not set
@@ -921,6 +954,7 @@ CONFIG_SYSV_FS=m
921CONFIG_UFS_FS=m 954CONFIG_UFS_FS=m
922# CONFIG_UFS_FS_WRITE is not set 955# CONFIG_UFS_FS_WRITE is not set
923# CONFIG_UFS_DEBUG is not set 956# CONFIG_UFS_DEBUG is not set
957# CONFIG_NILFS2_FS is not set
924CONFIG_NETWORK_FILESYSTEMS=y 958CONFIG_NETWORK_FILESYSTEMS=y
925CONFIG_NFS_FS=y 959CONFIG_NFS_FS=y
926CONFIG_NFS_V3=y 960CONFIG_NFS_V3=y
@@ -936,7 +970,6 @@ CONFIG_EXPORTFS=m
936CONFIG_NFS_COMMON=y 970CONFIG_NFS_COMMON=y
937CONFIG_SUNRPC=y 971CONFIG_SUNRPC=y
938CONFIG_SUNRPC_GSS=y 972CONFIG_SUNRPC_GSS=y
939# CONFIG_SUNRPC_REGISTER_V4 is not set
940CONFIG_RPCSEC_GSS_KRB5=y 973CONFIG_RPCSEC_GSS_KRB5=y
941# CONFIG_RPCSEC_GSS_SPKM3 is not set 974# CONFIG_RPCSEC_GSS_SPKM3 is not set
942CONFIG_SMB_FS=m 975CONFIG_SMB_FS=m
@@ -1011,11 +1044,6 @@ CONFIG_DEBUG_BUGVERBOSE=y
1011CONFIG_DEBUG_MEMORY_INIT=y 1044CONFIG_DEBUG_MEMORY_INIT=y
1012# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1045# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1013CONFIG_SYSCTL_SYSCALL_CHECK=y 1046CONFIG_SYSCTL_SYSCALL_CHECK=y
1014
1015#
1016# Tracers
1017#
1018# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1019# CONFIG_SAMPLES is not set 1047# CONFIG_SAMPLES is not set
1020 1048
1021# 1049#
@@ -1036,13 +1064,21 @@ CONFIG_CRYPTO=y
1036# 1064#
1037# CONFIG_CRYPTO_FIPS is not set 1065# CONFIG_CRYPTO_FIPS is not set
1038CONFIG_CRYPTO_ALGAPI=y 1066CONFIG_CRYPTO_ALGAPI=y
1039CONFIG_CRYPTO_AEAD=y 1067CONFIG_CRYPTO_ALGAPI2=y
1068CONFIG_CRYPTO_AEAD=m
1069CONFIG_CRYPTO_AEAD2=y
1040CONFIG_CRYPTO_BLKCIPHER=y 1070CONFIG_CRYPTO_BLKCIPHER=y
1071CONFIG_CRYPTO_BLKCIPHER2=y
1041CONFIG_CRYPTO_HASH=y 1072CONFIG_CRYPTO_HASH=y
1042CONFIG_CRYPTO_RNG=y 1073CONFIG_CRYPTO_HASH2=y
1074CONFIG_CRYPTO_RNG=m
1075CONFIG_CRYPTO_RNG2=y
1076CONFIG_CRYPTO_PCOMP=y
1043CONFIG_CRYPTO_MANAGER=y 1077CONFIG_CRYPTO_MANAGER=y
1078CONFIG_CRYPTO_MANAGER2=y
1044CONFIG_CRYPTO_GF128MUL=m 1079CONFIG_CRYPTO_GF128MUL=m
1045CONFIG_CRYPTO_NULL=m 1080CONFIG_CRYPTO_NULL=m
1081CONFIG_CRYPTO_WORKQUEUE=y
1046CONFIG_CRYPTO_CRYPTD=m 1082CONFIG_CRYPTO_CRYPTD=m
1047CONFIG_CRYPTO_AUTHENC=m 1083CONFIG_CRYPTO_AUTHENC=m
1048CONFIG_CRYPTO_TEST=m 1084CONFIG_CRYPTO_TEST=m
@@ -1112,6 +1148,7 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
1112# Compression 1148# Compression
1113# 1149#
1114CONFIG_CRYPTO_DEFLATE=m 1150CONFIG_CRYPTO_DEFLATE=m
1151CONFIG_CRYPTO_ZLIB=m
1115CONFIG_CRYPTO_LZO=m 1152CONFIG_CRYPTO_LZO=m
1116 1153
1117# 1154#
@@ -1119,11 +1156,13 @@ CONFIG_CRYPTO_LZO=m
1119# 1156#
1120# CONFIG_CRYPTO_ANSI_CPRNG is not set 1157# CONFIG_CRYPTO_ANSI_CPRNG is not set
1121# CONFIG_CRYPTO_HW is not set 1158# CONFIG_CRYPTO_HW is not set
1159# CONFIG_BINARY_PRINTF is not set
1122 1160
1123# 1161#
1124# Library routines 1162# Library routines
1125# 1163#
1126CONFIG_BITREVERSE=y 1164CONFIG_BITREVERSE=y
1165CONFIG_GENERIC_FIND_LAST_BIT=y
1127CONFIG_CRC_CCITT=m 1166CONFIG_CRC_CCITT=m
1128CONFIG_CRC16=m 1167CONFIG_CRC16=m
1129CONFIG_CRC_T10DIF=y 1168CONFIG_CRC_T10DIF=y
@@ -1135,10 +1174,13 @@ CONFIG_ZLIB_INFLATE=y
1135CONFIG_ZLIB_DEFLATE=m 1174CONFIG_ZLIB_DEFLATE=m
1136CONFIG_LZO_COMPRESS=m 1175CONFIG_LZO_COMPRESS=m
1137CONFIG_LZO_DECOMPRESS=m 1176CONFIG_LZO_DECOMPRESS=m
1177CONFIG_DECOMPRESS_GZIP=y
1178CONFIG_DECOMPRESS_BZIP2=y
1179CONFIG_DECOMPRESS_LZMA=y
1138CONFIG_TEXTSEARCH=y 1180CONFIG_TEXTSEARCH=y
1139CONFIG_TEXTSEARCH_KMP=m 1181CONFIG_TEXTSEARCH_KMP=m
1140CONFIG_TEXTSEARCH_BM=m 1182CONFIG_TEXTSEARCH_BM=m
1141CONFIG_TEXTSEARCH_FSM=m 1183CONFIG_TEXTSEARCH_FSM=m
1142CONFIG_PLIST=y
1143CONFIG_HAS_IOMEM=y 1184CONFIG_HAS_IOMEM=y
1144CONFIG_HAS_DMA=y 1185CONFIG_HAS_DMA=y
1186CONFIG_NLATTR=y
diff --git a/arch/m68k/configs/sun3_defconfig b/arch/m68k/configs/sun3_defconfig
index f404917429fa..f27c1a47bacf 100644
--- a/arch/m68k/configs/sun3_defconfig
+++ b/arch/m68k/configs/sun3_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc7 3# Linux kernel version: 2.6.30-rc3
4# Tue Dec 2 20:27:53 2008 4# Wed Apr 22 20:48:16 2009
5# 5#
6CONFIG_M68K=y 6CONFIG_M68K=y
7CONFIG_MMU=y 7CONFIG_MMU=y
@@ -29,14 +29,24 @@ CONFIG_SWAP=y
29CONFIG_SYSVIPC=y 29CONFIG_SYSVIPC=y
30CONFIG_SYSVIPC_SYSCTL=y 30CONFIG_SYSVIPC_SYSCTL=y
31CONFIG_POSIX_MQUEUE=y 31CONFIG_POSIX_MQUEUE=y
32CONFIG_POSIX_MQUEUE_SYSCTL=y
32CONFIG_BSD_PROCESS_ACCT=y 33CONFIG_BSD_PROCESS_ACCT=y
33# CONFIG_BSD_PROCESS_ACCT_V3 is not set 34# CONFIG_BSD_PROCESS_ACCT_V3 is not set
34# CONFIG_TASKSTATS is not set 35# CONFIG_TASKSTATS is not set
35# CONFIG_AUDIT is not set 36# CONFIG_AUDIT is not set
37
38#
39# RCU Subsystem
40#
41CONFIG_CLASSIC_RCU=y
42# CONFIG_TREE_RCU is not set
43# CONFIG_PREEMPT_RCU is not set
44# CONFIG_TREE_RCU_TRACE is not set
45# CONFIG_PREEMPT_RCU_TRACE is not set
36# CONFIG_IKCONFIG is not set 46# CONFIG_IKCONFIG is not set
37CONFIG_LOG_BUF_SHIFT=14 47CONFIG_LOG_BUF_SHIFT=14
38# CONFIG_CGROUPS is not set
39# CONFIG_GROUP_SCHED is not set 48# CONFIG_GROUP_SCHED is not set
49# CONFIG_CGROUPS is not set
40# CONFIG_SYSFS_DEPRECATED_V2 is not set 50# CONFIG_SYSFS_DEPRECATED_V2 is not set
41CONFIG_RELAY=y 51CONFIG_RELAY=y
42CONFIG_NAMESPACES=y 52CONFIG_NAMESPACES=y
@@ -44,23 +54,27 @@ CONFIG_NAMESPACES=y
44# CONFIG_IPC_NS is not set 54# CONFIG_IPC_NS is not set
45# CONFIG_USER_NS is not set 55# CONFIG_USER_NS is not set
46# CONFIG_PID_NS is not set 56# CONFIG_PID_NS is not set
57# CONFIG_NET_NS is not set
47CONFIG_BLK_DEV_INITRD=y 58CONFIG_BLK_DEV_INITRD=y
48CONFIG_INITRAMFS_SOURCE="" 59CONFIG_INITRAMFS_SOURCE=""
60CONFIG_RD_GZIP=y
61CONFIG_RD_BZIP2=y
62CONFIG_RD_LZMA=y
49# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 63# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
50CONFIG_SYSCTL=y 64CONFIG_SYSCTL=y
65CONFIG_ANON_INODES=y
51# CONFIG_EMBEDDED is not set 66# CONFIG_EMBEDDED is not set
52CONFIG_UID16=y 67CONFIG_UID16=y
53CONFIG_SYSCTL_SYSCALL=y 68CONFIG_SYSCTL_SYSCALL=y
54CONFIG_KALLSYMS=y 69CONFIG_KALLSYMS=y
55# CONFIG_KALLSYMS_EXTRA_PASS is not set 70# CONFIG_KALLSYMS_EXTRA_PASS is not set
71# CONFIG_STRIP_ASM_SYMS is not set
56CONFIG_HOTPLUG=y 72CONFIG_HOTPLUG=y
57CONFIG_PRINTK=y 73CONFIG_PRINTK=y
58CONFIG_BUG=y 74CONFIG_BUG=y
59CONFIG_ELF_CORE=y 75CONFIG_ELF_CORE=y
60CONFIG_COMPAT_BRK=y
61CONFIG_BASE_FULL=y 76CONFIG_BASE_FULL=y
62CONFIG_FUTEX=y 77CONFIG_FUTEX=y
63CONFIG_ANON_INODES=y
64CONFIG_EPOLL=y 78CONFIG_EPOLL=y
65CONFIG_SIGNALFD=y 79CONFIG_SIGNALFD=y
66CONFIG_TIMERFD=y 80CONFIG_TIMERFD=y
@@ -68,15 +82,16 @@ CONFIG_EVENTFD=y
68CONFIG_SHMEM=y 82CONFIG_SHMEM=y
69CONFIG_AIO=y 83CONFIG_AIO=y
70CONFIG_VM_EVENT_COUNTERS=y 84CONFIG_VM_EVENT_COUNTERS=y
85CONFIG_COMPAT_BRK=y
71CONFIG_SLAB=y 86CONFIG_SLAB=y
72# CONFIG_SLUB is not set 87# CONFIG_SLUB is not set
73# CONFIG_SLOB is not set 88# CONFIG_SLOB is not set
74# CONFIG_PROFILING is not set 89# CONFIG_PROFILING is not set
75# CONFIG_MARKERS is not set 90# CONFIG_MARKERS is not set
91# CONFIG_SLOW_WORK is not set
76# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 92# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
77CONFIG_SLABINFO=y 93CONFIG_SLABINFO=y
78CONFIG_RT_MUTEXES=y 94CONFIG_RT_MUTEXES=y
79# CONFIG_TINY_SHMEM is not set
80CONFIG_BASE_SMALL=0 95CONFIG_BASE_SMALL=0
81CONFIG_MODULES=y 96CONFIG_MODULES=y
82# CONFIG_MODULE_FORCE_LOAD is not set 97# CONFIG_MODULE_FORCE_LOAD is not set
@@ -84,11 +99,8 @@ CONFIG_MODULE_UNLOAD=y
84# CONFIG_MODULE_FORCE_UNLOAD is not set 99# CONFIG_MODULE_FORCE_UNLOAD is not set
85# CONFIG_MODVERSIONS is not set 100# CONFIG_MODVERSIONS is not set
86# CONFIG_MODULE_SRCVERSION_ALL is not set 101# CONFIG_MODULE_SRCVERSION_ALL is not set
87CONFIG_KMOD=y
88CONFIG_BLOCK=y 102CONFIG_BLOCK=y
89# CONFIG_LBD is not set 103# CONFIG_LBD is not set
90# CONFIG_BLK_DEV_IO_TRACE is not set
91# CONFIG_LSF is not set
92CONFIG_BLK_DEV_BSG=y 104CONFIG_BLK_DEV_BSG=y
93# CONFIG_BLK_DEV_INTEGRITY is not set 105# CONFIG_BLK_DEV_INTEGRITY is not set
94 106
@@ -104,7 +116,6 @@ CONFIG_DEFAULT_AS=y
104# CONFIG_DEFAULT_CFQ is not set 116# CONFIG_DEFAULT_CFQ is not set
105# CONFIG_DEFAULT_NOOP is not set 117# CONFIG_DEFAULT_NOOP is not set
106CONFIG_DEFAULT_IOSCHED="anticipatory" 118CONFIG_DEFAULT_IOSCHED="anticipatory"
107CONFIG_CLASSIC_RCU=y
108# CONFIG_FREEZER is not set 119# CONFIG_FREEZER is not set
109 120
110# 121#
@@ -138,12 +149,13 @@ CONFIG_FLAT_NODE_MEM_MAP=y
138CONFIG_NEED_MULTIPLE_NODES=y 149CONFIG_NEED_MULTIPLE_NODES=y
139CONFIG_PAGEFLAGS_EXTENDED=y 150CONFIG_PAGEFLAGS_EXTENDED=y
140CONFIG_SPLIT_PTLOCK_CPUS=4 151CONFIG_SPLIT_PTLOCK_CPUS=4
141# CONFIG_RESOURCES_64BIT is not set
142# CONFIG_PHYS_ADDR_T_64BIT is not set 152# CONFIG_PHYS_ADDR_T_64BIT is not set
143CONFIG_ZONE_DMA_FLAG=1 153CONFIG_ZONE_DMA_FLAG=1
144CONFIG_BOUNCE=y 154CONFIG_BOUNCE=y
145CONFIG_VIRT_TO_BUS=y 155CONFIG_VIRT_TO_BUS=y
146CONFIG_UNEVICTABLE_LRU=y 156CONFIG_UNEVICTABLE_LRU=y
157CONFIG_HAVE_MLOCK=y
158CONFIG_HAVE_MLOCKED_PAGE_BIT=y
147 159
148# 160#
149# General setup 161# General setup
@@ -253,6 +265,7 @@ CONFIG_NETFILTER_XTABLES=m
253CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 265CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
254CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 266CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
255CONFIG_NETFILTER_XT_TARGET_DSCP=m 267CONFIG_NETFILTER_XT_TARGET_DSCP=m
268CONFIG_NETFILTER_XT_TARGET_HL=m
256CONFIG_NETFILTER_XT_TARGET_MARK=m 269CONFIG_NETFILTER_XT_TARGET_MARK=m
257CONFIG_NETFILTER_XT_TARGET_NFLOG=m 270CONFIG_NETFILTER_XT_TARGET_NFLOG=m
258CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 271CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
@@ -261,6 +274,7 @@ CONFIG_NETFILTER_XT_TARGET_RATEEST=m
261CONFIG_NETFILTER_XT_TARGET_TRACE=m 274CONFIG_NETFILTER_XT_TARGET_TRACE=m
262CONFIG_NETFILTER_XT_TARGET_TCPMSS=m 275CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
263CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m 276CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
277CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
264CONFIG_NETFILTER_XT_MATCH_COMMENT=m 278CONFIG_NETFILTER_XT_MATCH_COMMENT=m
265CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m 279CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
266CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m 280CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
@@ -271,6 +285,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m
271CONFIG_NETFILTER_XT_MATCH_ESP=m 285CONFIG_NETFILTER_XT_MATCH_ESP=m
272CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m 286CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
273CONFIG_NETFILTER_XT_MATCH_HELPER=m 287CONFIG_NETFILTER_XT_MATCH_HELPER=m
288CONFIG_NETFILTER_XT_MATCH_HL=m
274CONFIG_NETFILTER_XT_MATCH_IPRANGE=m 289CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
275CONFIG_NETFILTER_XT_MATCH_LENGTH=m 290CONFIG_NETFILTER_XT_MATCH_LENGTH=m
276CONFIG_NETFILTER_XT_MATCH_LIMIT=m 291CONFIG_NETFILTER_XT_MATCH_LIMIT=m
@@ -349,25 +364,20 @@ CONFIG_IP6_NF_MATCH_HL=m
349CONFIG_IP6_NF_MATCH_IPV6HEADER=m 364CONFIG_IP6_NF_MATCH_IPV6HEADER=m
350CONFIG_IP6_NF_MATCH_MH=m 365CONFIG_IP6_NF_MATCH_MH=m
351CONFIG_IP6_NF_MATCH_RT=m 366CONFIG_IP6_NF_MATCH_RT=m
367CONFIG_IP6_NF_TARGET_HL=m
352CONFIG_IP6_NF_TARGET_LOG=m 368CONFIG_IP6_NF_TARGET_LOG=m
353CONFIG_IP6_NF_FILTER=m 369CONFIG_IP6_NF_FILTER=m
354CONFIG_IP6_NF_TARGET_REJECT=m 370CONFIG_IP6_NF_TARGET_REJECT=m
355CONFIG_IP6_NF_MANGLE=m 371CONFIG_IP6_NF_MANGLE=m
356CONFIG_IP6_NF_TARGET_HL=m
357CONFIG_IP6_NF_RAW=m 372CONFIG_IP6_NF_RAW=m
358CONFIG_IP_DCCP=m 373CONFIG_IP_DCCP=m
359CONFIG_INET_DCCP_DIAG=m 374CONFIG_INET_DCCP_DIAG=m
360CONFIG_IP_DCCP_ACKVEC=y
361 375
362# 376#
363# DCCP CCIDs Configuration (EXPERIMENTAL) 377# DCCP CCIDs Configuration (EXPERIMENTAL)
364# 378#
365CONFIG_IP_DCCP_CCID2=m
366# CONFIG_IP_DCCP_CCID2_DEBUG is not set 379# CONFIG_IP_DCCP_CCID2_DEBUG is not set
367CONFIG_IP_DCCP_CCID3=m 380# CONFIG_IP_DCCP_CCID3 is not set
368# CONFIG_IP_DCCP_CCID3_DEBUG is not set
369CONFIG_IP_DCCP_CCID3_RTO=100
370CONFIG_IP_DCCP_TFRC_LIB=m
371CONFIG_IP_SCTP=m 381CONFIG_IP_SCTP=m
372# CONFIG_SCTP_DBG_MSG is not set 382# CONFIG_SCTP_DBG_MSG is not set
373# CONFIG_SCTP_DBG_OBJCNT is not set 383# CONFIG_SCTP_DBG_OBJCNT is not set
@@ -389,8 +399,10 @@ CONFIG_ATALK=m
389# CONFIG_LAPB is not set 399# CONFIG_LAPB is not set
390# CONFIG_ECONET is not set 400# CONFIG_ECONET is not set
391# CONFIG_WAN_ROUTER is not set 401# CONFIG_WAN_ROUTER is not set
402# CONFIG_PHONET is not set
392# CONFIG_NET_SCHED is not set 403# CONFIG_NET_SCHED is not set
393CONFIG_NET_CLS_ROUTE=y 404CONFIG_NET_CLS_ROUTE=y
405# CONFIG_DCB is not set
394 406
395# 407#
396# Network testing 408# Network testing
@@ -401,8 +413,8 @@ CONFIG_NET_CLS_ROUTE=y
401# CONFIG_IRDA is not set 413# CONFIG_IRDA is not set
402# CONFIG_BT is not set 414# CONFIG_BT is not set
403# CONFIG_AF_RXRPC is not set 415# CONFIG_AF_RXRPC is not set
404# CONFIG_PHONET is not set
405# CONFIG_WIRELESS is not set 416# CONFIG_WIRELESS is not set
417# CONFIG_WIMAX is not set
406# CONFIG_RFKILL is not set 418# CONFIG_RFKILL is not set
407# CONFIG_NET_9P is not set 419# CONFIG_NET_9P is not set
408 420
@@ -438,9 +450,13 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
438CONFIG_ATA_OVER_ETH=m 450CONFIG_ATA_OVER_ETH=m
439# CONFIG_BLK_DEV_HD is not set 451# CONFIG_BLK_DEV_HD is not set
440CONFIG_MISC_DEVICES=y 452CONFIG_MISC_DEVICES=y
441# CONFIG_EEPROM_93CX6 is not set
442# CONFIG_ENCLOSURE_SERVICES is not set 453# CONFIG_ENCLOSURE_SERVICES is not set
443# CONFIG_C2PORT is not set 454# CONFIG_C2PORT is not set
455
456#
457# EEPROM support
458#
459# CONFIG_EEPROM_93CX6 is not set
444CONFIG_HAVE_IDE=y 460CONFIG_HAVE_IDE=y
445# CONFIG_IDE is not set 461# CONFIG_IDE is not set
446 462
@@ -488,9 +504,12 @@ CONFIG_SCSI_SRP_ATTRS=m
488CONFIG_SCSI_SRP_TGT_ATTRS=y 504CONFIG_SCSI_SRP_TGT_ATTRS=y
489CONFIG_SCSI_LOWLEVEL=y 505CONFIG_SCSI_LOWLEVEL=y
490CONFIG_ISCSI_TCP=m 506CONFIG_ISCSI_TCP=m
507# CONFIG_LIBFC is not set
508# CONFIG_LIBFCOE is not set
491# CONFIG_SCSI_DEBUG is not set 509# CONFIG_SCSI_DEBUG is not set
492CONFIG_SUN3_SCSI=y 510CONFIG_SUN3_SCSI=y
493# CONFIG_SCSI_DH is not set 511# CONFIG_SCSI_DH is not set
512# CONFIG_SCSI_OSD_INITIATOR is not set
494CONFIG_MD=y 513CONFIG_MD=y
495CONFIG_BLK_DEV_MD=m 514CONFIG_BLK_DEV_MD=m
496CONFIG_MD_LINEAR=m 515CONFIG_MD_LINEAR=m
@@ -498,7 +517,7 @@ CONFIG_MD_RAID0=m
498CONFIG_MD_RAID1=m 517CONFIG_MD_RAID1=m
499# CONFIG_MD_RAID10 is not set 518# CONFIG_MD_RAID10 is not set
500CONFIG_MD_RAID456=m 519CONFIG_MD_RAID456=m
501CONFIG_MD_RAID5_RESHAPE=y 520CONFIG_MD_RAID6_PQ=m
502# CONFIG_MD_MULTIPATH is not set 521# CONFIG_MD_MULTIPATH is not set
503# CONFIG_MD_FAULTY is not set 522# CONFIG_MD_FAULTY is not set
504CONFIG_BLK_DEV_DM=m 523CONFIG_BLK_DEV_DM=m
@@ -511,6 +530,7 @@ CONFIG_DM_MULTIPATH=m
511# CONFIG_DM_DELAY is not set 530# CONFIG_DM_DELAY is not set
512CONFIG_DM_UEVENT=y 531CONFIG_DM_UEVENT=y
513CONFIG_NETDEVICES=y 532CONFIG_NETDEVICES=y
533CONFIG_COMPAT_NET_DEV_OPS=y
514CONFIG_DUMMY=m 534CONFIG_DUMMY=m
515# CONFIG_BONDING is not set 535# CONFIG_BONDING is not set
516CONFIG_MACVLAN=m 536CONFIG_MACVLAN=m
@@ -522,6 +542,8 @@ CONFIG_NET_ETHERNET=y
522# CONFIG_MII is not set 542# CONFIG_MII is not set
523CONFIG_SUN3LANCE=y 543CONFIG_SUN3LANCE=y
524CONFIG_SUN3_82586=y 544CONFIG_SUN3_82586=y
545# CONFIG_ETHOC is not set
546# CONFIG_DNET is not set
525# CONFIG_IBM_NEW_EMAC_ZMII is not set 547# CONFIG_IBM_NEW_EMAC_ZMII is not set
526# CONFIG_IBM_NEW_EMAC_RGMII is not set 548# CONFIG_IBM_NEW_EMAC_RGMII is not set
527# CONFIG_IBM_NEW_EMAC_TAH is not set 549# CONFIG_IBM_NEW_EMAC_TAH is not set
@@ -537,7 +559,10 @@ CONFIG_SUN3_82586=y
537# 559#
538# CONFIG_WLAN_PRE80211 is not set 560# CONFIG_WLAN_PRE80211 is not set
539# CONFIG_WLAN_80211 is not set 561# CONFIG_WLAN_80211 is not set
540# CONFIG_IWLWIFI_LEDS is not set 562
563#
564# Enable WiMAX (Networking options) to see the WiMAX drivers
565#
541# CONFIG_WAN is not set 566# CONFIG_WAN is not set
542CONFIG_PPP=m 567CONFIG_PPP=m
543# CONFIG_PPP_MULTILINK is not set 568# CONFIG_PPP_MULTILINK is not set
@@ -595,7 +620,6 @@ CONFIG_MOUSE_PS2=m
595CONFIG_MOUSE_PS2_ALPS=y 620CONFIG_MOUSE_PS2_ALPS=y
596CONFIG_MOUSE_PS2_LOGIPS2PP=y 621CONFIG_MOUSE_PS2_LOGIPS2PP=y
597CONFIG_MOUSE_PS2_SYNAPTICS=y 622CONFIG_MOUSE_PS2_SYNAPTICS=y
598CONFIG_MOUSE_PS2_LIFEBOOK=y
599CONFIG_MOUSE_PS2_TRACKPOINT=y 623CONFIG_MOUSE_PS2_TRACKPOINT=y
600# CONFIG_MOUSE_PS2_ELANTECH is not set 624# CONFIG_MOUSE_PS2_ELANTECH is not set
601# CONFIG_MOUSE_PS2_TOUCHKIT is not set 625# CONFIG_MOUSE_PS2_TOUCHKIT is not set
@@ -635,6 +659,7 @@ CONFIG_VT_HW_CONSOLE_BINDING=y
635# Non-8250 serial port support 659# Non-8250 serial port support
636# 660#
637CONFIG_UNIX98_PTYS=y 661CONFIG_UNIX98_PTYS=y
662# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
638CONFIG_LEGACY_PTYS=y 663CONFIG_LEGACY_PTYS=y
639CONFIG_LEGACY_PTY_COUNT=256 664CONFIG_LEGACY_PTY_COUNT=256
640# CONFIG_IPMI_HANDLER is not set 665# CONFIG_IPMI_HANDLER is not set
@@ -710,6 +735,7 @@ CONFIG_FB=y
710# CONFIG_FB_VIRTUAL is not set 735# CONFIG_FB_VIRTUAL is not set
711# CONFIG_FB_METRONOME is not set 736# CONFIG_FB_METRONOME is not set
712# CONFIG_FB_MB862XX is not set 737# CONFIG_FB_MB862XX is not set
738# CONFIG_FB_BROADSHEET is not set
713# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 739# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
714 740
715# 741#
@@ -741,16 +767,15 @@ CONFIG_HIDRAW=y
741# 767#
742# Special HID drivers 768# Special HID drivers
743# 769#
744CONFIG_HID_COMPAT=y
745# CONFIG_USB_SUPPORT is not set 770# CONFIG_USB_SUPPORT is not set
746# CONFIG_MMC is not set 771# CONFIG_MMC is not set
747# CONFIG_MEMSTICK is not set 772# CONFIG_MEMSTICK is not set
748# CONFIG_NEW_LEDS is not set 773# CONFIG_NEW_LEDS is not set
749# CONFIG_ACCESSIBILITY is not set 774# CONFIG_ACCESSIBILITY is not set
750# CONFIG_RTC_CLASS is not set 775# CONFIG_RTC_CLASS is not set
776# CONFIG_AUXDISPLAY is not set
751# CONFIG_UIO is not set 777# CONFIG_UIO is not set
752# CONFIG_STAGING is not set 778# CONFIG_STAGING is not set
753CONFIG_STAGING_EXCLUDE_BUILD=y
754 779
755# 780#
756# Character devices 781# Character devices
@@ -763,6 +788,7 @@ CONFIG_EXT2_FS=y
763# CONFIG_EXT2_FS_XATTR is not set 788# CONFIG_EXT2_FS_XATTR is not set
764# CONFIG_EXT2_FS_XIP is not set 789# CONFIG_EXT2_FS_XIP is not set
765CONFIG_EXT3_FS=y 790CONFIG_EXT3_FS=y
791# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
766# CONFIG_EXT3_FS_XATTR is not set 792# CONFIG_EXT3_FS_XATTR is not set
767# CONFIG_EXT4_FS is not set 793# CONFIG_EXT4_FS is not set
768CONFIG_JBD=y 794CONFIG_JBD=y
@@ -789,13 +815,15 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
789# CONFIG_OCFS2_FS_STATS is not set 815# CONFIG_OCFS2_FS_STATS is not set
790# CONFIG_OCFS2_DEBUG_MASKLOG is not set 816# CONFIG_OCFS2_DEBUG_MASKLOG is not set
791# CONFIG_OCFS2_DEBUG_FS is not set 817# CONFIG_OCFS2_DEBUG_FS is not set
792# CONFIG_OCFS2_COMPAT_JBD is not set 818# CONFIG_OCFS2_FS_POSIX_ACL is not set
819# CONFIG_BTRFS_FS is not set
793CONFIG_DNOTIFY=y 820CONFIG_DNOTIFY=y
794CONFIG_INOTIFY=y 821CONFIG_INOTIFY=y
795CONFIG_INOTIFY_USER=y 822CONFIG_INOTIFY_USER=y
796CONFIG_QUOTA=y 823CONFIG_QUOTA=y
797CONFIG_QUOTA_NETLINK_INTERFACE=y 824CONFIG_QUOTA_NETLINK_INTERFACE=y
798# CONFIG_PRINT_QUOTA_WARNING is not set 825# CONFIG_PRINT_QUOTA_WARNING is not set
826CONFIG_QUOTA_TREE=m
799# CONFIG_QFMT_V1 is not set 827# CONFIG_QFMT_V1 is not set
800# CONFIG_QFMT_V2 is not set 828# CONFIG_QFMT_V2 is not set
801CONFIG_QUOTACTL=y 829CONFIG_QUOTACTL=y
@@ -804,6 +832,11 @@ CONFIG_AUTOFS4_FS=m
804CONFIG_FUSE_FS=m 832CONFIG_FUSE_FS=m
805 833
806# 834#
835# Caches
836#
837# CONFIG_FSCACHE is not set
838
839#
807# CD-ROM/DVD Filesystems 840# CD-ROM/DVD Filesystems
808# 841#
809CONFIG_ISO9660_FS=y 842CONFIG_ISO9660_FS=y
@@ -834,10 +867,7 @@ CONFIG_TMPFS=y
834# CONFIG_TMPFS_POSIX_ACL is not set 867# CONFIG_TMPFS_POSIX_ACL is not set
835# CONFIG_HUGETLB_PAGE is not set 868# CONFIG_HUGETLB_PAGE is not set
836CONFIG_CONFIGFS_FS=m 869CONFIG_CONFIGFS_FS=m
837 870CONFIG_MISC_FILESYSTEMS=y
838#
839# Miscellaneous filesystems
840#
841# CONFIG_ADFS_FS is not set 871# CONFIG_ADFS_FS is not set
842CONFIG_AFFS_FS=m 872CONFIG_AFFS_FS=m
843CONFIG_HFS_FS=m 873CONFIG_HFS_FS=m
@@ -846,6 +876,9 @@ CONFIG_HFSPLUS_FS=m
846# CONFIG_BFS_FS is not set 876# CONFIG_BFS_FS is not set
847# CONFIG_EFS_FS is not set 877# CONFIG_EFS_FS is not set
848CONFIG_CRAMFS=m 878CONFIG_CRAMFS=m
879CONFIG_SQUASHFS=m
880# CONFIG_SQUASHFS_EMBEDDED is not set
881CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
849# CONFIG_VXFS_FS is not set 882# CONFIG_VXFS_FS is not set
850CONFIG_MINIX_FS=y 883CONFIG_MINIX_FS=y
851# CONFIG_OMFS_FS is not set 884# CONFIG_OMFS_FS is not set
@@ -856,6 +889,7 @@ CONFIG_SYSV_FS=m
856CONFIG_UFS_FS=m 889CONFIG_UFS_FS=m
857# CONFIG_UFS_FS_WRITE is not set 890# CONFIG_UFS_FS_WRITE is not set
858# CONFIG_UFS_DEBUG is not set 891# CONFIG_UFS_DEBUG is not set
892# CONFIG_NILFS2_FS is not set
859CONFIG_NETWORK_FILESYSTEMS=y 893CONFIG_NETWORK_FILESYSTEMS=y
860CONFIG_NFS_FS=y 894CONFIG_NFS_FS=y
861CONFIG_NFS_V3=y 895CONFIG_NFS_V3=y
@@ -872,7 +906,6 @@ CONFIG_EXPORTFS=m
872CONFIG_NFS_COMMON=y 906CONFIG_NFS_COMMON=y
873CONFIG_SUNRPC=y 907CONFIG_SUNRPC=y
874CONFIG_SUNRPC_GSS=y 908CONFIG_SUNRPC_GSS=y
875# CONFIG_SUNRPC_REGISTER_V4 is not set
876CONFIG_RPCSEC_GSS_KRB5=y 909CONFIG_RPCSEC_GSS_KRB5=y
877# CONFIG_RPCSEC_GSS_SPKM3 is not set 910# CONFIG_RPCSEC_GSS_SPKM3 is not set
878CONFIG_SMB_FS=m 911CONFIG_SMB_FS=m
@@ -948,11 +981,6 @@ CONFIG_DEBUG_BUGVERBOSE=y
948CONFIG_DEBUG_MEMORY_INIT=y 981CONFIG_DEBUG_MEMORY_INIT=y
949# CONFIG_RCU_CPU_STALL_DETECTOR is not set 982# CONFIG_RCU_CPU_STALL_DETECTOR is not set
950CONFIG_SYSCTL_SYSCALL_CHECK=y 983CONFIG_SYSCTL_SYSCALL_CHECK=y
951
952#
953# Tracers
954#
955# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
956# CONFIG_SAMPLES is not set 984# CONFIG_SAMPLES is not set
957 985
958# 986#
@@ -973,13 +1001,21 @@ CONFIG_CRYPTO=y
973# 1001#
974# CONFIG_CRYPTO_FIPS is not set 1002# CONFIG_CRYPTO_FIPS is not set
975CONFIG_CRYPTO_ALGAPI=y 1003CONFIG_CRYPTO_ALGAPI=y
976CONFIG_CRYPTO_AEAD=y 1004CONFIG_CRYPTO_ALGAPI2=y
1005CONFIG_CRYPTO_AEAD=m
1006CONFIG_CRYPTO_AEAD2=y
977CONFIG_CRYPTO_BLKCIPHER=y 1007CONFIG_CRYPTO_BLKCIPHER=y
1008CONFIG_CRYPTO_BLKCIPHER2=y
978CONFIG_CRYPTO_HASH=y 1009CONFIG_CRYPTO_HASH=y
979CONFIG_CRYPTO_RNG=y 1010CONFIG_CRYPTO_HASH2=y
1011CONFIG_CRYPTO_RNG=m
1012CONFIG_CRYPTO_RNG2=y
1013CONFIG_CRYPTO_PCOMP=y
980CONFIG_CRYPTO_MANAGER=y 1014CONFIG_CRYPTO_MANAGER=y
1015CONFIG_CRYPTO_MANAGER2=y
981CONFIG_CRYPTO_GF128MUL=m 1016CONFIG_CRYPTO_GF128MUL=m
982CONFIG_CRYPTO_NULL=m 1017CONFIG_CRYPTO_NULL=m
1018CONFIG_CRYPTO_WORKQUEUE=y
983CONFIG_CRYPTO_CRYPTD=m 1019CONFIG_CRYPTO_CRYPTD=m
984CONFIG_CRYPTO_AUTHENC=m 1020CONFIG_CRYPTO_AUTHENC=m
985CONFIG_CRYPTO_TEST=m 1021CONFIG_CRYPTO_TEST=m
@@ -1049,6 +1085,7 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
1049# Compression 1085# Compression
1050# 1086#
1051CONFIG_CRYPTO_DEFLATE=m 1087CONFIG_CRYPTO_DEFLATE=m
1088CONFIG_CRYPTO_ZLIB=m
1052CONFIG_CRYPTO_LZO=m 1089CONFIG_CRYPTO_LZO=m
1053 1090
1054# 1091#
@@ -1056,11 +1093,13 @@ CONFIG_CRYPTO_LZO=m
1056# 1093#
1057# CONFIG_CRYPTO_ANSI_CPRNG is not set 1094# CONFIG_CRYPTO_ANSI_CPRNG is not set
1058# CONFIG_CRYPTO_HW is not set 1095# CONFIG_CRYPTO_HW is not set
1096# CONFIG_BINARY_PRINTF is not set
1059 1097
1060# 1098#
1061# Library routines 1099# Library routines
1062# 1100#
1063CONFIG_BITREVERSE=y 1101CONFIG_BITREVERSE=y
1102CONFIG_GENERIC_FIND_LAST_BIT=y
1064CONFIG_CRC_CCITT=m 1103CONFIG_CRC_CCITT=m
1065CONFIG_CRC16=m 1104CONFIG_CRC16=m
1066CONFIG_CRC_T10DIF=y 1105CONFIG_CRC_T10DIF=y
@@ -1072,9 +1111,12 @@ CONFIG_ZLIB_INFLATE=y
1072CONFIG_ZLIB_DEFLATE=m 1111CONFIG_ZLIB_DEFLATE=m
1073CONFIG_LZO_COMPRESS=m 1112CONFIG_LZO_COMPRESS=m
1074CONFIG_LZO_DECOMPRESS=m 1113CONFIG_LZO_DECOMPRESS=m
1114CONFIG_DECOMPRESS_GZIP=y
1115CONFIG_DECOMPRESS_BZIP2=y
1116CONFIG_DECOMPRESS_LZMA=y
1075CONFIG_TEXTSEARCH=y 1117CONFIG_TEXTSEARCH=y
1076CONFIG_TEXTSEARCH_KMP=m 1118CONFIG_TEXTSEARCH_KMP=m
1077CONFIG_TEXTSEARCH_BM=m 1119CONFIG_TEXTSEARCH_BM=m
1078CONFIG_TEXTSEARCH_FSM=m 1120CONFIG_TEXTSEARCH_FSM=m
1079CONFIG_PLIST=y
1080CONFIG_HAS_IOMEM=y 1121CONFIG_HAS_IOMEM=y
1122CONFIG_NLATTR=y
diff --git a/arch/m68k/configs/sun3x_defconfig b/arch/m68k/configs/sun3x_defconfig
index 4d8a1e84e39f..c40edb919fda 100644
--- a/arch/m68k/configs/sun3x_defconfig
+++ b/arch/m68k/configs/sun3x_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc7 3# Linux kernel version: 2.6.30-rc3
4# Tue Dec 2 20:27:54 2008 4# Wed Apr 22 20:48:20 2009
5# 5#
6CONFIG_M68K=y 6CONFIG_M68K=y
7CONFIG_MMU=y 7CONFIG_MMU=y
@@ -29,14 +29,24 @@ CONFIG_SWAP=y
29CONFIG_SYSVIPC=y 29CONFIG_SYSVIPC=y
30CONFIG_SYSVIPC_SYSCTL=y 30CONFIG_SYSVIPC_SYSCTL=y
31CONFIG_POSIX_MQUEUE=y 31CONFIG_POSIX_MQUEUE=y
32CONFIG_POSIX_MQUEUE_SYSCTL=y
32CONFIG_BSD_PROCESS_ACCT=y 33CONFIG_BSD_PROCESS_ACCT=y
33# CONFIG_BSD_PROCESS_ACCT_V3 is not set 34# CONFIG_BSD_PROCESS_ACCT_V3 is not set
34# CONFIG_TASKSTATS is not set 35# CONFIG_TASKSTATS is not set
35# CONFIG_AUDIT is not set 36# CONFIG_AUDIT is not set
37
38#
39# RCU Subsystem
40#
41CONFIG_CLASSIC_RCU=y
42# CONFIG_TREE_RCU is not set
43# CONFIG_PREEMPT_RCU is not set
44# CONFIG_TREE_RCU_TRACE is not set
45# CONFIG_PREEMPT_RCU_TRACE is not set
36# CONFIG_IKCONFIG is not set 46# CONFIG_IKCONFIG is not set
37CONFIG_LOG_BUF_SHIFT=14 47CONFIG_LOG_BUF_SHIFT=14
38# CONFIG_CGROUPS is not set
39# CONFIG_GROUP_SCHED is not set 48# CONFIG_GROUP_SCHED is not set
49# CONFIG_CGROUPS is not set
40# CONFIG_SYSFS_DEPRECATED_V2 is not set 50# CONFIG_SYSFS_DEPRECATED_V2 is not set
41CONFIG_RELAY=y 51CONFIG_RELAY=y
42CONFIG_NAMESPACES=y 52CONFIG_NAMESPACES=y
@@ -44,23 +54,27 @@ CONFIG_NAMESPACES=y
44# CONFIG_IPC_NS is not set 54# CONFIG_IPC_NS is not set
45# CONFIG_USER_NS is not set 55# CONFIG_USER_NS is not set
46# CONFIG_PID_NS is not set 56# CONFIG_PID_NS is not set
57# CONFIG_NET_NS is not set
47CONFIG_BLK_DEV_INITRD=y 58CONFIG_BLK_DEV_INITRD=y
48CONFIG_INITRAMFS_SOURCE="" 59CONFIG_INITRAMFS_SOURCE=""
60CONFIG_RD_GZIP=y
61CONFIG_RD_BZIP2=y
62CONFIG_RD_LZMA=y
49# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 63# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
50CONFIG_SYSCTL=y 64CONFIG_SYSCTL=y
65CONFIG_ANON_INODES=y
51# CONFIG_EMBEDDED is not set 66# CONFIG_EMBEDDED is not set
52CONFIG_UID16=y 67CONFIG_UID16=y
53CONFIG_SYSCTL_SYSCALL=y 68CONFIG_SYSCTL_SYSCALL=y
54CONFIG_KALLSYMS=y 69CONFIG_KALLSYMS=y
55# CONFIG_KALLSYMS_EXTRA_PASS is not set 70# CONFIG_KALLSYMS_EXTRA_PASS is not set
71# CONFIG_STRIP_ASM_SYMS is not set
56CONFIG_HOTPLUG=y 72CONFIG_HOTPLUG=y
57CONFIG_PRINTK=y 73CONFIG_PRINTK=y
58CONFIG_BUG=y 74CONFIG_BUG=y
59CONFIG_ELF_CORE=y 75CONFIG_ELF_CORE=y
60CONFIG_COMPAT_BRK=y
61CONFIG_BASE_FULL=y 76CONFIG_BASE_FULL=y
62CONFIG_FUTEX=y 77CONFIG_FUTEX=y
63CONFIG_ANON_INODES=y
64CONFIG_EPOLL=y 78CONFIG_EPOLL=y
65CONFIG_SIGNALFD=y 79CONFIG_SIGNALFD=y
66CONFIG_TIMERFD=y 80CONFIG_TIMERFD=y
@@ -68,15 +82,16 @@ CONFIG_EVENTFD=y
68CONFIG_SHMEM=y 82CONFIG_SHMEM=y
69CONFIG_AIO=y 83CONFIG_AIO=y
70CONFIG_VM_EVENT_COUNTERS=y 84CONFIG_VM_EVENT_COUNTERS=y
85CONFIG_COMPAT_BRK=y
71CONFIG_SLAB=y 86CONFIG_SLAB=y
72# CONFIG_SLUB is not set 87# CONFIG_SLUB is not set
73# CONFIG_SLOB is not set 88# CONFIG_SLOB is not set
74# CONFIG_PROFILING is not set 89# CONFIG_PROFILING is not set
75# CONFIG_MARKERS is not set 90# CONFIG_MARKERS is not set
91# CONFIG_SLOW_WORK is not set
76# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 92# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
77CONFIG_SLABINFO=y 93CONFIG_SLABINFO=y
78CONFIG_RT_MUTEXES=y 94CONFIG_RT_MUTEXES=y
79# CONFIG_TINY_SHMEM is not set
80CONFIG_BASE_SMALL=0 95CONFIG_BASE_SMALL=0
81CONFIG_MODULES=y 96CONFIG_MODULES=y
82# CONFIG_MODULE_FORCE_LOAD is not set 97# CONFIG_MODULE_FORCE_LOAD is not set
@@ -84,11 +99,8 @@ CONFIG_MODULE_UNLOAD=y
84# CONFIG_MODULE_FORCE_UNLOAD is not set 99# CONFIG_MODULE_FORCE_UNLOAD is not set
85# CONFIG_MODVERSIONS is not set 100# CONFIG_MODVERSIONS is not set
86# CONFIG_MODULE_SRCVERSION_ALL is not set 101# CONFIG_MODULE_SRCVERSION_ALL is not set
87CONFIG_KMOD=y
88CONFIG_BLOCK=y 102CONFIG_BLOCK=y
89# CONFIG_LBD is not set 103# CONFIG_LBD is not set
90# CONFIG_BLK_DEV_IO_TRACE is not set
91# CONFIG_LSF is not set
92CONFIG_BLK_DEV_BSG=y 104CONFIG_BLK_DEV_BSG=y
93# CONFIG_BLK_DEV_INTEGRITY is not set 105# CONFIG_BLK_DEV_INTEGRITY is not set
94 106
@@ -104,7 +116,6 @@ CONFIG_DEFAULT_AS=y
104# CONFIG_DEFAULT_CFQ is not set 116# CONFIG_DEFAULT_CFQ is not set
105# CONFIG_DEFAULT_NOOP is not set 117# CONFIG_DEFAULT_NOOP is not set
106CONFIG_DEFAULT_IOSCHED="anticipatory" 118CONFIG_DEFAULT_IOSCHED="anticipatory"
107CONFIG_CLASSIC_RCU=y
108# CONFIG_FREEZER is not set 119# CONFIG_FREEZER is not set
109 120
110# 121#
@@ -140,12 +151,13 @@ CONFIG_FLAT_NODE_MEM_MAP=y
140CONFIG_NEED_MULTIPLE_NODES=y 151CONFIG_NEED_MULTIPLE_NODES=y
141CONFIG_PAGEFLAGS_EXTENDED=y 152CONFIG_PAGEFLAGS_EXTENDED=y
142CONFIG_SPLIT_PTLOCK_CPUS=4 153CONFIG_SPLIT_PTLOCK_CPUS=4
143# CONFIG_RESOURCES_64BIT is not set
144# CONFIG_PHYS_ADDR_T_64BIT is not set 154# CONFIG_PHYS_ADDR_T_64BIT is not set
145CONFIG_ZONE_DMA_FLAG=1 155CONFIG_ZONE_DMA_FLAG=1
146CONFIG_BOUNCE=y 156CONFIG_BOUNCE=y
147CONFIG_VIRT_TO_BUS=y 157CONFIG_VIRT_TO_BUS=y
148CONFIG_UNEVICTABLE_LRU=y 158CONFIG_UNEVICTABLE_LRU=y
159CONFIG_HAVE_MLOCK=y
160CONFIG_HAVE_MLOCKED_PAGE_BIT=y
149 161
150# 162#
151# General setup 163# General setup
@@ -255,6 +267,7 @@ CONFIG_NETFILTER_XTABLES=m
255CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 267CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
256CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 268CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
257CONFIG_NETFILTER_XT_TARGET_DSCP=m 269CONFIG_NETFILTER_XT_TARGET_DSCP=m
270CONFIG_NETFILTER_XT_TARGET_HL=m
258CONFIG_NETFILTER_XT_TARGET_MARK=m 271CONFIG_NETFILTER_XT_TARGET_MARK=m
259CONFIG_NETFILTER_XT_TARGET_NFLOG=m 272CONFIG_NETFILTER_XT_TARGET_NFLOG=m
260CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 273CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
@@ -263,6 +276,7 @@ CONFIG_NETFILTER_XT_TARGET_RATEEST=m
263CONFIG_NETFILTER_XT_TARGET_TRACE=m 276CONFIG_NETFILTER_XT_TARGET_TRACE=m
264CONFIG_NETFILTER_XT_TARGET_TCPMSS=m 277CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
265CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m 278CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
279CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
266CONFIG_NETFILTER_XT_MATCH_COMMENT=m 280CONFIG_NETFILTER_XT_MATCH_COMMENT=m
267CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m 281CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
268CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m 282CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
@@ -273,6 +287,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m
273CONFIG_NETFILTER_XT_MATCH_ESP=m 287CONFIG_NETFILTER_XT_MATCH_ESP=m
274CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m 288CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
275CONFIG_NETFILTER_XT_MATCH_HELPER=m 289CONFIG_NETFILTER_XT_MATCH_HELPER=m
290CONFIG_NETFILTER_XT_MATCH_HL=m
276CONFIG_NETFILTER_XT_MATCH_IPRANGE=m 291CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
277CONFIG_NETFILTER_XT_MATCH_LENGTH=m 292CONFIG_NETFILTER_XT_MATCH_LENGTH=m
278CONFIG_NETFILTER_XT_MATCH_LIMIT=m 293CONFIG_NETFILTER_XT_MATCH_LIMIT=m
@@ -351,25 +366,20 @@ CONFIG_IP6_NF_MATCH_HL=m
351CONFIG_IP6_NF_MATCH_IPV6HEADER=m 366CONFIG_IP6_NF_MATCH_IPV6HEADER=m
352CONFIG_IP6_NF_MATCH_MH=m 367CONFIG_IP6_NF_MATCH_MH=m
353CONFIG_IP6_NF_MATCH_RT=m 368CONFIG_IP6_NF_MATCH_RT=m
369CONFIG_IP6_NF_TARGET_HL=m
354CONFIG_IP6_NF_TARGET_LOG=m 370CONFIG_IP6_NF_TARGET_LOG=m
355CONFIG_IP6_NF_FILTER=m 371CONFIG_IP6_NF_FILTER=m
356CONFIG_IP6_NF_TARGET_REJECT=m 372CONFIG_IP6_NF_TARGET_REJECT=m
357CONFIG_IP6_NF_MANGLE=m 373CONFIG_IP6_NF_MANGLE=m
358CONFIG_IP6_NF_TARGET_HL=m
359CONFIG_IP6_NF_RAW=m 374CONFIG_IP6_NF_RAW=m
360CONFIG_IP_DCCP=m 375CONFIG_IP_DCCP=m
361CONFIG_INET_DCCP_DIAG=m 376CONFIG_INET_DCCP_DIAG=m
362CONFIG_IP_DCCP_ACKVEC=y
363 377
364# 378#
365# DCCP CCIDs Configuration (EXPERIMENTAL) 379# DCCP CCIDs Configuration (EXPERIMENTAL)
366# 380#
367CONFIG_IP_DCCP_CCID2=m
368# CONFIG_IP_DCCP_CCID2_DEBUG is not set 381# CONFIG_IP_DCCP_CCID2_DEBUG is not set
369CONFIG_IP_DCCP_CCID3=m 382# CONFIG_IP_DCCP_CCID3 is not set
370# CONFIG_IP_DCCP_CCID3_DEBUG is not set
371CONFIG_IP_DCCP_CCID3_RTO=100
372CONFIG_IP_DCCP_TFRC_LIB=m
373CONFIG_IP_SCTP=m 383CONFIG_IP_SCTP=m
374# CONFIG_SCTP_DBG_MSG is not set 384# CONFIG_SCTP_DBG_MSG is not set
375# CONFIG_SCTP_DBG_OBJCNT is not set 385# CONFIG_SCTP_DBG_OBJCNT is not set
@@ -391,8 +401,10 @@ CONFIG_ATALK=m
391# CONFIG_LAPB is not set 401# CONFIG_LAPB is not set
392# CONFIG_ECONET is not set 402# CONFIG_ECONET is not set
393# CONFIG_WAN_ROUTER is not set 403# CONFIG_WAN_ROUTER is not set
404# CONFIG_PHONET is not set
394# CONFIG_NET_SCHED is not set 405# CONFIG_NET_SCHED is not set
395CONFIG_NET_CLS_ROUTE=y 406CONFIG_NET_CLS_ROUTE=y
407# CONFIG_DCB is not set
396 408
397# 409#
398# Network testing 410# Network testing
@@ -403,8 +415,8 @@ CONFIG_NET_CLS_ROUTE=y
403# CONFIG_IRDA is not set 415# CONFIG_IRDA is not set
404# CONFIG_BT is not set 416# CONFIG_BT is not set
405# CONFIG_AF_RXRPC is not set 417# CONFIG_AF_RXRPC is not set
406# CONFIG_PHONET is not set
407# CONFIG_WIRELESS is not set 418# CONFIG_WIRELESS is not set
419# CONFIG_WIMAX is not set
408# CONFIG_RFKILL is not set 420# CONFIG_RFKILL is not set
409# CONFIG_NET_9P is not set 421# CONFIG_NET_9P is not set
410 422
@@ -440,9 +452,13 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
440CONFIG_ATA_OVER_ETH=m 452CONFIG_ATA_OVER_ETH=m
441# CONFIG_BLK_DEV_HD is not set 453# CONFIG_BLK_DEV_HD is not set
442CONFIG_MISC_DEVICES=y 454CONFIG_MISC_DEVICES=y
443# CONFIG_EEPROM_93CX6 is not set
444# CONFIG_ENCLOSURE_SERVICES is not set 455# CONFIG_ENCLOSURE_SERVICES is not set
445# CONFIG_C2PORT is not set 456# CONFIG_C2PORT is not set
457
458#
459# EEPROM support
460#
461# CONFIG_EEPROM_93CX6 is not set
446CONFIG_HAVE_IDE=y 462CONFIG_HAVE_IDE=y
447# CONFIG_IDE is not set 463# CONFIG_IDE is not set
448 464
@@ -490,9 +506,12 @@ CONFIG_SCSI_SRP_ATTRS=m
490CONFIG_SCSI_SRP_TGT_ATTRS=y 506CONFIG_SCSI_SRP_TGT_ATTRS=y
491CONFIG_SCSI_LOWLEVEL=y 507CONFIG_SCSI_LOWLEVEL=y
492CONFIG_ISCSI_TCP=m 508CONFIG_ISCSI_TCP=m
509# CONFIG_LIBFC is not set
510# CONFIG_LIBFCOE is not set
493# CONFIG_SCSI_DEBUG is not set 511# CONFIG_SCSI_DEBUG is not set
494CONFIG_SUN3X_ESP=y 512CONFIG_SUN3X_ESP=y
495# CONFIG_SCSI_DH is not set 513# CONFIG_SCSI_DH is not set
514# CONFIG_SCSI_OSD_INITIATOR is not set
496CONFIG_MD=y 515CONFIG_MD=y
497CONFIG_BLK_DEV_MD=m 516CONFIG_BLK_DEV_MD=m
498CONFIG_MD_LINEAR=m 517CONFIG_MD_LINEAR=m
@@ -500,7 +519,7 @@ CONFIG_MD_RAID0=m
500CONFIG_MD_RAID1=m 519CONFIG_MD_RAID1=m
501# CONFIG_MD_RAID10 is not set 520# CONFIG_MD_RAID10 is not set
502CONFIG_MD_RAID456=m 521CONFIG_MD_RAID456=m
503CONFIG_MD_RAID5_RESHAPE=y 522CONFIG_MD_RAID6_PQ=m
504# CONFIG_MD_MULTIPATH is not set 523# CONFIG_MD_MULTIPATH is not set
505# CONFIG_MD_FAULTY is not set 524# CONFIG_MD_FAULTY is not set
506CONFIG_BLK_DEV_DM=m 525CONFIG_BLK_DEV_DM=m
@@ -513,6 +532,7 @@ CONFIG_DM_MULTIPATH=m
513# CONFIG_DM_DELAY is not set 532# CONFIG_DM_DELAY is not set
514CONFIG_DM_UEVENT=y 533CONFIG_DM_UEVENT=y
515CONFIG_NETDEVICES=y 534CONFIG_NETDEVICES=y
535CONFIG_COMPAT_NET_DEV_OPS=y
516CONFIG_DUMMY=m 536CONFIG_DUMMY=m
517# CONFIG_BONDING is not set 537# CONFIG_BONDING is not set
518CONFIG_MACVLAN=m 538CONFIG_MACVLAN=m
@@ -523,6 +543,8 @@ CONFIG_VETH=m
523CONFIG_NET_ETHERNET=y 543CONFIG_NET_ETHERNET=y
524# CONFIG_MII is not set 544# CONFIG_MII is not set
525CONFIG_SUN3LANCE=y 545CONFIG_SUN3LANCE=y
546# CONFIG_ETHOC is not set
547# CONFIG_DNET is not set
526# CONFIG_IBM_NEW_EMAC_ZMII is not set 548# CONFIG_IBM_NEW_EMAC_ZMII is not set
527# CONFIG_IBM_NEW_EMAC_RGMII is not set 549# CONFIG_IBM_NEW_EMAC_RGMII is not set
528# CONFIG_IBM_NEW_EMAC_TAH is not set 550# CONFIG_IBM_NEW_EMAC_TAH is not set
@@ -539,7 +561,10 @@ CONFIG_SUN3LANCE=y
539# 561#
540# CONFIG_WLAN_PRE80211 is not set 562# CONFIG_WLAN_PRE80211 is not set
541# CONFIG_WLAN_80211 is not set 563# CONFIG_WLAN_80211 is not set
542# CONFIG_IWLWIFI_LEDS is not set 564
565#
566# Enable WiMAX (Networking options) to see the WiMAX drivers
567#
543# CONFIG_WAN is not set 568# CONFIG_WAN is not set
544CONFIG_PPP=m 569CONFIG_PPP=m
545# CONFIG_PPP_MULTILINK is not set 570# CONFIG_PPP_MULTILINK is not set
@@ -597,7 +622,6 @@ CONFIG_MOUSE_PS2=m
597CONFIG_MOUSE_PS2_ALPS=y 622CONFIG_MOUSE_PS2_ALPS=y
598CONFIG_MOUSE_PS2_LOGIPS2PP=y 623CONFIG_MOUSE_PS2_LOGIPS2PP=y
599CONFIG_MOUSE_PS2_SYNAPTICS=y 624CONFIG_MOUSE_PS2_SYNAPTICS=y
600CONFIG_MOUSE_PS2_LIFEBOOK=y
601CONFIG_MOUSE_PS2_TRACKPOINT=y 625CONFIG_MOUSE_PS2_TRACKPOINT=y
602# CONFIG_MOUSE_PS2_ELANTECH is not set 626# CONFIG_MOUSE_PS2_ELANTECH is not set
603# CONFIG_MOUSE_PS2_TOUCHKIT is not set 627# CONFIG_MOUSE_PS2_TOUCHKIT is not set
@@ -637,6 +661,7 @@ CONFIG_VT_HW_CONSOLE_BINDING=y
637# Non-8250 serial port support 661# Non-8250 serial port support
638# 662#
639CONFIG_UNIX98_PTYS=y 663CONFIG_UNIX98_PTYS=y
664# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
640CONFIG_LEGACY_PTYS=y 665CONFIG_LEGACY_PTYS=y
641CONFIG_LEGACY_PTY_COUNT=256 666CONFIG_LEGACY_PTY_COUNT=256
642# CONFIG_IPMI_HANDLER is not set 667# CONFIG_IPMI_HANDLER is not set
@@ -718,6 +743,7 @@ CONFIG_FB=y
718# CONFIG_FB_VIRTUAL is not set 743# CONFIG_FB_VIRTUAL is not set
719# CONFIG_FB_METRONOME is not set 744# CONFIG_FB_METRONOME is not set
720# CONFIG_FB_MB862XX is not set 745# CONFIG_FB_MB862XX is not set
746# CONFIG_FB_BROADSHEET is not set
721# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 747# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
722 748
723# 749#
@@ -749,7 +775,6 @@ CONFIG_HIDRAW=y
749# 775#
750# Special HID drivers 776# Special HID drivers
751# 777#
752CONFIG_HID_COMPAT=y
753# CONFIG_USB_SUPPORT is not set 778# CONFIG_USB_SUPPORT is not set
754# CONFIG_MMC is not set 779# CONFIG_MMC is not set
755# CONFIG_MEMSTICK is not set 780# CONFIG_MEMSTICK is not set
@@ -757,9 +782,9 @@ CONFIG_HID_COMPAT=y
757# CONFIG_ACCESSIBILITY is not set 782# CONFIG_ACCESSIBILITY is not set
758# CONFIG_RTC_CLASS is not set 783# CONFIG_RTC_CLASS is not set
759# CONFIG_DMADEVICES is not set 784# CONFIG_DMADEVICES is not set
785# CONFIG_AUXDISPLAY is not set
760# CONFIG_UIO is not set 786# CONFIG_UIO is not set
761# CONFIG_STAGING is not set 787# CONFIG_STAGING is not set
762CONFIG_STAGING_EXCLUDE_BUILD=y
763 788
764# 789#
765# Character devices 790# Character devices
@@ -772,6 +797,7 @@ CONFIG_EXT2_FS=y
772# CONFIG_EXT2_FS_XATTR is not set 797# CONFIG_EXT2_FS_XATTR is not set
773# CONFIG_EXT2_FS_XIP is not set 798# CONFIG_EXT2_FS_XIP is not set
774CONFIG_EXT3_FS=y 799CONFIG_EXT3_FS=y
800# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
775# CONFIG_EXT3_FS_XATTR is not set 801# CONFIG_EXT3_FS_XATTR is not set
776# CONFIG_EXT4_FS is not set 802# CONFIG_EXT4_FS is not set
777CONFIG_JBD=y 803CONFIG_JBD=y
@@ -798,13 +824,15 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
798# CONFIG_OCFS2_FS_STATS is not set 824# CONFIG_OCFS2_FS_STATS is not set
799# CONFIG_OCFS2_DEBUG_MASKLOG is not set 825# CONFIG_OCFS2_DEBUG_MASKLOG is not set
800# CONFIG_OCFS2_DEBUG_FS is not set 826# CONFIG_OCFS2_DEBUG_FS is not set
801# CONFIG_OCFS2_COMPAT_JBD is not set 827# CONFIG_OCFS2_FS_POSIX_ACL is not set
828# CONFIG_BTRFS_FS is not set
802CONFIG_DNOTIFY=y 829CONFIG_DNOTIFY=y
803CONFIG_INOTIFY=y 830CONFIG_INOTIFY=y
804CONFIG_INOTIFY_USER=y 831CONFIG_INOTIFY_USER=y
805CONFIG_QUOTA=y 832CONFIG_QUOTA=y
806CONFIG_QUOTA_NETLINK_INTERFACE=y 833CONFIG_QUOTA_NETLINK_INTERFACE=y
807# CONFIG_PRINT_QUOTA_WARNING is not set 834# CONFIG_PRINT_QUOTA_WARNING is not set
835CONFIG_QUOTA_TREE=m
808# CONFIG_QFMT_V1 is not set 836# CONFIG_QFMT_V1 is not set
809# CONFIG_QFMT_V2 is not set 837# CONFIG_QFMT_V2 is not set
810CONFIG_QUOTACTL=y 838CONFIG_QUOTACTL=y
@@ -813,6 +841,11 @@ CONFIG_AUTOFS4_FS=m
813CONFIG_FUSE_FS=m 841CONFIG_FUSE_FS=m
814 842
815# 843#
844# Caches
845#
846# CONFIG_FSCACHE is not set
847
848#
816# CD-ROM/DVD Filesystems 849# CD-ROM/DVD Filesystems
817# 850#
818CONFIG_ISO9660_FS=y 851CONFIG_ISO9660_FS=y
@@ -843,10 +876,7 @@ CONFIG_TMPFS=y
843# CONFIG_TMPFS_POSIX_ACL is not set 876# CONFIG_TMPFS_POSIX_ACL is not set
844# CONFIG_HUGETLB_PAGE is not set 877# CONFIG_HUGETLB_PAGE is not set
845CONFIG_CONFIGFS_FS=m 878CONFIG_CONFIGFS_FS=m
846 879CONFIG_MISC_FILESYSTEMS=y
847#
848# Miscellaneous filesystems
849#
850# CONFIG_ADFS_FS is not set 880# CONFIG_ADFS_FS is not set
851CONFIG_AFFS_FS=m 881CONFIG_AFFS_FS=m
852CONFIG_HFS_FS=m 882CONFIG_HFS_FS=m
@@ -855,6 +885,9 @@ CONFIG_HFSPLUS_FS=m
855# CONFIG_BFS_FS is not set 885# CONFIG_BFS_FS is not set
856# CONFIG_EFS_FS is not set 886# CONFIG_EFS_FS is not set
857CONFIG_CRAMFS=m 887CONFIG_CRAMFS=m
888CONFIG_SQUASHFS=m
889# CONFIG_SQUASHFS_EMBEDDED is not set
890CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
858# CONFIG_VXFS_FS is not set 891# CONFIG_VXFS_FS is not set
859CONFIG_MINIX_FS=y 892CONFIG_MINIX_FS=y
860# CONFIG_OMFS_FS is not set 893# CONFIG_OMFS_FS is not set
@@ -865,6 +898,7 @@ CONFIG_SYSV_FS=m
865CONFIG_UFS_FS=m 898CONFIG_UFS_FS=m
866# CONFIG_UFS_FS_WRITE is not set 899# CONFIG_UFS_FS_WRITE is not set
867# CONFIG_UFS_DEBUG is not set 900# CONFIG_UFS_DEBUG is not set
901# CONFIG_NILFS2_FS is not set
868CONFIG_NETWORK_FILESYSTEMS=y 902CONFIG_NETWORK_FILESYSTEMS=y
869CONFIG_NFS_FS=y 903CONFIG_NFS_FS=y
870CONFIG_NFS_V3=y 904CONFIG_NFS_V3=y
@@ -881,7 +915,6 @@ CONFIG_EXPORTFS=m
881CONFIG_NFS_COMMON=y 915CONFIG_NFS_COMMON=y
882CONFIG_SUNRPC=y 916CONFIG_SUNRPC=y
883CONFIG_SUNRPC_GSS=y 917CONFIG_SUNRPC_GSS=y
884# CONFIG_SUNRPC_REGISTER_V4 is not set
885CONFIG_RPCSEC_GSS_KRB5=y 918CONFIG_RPCSEC_GSS_KRB5=y
886# CONFIG_RPCSEC_GSS_SPKM3 is not set 919# CONFIG_RPCSEC_GSS_SPKM3 is not set
887CONFIG_SMB_FS=m 920CONFIG_SMB_FS=m
@@ -957,11 +990,6 @@ CONFIG_DEBUG_BUGVERBOSE=y
957CONFIG_DEBUG_MEMORY_INIT=y 990CONFIG_DEBUG_MEMORY_INIT=y
958# CONFIG_RCU_CPU_STALL_DETECTOR is not set 991# CONFIG_RCU_CPU_STALL_DETECTOR is not set
959CONFIG_SYSCTL_SYSCALL_CHECK=y 992CONFIG_SYSCTL_SYSCALL_CHECK=y
960
961#
962# Tracers
963#
964# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
965# CONFIG_SAMPLES is not set 993# CONFIG_SAMPLES is not set
966 994
967# 995#
@@ -982,13 +1010,21 @@ CONFIG_CRYPTO=y
982# 1010#
983# CONFIG_CRYPTO_FIPS is not set 1011# CONFIG_CRYPTO_FIPS is not set
984CONFIG_CRYPTO_ALGAPI=y 1012CONFIG_CRYPTO_ALGAPI=y
985CONFIG_CRYPTO_AEAD=y 1013CONFIG_CRYPTO_ALGAPI2=y
1014CONFIG_CRYPTO_AEAD=m
1015CONFIG_CRYPTO_AEAD2=y
986CONFIG_CRYPTO_BLKCIPHER=y 1016CONFIG_CRYPTO_BLKCIPHER=y
1017CONFIG_CRYPTO_BLKCIPHER2=y
987CONFIG_CRYPTO_HASH=y 1018CONFIG_CRYPTO_HASH=y
988CONFIG_CRYPTO_RNG=y 1019CONFIG_CRYPTO_HASH2=y
1020CONFIG_CRYPTO_RNG=m
1021CONFIG_CRYPTO_RNG2=y
1022CONFIG_CRYPTO_PCOMP=y
989CONFIG_CRYPTO_MANAGER=y 1023CONFIG_CRYPTO_MANAGER=y
1024CONFIG_CRYPTO_MANAGER2=y
990CONFIG_CRYPTO_GF128MUL=m 1025CONFIG_CRYPTO_GF128MUL=m
991CONFIG_CRYPTO_NULL=m 1026CONFIG_CRYPTO_NULL=m
1027CONFIG_CRYPTO_WORKQUEUE=y
992CONFIG_CRYPTO_CRYPTD=m 1028CONFIG_CRYPTO_CRYPTD=m
993CONFIG_CRYPTO_AUTHENC=m 1029CONFIG_CRYPTO_AUTHENC=m
994CONFIG_CRYPTO_TEST=m 1030CONFIG_CRYPTO_TEST=m
@@ -1058,6 +1094,7 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
1058# Compression 1094# Compression
1059# 1095#
1060CONFIG_CRYPTO_DEFLATE=m 1096CONFIG_CRYPTO_DEFLATE=m
1097CONFIG_CRYPTO_ZLIB=m
1061CONFIG_CRYPTO_LZO=m 1098CONFIG_CRYPTO_LZO=m
1062 1099
1063# 1100#
@@ -1065,11 +1102,13 @@ CONFIG_CRYPTO_LZO=m
1065# 1102#
1066# CONFIG_CRYPTO_ANSI_CPRNG is not set 1103# CONFIG_CRYPTO_ANSI_CPRNG is not set
1067# CONFIG_CRYPTO_HW is not set 1104# CONFIG_CRYPTO_HW is not set
1105# CONFIG_BINARY_PRINTF is not set
1068 1106
1069# 1107#
1070# Library routines 1108# Library routines
1071# 1109#
1072CONFIG_BITREVERSE=y 1110CONFIG_BITREVERSE=y
1111CONFIG_GENERIC_FIND_LAST_BIT=y
1073CONFIG_CRC_CCITT=m 1112CONFIG_CRC_CCITT=m
1074CONFIG_CRC16=m 1113CONFIG_CRC16=m
1075CONFIG_CRC_T10DIF=y 1114CONFIG_CRC_T10DIF=y
@@ -1081,10 +1120,13 @@ CONFIG_ZLIB_INFLATE=y
1081CONFIG_ZLIB_DEFLATE=m 1120CONFIG_ZLIB_DEFLATE=m
1082CONFIG_LZO_COMPRESS=m 1121CONFIG_LZO_COMPRESS=m
1083CONFIG_LZO_DECOMPRESS=m 1122CONFIG_LZO_DECOMPRESS=m
1123CONFIG_DECOMPRESS_GZIP=y
1124CONFIG_DECOMPRESS_BZIP2=y
1125CONFIG_DECOMPRESS_LZMA=y
1084CONFIG_TEXTSEARCH=y 1126CONFIG_TEXTSEARCH=y
1085CONFIG_TEXTSEARCH_KMP=m 1127CONFIG_TEXTSEARCH_KMP=m
1086CONFIG_TEXTSEARCH_BM=m 1128CONFIG_TEXTSEARCH_BM=m
1087CONFIG_TEXTSEARCH_FSM=m 1129CONFIG_TEXTSEARCH_FSM=m
1088CONFIG_PLIST=y
1089CONFIG_HAS_IOMEM=y 1130CONFIG_HAS_IOMEM=y
1090CONFIG_HAS_DMA=y 1131CONFIG_HAS_DMA=y
1132CONFIG_NLATTR=y
diff --git a/arch/m68k/include/asm/unistd.h b/arch/m68k/include/asm/unistd.h
index 3c19027331fa..aa29a8640f74 100644
--- a/arch/m68k/include/asm/unistd.h
+++ b/arch/m68k/include/asm/unistd.h
@@ -332,10 +332,12 @@
332#define __NR_dup3 326 332#define __NR_dup3 326
333#define __NR_pipe2 327 333#define __NR_pipe2 327
334#define __NR_inotify_init1 328 334#define __NR_inotify_init1 328
335#define __NR_preadv 329
336#define __NR_pwritev 330
335 337
336#ifdef __KERNEL__ 338#ifdef __KERNEL__
337 339
338#define NR_syscalls 329 340#define NR_syscalls 331
339 341
340#define __ARCH_WANT_IPC_PARSE_VERSION 342#define __ARCH_WANT_IPC_PARSE_VERSION
341#define __ARCH_WANT_OLD_READDIR 343#define __ARCH_WANT_OLD_READDIR
diff --git a/arch/m68k/kernel/entry.S b/arch/m68k/kernel/entry.S
index 5c332f2b9b83..8744f60c07a9 100644
--- a/arch/m68k/kernel/entry.S
+++ b/arch/m68k/kernel/entry.S
@@ -753,4 +753,6 @@ sys_call_table:
753 .long sys_dup3 753 .long sys_dup3
754 .long sys_pipe2 754 .long sys_pipe2
755 .long sys_inotify_init1 755 .long sys_inotify_init1
756 .long sys_preadv
757 .long sys_pwritev /* 330 */
756 758
diff --git a/arch/m68k/kernel/head.S b/arch/m68k/kernel/head.S
index f513f530de91..86edb5fbcfc3 100644
--- a/arch/m68k/kernel/head.S
+++ b/arch/m68k/kernel/head.S
@@ -577,7 +577,7 @@ func_define putn,1
577#endif 577#endif
578.endm 578.endm
579 579
580.section ".text.head","ax" 580__HEAD
581ENTRY(_stext) 581ENTRY(_stext)
582/* 582/*
583 * Version numbers of the bootinfo interface 583 * Version numbers of the bootinfo interface
diff --git a/arch/m68k/kernel/sun3-head.S b/arch/m68k/kernel/sun3-head.S
index aad01592dbbc..9e5c3e57c598 100644
--- a/arch/m68k/kernel/sun3-head.S
+++ b/arch/m68k/kernel/sun3-head.S
@@ -29,7 +29,7 @@ kernel_pmd_table: .skip 0x2000
29.globl kernel_pg_dir 29.globl kernel_pg_dir
30.equ kernel_pg_dir,kernel_pmd_table 30.equ kernel_pg_dir,kernel_pmd_table
31 31
32 .section .text.head 32 __HEAD
33ENTRY(_stext) 33ENTRY(_stext)
34ENTRY(_start) 34ENTRY(_start)
35 35
diff --git a/arch/m68k/kernel/vmlinux-std.lds b/arch/m68k/kernel/vmlinux-std.lds
index f846d4e3e5e1..01d212bb05a6 100644
--- a/arch/m68k/kernel/vmlinux-std.lds
+++ b/arch/m68k/kernel/vmlinux-std.lds
@@ -12,7 +12,7 @@ SECTIONS
12 . = 0x1000; 12 . = 0x1000;
13 _text = .; /* Text and read-only data */ 13 _text = .; /* Text and read-only data */
14 .text : { 14 .text : {
15 *(.text.head) 15 HEAD_TEXT
16 TEXT_TEXT 16 TEXT_TEXT
17 SCHED_TEXT 17 SCHED_TEXT
18 LOCK_TEXT 18 LOCK_TEXT
diff --git a/arch/m68k/kernel/vmlinux-sun3.lds b/arch/m68k/kernel/vmlinux-sun3.lds
index d9368c0709ba..c192f773db96 100644
--- a/arch/m68k/kernel/vmlinux-sun3.lds
+++ b/arch/m68k/kernel/vmlinux-sun3.lds
@@ -12,7 +12,7 @@ SECTIONS
12 . = 0xE002000; 12 . = 0xE002000;
13 _text = .; /* Text and read-only data */ 13 _text = .; /* Text and read-only data */
14 .text : { 14 .text : {
15 *(.text.head) 15 HEAD_TEXT
16 TEXT_TEXT 16 TEXT_TEXT
17 SCHED_TEXT 17 SCHED_TEXT
18 LOCK_TEXT 18 LOCK_TEXT
diff --git a/arch/m68knommu/Kconfig b/arch/m68knommu/Kconfig
index 4beb59dfc6ec..534376299a99 100644
--- a/arch/m68knommu/Kconfig
+++ b/arch/m68knommu/Kconfig
@@ -16,6 +16,7 @@ config MMU
16 16
17config NO_DMA 17config NO_DMA
18 bool 18 bool
19 depends on !COLDFIRE
19 default y 20 default y
20 21
21config FPU 22config FPU
diff --git a/arch/m68knommu/configs/m5208evb_defconfig b/arch/m68knommu/configs/m5208evb_defconfig
index 6fae33a05e2a..854a4f333b2f 100644
--- a/arch/m68knommu/configs/m5208evb_defconfig
+++ b/arch/m68knommu/configs/m5208evb_defconfig
@@ -1,6 +1,6 @@
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-rc1 3# Linux kernel version: 2.6.30-rc2
4# 4#
5CONFIG_M68K=y 5CONFIG_M68K=y
6# CONFIG_MMU is not set 6# CONFIG_MMU is not set
@@ -15,9 +15,10 @@ CONFIG_GENERIC_HWEIGHT=y
15CONFIG_GENERIC_HARDIRQS=y 15CONFIG_GENERIC_HARDIRQS=y
16CONFIG_GENERIC_CALIBRATE_DELAY=y 16CONFIG_GENERIC_CALIBRATE_DELAY=y
17CONFIG_GENERIC_TIME=y 17CONFIG_GENERIC_TIME=y
18CONFIG_GENERIC_CMOS_UPDATE=y
18CONFIG_TIME_LOW_RES=y 19CONFIG_TIME_LOW_RES=y
20CONFIG_GENERIC_CLOCKEVENTS=y
19CONFIG_NO_IOPORT=y 21CONFIG_NO_IOPORT=y
20CONFIG_ARCH_SUPPORTS_AOUT=y
21CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 22CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
22 23
23# 24#
@@ -33,53 +34,55 @@ CONFIG_LOCALVERSION_AUTO=y
33# CONFIG_BSD_PROCESS_ACCT is not set 34# CONFIG_BSD_PROCESS_ACCT is not set
34# CONFIG_TASKSTATS is not set 35# CONFIG_TASKSTATS is not set
35# CONFIG_AUDIT is not set 36# CONFIG_AUDIT is not set
37
38#
39# RCU Subsystem
40#
41CONFIG_CLASSIC_RCU=y
42# CONFIG_TREE_RCU is not set
43# CONFIG_PREEMPT_RCU is not set
44# CONFIG_TREE_RCU_TRACE is not set
45# CONFIG_PREEMPT_RCU_TRACE is not set
36# CONFIG_IKCONFIG is not set 46# CONFIG_IKCONFIG is not set
37CONFIG_LOG_BUF_SHIFT=14 47CONFIG_LOG_BUF_SHIFT=14
38# CONFIG_CGROUPS is not set
39# CONFIG_GROUP_SCHED is not set 48# CONFIG_GROUP_SCHED is not set
49# CONFIG_CGROUPS is not set
40# CONFIG_RELAY is not set 50# CONFIG_RELAY is not set
41# CONFIG_NAMESPACES is not set 51# CONFIG_NAMESPACES is not set
42# CONFIG_BLK_DEV_INITRD is not set 52# CONFIG_BLK_DEV_INITRD is not set
43# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 53# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
44CONFIG_SYSCTL=y 54CONFIG_SYSCTL=y
45CONFIG_EMBEDDED=y 55CONFIG_EMBEDDED=y
46# CONFIG_UID16 is not set 56CONFIG_UID16=y
47# CONFIG_SYSCTL_SYSCALL is not set 57CONFIG_SYSCTL_SYSCALL=y
48# CONFIG_KALLSYMS is not set 58# CONFIG_KALLSYMS is not set
59# CONFIG_STRIP_ASM_SYMS is not set
49# CONFIG_HOTPLUG is not set 60# CONFIG_HOTPLUG is not set
50CONFIG_PRINTK=y 61CONFIG_PRINTK=y
51CONFIG_BUG=y 62CONFIG_BUG=y
52CONFIG_ELF_CORE=y 63CONFIG_ELF_CORE=y
53# CONFIG_COMPAT_BRK is not set
54CONFIG_BASE_FULL=y 64CONFIG_BASE_FULL=y
55# CONFIG_FUTEX is not set 65# CONFIG_FUTEX is not set
56# CONFIG_EPOLL is not set 66# CONFIG_EPOLL is not set
57# CONFIG_SIGNALFD is not set 67# CONFIG_SIGNALFD is not set
58# CONFIG_TIMERFD is not set 68# CONFIG_TIMERFD is not set
59# CONFIG_EVENTFD is not set 69# CONFIG_EVENTFD is not set
70# CONFIG_AIO is not set
60# CONFIG_VM_EVENT_COUNTERS is not set 71# CONFIG_VM_EVENT_COUNTERS is not set
61CONFIG_SLAB=y 72# CONFIG_COMPAT_BRK is not set
62# CONFIG_SLUB is not set 73# CONFIG_SLAB is not set
74CONFIG_SLUB=y
63# CONFIG_SLOB is not set 75# CONFIG_SLOB is not set
64# CONFIG_PROFILING is not set 76# CONFIG_PROFILING is not set
65# CONFIG_MARKERS is not set 77# CONFIG_MARKERS is not set
66# CONFIG_HAVE_OPROFILE is not set 78# CONFIG_SLOW_WORK is not set
67# CONFIG_HAVE_KPROBES is not set 79# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
68# CONFIG_HAVE_KRETPROBES is not set
69# CONFIG_HAVE_DMA_ATTRS is not set
70CONFIG_SLABINFO=y
71CONFIG_TINY_SHMEM=y
72CONFIG_BASE_SMALL=0 80CONFIG_BASE_SMALL=0
73CONFIG_MODULES=y 81# CONFIG_MODULES is not set
74CONFIG_MODULE_UNLOAD=y
75# CONFIG_MODULE_FORCE_UNLOAD is not set
76# CONFIG_MODVERSIONS is not set
77# CONFIG_MODULE_SRCVERSION_ALL is not set
78# CONFIG_KMOD is not set
79CONFIG_BLOCK=y 82CONFIG_BLOCK=y
80# CONFIG_LBD is not set 83# CONFIG_LBD is not set
81# CONFIG_LSF is not set
82# CONFIG_BLK_DEV_BSG is not set 84# CONFIG_BLK_DEV_BSG is not set
85# CONFIG_BLK_DEV_INTEGRITY is not set
83 86
84# 87#
85# IO Schedulers 88# IO Schedulers
@@ -93,7 +96,7 @@ CONFIG_IOSCHED_NOOP=y
93# CONFIG_DEFAULT_CFQ is not set 96# CONFIG_DEFAULT_CFQ is not set
94CONFIG_DEFAULT_NOOP=y 97CONFIG_DEFAULT_NOOP=y
95CONFIG_DEFAULT_IOSCHED="noop" 98CONFIG_DEFAULT_IOSCHED="noop"
96CONFIG_CLASSIC_RCU=y 99# CONFIG_FREEZER is not set
97 100
98# 101#
99# Processor type and features 102# Processor type and features
@@ -145,44 +148,39 @@ CONFIG_RAM16BIT=y
145# CONFIG_ROM is not set 148# CONFIG_ROM is not set
146CONFIG_RAMKERNEL=y 149CONFIG_RAMKERNEL=y
147# CONFIG_ROMKERNEL is not set 150# CONFIG_ROMKERNEL is not set
151CONFIG_PREEMPT_NONE=y
152# CONFIG_PREEMPT_VOLUNTARY is not set
153# CONFIG_PREEMPT is not set
154# CONFIG_NO_HZ is not set
155# CONFIG_HIGH_RES_TIMERS is not set
156CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
148CONFIG_SELECT_MEMORY_MODEL=y 157CONFIG_SELECT_MEMORY_MODEL=y
149CONFIG_FLATMEM_MANUAL=y 158CONFIG_FLATMEM_MANUAL=y
150# CONFIG_DISCONTIGMEM_MANUAL is not set 159# CONFIG_DISCONTIGMEM_MANUAL is not set
151# CONFIG_SPARSEMEM_MANUAL is not set 160# CONFIG_SPARSEMEM_MANUAL is not set
152CONFIG_FLATMEM=y 161CONFIG_FLATMEM=y
153CONFIG_FLAT_NODE_MEM_MAP=y 162CONFIG_FLAT_NODE_MEM_MAP=y
154# CONFIG_SPARSEMEM_STATIC is not set
155# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
156CONFIG_PAGEFLAGS_EXTENDED=y 163CONFIG_PAGEFLAGS_EXTENDED=y
157CONFIG_SPLIT_PTLOCK_CPUS=4 164CONFIG_SPLIT_PTLOCK_CPUS=4
158# CONFIG_RESOURCES_64BIT is not set 165# CONFIG_PHYS_ADDR_T_64BIT is not set
159CONFIG_ZONE_DMA_FLAG=1 166CONFIG_ZONE_DMA_FLAG=1
160CONFIG_VIRT_TO_BUS=y 167CONFIG_VIRT_TO_BUS=y
168# CONFIG_UNEVICTABLE_LRU is not set
161CONFIG_ISA_DMA_API=y 169CONFIG_ISA_DMA_API=y
162 170
163# 171#
164# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
165#
166# CONFIG_PCI is not set
167# CONFIG_ARCH_SUPPORTS_MSI is not set
168
169#
170# Executable file formats 172# Executable file formats
171# 173#
172CONFIG_BINFMT_FLAT=y 174CONFIG_BINFMT_FLAT=y
173# CONFIG_BINFMT_ZFLAT is not set 175# CONFIG_BINFMT_ZFLAT is not set
174# CONFIG_BINFMT_SHARED_FLAT is not set 176# CONFIG_BINFMT_SHARED_FLAT is not set
175# CONFIG_BINFMT_AOUT is not set 177# CONFIG_HAVE_AOUT is not set
176# CONFIG_BINFMT_MISC is not set 178# CONFIG_BINFMT_MISC is not set
177 179
178# 180#
179# Power management options 181# Power management options
180# 182#
181# CONFIG_PM is not set 183# CONFIG_PM is not set
182
183#
184# Networking
185#
186CONFIG_NET=y 184CONFIG_NET=y
187 185
188# 186#
@@ -223,6 +221,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
223# CONFIG_TIPC is not set 221# CONFIG_TIPC is not set
224# CONFIG_ATM is not set 222# CONFIG_ATM is not set
225# CONFIG_BRIDGE is not set 223# CONFIG_BRIDGE is not set
224# CONFIG_NET_DSA is not set
226# CONFIG_VLAN_8021Q is not set 225# CONFIG_VLAN_8021Q is not set
227# CONFIG_DECNET is not set 226# CONFIG_DECNET is not set
228# CONFIG_LLC2 is not set 227# CONFIG_LLC2 is not set
@@ -232,7 +231,9 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
232# CONFIG_LAPB is not set 231# CONFIG_LAPB is not set
233# CONFIG_ECONET is not set 232# CONFIG_ECONET is not set
234# CONFIG_WAN_ROUTER is not set 233# CONFIG_WAN_ROUTER is not set
234# CONFIG_PHONET is not set
235# CONFIG_NET_SCHED is not set 235# CONFIG_NET_SCHED is not set
236# CONFIG_DCB is not set
236 237
237# 238#
238# Network testing 239# Network testing
@@ -243,14 +244,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
243# CONFIG_IRDA is not set 244# CONFIG_IRDA is not set
244# CONFIG_BT is not set 245# CONFIG_BT is not set
245# CONFIG_AF_RXRPC is not set 246# CONFIG_AF_RXRPC is not set
246 247# CONFIG_WIRELESS is not set
247# 248# CONFIG_WIMAX is not set
248# Wireless
249#
250# CONFIG_CFG80211 is not set
251# CONFIG_WIRELESS_EXT is not set
252# CONFIG_MAC80211 is not set
253# CONFIG_IEEE80211 is not set
254# CONFIG_RFKILL is not set 249# CONFIG_RFKILL is not set
255# CONFIG_NET_9P is not set 250# CONFIG_NET_9P is not set
256 251
@@ -289,10 +284,8 @@ CONFIG_MTD_BLOCK=y
289# 284#
290# RAM/ROM/Flash chip drivers 285# RAM/ROM/Flash chip drivers
291# 286#
292CONFIG_MTD_CFI=y 287# CONFIG_MTD_CFI is not set
293# CONFIG_MTD_JEDECPROBE is not set 288# CONFIG_MTD_JEDECPROBE is not set
294CONFIG_MTD_GEN_PROBE=y
295# CONFIG_MTD_CFI_ADV_OPTIONS is not set
296CONFIG_MTD_MAP_BANK_WIDTH_1=y 289CONFIG_MTD_MAP_BANK_WIDTH_1=y
297CONFIG_MTD_MAP_BANK_WIDTH_2=y 290CONFIG_MTD_MAP_BANK_WIDTH_2=y
298CONFIG_MTD_MAP_BANK_WIDTH_4=y 291CONFIG_MTD_MAP_BANK_WIDTH_4=y
@@ -303,10 +296,6 @@ CONFIG_MTD_CFI_I1=y
303CONFIG_MTD_CFI_I2=y 296CONFIG_MTD_CFI_I2=y
304# CONFIG_MTD_CFI_I4 is not set 297# CONFIG_MTD_CFI_I4 is not set
305# CONFIG_MTD_CFI_I8 is not set 298# CONFIG_MTD_CFI_I8 is not set
306# CONFIG_MTD_CFI_INTELEXT is not set
307CONFIG_MTD_CFI_AMDSTD=y
308# CONFIG_MTD_CFI_STAA is not set
309CONFIG_MTD_CFI_UTIL=y
310CONFIG_MTD_RAM=y 299CONFIG_MTD_RAM=y
311# CONFIG_MTD_ROM is not set 300# CONFIG_MTD_ROM is not set
312# CONFIG_MTD_ABSENT is not set 301# CONFIG_MTD_ABSENT is not set
@@ -315,7 +304,6 @@ CONFIG_MTD_RAM=y
315# Mapping drivers for chip access 304# Mapping drivers for chip access
316# 305#
317# CONFIG_MTD_COMPLEX_MAPPINGS is not set 306# CONFIG_MTD_COMPLEX_MAPPINGS is not set
318# CONFIG_MTD_PHYSMAP is not set
319CONFIG_MTD_UCLINUX=y 307CONFIG_MTD_UCLINUX=y
320# CONFIG_MTD_PLATRAM is not set 308# CONFIG_MTD_PLATRAM is not set
321 309
@@ -337,6 +325,11 @@ CONFIG_MTD_UCLINUX=y
337# CONFIG_MTD_ONENAND is not set 325# CONFIG_MTD_ONENAND is not set
338 326
339# 327#
328# LPDDR flash memory drivers
329#
330# CONFIG_MTD_LPDDR is not set
331
332#
340# UBI - Unsorted block images 333# UBI - Unsorted block images
341# 334#
342# CONFIG_MTD_UBI is not set 335# CONFIG_MTD_UBI is not set
@@ -351,6 +344,7 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
351# CONFIG_BLK_DEV_XIP is not set 344# CONFIG_BLK_DEV_XIP is not set
352# CONFIG_CDROM_PKTCDVD is not set 345# CONFIG_CDROM_PKTCDVD is not set
353# CONFIG_ATA_OVER_ETH is not set 346# CONFIG_ATA_OVER_ETH is not set
347# CONFIG_BLK_DEV_HD is not set
354# CONFIG_MISC_DEVICES is not set 348# CONFIG_MISC_DEVICES is not set
355CONFIG_HAVE_IDE=y 349CONFIG_HAVE_IDE=y
356# CONFIG_IDE is not set 350# CONFIG_IDE is not set
@@ -364,7 +358,7 @@ CONFIG_HAVE_IDE=y
364# CONFIG_SCSI_NETLINK is not set 358# CONFIG_SCSI_NETLINK is not set
365# CONFIG_MD is not set 359# CONFIG_MD is not set
366CONFIG_NETDEVICES=y 360CONFIG_NETDEVICES=y
367# CONFIG_NETDEVICES_MULTIQUEUE is not set 361CONFIG_COMPAT_NET_DEV_OPS=y
368# CONFIG_DUMMY is not set 362# CONFIG_DUMMY is not set
369# CONFIG_BONDING is not set 363# CONFIG_BONDING is not set
370# CONFIG_MACVLAN is not set 364# CONFIG_MACVLAN is not set
@@ -374,10 +368,15 @@ CONFIG_NETDEVICES=y
374# CONFIG_PHYLIB is not set 368# CONFIG_PHYLIB is not set
375CONFIG_NET_ETHERNET=y 369CONFIG_NET_ETHERNET=y
376# CONFIG_MII is not set 370# CONFIG_MII is not set
371# CONFIG_ETHOC is not set
372# CONFIG_DNET is not set
377# CONFIG_IBM_NEW_EMAC_ZMII is not set 373# CONFIG_IBM_NEW_EMAC_ZMII is not set
378# CONFIG_IBM_NEW_EMAC_RGMII is not set 374# CONFIG_IBM_NEW_EMAC_RGMII is not set
379# CONFIG_IBM_NEW_EMAC_TAH is not set 375# CONFIG_IBM_NEW_EMAC_TAH is not set
380# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 376# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
377# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
378# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
379# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
381# CONFIG_B44 is not set 380# CONFIG_B44 is not set
382CONFIG_FEC=y 381CONFIG_FEC=y
383# CONFIG_FEC2 is not set 382# CONFIG_FEC2 is not set
@@ -389,8 +388,10 @@ CONFIG_FEC=y
389# 388#
390# CONFIG_WLAN_PRE80211 is not set 389# CONFIG_WLAN_PRE80211 is not set
391# CONFIG_WLAN_80211 is not set 390# CONFIG_WLAN_80211 is not set
392# CONFIG_IWLWIFI is not set 391
393# CONFIG_IWLWIFI_LEDS is not set 392#
393# Enable WiMAX (Networking options) to see the WiMAX drivers
394#
394# CONFIG_WAN is not set 395# CONFIG_WAN is not set
395# CONFIG_PPP is not set 396# CONFIG_PPP is not set
396# CONFIG_SLIP is not set 397# CONFIG_SLIP is not set
@@ -415,7 +416,7 @@ CONFIG_FEC=y
415# Character devices 416# Character devices
416# 417#
417# CONFIG_VT is not set 418# CONFIG_VT is not set
418# CONFIG_DEVKMEM is not set 419CONFIG_DEVKMEM=y
419# CONFIG_SERIAL_NONSTANDARD is not set 420# CONFIG_SERIAL_NONSTANDARD is not set
420 421
421# 422#
@@ -428,7 +429,6 @@ CONFIG_FEC=y
428# 429#
429CONFIG_SERIAL_CORE=y 430CONFIG_SERIAL_CORE=y
430CONFIG_SERIAL_CORE_CONSOLE=y 431CONFIG_SERIAL_CORE_CONSOLE=y
431# CONFIG_SERIAL_COLDFIRE is not set
432CONFIG_SERIAL_MCF=y 432CONFIG_SERIAL_MCF=y
433CONFIG_SERIAL_MCF_BAUDRATE=115200 433CONFIG_SERIAL_MCF_BAUDRATE=115200
434CONFIG_SERIAL_MCF_CONSOLE=y 434CONFIG_SERIAL_MCF_CONSOLE=y
@@ -447,19 +447,23 @@ CONFIG_LEGACY_PTY_COUNT=256
447# CONFIG_POWER_SUPPLY is not set 447# CONFIG_POWER_SUPPLY is not set
448# CONFIG_HWMON is not set 448# CONFIG_HWMON is not set
449# CONFIG_THERMAL is not set 449# CONFIG_THERMAL is not set
450# CONFIG_THERMAL_HWMON is not set
450# CONFIG_WATCHDOG is not set 451# CONFIG_WATCHDOG is not set
452CONFIG_SSB_POSSIBLE=y
451 453
452# 454#
453# Sonics Silicon Backplane 455# Sonics Silicon Backplane
454# 456#
455CONFIG_SSB_POSSIBLE=y
456# CONFIG_SSB is not set 457# CONFIG_SSB is not set
457 458
458# 459#
459# Multifunction device drivers 460# Multifunction device drivers
460# 461#
462# CONFIG_MFD_CORE is not set
461# CONFIG_MFD_SM501 is not set 463# CONFIG_MFD_SM501 is not set
462# CONFIG_HTC_PASIC3 is not set 464# CONFIG_HTC_PASIC3 is not set
465# CONFIG_MFD_TMIO is not set
466# CONFIG_REGULATOR is not set
463 467
464# 468#
465# Multimedia devices 469# Multimedia devices
@@ -470,11 +474,12 @@ CONFIG_SSB_POSSIBLE=y
470# 474#
471# CONFIG_VIDEO_DEV is not set 475# CONFIG_VIDEO_DEV is not set
472# CONFIG_DVB_CORE is not set 476# CONFIG_DVB_CORE is not set
477# CONFIG_VIDEO_MEDIA is not set
473 478
474# 479#
475# Multimedia drivers 480# Multimedia drivers
476# 481#
477# CONFIG_DAB is not set 482CONFIG_DAB=y
478 483
479# 484#
480# Graphics support 485# Graphics support
@@ -488,10 +493,6 @@ CONFIG_SSB_POSSIBLE=y
488# Display device support 493# Display device support
489# 494#
490# CONFIG_DISPLAY_SUPPORT is not set 495# CONFIG_DISPLAY_SUPPORT is not set
491
492#
493# Sound
494#
495# CONFIG_SOUND is not set 496# CONFIG_SOUND is not set
496# CONFIG_USB_SUPPORT is not set 497# CONFIG_USB_SUPPORT is not set
497# CONFIG_MMC is not set 498# CONFIG_MMC is not set
@@ -499,7 +500,10 @@ CONFIG_SSB_POSSIBLE=y
499# CONFIG_NEW_LEDS is not set 500# CONFIG_NEW_LEDS is not set
500# CONFIG_ACCESSIBILITY is not set 501# CONFIG_ACCESSIBILITY is not set
501# CONFIG_RTC_CLASS is not set 502# CONFIG_RTC_CLASS is not set
503# CONFIG_DMADEVICES is not set
504# CONFIG_AUXDISPLAY is not set
502# CONFIG_UIO is not set 505# CONFIG_UIO is not set
506# CONFIG_STAGING is not set
503 507
504# 508#
505# File systems 509# File systems
@@ -507,11 +511,13 @@ CONFIG_SSB_POSSIBLE=y
507CONFIG_EXT2_FS=y 511CONFIG_EXT2_FS=y
508# CONFIG_EXT2_FS_XATTR is not set 512# CONFIG_EXT2_FS_XATTR is not set
509# CONFIG_EXT3_FS is not set 513# CONFIG_EXT3_FS is not set
510# CONFIG_EXT4DEV_FS is not set 514# CONFIG_EXT4_FS is not set
511# CONFIG_REISERFS_FS is not set 515# CONFIG_REISERFS_FS is not set
512# CONFIG_JFS_FS is not set 516# CONFIG_JFS_FS is not set
513# CONFIG_FS_POSIX_ACL is not set 517# CONFIG_FS_POSIX_ACL is not set
518# CONFIG_FILE_LOCKING is not set
514# CONFIG_XFS_FS is not set 519# CONFIG_XFS_FS is not set
520# CONFIG_BTRFS_FS is not set
515# CONFIG_DNOTIFY is not set 521# CONFIG_DNOTIFY is not set
516# CONFIG_INOTIFY is not set 522# CONFIG_INOTIFY is not set
517# CONFIG_QUOTA is not set 523# CONFIG_QUOTA is not set
@@ -520,6 +526,11 @@ CONFIG_EXT2_FS=y
520# CONFIG_FUSE_FS is not set 526# CONFIG_FUSE_FS is not set
521 527
522# 528#
529# Caches
530#
531# CONFIG_FSCACHE is not set
532
533#
523# CD-ROM/DVD Filesystems 534# CD-ROM/DVD Filesystems
524# 535#
525# CONFIG_ISO9660_FS is not set 536# CONFIG_ISO9660_FS is not set
@@ -540,10 +551,7 @@ CONFIG_PROC_SYSCTL=y
540# CONFIG_SYSFS is not set 551# CONFIG_SYSFS is not set
541# CONFIG_TMPFS is not set 552# CONFIG_TMPFS is not set
542# CONFIG_HUGETLB_PAGE is not set 553# CONFIG_HUGETLB_PAGE is not set
543 554CONFIG_MISC_FILESYSTEMS=y
544#
545# Miscellaneous filesystems
546#
547# CONFIG_ADFS_FS is not set 555# CONFIG_ADFS_FS is not set
548# CONFIG_AFFS_FS is not set 556# CONFIG_AFFS_FS is not set
549# CONFIG_HFS_FS is not set 557# CONFIG_HFS_FS is not set
@@ -553,13 +561,20 @@ CONFIG_PROC_SYSCTL=y
553# CONFIG_EFS_FS is not set 561# CONFIG_EFS_FS is not set
554# CONFIG_JFFS2_FS is not set 562# CONFIG_JFFS2_FS is not set
555# CONFIG_CRAMFS is not set 563# CONFIG_CRAMFS is not set
564# CONFIG_SQUASHFS is not set
556# CONFIG_VXFS_FS is not set 565# CONFIG_VXFS_FS is not set
557# CONFIG_MINIX_FS is not set 566# CONFIG_MINIX_FS is not set
567# CONFIG_OMFS_FS is not set
558# CONFIG_HPFS_FS is not set 568# CONFIG_HPFS_FS is not set
559# CONFIG_QNX4FS_FS is not set 569# CONFIG_QNX4FS_FS is not set
560CONFIG_ROMFS_FS=y 570CONFIG_ROMFS_FS=y
571# CONFIG_ROMFS_BACKED_BY_BLOCK is not set
572CONFIG_ROMFS_BACKED_BY_MTD=y
573# CONFIG_ROMFS_BACKED_BY_BOTH is not set
574CONFIG_ROMFS_ON_MTD=y
561# CONFIG_SYSV_FS is not set 575# CONFIG_SYSV_FS is not set
562# CONFIG_UFS_FS is not set 576# CONFIG_UFS_FS is not set
577# CONFIG_NILFS2_FS is not set
563# CONFIG_NETWORK_FILESYSTEMS is not set 578# CONFIG_NETWORK_FILESYSTEMS is not set
564 579
565# 580#
@@ -581,10 +596,14 @@ CONFIG_FRAME_WARN=1024
581# CONFIG_HEADERS_CHECK is not set 596# CONFIG_HEADERS_CHECK is not set
582# CONFIG_DEBUG_KERNEL is not set 597# CONFIG_DEBUG_KERNEL is not set
583# CONFIG_DEBUG_BUGVERBOSE is not set 598# CONFIG_DEBUG_BUGVERBOSE is not set
599# CONFIG_DEBUG_MEMORY_INIT is not set
600# CONFIG_RCU_CPU_STALL_DETECTOR is not set
601CONFIG_SYSCTL_SYSCALL_CHECK=y
584# CONFIG_SAMPLES is not set 602# CONFIG_SAMPLES is not set
585CONFIG_FULLDEBUG=y 603CONFIG_FULLDEBUG=y
586# CONFIG_HIGHPROFILE is not set 604# CONFIG_HIGHPROFILE is not set
587# CONFIG_BOOTPARAM is not set 605CONFIG_BOOTPARAM=y
606CONFIG_BOOTPARAM_STRING="root=/dev/mtdblock0"
588# CONFIG_NO_KERNEL_MSG is not set 607# CONFIG_NO_KERNEL_MSG is not set
589# CONFIG_BDM_DISABLE is not set 608# CONFIG_BDM_DISABLE is not set
590 609
@@ -592,19 +611,23 @@ CONFIG_FULLDEBUG=y
592# Security options 611# Security options
593# 612#
594# CONFIG_KEYS is not set 613# CONFIG_KEYS is not set
614# CONFIG_SECURITYFS is not set
595# CONFIG_SECURITY_FILE_CAPABILITIES is not set 615# CONFIG_SECURITY_FILE_CAPABILITIES is not set
596# CONFIG_CRYPTO is not set 616# CONFIG_CRYPTO is not set
617# CONFIG_BINARY_PRINTF is not set
597 618
598# 619#
599# Library routines 620# Library routines
600# 621#
601CONFIG_BITREVERSE=y 622CONFIG_BITREVERSE=y
602# CONFIG_GENERIC_FIND_FIRST_BIT is not set 623CONFIG_GENERIC_FIND_LAST_BIT=y
603# CONFIG_CRC_CCITT is not set 624# CONFIG_CRC_CCITT is not set
604# CONFIG_CRC16 is not set 625# CONFIG_CRC16 is not set
626# CONFIG_CRC_T10DIF is not set
605# CONFIG_CRC_ITU_T is not set 627# CONFIG_CRC_ITU_T is not set
606CONFIG_CRC32=y 628CONFIG_CRC32=y
607# CONFIG_CRC7 is not set 629# CONFIG_CRC7 is not set
608# CONFIG_LIBCRC32C is not set 630# CONFIG_LIBCRC32C is not set
609CONFIG_HAS_IOMEM=y 631CONFIG_HAS_IOMEM=y
610CONFIG_HAS_DMA=y 632CONFIG_HAS_DMA=y
633CONFIG_NLATTR=y
diff --git a/arch/m68knommu/configs/m5249evb_defconfig b/arch/m68knommu/configs/m5249evb_defconfig
index cc6458333d67..2efba32e33a0 100644
--- a/arch/m68knommu/configs/m5249evb_defconfig
+++ b/arch/m68knommu/configs/m5249evb_defconfig
@@ -1,6 +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.26-rc1 3# Linux kernel version: 2.6.30-rc2
4# Wed Apr 22 17:32:41 2009
4# 5#
5CONFIG_M68K=y 6CONFIG_M68K=y
6# CONFIG_MMU is not set 7# CONFIG_MMU is not set
@@ -15,9 +16,10 @@ CONFIG_GENERIC_HWEIGHT=y
15CONFIG_GENERIC_HARDIRQS=y 16CONFIG_GENERIC_HARDIRQS=y
16CONFIG_GENERIC_CALIBRATE_DELAY=y 17CONFIG_GENERIC_CALIBRATE_DELAY=y
17CONFIG_GENERIC_TIME=y 18CONFIG_GENERIC_TIME=y
19CONFIG_GENERIC_CMOS_UPDATE=y
18CONFIG_TIME_LOW_RES=y 20CONFIG_TIME_LOW_RES=y
21# CONFIG_GENERIC_CLOCKEVENTS is not set
19CONFIG_NO_IOPORT=y 22CONFIG_NO_IOPORT=y
20CONFIG_ARCH_SUPPORTS_AOUT=y
21CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 23CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
22 24
23# 25#
@@ -29,11 +31,23 @@ CONFIG_INIT_ENV_ARG_LIMIT=32
29CONFIG_LOCALVERSION="" 31CONFIG_LOCALVERSION=""
30CONFIG_LOCALVERSION_AUTO=y 32CONFIG_LOCALVERSION_AUTO=y
31# CONFIG_SYSVIPC is not set 33# CONFIG_SYSVIPC is not set
34# CONFIG_POSIX_MQUEUE is not set
32# CONFIG_BSD_PROCESS_ACCT is not set 35# CONFIG_BSD_PROCESS_ACCT is not set
36# CONFIG_TASKSTATS is not set
37# CONFIG_AUDIT is not set
38
39#
40# RCU Subsystem
41#
42CONFIG_CLASSIC_RCU=y
43# CONFIG_TREE_RCU is not set
44# CONFIG_PREEMPT_RCU is not set
45# CONFIG_TREE_RCU_TRACE is not set
46# CONFIG_PREEMPT_RCU_TRACE is not set
33# CONFIG_IKCONFIG is not set 47# CONFIG_IKCONFIG is not set
34CONFIG_LOG_BUF_SHIFT=14 48CONFIG_LOG_BUF_SHIFT=14
35# CONFIG_CGROUPS is not set
36# CONFIG_GROUP_SCHED is not set 49# CONFIG_GROUP_SCHED is not set
50# CONFIG_CGROUPS is not set
37# CONFIG_SYSFS_DEPRECATED_V2 is not set 51# CONFIG_SYSFS_DEPRECATED_V2 is not set
38# CONFIG_RELAY is not set 52# CONFIG_RELAY is not set
39# CONFIG_NAMESPACES is not set 53# CONFIG_NAMESPACES is not set
@@ -41,44 +55,37 @@ CONFIG_LOG_BUF_SHIFT=14
41# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 55# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
42CONFIG_SYSCTL=y 56CONFIG_SYSCTL=y
43CONFIG_EMBEDDED=y 57CONFIG_EMBEDDED=y
44# CONFIG_UID16 is not set 58CONFIG_UID16=y
45# CONFIG_SYSCTL_SYSCALL is not set 59CONFIG_SYSCTL_SYSCALL=y
46# CONFIG_KALLSYMS is not set 60# CONFIG_KALLSYMS is not set
61# CONFIG_STRIP_ASM_SYMS is not set
47# CONFIG_HOTPLUG is not set 62# CONFIG_HOTPLUG is not set
48CONFIG_PRINTK=y 63CONFIG_PRINTK=y
49CONFIG_BUG=y 64CONFIG_BUG=y
50CONFIG_ELF_CORE=y 65CONFIG_ELF_CORE=y
51# CONFIG_COMPAT_BRK is not set
52CONFIG_BASE_FULL=y 66CONFIG_BASE_FULL=y
53# CONFIG_FUTEX is not set 67# CONFIG_FUTEX is not set
54# CONFIG_EPOLL is not set 68# CONFIG_EPOLL is not set
55# CONFIG_SIGNALFD is not set 69# CONFIG_SIGNALFD is not set
56# CONFIG_TIMERFD is not set 70# CONFIG_TIMERFD is not set
57# CONFIG_EVENTFD is not set 71# CONFIG_EVENTFD is not set
72# CONFIG_AIO is not set
58# CONFIG_VM_EVENT_COUNTERS is not set 73# CONFIG_VM_EVENT_COUNTERS is not set
59CONFIG_SLAB=y 74# CONFIG_SLUB_DEBUG is not set
60# CONFIG_SLUB is not set 75CONFIG_COMPAT_BRK=y
76# CONFIG_SLAB is not set
77CONFIG_SLUB=y
61# CONFIG_SLOB is not set 78# CONFIG_SLOB is not set
62# CONFIG_PROFILING is not set 79# CONFIG_PROFILING is not set
63# CONFIG_MARKERS is not set 80# CONFIG_MARKERS is not set
64# CONFIG_HAVE_OPROFILE is not set 81# CONFIG_SLOW_WORK is not set
65# CONFIG_HAVE_KPROBES is not set 82# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
66# CONFIG_HAVE_KRETPROBES is not set
67# CONFIG_HAVE_DMA_ATTRS is not set
68CONFIG_SLABINFO=y
69CONFIG_TINY_SHMEM=y
70CONFIG_BASE_SMALL=0 83CONFIG_BASE_SMALL=0
71CONFIG_MODULES=y 84# CONFIG_MODULES is not set
72CONFIG_MODULE_UNLOAD=y
73# CONFIG_MODULE_FORCE_UNLOAD is not set
74# CONFIG_MODVERSIONS is not set
75# CONFIG_MODULE_SRCVERSION_ALL is not set
76# CONFIG_KMOD is not set
77CONFIG_BLOCK=y 85CONFIG_BLOCK=y
78# CONFIG_LBD is not set 86# CONFIG_LBD is not set
79# CONFIG_BLK_DEV_IO_TRACE is not set
80# CONFIG_LSF is not set
81# CONFIG_BLK_DEV_BSG is not set 87# CONFIG_BLK_DEV_BSG is not set
88# CONFIG_BLK_DEV_INTEGRITY is not set
82 89
83# 90#
84# IO Schedulers 91# IO Schedulers
@@ -92,7 +99,7 @@ CONFIG_IOSCHED_NOOP=y
92# CONFIG_DEFAULT_CFQ is not set 99# CONFIG_DEFAULT_CFQ is not set
93CONFIG_DEFAULT_NOOP=y 100CONFIG_DEFAULT_NOOP=y
94CONFIG_DEFAULT_IOSCHED="noop" 101CONFIG_DEFAULT_IOSCHED="noop"
95CONFIG_CLASSIC_RCU=y 102# CONFIG_FREEZER is not set
96 103
97# 104#
98# Processor type and features 105# Processor type and features
@@ -144,45 +151,103 @@ CONFIG_RAMAUTOBIT=y
144# CONFIG_ROM is not set 151# CONFIG_ROM is not set
145CONFIG_RAMKERNEL=y 152CONFIG_RAMKERNEL=y
146# CONFIG_ROMKERNEL is not set 153# CONFIG_ROMKERNEL is not set
154CONFIG_PREEMPT_NONE=y
155# CONFIG_PREEMPT_VOLUNTARY is not set
156# CONFIG_PREEMPT is not set
147CONFIG_SELECT_MEMORY_MODEL=y 157CONFIG_SELECT_MEMORY_MODEL=y
148CONFIG_FLATMEM_MANUAL=y 158CONFIG_FLATMEM_MANUAL=y
149# CONFIG_DISCONTIGMEM_MANUAL is not set 159# CONFIG_DISCONTIGMEM_MANUAL is not set
150# CONFIG_SPARSEMEM_MANUAL is not set 160# CONFIG_SPARSEMEM_MANUAL is not set
151CONFIG_FLATMEM=y 161CONFIG_FLATMEM=y
152CONFIG_FLAT_NODE_MEM_MAP=y 162CONFIG_FLAT_NODE_MEM_MAP=y
153# CONFIG_SPARSEMEM_STATIC is not set
154# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
155CONFIG_PAGEFLAGS_EXTENDED=y 163CONFIG_PAGEFLAGS_EXTENDED=y
156CONFIG_SPLIT_PTLOCK_CPUS=4 164CONFIG_SPLIT_PTLOCK_CPUS=4
157# CONFIG_RESOURCES_64BIT is not set 165# CONFIG_PHYS_ADDR_T_64BIT is not set
158CONFIG_ZONE_DMA_FLAG=1 166CONFIG_ZONE_DMA_FLAG=1
159CONFIG_VIRT_TO_BUS=y 167CONFIG_VIRT_TO_BUS=y
168# CONFIG_UNEVICTABLE_LRU is not set
160CONFIG_ISA_DMA_API=y 169CONFIG_ISA_DMA_API=y
161 170
162# 171#
163# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
164#
165# CONFIG_PCI is not set
166# CONFIG_ARCH_SUPPORTS_MSI is not set
167
168#
169# Executable file formats 172# Executable file formats
170# 173#
171CONFIG_BINFMT_FLAT=y 174CONFIG_BINFMT_FLAT=y
172# CONFIG_BINFMT_ZFLAT is not set 175# CONFIG_BINFMT_ZFLAT is not set
173# CONFIG_BINFMT_SHARED_FLAT is not set 176# CONFIG_BINFMT_SHARED_FLAT is not set
174# CONFIG_BINFMT_AOUT is not set 177# CONFIG_HAVE_AOUT is not set
175# CONFIG_BINFMT_MISC is not set 178# CONFIG_BINFMT_MISC is not set
176 179
177# 180#
178# Power management options 181# Power management options
179# 182#
180# CONFIG_PM is not set 183# CONFIG_PM is not set
181 184CONFIG_NET=y
182# 185
183# Networking 186#
184# 187# Networking options
185# CONFIG_NET is not set 188#
189CONFIG_PACKET=y
190# CONFIG_PACKET_MMAP is not set
191CONFIG_UNIX=y
192# CONFIG_NET_KEY is not set
193CONFIG_INET=y
194# CONFIG_IP_MULTICAST is not set
195# CONFIG_IP_ADVANCED_ROUTER is not set
196CONFIG_IP_FIB_HASH=y
197# CONFIG_IP_PNP is not set
198# CONFIG_NET_IPIP is not set
199# CONFIG_NET_IPGRE is not set
200# CONFIG_ARPD is not set
201# CONFIG_SYN_COOKIES is not set
202# CONFIG_INET_AH is not set
203# CONFIG_INET_ESP is not set
204# CONFIG_INET_IPCOMP is not set
205# CONFIG_INET_XFRM_TUNNEL is not set
206# CONFIG_INET_TUNNEL is not set
207# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
208# CONFIG_INET_XFRM_MODE_TUNNEL is not set
209# CONFIG_INET_XFRM_MODE_BEET is not set
210# CONFIG_INET_LRO is not set
211# CONFIG_INET_DIAG is not set
212# CONFIG_TCP_CONG_ADVANCED is not set
213CONFIG_TCP_CONG_CUBIC=y
214CONFIG_DEFAULT_TCP_CONG="cubic"
215# CONFIG_TCP_MD5SIG is not set
216# CONFIG_IPV6 is not set
217# CONFIG_NETWORK_SECMARK is not set
218# CONFIG_NETFILTER is not set
219# CONFIG_IP_DCCP is not set
220# CONFIG_IP_SCTP is not set
221# CONFIG_TIPC is not set
222# CONFIG_ATM is not set
223# CONFIG_BRIDGE is not set
224# CONFIG_NET_DSA is not set
225# CONFIG_VLAN_8021Q is not set
226# CONFIG_DECNET is not set
227# CONFIG_LLC2 is not set
228# CONFIG_IPX is not set
229# CONFIG_ATALK is not set
230# CONFIG_X25 is not set
231# CONFIG_LAPB is not set
232# CONFIG_ECONET is not set
233# CONFIG_WAN_ROUTER is not set
234# CONFIG_PHONET is not set
235# CONFIG_NET_SCHED is not set
236# CONFIG_DCB is not set
237
238#
239# Network testing
240#
241# CONFIG_NET_PKTGEN is not set
242# CONFIG_HAMRADIO is not set
243# CONFIG_CAN is not set
244# CONFIG_IRDA is not set
245# CONFIG_BT is not set
246# CONFIG_AF_RXRPC is not set
247# CONFIG_WIRELESS is not set
248# CONFIG_WIMAX is not set
249# CONFIG_RFKILL is not set
250# CONFIG_NET_9P is not set
186 251
187# 252#
188# Device Drivers 253# Device Drivers
@@ -194,6 +259,7 @@ CONFIG_BINFMT_FLAT=y
194CONFIG_STANDALONE=y 259CONFIG_STANDALONE=y
195CONFIG_PREVENT_FIRMWARE_BUILD=y 260CONFIG_PREVENT_FIRMWARE_BUILD=y
196# CONFIG_SYS_HYPERVISOR is not set 261# CONFIG_SYS_HYPERVISOR is not set
262# CONFIG_CONNECTOR is not set
197CONFIG_MTD=y 263CONFIG_MTD=y
198# CONFIG_MTD_DEBUG is not set 264# CONFIG_MTD_DEBUG is not set
199# CONFIG_MTD_CONCAT is not set 265# CONFIG_MTD_CONCAT is not set
@@ -259,6 +325,11 @@ CONFIG_MTD_UCLINUX=y
259# CONFIG_MTD_ONENAND is not set 325# CONFIG_MTD_ONENAND is not set
260 326
261# 327#
328# LPDDR flash memory drivers
329#
330# CONFIG_MTD_LPDDR is not set
331
332#
262# UBI - Unsorted block images 333# UBI - Unsorted block images
263# 334#
264# CONFIG_MTD_UBI is not set 335# CONFIG_MTD_UBI is not set
@@ -266,14 +337,15 @@ CONFIG_MTD_UCLINUX=y
266CONFIG_BLK_DEV=y 337CONFIG_BLK_DEV=y
267# CONFIG_BLK_DEV_COW_COMMON is not set 338# CONFIG_BLK_DEV_COW_COMMON is not set
268# CONFIG_BLK_DEV_LOOP is not set 339# CONFIG_BLK_DEV_LOOP is not set
340# CONFIG_BLK_DEV_NBD is not set
269CONFIG_BLK_DEV_RAM=y 341CONFIG_BLK_DEV_RAM=y
270CONFIG_BLK_DEV_RAM_COUNT=16 342CONFIG_BLK_DEV_RAM_COUNT=16
271CONFIG_BLK_DEV_RAM_SIZE=4096 343CONFIG_BLK_DEV_RAM_SIZE=4096
272# CONFIG_BLK_DEV_XIP is not set 344# CONFIG_BLK_DEV_XIP is not set
273# CONFIG_CDROM_PKTCDVD is not set 345# CONFIG_CDROM_PKTCDVD is not set
274CONFIG_MISC_DEVICES=y 346# CONFIG_ATA_OVER_ETH is not set
275# CONFIG_EEPROM_93CX6 is not set 347# CONFIG_BLK_DEV_HD is not set
276# CONFIG_ENCLOSURE_SERVICES is not set 348# CONFIG_MISC_DEVICES is not set
277CONFIG_HAVE_IDE=y 349CONFIG_HAVE_IDE=y
278# CONFIG_IDE is not set 350# CONFIG_IDE is not set
279 351
@@ -285,6 +357,56 @@ CONFIG_HAVE_IDE=y
285# CONFIG_SCSI_DMA is not set 357# CONFIG_SCSI_DMA is not set
286# CONFIG_SCSI_NETLINK is not set 358# CONFIG_SCSI_NETLINK is not set
287# CONFIG_MD is not set 359# CONFIG_MD is not set
360CONFIG_NETDEVICES=y
361CONFIG_COMPAT_NET_DEV_OPS=y
362# CONFIG_DUMMY is not set
363# CONFIG_BONDING is not set
364# CONFIG_MACVLAN is not set
365# CONFIG_EQUALIZER is not set
366# CONFIG_TUN is not set
367# CONFIG_VETH is not set
368# CONFIG_PHYLIB is not set
369CONFIG_NET_ETHERNET=y
370# CONFIG_MII is not set
371# CONFIG_ETHOC is not set
372# CONFIG_DNET is not set
373# CONFIG_IBM_NEW_EMAC_ZMII is not set
374# CONFIG_IBM_NEW_EMAC_RGMII is not set
375# CONFIG_IBM_NEW_EMAC_TAH is not set
376# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
377# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
378# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
379# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
380# CONFIG_B44 is not set
381# CONFIG_NETDEV_1000 is not set
382# CONFIG_NETDEV_10000 is not set
383
384#
385# Wireless LAN
386#
387# CONFIG_WLAN_PRE80211 is not set
388# CONFIG_WLAN_80211 is not set
389
390#
391# Enable WiMAX (Networking options) to see the WiMAX drivers
392#
393# CONFIG_WAN is not set
394CONFIG_PPP=y
395# CONFIG_PPP_MULTILINK is not set
396# CONFIG_PPP_FILTER is not set
397# CONFIG_PPP_ASYNC is not set
398# CONFIG_PPP_SYNC_TTY is not set
399# CONFIG_PPP_DEFLATE is not set
400# CONFIG_PPP_BSDCOMP is not set
401# CONFIG_PPP_MPPE is not set
402# CONFIG_PPPOE is not set
403# CONFIG_PPPOL2TP is not set
404# CONFIG_SLIP is not set
405CONFIG_SLHC=y
406# CONFIG_NETCONSOLE is not set
407# CONFIG_NETPOLL is not set
408# CONFIG_NET_POLL_CONTROLLER is not set
409# CONFIG_ISDN is not set
288# CONFIG_PHONE is not set 410# CONFIG_PHONE is not set
289 411
290# 412#
@@ -302,7 +424,7 @@ CONFIG_HAVE_IDE=y
302# Character devices 424# Character devices
303# 425#
304# CONFIG_VT is not set 426# CONFIG_VT is not set
305# CONFIG_DEVKMEM is not set 427CONFIG_DEVKMEM=y
306# CONFIG_SERIAL_NONSTANDARD is not set 428# CONFIG_SERIAL_NONSTANDARD is not set
307 429
308# 430#
@@ -315,7 +437,6 @@ CONFIG_HAVE_IDE=y
315# 437#
316CONFIG_SERIAL_CORE=y 438CONFIG_SERIAL_CORE=y
317CONFIG_SERIAL_CORE_CONSOLE=y 439CONFIG_SERIAL_CORE_CONSOLE=y
318# CONFIG_SERIAL_COLDFIRE is not set
319CONFIG_SERIAL_MCF=y 440CONFIG_SERIAL_MCF=y
320CONFIG_SERIAL_MCF_BAUDRATE=19200 441CONFIG_SERIAL_MCF_BAUDRATE=19200
321CONFIG_SERIAL_MCF_CONSOLE=y 442CONFIG_SERIAL_MCF_CONSOLE=y
@@ -323,7 +444,8 @@ CONFIG_SERIAL_MCF_CONSOLE=y
323CONFIG_LEGACY_PTYS=y 444CONFIG_LEGACY_PTYS=y
324CONFIG_LEGACY_PTY_COUNT=256 445CONFIG_LEGACY_PTY_COUNT=256
325# CONFIG_IPMI_HANDLER is not set 446# CONFIG_IPMI_HANDLER is not set
326# CONFIG_HW_RANDOM is not set 447CONFIG_HW_RANDOM=y
448# CONFIG_HW_RANDOM_TIMERIOMEM is not set
327# CONFIG_GEN_RTC is not set 449# CONFIG_GEN_RTC is not set
328# CONFIG_R3964 is not set 450# CONFIG_R3964 is not set
329# CONFIG_RAW_DRIVER is not set 451# CONFIG_RAW_DRIVER is not set
@@ -334,19 +456,23 @@ CONFIG_LEGACY_PTY_COUNT=256
334# CONFIG_POWER_SUPPLY is not set 456# CONFIG_POWER_SUPPLY is not set
335# CONFIG_HWMON is not set 457# CONFIG_HWMON is not set
336# CONFIG_THERMAL is not set 458# CONFIG_THERMAL is not set
459# CONFIG_THERMAL_HWMON is not set
337# CONFIG_WATCHDOG is not set 460# CONFIG_WATCHDOG is not set
461CONFIG_SSB_POSSIBLE=y
338 462
339# 463#
340# Sonics Silicon Backplane 464# Sonics Silicon Backplane
341# 465#
342CONFIG_SSB_POSSIBLE=y
343# CONFIG_SSB is not set 466# CONFIG_SSB is not set
344 467
345# 468#
346# Multifunction device drivers 469# Multifunction device drivers
347# 470#
471# CONFIG_MFD_CORE is not set
348# CONFIG_MFD_SM501 is not set 472# CONFIG_MFD_SM501 is not set
349# CONFIG_HTC_PASIC3 is not set 473# CONFIG_HTC_PASIC3 is not set
474# CONFIG_MFD_TMIO is not set
475# CONFIG_REGULATOR is not set
350 476
351# 477#
352# Multimedia devices 478# Multimedia devices
@@ -356,11 +482,13 @@ CONFIG_SSB_POSSIBLE=y
356# Multimedia core support 482# Multimedia core support
357# 483#
358# CONFIG_VIDEO_DEV is not set 484# CONFIG_VIDEO_DEV is not set
485# CONFIG_DVB_CORE is not set
486# CONFIG_VIDEO_MEDIA is not set
359 487
360# 488#
361# Multimedia drivers 489# Multimedia drivers
362# 490#
363# CONFIG_DAB is not set 491CONFIG_DAB=y
364 492
365# 493#
366# Graphics support 494# Graphics support
@@ -374,10 +502,6 @@ CONFIG_SSB_POSSIBLE=y
374# Display device support 502# Display device support
375# 503#
376# CONFIG_DISPLAY_SUPPORT is not set 504# CONFIG_DISPLAY_SUPPORT is not set
377
378#
379# Sound
380#
381# CONFIG_SOUND is not set 505# CONFIG_SOUND is not set
382# CONFIG_USB_SUPPORT is not set 506# CONFIG_USB_SUPPORT is not set
383# CONFIG_MMC is not set 507# CONFIG_MMC is not set
@@ -385,7 +509,10 @@ CONFIG_SSB_POSSIBLE=y
385# CONFIG_NEW_LEDS is not set 509# CONFIG_NEW_LEDS is not set
386# CONFIG_ACCESSIBILITY is not set 510# CONFIG_ACCESSIBILITY is not set
387# CONFIG_RTC_CLASS is not set 511# CONFIG_RTC_CLASS is not set
512# CONFIG_DMADEVICES is not set
513# CONFIG_AUXDISPLAY is not set
388# CONFIG_UIO is not set 514# CONFIG_UIO is not set
515# CONFIG_STAGING is not set
389 516
390# 517#
391# File systems 518# File systems
@@ -393,19 +520,28 @@ CONFIG_SSB_POSSIBLE=y
393CONFIG_EXT2_FS=y 520CONFIG_EXT2_FS=y
394# CONFIG_EXT2_FS_XATTR is not set 521# CONFIG_EXT2_FS_XATTR is not set
395# CONFIG_EXT3_FS is not set 522# CONFIG_EXT3_FS is not set
396# CONFIG_EXT4DEV_FS is not set 523# CONFIG_EXT4_FS is not set
397# CONFIG_REISERFS_FS is not set 524# CONFIG_REISERFS_FS is not set
398# CONFIG_JFS_FS is not set 525# CONFIG_JFS_FS is not set
399# CONFIG_FS_POSIX_ACL is not set 526# CONFIG_FS_POSIX_ACL is not set
527# CONFIG_FILE_LOCKING is not set
400# CONFIG_XFS_FS is not set 528# CONFIG_XFS_FS is not set
401# CONFIG_DNOTIFY is not set 529# CONFIG_OCFS2_FS is not set
402# CONFIG_INOTIFY is not set 530# CONFIG_BTRFS_FS is not set
531CONFIG_DNOTIFY=y
532CONFIG_INOTIFY=y
533CONFIG_INOTIFY_USER=y
403# CONFIG_QUOTA is not set 534# CONFIG_QUOTA is not set
404# CONFIG_AUTOFS_FS is not set 535# CONFIG_AUTOFS_FS is not set
405# CONFIG_AUTOFS4_FS is not set 536# CONFIG_AUTOFS4_FS is not set
406# CONFIG_FUSE_FS is not set 537# CONFIG_FUSE_FS is not set
407 538
408# 539#
540# Caches
541#
542# CONFIG_FSCACHE is not set
543
544#
409# CD-ROM/DVD Filesystems 545# CD-ROM/DVD Filesystems
410# 546#
411# CONFIG_ISO9660_FS is not set 547# CONFIG_ISO9660_FS is not set
@@ -427,10 +563,7 @@ CONFIG_SYSFS=y
427# CONFIG_TMPFS is not set 563# CONFIG_TMPFS is not set
428# CONFIG_HUGETLB_PAGE is not set 564# CONFIG_HUGETLB_PAGE is not set
429# CONFIG_CONFIGFS_FS is not set 565# CONFIG_CONFIGFS_FS is not set
430 566CONFIG_MISC_FILESYSTEMS=y
431#
432# Miscellaneous filesystems
433#
434# CONFIG_ADFS_FS is not set 567# CONFIG_ADFS_FS is not set
435# CONFIG_AFFS_FS is not set 568# CONFIG_AFFS_FS is not set
436# CONFIG_HFS_FS is not set 569# CONFIG_HFS_FS is not set
@@ -440,13 +573,21 @@ CONFIG_SYSFS=y
440# CONFIG_EFS_FS is not set 573# CONFIG_EFS_FS is not set
441# CONFIG_JFFS2_FS is not set 574# CONFIG_JFFS2_FS is not set
442# CONFIG_CRAMFS is not set 575# CONFIG_CRAMFS is not set
576# CONFIG_SQUASHFS is not set
443# CONFIG_VXFS_FS is not set 577# CONFIG_VXFS_FS is not set
444# CONFIG_MINIX_FS is not set 578# CONFIG_MINIX_FS is not set
579# CONFIG_OMFS_FS is not set
445# CONFIG_HPFS_FS is not set 580# CONFIG_HPFS_FS is not set
446# CONFIG_QNX4FS_FS is not set 581# CONFIG_QNX4FS_FS is not set
447CONFIG_ROMFS_FS=y 582CONFIG_ROMFS_FS=y
583# CONFIG_ROMFS_BACKED_BY_BLOCK is not set
584CONFIG_ROMFS_BACKED_BY_MTD=y
585# CONFIG_ROMFS_BACKED_BY_BOTH is not set
586CONFIG_ROMFS_ON_MTD=y
448# CONFIG_SYSV_FS is not set 587# CONFIG_SYSV_FS is not set
449# CONFIG_UFS_FS is not set 588# CONFIG_UFS_FS is not set
589# CONFIG_NILFS2_FS is not set
590# CONFIG_NETWORK_FILESYSTEMS is not set
450 591
451# 592#
452# Partition Types 593# Partition Types
@@ -454,6 +595,7 @@ CONFIG_ROMFS_FS=y
454# CONFIG_PARTITION_ADVANCED is not set 595# CONFIG_PARTITION_ADVANCED is not set
455CONFIG_MSDOS_PARTITION=y 596CONFIG_MSDOS_PARTITION=y
456# CONFIG_NLS is not set 597# CONFIG_NLS is not set
598# CONFIG_DLM is not set
457 599
458# 600#
459# Kernel hacking 601# Kernel hacking
@@ -468,10 +610,14 @@ CONFIG_FRAME_WARN=1024
468# CONFIG_HEADERS_CHECK is not set 610# CONFIG_HEADERS_CHECK is not set
469# CONFIG_DEBUG_KERNEL is not set 611# CONFIG_DEBUG_KERNEL is not set
470# CONFIG_DEBUG_BUGVERBOSE is not set 612# CONFIG_DEBUG_BUGVERBOSE is not set
613# CONFIG_DEBUG_MEMORY_INIT is not set
614# CONFIG_RCU_CPU_STALL_DETECTOR is not set
615# CONFIG_SYSCTL_SYSCALL_CHECK is not set
471# CONFIG_SAMPLES is not set 616# CONFIG_SAMPLES is not set
472# CONFIG_FULLDEBUG is not set 617# CONFIG_FULLDEBUG is not set
473# CONFIG_HIGHPROFILE is not set 618# CONFIG_HIGHPROFILE is not set
474# CONFIG_BOOTPARAM is not set 619CONFIG_BOOTPARAM=y
620CONFIG_BOOTPARAM_STRING="root=/dev/mtdblock0"
475# CONFIG_NO_KERNEL_MSG is not set 621# CONFIG_NO_KERNEL_MSG is not set
476# CONFIG_BDM_DISABLE is not set 622# CONFIG_BDM_DISABLE is not set
477 623
@@ -480,18 +626,22 @@ CONFIG_FRAME_WARN=1024
480# 626#
481# CONFIG_KEYS is not set 627# CONFIG_KEYS is not set
482# CONFIG_SECURITY is not set 628# CONFIG_SECURITY is not set
629# CONFIG_SECURITYFS is not set
483# CONFIG_SECURITY_FILE_CAPABILITIES is not set 630# CONFIG_SECURITY_FILE_CAPABILITIES is not set
484# CONFIG_CRYPTO is not set 631# CONFIG_CRYPTO is not set
632# CONFIG_BINARY_PRINTF is not set
485 633
486# 634#
487# Library routines 635# Library routines
488# 636#
489# CONFIG_GENERIC_FIND_FIRST_BIT is not set 637CONFIG_GENERIC_FIND_LAST_BIT=y
490# CONFIG_CRC_CCITT is not set 638# CONFIG_CRC_CCITT is not set
491# CONFIG_CRC16 is not set 639# CONFIG_CRC16 is not set
640# CONFIG_CRC_T10DIF is not set
492# CONFIG_CRC_ITU_T is not set 641# CONFIG_CRC_ITU_T is not set
493# CONFIG_CRC32 is not set 642# CONFIG_CRC32 is not set
494# CONFIG_CRC7 is not set 643# CONFIG_CRC7 is not set
495# CONFIG_LIBCRC32C is not set 644# CONFIG_LIBCRC32C is not set
496CONFIG_HAS_IOMEM=y 645CONFIG_HAS_IOMEM=y
497CONFIG_HAS_DMA=y 646CONFIG_HAS_DMA=y
647CONFIG_NLATTR=y
diff --git a/arch/m68knommu/configs/m5272c3_defconfig b/arch/m68knommu/configs/m5272c3_defconfig
new file mode 100644
index 000000000000..f37852a34218
--- /dev/null
+++ b/arch/m68knommu/configs/m5272c3_defconfig
@@ -0,0 +1,645 @@
1#
2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.30-rc2
4# Wed Apr 22 17:17:30 2009
5#
6CONFIG_M68K=y
7# CONFIG_MMU is not set
8# CONFIG_FPU is not set
9CONFIG_ZONE_DMA=y
10CONFIG_RWSEM_GENERIC_SPINLOCK=y
11# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
12# CONFIG_ARCH_HAS_ILOG2_U32 is not set
13# CONFIG_ARCH_HAS_ILOG2_U64 is not set
14CONFIG_GENERIC_FIND_NEXT_BIT=y
15CONFIG_GENERIC_HWEIGHT=y
16CONFIG_GENERIC_HARDIRQS=y
17CONFIG_GENERIC_CALIBRATE_DELAY=y
18CONFIG_GENERIC_TIME=y
19CONFIG_GENERIC_CMOS_UPDATE=y
20CONFIG_TIME_LOW_RES=y
21# CONFIG_GENERIC_CLOCKEVENTS is not set
22CONFIG_NO_IOPORT=y
23CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
24
25#
26# General setup
27#
28CONFIG_EXPERIMENTAL=y
29CONFIG_BROKEN_ON_SMP=y
30CONFIG_INIT_ENV_ARG_LIMIT=32
31CONFIG_LOCALVERSION=""
32CONFIG_LOCALVERSION_AUTO=y
33# CONFIG_SYSVIPC is not set
34# CONFIG_POSIX_MQUEUE is not set
35# CONFIG_BSD_PROCESS_ACCT is not set
36# CONFIG_TASKSTATS is not set
37# CONFIG_AUDIT is not set
38
39#
40# RCU Subsystem
41#
42CONFIG_CLASSIC_RCU=y
43# CONFIG_TREE_RCU is not set
44# CONFIG_PREEMPT_RCU is not set
45# CONFIG_TREE_RCU_TRACE is not set
46# CONFIG_PREEMPT_RCU_TRACE is not set
47# CONFIG_IKCONFIG is not set
48CONFIG_LOG_BUF_SHIFT=14
49# CONFIG_GROUP_SCHED is not set
50# CONFIG_CGROUPS is not set
51# CONFIG_SYSFS_DEPRECATED_V2 is not set
52# CONFIG_RELAY is not set
53# CONFIG_NAMESPACES is not set
54# CONFIG_BLK_DEV_INITRD is not set
55# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
56CONFIG_SYSCTL=y
57CONFIG_EMBEDDED=y
58CONFIG_UID16=y
59CONFIG_SYSCTL_SYSCALL=y
60# CONFIG_KALLSYMS is not set
61# CONFIG_STRIP_ASM_SYMS is not set
62# CONFIG_HOTPLUG is not set
63CONFIG_PRINTK=y
64CONFIG_BUG=y
65CONFIG_ELF_CORE=y
66CONFIG_BASE_FULL=y
67# CONFIG_FUTEX is not set
68# CONFIG_EPOLL is not set
69# CONFIG_SIGNALFD is not set
70# CONFIG_TIMERFD is not set
71# CONFIG_EVENTFD is not set
72# CONFIG_AIO is not set
73# CONFIG_VM_EVENT_COUNTERS is not set
74# CONFIG_SLUB_DEBUG is not set
75CONFIG_COMPAT_BRK=y
76# CONFIG_SLAB is not set
77CONFIG_SLUB=y
78# CONFIG_SLOB is not set
79# CONFIG_PROFILING is not set
80# CONFIG_MARKERS is not set
81# CONFIG_SLOW_WORK is not set
82# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
83CONFIG_BASE_SMALL=0
84# CONFIG_MODULES is not set
85CONFIG_BLOCK=y
86# CONFIG_LBD is not set
87# CONFIG_BLK_DEV_BSG is not set
88# CONFIG_BLK_DEV_INTEGRITY is not set
89
90#
91# IO Schedulers
92#
93CONFIG_IOSCHED_NOOP=y
94# CONFIG_IOSCHED_AS is not set
95# CONFIG_IOSCHED_DEADLINE is not set
96# CONFIG_IOSCHED_CFQ is not set
97# CONFIG_DEFAULT_AS is not set
98# CONFIG_DEFAULT_DEADLINE is not set
99# CONFIG_DEFAULT_CFQ is not set
100CONFIG_DEFAULT_NOOP=y
101CONFIG_DEFAULT_IOSCHED="noop"
102# CONFIG_FREEZER is not set
103
104#
105# Processor type and features
106#
107# CONFIG_M68328 is not set
108# CONFIG_M68EZ328 is not set
109# CONFIG_M68VZ328 is not set
110# CONFIG_M68360 is not set
111# CONFIG_M5206 is not set
112# CONFIG_M5206e is not set
113# CONFIG_M520x is not set
114# CONFIG_M523x is not set
115# CONFIG_M5249 is not set
116# CONFIG_M5271 is not set
117CONFIG_M5272=y
118# CONFIG_M5275 is not set
119# CONFIG_M528x is not set
120# CONFIG_M5307 is not set
121# CONFIG_M532x is not set
122# CONFIG_M5407 is not set
123CONFIG_COLDFIRE=y
124CONFIG_CLOCK_SET=y
125CONFIG_CLOCK_FREQ=66666666
126CONFIG_CLOCK_DIV=1
127
128#
129# Platform
130#
131# CONFIG_UC5272 is not set
132CONFIG_M5272C3=y
133# CONFIG_COBRA5272 is not set
134# CONFIG_CANCam is not set
135# CONFIG_SCALES is not set
136# CONFIG_NETtel is not set
137# CONFIG_CPU16B is not set
138# CONFIG_MOD5272 is not set
139CONFIG_FREESCALE=y
140CONFIG_4KSTACKS=y
141CONFIG_HZ=100
142
143#
144# RAM configuration
145#
146CONFIG_RAMBASE=0x00000000
147CONFIG_RAMSIZE=0x00800000
148CONFIG_VECTORBASE=0x00000000
149CONFIG_KERNELBASE=0x00020000
150CONFIG_RAMAUTOBIT=y
151# CONFIG_RAM8BIT is not set
152# CONFIG_RAM16BIT is not set
153# CONFIG_RAM32BIT is not set
154
155#
156# ROM configuration
157#
158# CONFIG_ROM is not set
159CONFIG_RAMKERNEL=y
160# CONFIG_ROMKERNEL is not set
161CONFIG_PREEMPT_NONE=y
162# CONFIG_PREEMPT_VOLUNTARY is not set
163# CONFIG_PREEMPT is not set
164CONFIG_SELECT_MEMORY_MODEL=y
165CONFIG_FLATMEM_MANUAL=y
166# CONFIG_DISCONTIGMEM_MANUAL is not set
167# CONFIG_SPARSEMEM_MANUAL is not set
168CONFIG_FLATMEM=y
169CONFIG_FLAT_NODE_MEM_MAP=y
170CONFIG_PAGEFLAGS_EXTENDED=y
171CONFIG_SPLIT_PTLOCK_CPUS=4
172# CONFIG_PHYS_ADDR_T_64BIT is not set
173CONFIG_ZONE_DMA_FLAG=1
174CONFIG_VIRT_TO_BUS=y
175# CONFIG_UNEVICTABLE_LRU is not set
176
177#
178# Executable file formats
179#
180CONFIG_BINFMT_FLAT=y
181# CONFIG_BINFMT_ZFLAT is not set
182# CONFIG_BINFMT_SHARED_FLAT is not set
183# CONFIG_HAVE_AOUT is not set
184# CONFIG_BINFMT_MISC is not set
185
186#
187# Power management options
188#
189# CONFIG_PM is not set
190CONFIG_NET=y
191
192#
193# Networking options
194#
195CONFIG_PACKET=y
196# CONFIG_PACKET_MMAP is not set
197CONFIG_UNIX=y
198# CONFIG_NET_KEY is not set
199CONFIG_INET=y
200# CONFIG_IP_MULTICAST is not set
201# CONFIG_IP_ADVANCED_ROUTER is not set
202CONFIG_IP_FIB_HASH=y
203# CONFIG_IP_PNP is not set
204# CONFIG_NET_IPIP is not set
205# CONFIG_NET_IPGRE is not set
206# CONFIG_ARPD is not set
207# CONFIG_SYN_COOKIES is not set
208# CONFIG_INET_AH is not set
209# CONFIG_INET_ESP is not set
210# CONFIG_INET_IPCOMP is not set
211# CONFIG_INET_XFRM_TUNNEL is not set
212# CONFIG_INET_TUNNEL is not set
213# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
214# CONFIG_INET_XFRM_MODE_TUNNEL is not set
215# CONFIG_INET_XFRM_MODE_BEET is not set
216# CONFIG_INET_LRO is not set
217# CONFIG_INET_DIAG is not set
218# CONFIG_TCP_CONG_ADVANCED is not set
219CONFIG_TCP_CONG_CUBIC=y
220CONFIG_DEFAULT_TCP_CONG="cubic"
221# CONFIG_TCP_MD5SIG is not set
222# CONFIG_IPV6 is not set
223# CONFIG_NETWORK_SECMARK is not set
224# CONFIG_NETFILTER is not set
225# CONFIG_IP_DCCP is not set
226# CONFIG_IP_SCTP is not set
227# CONFIG_TIPC is not set
228# CONFIG_ATM is not set
229# CONFIG_BRIDGE is not set
230# CONFIG_NET_DSA is not set
231# CONFIG_VLAN_8021Q is not set
232# CONFIG_DECNET is not set
233# CONFIG_LLC2 is not set
234# CONFIG_IPX is not set
235# CONFIG_ATALK is not set
236# CONFIG_X25 is not set
237# CONFIG_LAPB is not set
238# CONFIG_ECONET is not set
239# CONFIG_WAN_ROUTER is not set
240# CONFIG_PHONET is not set
241# CONFIG_NET_SCHED is not set
242# CONFIG_DCB is not set
243
244#
245# Network testing
246#
247# CONFIG_NET_PKTGEN is not set
248# CONFIG_HAMRADIO is not set
249# CONFIG_CAN is not set
250# CONFIG_IRDA is not set
251# CONFIG_BT is not set
252# CONFIG_AF_RXRPC is not set
253# CONFIG_WIRELESS is not set
254# CONFIG_WIMAX is not set
255# CONFIG_RFKILL is not set
256# CONFIG_NET_9P is not set
257
258#
259# Device Drivers
260#
261
262#
263# Generic Driver Options
264#
265CONFIG_STANDALONE=y
266CONFIG_PREVENT_FIRMWARE_BUILD=y
267# CONFIG_SYS_HYPERVISOR is not set
268# CONFIG_CONNECTOR is not set
269CONFIG_MTD=y
270# CONFIG_MTD_DEBUG is not set
271# CONFIG_MTD_CONCAT is not set
272CONFIG_MTD_PARTITIONS=y
273# CONFIG_MTD_REDBOOT_PARTS is not set
274# CONFIG_MTD_CMDLINE_PARTS is not set
275# CONFIG_MTD_AR7_PARTS is not set
276
277#
278# User Modules And Translation Layers
279#
280CONFIG_MTD_CHAR=y
281CONFIG_MTD_BLKDEVS=y
282CONFIG_MTD_BLOCK=y
283# CONFIG_FTL is not set
284# CONFIG_NFTL is not set
285# CONFIG_INFTL is not set
286# CONFIG_RFD_FTL is not set
287# CONFIG_SSFDC is not set
288# CONFIG_MTD_OOPS is not set
289
290#
291# RAM/ROM/Flash chip drivers
292#
293# CONFIG_MTD_CFI is not set
294# CONFIG_MTD_JEDECPROBE is not set
295CONFIG_MTD_MAP_BANK_WIDTH_1=y
296CONFIG_MTD_MAP_BANK_WIDTH_2=y
297CONFIG_MTD_MAP_BANK_WIDTH_4=y
298# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
299# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
300# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
301CONFIG_MTD_CFI_I1=y
302CONFIG_MTD_CFI_I2=y
303# CONFIG_MTD_CFI_I4 is not set
304# CONFIG_MTD_CFI_I8 is not set
305CONFIG_MTD_RAM=y
306# CONFIG_MTD_ROM is not set
307# CONFIG_MTD_ABSENT is not set
308
309#
310# Mapping drivers for chip access
311#
312# CONFIG_MTD_COMPLEX_MAPPINGS is not set
313CONFIG_MTD_UCLINUX=y
314# CONFIG_MTD_PLATRAM is not set
315
316#
317# Self-contained MTD device drivers
318#
319# CONFIG_MTD_SLRAM is not set
320# CONFIG_MTD_PHRAM is not set
321# CONFIG_MTD_MTDRAM is not set
322# CONFIG_MTD_BLOCK2MTD is not set
323
324#
325# Disk-On-Chip Device Drivers
326#
327# CONFIG_MTD_DOC2000 is not set
328# CONFIG_MTD_DOC2001 is not set
329# CONFIG_MTD_DOC2001PLUS is not set
330# CONFIG_MTD_NAND is not set
331# CONFIG_MTD_ONENAND is not set
332
333#
334# LPDDR flash memory drivers
335#
336# CONFIG_MTD_LPDDR is not set
337
338#
339# UBI - Unsorted block images
340#
341# CONFIG_MTD_UBI is not set
342# CONFIG_PARPORT is not set
343CONFIG_BLK_DEV=y
344# CONFIG_BLK_DEV_COW_COMMON is not set
345# CONFIG_BLK_DEV_LOOP is not set
346# CONFIG_BLK_DEV_NBD is not set
347CONFIG_BLK_DEV_RAM=y
348CONFIG_BLK_DEV_RAM_COUNT=16
349CONFIG_BLK_DEV_RAM_SIZE=4096
350# CONFIG_BLK_DEV_XIP is not set
351# CONFIG_CDROM_PKTCDVD is not set
352# CONFIG_ATA_OVER_ETH is not set
353# CONFIG_BLK_DEV_HD is not set
354# CONFIG_MISC_DEVICES is not set
355CONFIG_HAVE_IDE=y
356# CONFIG_IDE is not set
357
358#
359# SCSI device support
360#
361# CONFIG_RAID_ATTRS is not set
362# CONFIG_SCSI is not set
363# CONFIG_SCSI_DMA is not set
364# CONFIG_SCSI_NETLINK is not set
365# CONFIG_MD is not set
366CONFIG_NETDEVICES=y
367CONFIG_COMPAT_NET_DEV_OPS=y
368# CONFIG_DUMMY is not set
369# CONFIG_BONDING is not set
370# CONFIG_MACVLAN is not set
371# CONFIG_EQUALIZER is not set
372# CONFIG_TUN is not set
373# CONFIG_VETH is not set
374# CONFIG_PHYLIB is not set
375CONFIG_NET_ETHERNET=y
376# CONFIG_MII is not set
377# CONFIG_ETHOC is not set
378# CONFIG_DNET is not set
379# CONFIG_IBM_NEW_EMAC_ZMII is not set
380# CONFIG_IBM_NEW_EMAC_RGMII is not set
381# CONFIG_IBM_NEW_EMAC_TAH is not set
382# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
383# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
384# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
385# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
386# CONFIG_B44 is not set
387CONFIG_FEC=y
388# CONFIG_FEC2 is not set
389# CONFIG_NETDEV_1000 is not set
390# CONFIG_NETDEV_10000 is not set
391
392#
393# Wireless LAN
394#
395# CONFIG_WLAN_PRE80211 is not set
396# CONFIG_WLAN_80211 is not set
397
398#
399# Enable WiMAX (Networking options) to see the WiMAX drivers
400#
401# CONFIG_WAN is not set
402# CONFIG_PPP is not set
403# CONFIG_SLIP is not set
404# CONFIG_NETCONSOLE is not set
405# CONFIG_NETPOLL is not set
406# CONFIG_NET_POLL_CONTROLLER is not set
407# CONFIG_ISDN is not set
408# CONFIG_PHONE is not set
409
410#
411# Input device support
412#
413# CONFIG_INPUT is not set
414
415#
416# Hardware I/O ports
417#
418# CONFIG_SERIO is not set
419# CONFIG_GAMEPORT is not set
420
421#
422# Character devices
423#
424# CONFIG_VT is not set
425CONFIG_DEVKMEM=y
426# CONFIG_SERIAL_NONSTANDARD is not set
427
428#
429# Serial drivers
430#
431# CONFIG_SERIAL_8250 is not set
432
433#
434# Non-8250 serial port support
435#
436CONFIG_SERIAL_CORE=y
437CONFIG_SERIAL_CORE_CONSOLE=y
438CONFIG_SERIAL_MCF=y
439CONFIG_SERIAL_MCF_BAUDRATE=19200
440CONFIG_SERIAL_MCF_CONSOLE=y
441# CONFIG_UNIX98_PTYS is not set
442CONFIG_LEGACY_PTYS=y
443CONFIG_LEGACY_PTY_COUNT=256
444# CONFIG_IPMI_HANDLER is not set
445CONFIG_HW_RANDOM=y
446# CONFIG_HW_RANDOM_TIMERIOMEM is not set
447# CONFIG_GEN_RTC is not set
448# CONFIG_R3964 is not set
449# CONFIG_RAW_DRIVER is not set
450# CONFIG_TCG_TPM is not set
451# CONFIG_I2C is not set
452# CONFIG_SPI is not set
453# CONFIG_W1 is not set
454# CONFIG_POWER_SUPPLY is not set
455# CONFIG_HWMON is not set
456# CONFIG_THERMAL is not set
457# CONFIG_THERMAL_HWMON is not set
458# CONFIG_WATCHDOG is not set
459CONFIG_SSB_POSSIBLE=y
460
461#
462# Sonics Silicon Backplane
463#
464# CONFIG_SSB is not set
465
466#
467# Multifunction device drivers
468#
469# CONFIG_MFD_CORE is not set
470# CONFIG_MFD_SM501 is not set
471# CONFIG_HTC_PASIC3 is not set
472# CONFIG_MFD_TMIO is not set
473# CONFIG_REGULATOR is not set
474
475#
476# Multimedia devices
477#
478
479#
480# Multimedia core support
481#
482# CONFIG_VIDEO_DEV is not set
483# CONFIG_DVB_CORE is not set
484# CONFIG_VIDEO_MEDIA is not set
485
486#
487# Multimedia drivers
488#
489CONFIG_DAB=y
490
491#
492# Graphics support
493#
494# CONFIG_VGASTATE is not set
495# CONFIG_VIDEO_OUTPUT_CONTROL is not set
496# CONFIG_FB is not set
497# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
498
499#
500# Display device support
501#
502# CONFIG_DISPLAY_SUPPORT is not set
503# CONFIG_SOUND is not set
504# CONFIG_USB_SUPPORT is not set
505# CONFIG_MMC is not set
506# CONFIG_MEMSTICK is not set
507# CONFIG_NEW_LEDS is not set
508# CONFIG_ACCESSIBILITY is not set
509# CONFIG_RTC_CLASS is not set
510# CONFIG_DMADEVICES is not set
511# CONFIG_AUXDISPLAY is not set
512# CONFIG_UIO is not set
513# CONFIG_STAGING is not set
514
515#
516# File systems
517#
518CONFIG_EXT2_FS=y
519# CONFIG_EXT2_FS_XATTR is not set
520# CONFIG_EXT3_FS is not set
521# CONFIG_EXT4_FS is not set
522# CONFIG_REISERFS_FS is not set
523# CONFIG_JFS_FS is not set
524# CONFIG_FS_POSIX_ACL is not set
525# CONFIG_FILE_LOCKING is not set
526# CONFIG_XFS_FS is not set
527# CONFIG_OCFS2_FS is not set
528# CONFIG_BTRFS_FS is not set
529# CONFIG_DNOTIFY is not set
530# CONFIG_INOTIFY is not set
531# CONFIG_QUOTA is not set
532# CONFIG_AUTOFS_FS is not set
533# CONFIG_AUTOFS4_FS is not set
534# CONFIG_FUSE_FS is not set
535
536#
537# Caches
538#
539# CONFIG_FSCACHE is not set
540
541#
542# CD-ROM/DVD Filesystems
543#
544# CONFIG_ISO9660_FS is not set
545# CONFIG_UDF_FS is not set
546
547#
548# DOS/FAT/NT Filesystems
549#
550# CONFIG_MSDOS_FS is not set
551# CONFIG_VFAT_FS is not set
552# CONFIG_NTFS_FS is not set
553
554#
555# Pseudo filesystems
556#
557CONFIG_PROC_FS=y
558CONFIG_PROC_SYSCTL=y
559CONFIG_SYSFS=y
560# CONFIG_TMPFS is not set
561# CONFIG_HUGETLB_PAGE is not set
562# CONFIG_CONFIGFS_FS is not set
563CONFIG_MISC_FILESYSTEMS=y
564# CONFIG_ADFS_FS is not set
565# CONFIG_AFFS_FS is not set
566# CONFIG_HFS_FS is not set
567# CONFIG_HFSPLUS_FS is not set
568# CONFIG_BEFS_FS is not set
569# CONFIG_BFS_FS is not set
570# CONFIG_EFS_FS is not set
571# CONFIG_JFFS2_FS is not set
572# CONFIG_CRAMFS is not set
573# CONFIG_SQUASHFS is not set
574# CONFIG_VXFS_FS is not set
575# CONFIG_MINIX_FS is not set
576# CONFIG_OMFS_FS is not set
577# CONFIG_HPFS_FS is not set
578# CONFIG_QNX4FS_FS is not set
579CONFIG_ROMFS_FS=y
580# CONFIG_ROMFS_BACKED_BY_BLOCK is not set
581CONFIG_ROMFS_BACKED_BY_MTD=y
582# CONFIG_ROMFS_BACKED_BY_BOTH is not set
583CONFIG_ROMFS_ON_MTD=y
584# CONFIG_SYSV_FS is not set
585# CONFIG_UFS_FS is not set
586# CONFIG_NILFS2_FS is not set
587# CONFIG_NETWORK_FILESYSTEMS is not set
588
589#
590# Partition Types
591#
592# CONFIG_PARTITION_ADVANCED is not set
593CONFIG_MSDOS_PARTITION=y
594# CONFIG_NLS is not set
595# CONFIG_DLM is not set
596
597#
598# Kernel hacking
599#
600# CONFIG_PRINTK_TIME is not set
601CONFIG_ENABLE_WARN_DEPRECATED=y
602CONFIG_ENABLE_MUST_CHECK=y
603CONFIG_FRAME_WARN=1024
604# CONFIG_MAGIC_SYSRQ is not set
605# CONFIG_UNUSED_SYMBOLS is not set
606# CONFIG_DEBUG_FS is not set
607# CONFIG_HEADERS_CHECK is not set
608# CONFIG_DEBUG_KERNEL is not set
609# CONFIG_DEBUG_BUGVERBOSE is not set
610# CONFIG_DEBUG_MEMORY_INIT is not set
611# CONFIG_RCU_CPU_STALL_DETECTOR is not set
612# CONFIG_SYSCTL_SYSCALL_CHECK is not set
613# CONFIG_SAMPLES is not set
614# CONFIG_FULLDEBUG is not set
615# CONFIG_HIGHPROFILE is not set
616CONFIG_BOOTPARAM=y
617CONFIG_BOOTPARAM_STRING="root=/dev/mtdblock0"
618# CONFIG_NO_KERNEL_MSG is not set
619# CONFIG_BDM_DISABLE is not set
620
621#
622# Security options
623#
624# CONFIG_KEYS is not set
625# CONFIG_SECURITY is not set
626# CONFIG_SECURITYFS is not set
627# CONFIG_SECURITY_FILE_CAPABILITIES is not set
628# CONFIG_CRYPTO is not set
629# CONFIG_BINARY_PRINTF is not set
630
631#
632# Library routines
633#
634CONFIG_BITREVERSE=y
635CONFIG_GENERIC_FIND_LAST_BIT=y
636# CONFIG_CRC_CCITT is not set
637# CONFIG_CRC16 is not set
638# CONFIG_CRC_T10DIF is not set
639# CONFIG_CRC_ITU_T is not set
640CONFIG_CRC32=y
641# CONFIG_CRC7 is not set
642# CONFIG_LIBCRC32C is not set
643CONFIG_HAS_IOMEM=y
644CONFIG_HAS_DMA=y
645CONFIG_NLATTR=y
diff --git a/arch/m68knommu/configs/m5275evb_defconfig b/arch/m68knommu/configs/m5275evb_defconfig
index 0d1256f5addb..dc5c621d419c 100644
--- a/arch/m68knommu/configs/m5275evb_defconfig
+++ b/arch/m68knommu/configs/m5275evb_defconfig
@@ -1,6 +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.26-rc1 3# Linux kernel version: 2.6.30-rc2
4# Wed Apr 22 23:29:01 2009
4# 5#
5CONFIG_M68K=y 6CONFIG_M68K=y
6# CONFIG_MMU is not set 7# CONFIG_MMU is not set
@@ -15,9 +16,10 @@ CONFIG_GENERIC_HWEIGHT=y
15CONFIG_GENERIC_HARDIRQS=y 16CONFIG_GENERIC_HARDIRQS=y
16CONFIG_GENERIC_CALIBRATE_DELAY=y 17CONFIG_GENERIC_CALIBRATE_DELAY=y
17CONFIG_GENERIC_TIME=y 18CONFIG_GENERIC_TIME=y
19CONFIG_GENERIC_CMOS_UPDATE=y
18CONFIG_TIME_LOW_RES=y 20CONFIG_TIME_LOW_RES=y
21CONFIG_GENERIC_CLOCKEVENTS=y
19CONFIG_NO_IOPORT=y 22CONFIG_NO_IOPORT=y
20CONFIG_ARCH_SUPPORTS_AOUT=y
21CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 23CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
22 24
23# 25#
@@ -33,10 +35,19 @@ CONFIG_LOCALVERSION_AUTO=y
33# CONFIG_BSD_PROCESS_ACCT is not set 35# CONFIG_BSD_PROCESS_ACCT is not set
34# CONFIG_TASKSTATS is not set 36# CONFIG_TASKSTATS is not set
35# CONFIG_AUDIT is not set 37# CONFIG_AUDIT is not set
38
39#
40# RCU Subsystem
41#
42CONFIG_CLASSIC_RCU=y
43# CONFIG_TREE_RCU is not set
44# CONFIG_PREEMPT_RCU is not set
45# CONFIG_TREE_RCU_TRACE is not set
46# CONFIG_PREEMPT_RCU_TRACE is not set
36# CONFIG_IKCONFIG is not set 47# CONFIG_IKCONFIG is not set
37CONFIG_LOG_BUF_SHIFT=14 48CONFIG_LOG_BUF_SHIFT=14
38# CONFIG_CGROUPS is not set
39# CONFIG_GROUP_SCHED is not set 49# CONFIG_GROUP_SCHED is not set
50# CONFIG_CGROUPS is not set
40# CONFIG_SYSFS_DEPRECATED_V2 is not set 51# CONFIG_SYSFS_DEPRECATED_V2 is not set
41# CONFIG_RELAY is not set 52# CONFIG_RELAY is not set
42# CONFIG_NAMESPACES is not set 53# CONFIG_NAMESPACES is not set
@@ -44,44 +55,37 @@ CONFIG_LOG_BUF_SHIFT=14
44# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 55# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
45CONFIG_SYSCTL=y 56CONFIG_SYSCTL=y
46CONFIG_EMBEDDED=y 57CONFIG_EMBEDDED=y
47# CONFIG_UID16 is not set 58CONFIG_UID16=y
48# CONFIG_SYSCTL_SYSCALL is not set 59CONFIG_SYSCTL_SYSCALL=y
49# CONFIG_KALLSYMS is not set 60# CONFIG_KALLSYMS is not set
61# CONFIG_STRIP_ASM_SYMS is not set
50# CONFIG_HOTPLUG is not set 62# CONFIG_HOTPLUG is not set
51CONFIG_PRINTK=y 63CONFIG_PRINTK=y
52CONFIG_BUG=y 64CONFIG_BUG=y
53CONFIG_ELF_CORE=y 65CONFIG_ELF_CORE=y
54# CONFIG_COMPAT_BRK is not set
55CONFIG_BASE_FULL=y 66CONFIG_BASE_FULL=y
56# CONFIG_FUTEX is not set 67# CONFIG_FUTEX is not set
57# CONFIG_EPOLL is not set 68# CONFIG_EPOLL is not set
58# CONFIG_SIGNALFD is not set 69# CONFIG_SIGNALFD is not set
59# CONFIG_TIMERFD is not set 70# CONFIG_TIMERFD is not set
60# CONFIG_EVENTFD is not set 71# CONFIG_EVENTFD is not set
72# CONFIG_AIO is not set
61# CONFIG_VM_EVENT_COUNTERS is not set 73# CONFIG_VM_EVENT_COUNTERS is not set
62CONFIG_SLAB=y 74# CONFIG_SLUB_DEBUG is not set
63# CONFIG_SLUB is not set 75CONFIG_COMPAT_BRK=y
76# CONFIG_SLAB is not set
77CONFIG_SLUB=y
64# CONFIG_SLOB is not set 78# CONFIG_SLOB is not set
65# CONFIG_PROFILING is not set 79# CONFIG_PROFILING is not set
66# CONFIG_MARKERS is not set 80# CONFIG_MARKERS is not set
67# CONFIG_HAVE_OPROFILE is not set 81# CONFIG_SLOW_WORK is not set
68# CONFIG_HAVE_KPROBES is not set 82# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
69# CONFIG_HAVE_KRETPROBES is not set
70# CONFIG_HAVE_DMA_ATTRS is not set
71CONFIG_SLABINFO=y
72CONFIG_TINY_SHMEM=y
73CONFIG_BASE_SMALL=0 83CONFIG_BASE_SMALL=0
74CONFIG_MODULES=y 84# CONFIG_MODULES is not set
75CONFIG_MODULE_UNLOAD=y
76# CONFIG_MODULE_FORCE_UNLOAD is not set
77# CONFIG_MODVERSIONS is not set
78# CONFIG_MODULE_SRCVERSION_ALL is not set
79# CONFIG_KMOD is not set
80CONFIG_BLOCK=y 85CONFIG_BLOCK=y
81# CONFIG_LBD is not set 86# CONFIG_LBD is not set
82# CONFIG_BLK_DEV_IO_TRACE is not set
83# CONFIG_LSF is not set
84# CONFIG_BLK_DEV_BSG is not set 87# CONFIG_BLK_DEV_BSG is not set
88# CONFIG_BLK_DEV_INTEGRITY is not set
85 89
86# 90#
87# IO Schedulers 91# IO Schedulers
@@ -95,7 +99,7 @@ CONFIG_IOSCHED_NOOP=y
95# CONFIG_DEFAULT_CFQ is not set 99# CONFIG_DEFAULT_CFQ is not set
96CONFIG_DEFAULT_NOOP=y 100CONFIG_DEFAULT_NOOP=y
97CONFIG_DEFAULT_IOSCHED="noop" 101CONFIG_DEFAULT_IOSCHED="noop"
98CONFIG_CLASSIC_RCU=y 102# CONFIG_FREEZER is not set
99 103
100# 104#
101# Processor type and features 105# Processor type and features
@@ -148,44 +152,39 @@ CONFIG_RAMAUTOBIT=y
148# CONFIG_ROM is not set 152# CONFIG_ROM is not set
149CONFIG_RAMKERNEL=y 153CONFIG_RAMKERNEL=y
150# CONFIG_ROMKERNEL is not set 154# CONFIG_ROMKERNEL is not set
155CONFIG_PREEMPT_NONE=y
156# CONFIG_PREEMPT_VOLUNTARY is not set
157# CONFIG_PREEMPT is not set
158# CONFIG_NO_HZ is not set
159# CONFIG_HIGH_RES_TIMERS is not set
160CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
151CONFIG_SELECT_MEMORY_MODEL=y 161CONFIG_SELECT_MEMORY_MODEL=y
152CONFIG_FLATMEM_MANUAL=y 162CONFIG_FLATMEM_MANUAL=y
153# CONFIG_DISCONTIGMEM_MANUAL is not set 163# CONFIG_DISCONTIGMEM_MANUAL is not set
154# CONFIG_SPARSEMEM_MANUAL is not set 164# CONFIG_SPARSEMEM_MANUAL is not set
155CONFIG_FLATMEM=y 165CONFIG_FLATMEM=y
156CONFIG_FLAT_NODE_MEM_MAP=y 166CONFIG_FLAT_NODE_MEM_MAP=y
157# CONFIG_SPARSEMEM_STATIC is not set
158# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
159CONFIG_PAGEFLAGS_EXTENDED=y 167CONFIG_PAGEFLAGS_EXTENDED=y
160CONFIG_SPLIT_PTLOCK_CPUS=4 168CONFIG_SPLIT_PTLOCK_CPUS=4
161# CONFIG_RESOURCES_64BIT is not set 169# CONFIG_PHYS_ADDR_T_64BIT is not set
162CONFIG_ZONE_DMA_FLAG=1 170CONFIG_ZONE_DMA_FLAG=1
163CONFIG_VIRT_TO_BUS=y 171CONFIG_VIRT_TO_BUS=y
172# CONFIG_UNEVICTABLE_LRU is not set
164CONFIG_ISA_DMA_API=y 173CONFIG_ISA_DMA_API=y
165 174
166# 175#
167# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
168#
169# CONFIG_PCI is not set
170# CONFIG_ARCH_SUPPORTS_MSI is not set
171
172#
173# Executable file formats 176# Executable file formats
174# 177#
175CONFIG_BINFMT_FLAT=y 178CONFIG_BINFMT_FLAT=y
176# CONFIG_BINFMT_ZFLAT is not set 179# CONFIG_BINFMT_ZFLAT is not set
177# CONFIG_BINFMT_SHARED_FLAT is not set 180# CONFIG_BINFMT_SHARED_FLAT is not set
178# CONFIG_BINFMT_AOUT is not set 181# CONFIG_HAVE_AOUT is not set
179# CONFIG_BINFMT_MISC is not set 182# CONFIG_BINFMT_MISC is not set
180 183
181# 184#
182# Power management options 185# Power management options
183# 186#
184# CONFIG_PM is not set 187# CONFIG_PM is not set
185
186#
187# Networking
188#
189CONFIG_NET=y 188CONFIG_NET=y
190 189
191# 190#
@@ -226,6 +225,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
226# CONFIG_TIPC is not set 225# CONFIG_TIPC is not set
227# CONFIG_ATM is not set 226# CONFIG_ATM is not set
228# CONFIG_BRIDGE is not set 227# CONFIG_BRIDGE is not set
228# CONFIG_NET_DSA is not set
229# CONFIG_VLAN_8021Q is not set 229# CONFIG_VLAN_8021Q is not set
230# CONFIG_DECNET is not set 230# CONFIG_DECNET is not set
231# CONFIG_LLC2 is not set 231# CONFIG_LLC2 is not set
@@ -235,7 +235,9 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
235# CONFIG_LAPB is not set 235# CONFIG_LAPB is not set
236# CONFIG_ECONET is not set 236# CONFIG_ECONET is not set
237# CONFIG_WAN_ROUTER is not set 237# CONFIG_WAN_ROUTER is not set
238# CONFIG_PHONET is not set
238# CONFIG_NET_SCHED is not set 239# CONFIG_NET_SCHED is not set
240# CONFIG_DCB is not set
239 241
240# 242#
241# Network testing 243# Network testing
@@ -246,14 +248,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
246# CONFIG_IRDA is not set 248# CONFIG_IRDA is not set
247# CONFIG_BT is not set 249# CONFIG_BT is not set
248# CONFIG_AF_RXRPC is not set 250# CONFIG_AF_RXRPC is not set
249 251# CONFIG_WIRELESS is not set
250# 252# CONFIG_WIMAX is not set
251# Wireless
252#
253# CONFIG_CFG80211 is not set
254# CONFIG_WIRELESS_EXT is not set
255# CONFIG_MAC80211 is not set
256# CONFIG_IEEE80211 is not set
257# CONFIG_RFKILL is not set 253# CONFIG_RFKILL is not set
258# CONFIG_NET_9P is not set 254# CONFIG_NET_9P is not set
259 255
@@ -333,6 +329,11 @@ CONFIG_MTD_UCLINUX=y
333# CONFIG_MTD_ONENAND is not set 329# CONFIG_MTD_ONENAND is not set
334 330
335# 331#
332# LPDDR flash memory drivers
333#
334# CONFIG_MTD_LPDDR is not set
335
336#
336# UBI - Unsorted block images 337# UBI - Unsorted block images
337# 338#
338# CONFIG_MTD_UBI is not set 339# CONFIG_MTD_UBI is not set
@@ -347,6 +348,7 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
347# CONFIG_BLK_DEV_XIP is not set 348# CONFIG_BLK_DEV_XIP is not set
348# CONFIG_CDROM_PKTCDVD is not set 349# CONFIG_CDROM_PKTCDVD is not set
349# CONFIG_ATA_OVER_ETH is not set 350# CONFIG_ATA_OVER_ETH is not set
351# CONFIG_BLK_DEV_HD is not set
350# CONFIG_MISC_DEVICES is not set 352# CONFIG_MISC_DEVICES is not set
351CONFIG_HAVE_IDE=y 353CONFIG_HAVE_IDE=y
352# CONFIG_IDE is not set 354# CONFIG_IDE is not set
@@ -360,7 +362,7 @@ CONFIG_HAVE_IDE=y
360# CONFIG_SCSI_NETLINK is not set 362# CONFIG_SCSI_NETLINK is not set
361# CONFIG_MD is not set 363# CONFIG_MD is not set
362CONFIG_NETDEVICES=y 364CONFIG_NETDEVICES=y
363# CONFIG_NETDEVICES_MULTIQUEUE is not set 365CONFIG_COMPAT_NET_DEV_OPS=y
364# CONFIG_DUMMY is not set 366# CONFIG_DUMMY is not set
365# CONFIG_BONDING is not set 367# CONFIG_BONDING is not set
366# CONFIG_MACVLAN is not set 368# CONFIG_MACVLAN is not set
@@ -370,10 +372,15 @@ CONFIG_NETDEVICES=y
370# CONFIG_PHYLIB is not set 372# CONFIG_PHYLIB is not set
371CONFIG_NET_ETHERNET=y 373CONFIG_NET_ETHERNET=y
372# CONFIG_MII is not set 374# CONFIG_MII is not set
375# CONFIG_ETHOC is not set
376# CONFIG_DNET is not set
373# CONFIG_IBM_NEW_EMAC_ZMII is not set 377# CONFIG_IBM_NEW_EMAC_ZMII is not set
374# CONFIG_IBM_NEW_EMAC_RGMII is not set 378# CONFIG_IBM_NEW_EMAC_RGMII is not set
375# CONFIG_IBM_NEW_EMAC_TAH is not set 379# CONFIG_IBM_NEW_EMAC_TAH is not set
376# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 380# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
381# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
382# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
383# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
377# CONFIG_B44 is not set 384# CONFIG_B44 is not set
378CONFIG_FEC=y 385CONFIG_FEC=y
379CONFIG_FEC2=y 386CONFIG_FEC2=y
@@ -385,8 +392,10 @@ CONFIG_FEC2=y
385# 392#
386# CONFIG_WLAN_PRE80211 is not set 393# CONFIG_WLAN_PRE80211 is not set
387# CONFIG_WLAN_80211 is not set 394# CONFIG_WLAN_80211 is not set
388# CONFIG_IWLWIFI is not set 395
389# CONFIG_IWLWIFI_LEDS is not set 396#
397# Enable WiMAX (Networking options) to see the WiMAX drivers
398#
390# CONFIG_WAN is not set 399# CONFIG_WAN is not set
391CONFIG_PPP=y 400CONFIG_PPP=y
392# CONFIG_PPP_MULTILINK is not set 401# CONFIG_PPP_MULTILINK is not set
@@ -421,7 +430,7 @@ CONFIG_SLHC=y
421# Character devices 430# Character devices
422# 431#
423# CONFIG_VT is not set 432# CONFIG_VT is not set
424# CONFIG_DEVKMEM is not set 433CONFIG_DEVKMEM=y
425# CONFIG_SERIAL_NONSTANDARD is not set 434# CONFIG_SERIAL_NONSTANDARD is not set
426 435
427# 436#
@@ -434,7 +443,6 @@ CONFIG_SLHC=y
434# 443#
435CONFIG_SERIAL_CORE=y 444CONFIG_SERIAL_CORE=y
436CONFIG_SERIAL_CORE_CONSOLE=y 445CONFIG_SERIAL_CORE_CONSOLE=y
437# CONFIG_SERIAL_COLDFIRE is not set
438CONFIG_SERIAL_MCF=y 446CONFIG_SERIAL_MCF=y
439CONFIG_SERIAL_MCF_BAUDRATE=19200 447CONFIG_SERIAL_MCF_BAUDRATE=19200
440CONFIG_SERIAL_MCF_CONSOLE=y 448CONFIG_SERIAL_MCF_CONSOLE=y
@@ -442,7 +450,8 @@ CONFIG_SERIAL_MCF_CONSOLE=y
442CONFIG_LEGACY_PTYS=y 450CONFIG_LEGACY_PTYS=y
443CONFIG_LEGACY_PTY_COUNT=256 451CONFIG_LEGACY_PTY_COUNT=256
444# CONFIG_IPMI_HANDLER is not set 452# CONFIG_IPMI_HANDLER is not set
445# CONFIG_HW_RANDOM is not set 453CONFIG_HW_RANDOM=y
454# CONFIG_HW_RANDOM_TIMERIOMEM is not set
446# CONFIG_GEN_RTC is not set 455# CONFIG_GEN_RTC is not set
447# CONFIG_R3964 is not set 456# CONFIG_R3964 is not set
448# CONFIG_RAW_DRIVER is not set 457# CONFIG_RAW_DRIVER is not set
@@ -453,19 +462,23 @@ CONFIG_LEGACY_PTY_COUNT=256
453# CONFIG_POWER_SUPPLY is not set 462# CONFIG_POWER_SUPPLY is not set
454# CONFIG_HWMON is not set 463# CONFIG_HWMON is not set
455# CONFIG_THERMAL is not set 464# CONFIG_THERMAL is not set
465# CONFIG_THERMAL_HWMON is not set
456# CONFIG_WATCHDOG is not set 466# CONFIG_WATCHDOG is not set
467CONFIG_SSB_POSSIBLE=y
457 468
458# 469#
459# Sonics Silicon Backplane 470# Sonics Silicon Backplane
460# 471#
461CONFIG_SSB_POSSIBLE=y
462# CONFIG_SSB is not set 472# CONFIG_SSB is not set
463 473
464# 474#
465# Multifunction device drivers 475# Multifunction device drivers
466# 476#
477# CONFIG_MFD_CORE is not set
467# CONFIG_MFD_SM501 is not set 478# CONFIG_MFD_SM501 is not set
468# CONFIG_HTC_PASIC3 is not set 479# CONFIG_HTC_PASIC3 is not set
480# CONFIG_MFD_TMIO is not set
481# CONFIG_REGULATOR is not set
469 482
470# 483#
471# Multimedia devices 484# Multimedia devices
@@ -476,6 +489,7 @@ CONFIG_SSB_POSSIBLE=y
476# 489#
477# CONFIG_VIDEO_DEV is not set 490# CONFIG_VIDEO_DEV is not set
478# CONFIG_DVB_CORE is not set 491# CONFIG_DVB_CORE is not set
492# CONFIG_VIDEO_MEDIA is not set
479 493
480# 494#
481# Multimedia drivers 495# Multimedia drivers
@@ -494,10 +508,6 @@ CONFIG_DAB=y
494# Display device support 508# Display device support
495# 509#
496# CONFIG_DISPLAY_SUPPORT is not set 510# CONFIG_DISPLAY_SUPPORT is not set
497
498#
499# Sound
500#
501# CONFIG_SOUND is not set 511# CONFIG_SOUND is not set
502# CONFIG_USB_SUPPORT is not set 512# CONFIG_USB_SUPPORT is not set
503# CONFIG_MMC is not set 513# CONFIG_MMC is not set
@@ -505,7 +515,10 @@ CONFIG_DAB=y
505# CONFIG_NEW_LEDS is not set 515# CONFIG_NEW_LEDS is not set
506# CONFIG_ACCESSIBILITY is not set 516# CONFIG_ACCESSIBILITY is not set
507# CONFIG_RTC_CLASS is not set 517# CONFIG_RTC_CLASS is not set
518# CONFIG_DMADEVICES is not set
519# CONFIG_AUXDISPLAY is not set
508# CONFIG_UIO is not set 520# CONFIG_UIO is not set
521# CONFIG_STAGING is not set
509 522
510# 523#
511# File systems 524# File systems
@@ -513,12 +526,14 @@ CONFIG_DAB=y
513CONFIG_EXT2_FS=y 526CONFIG_EXT2_FS=y
514# CONFIG_EXT2_FS_XATTR is not set 527# CONFIG_EXT2_FS_XATTR is not set
515# CONFIG_EXT3_FS is not set 528# CONFIG_EXT3_FS is not set
516# CONFIG_EXT4DEV_FS is not set 529# CONFIG_EXT4_FS is not set
517# CONFIG_REISERFS_FS is not set 530# CONFIG_REISERFS_FS is not set
518# CONFIG_JFS_FS is not set 531# CONFIG_JFS_FS is not set
519# CONFIG_FS_POSIX_ACL is not set 532# CONFIG_FS_POSIX_ACL is not set
533# CONFIG_FILE_LOCKING is not set
520# CONFIG_XFS_FS is not set 534# CONFIG_XFS_FS is not set
521# CONFIG_OCFS2_FS is not set 535# CONFIG_OCFS2_FS is not set
536# CONFIG_BTRFS_FS is not set
522# CONFIG_DNOTIFY is not set 537# CONFIG_DNOTIFY is not set
523# CONFIG_INOTIFY is not set 538# CONFIG_INOTIFY is not set
524# CONFIG_QUOTA is not set 539# CONFIG_QUOTA is not set
@@ -527,6 +542,11 @@ CONFIG_EXT2_FS=y
527# CONFIG_FUSE_FS is not set 542# CONFIG_FUSE_FS is not set
528 543
529# 544#
545# Caches
546#
547# CONFIG_FSCACHE is not set
548
549#
530# CD-ROM/DVD Filesystems 550# CD-ROM/DVD Filesystems
531# 551#
532# CONFIG_ISO9660_FS is not set 552# CONFIG_ISO9660_FS is not set
@@ -548,10 +568,7 @@ CONFIG_SYSFS=y
548# CONFIG_TMPFS is not set 568# CONFIG_TMPFS is not set
549# CONFIG_HUGETLB_PAGE is not set 569# CONFIG_HUGETLB_PAGE is not set
550# CONFIG_CONFIGFS_FS is not set 570# CONFIG_CONFIGFS_FS is not set
551 571CONFIG_MISC_FILESYSTEMS=y
552#
553# Miscellaneous filesystems
554#
555# CONFIG_ADFS_FS is not set 572# CONFIG_ADFS_FS is not set
556# CONFIG_AFFS_FS is not set 573# CONFIG_AFFS_FS is not set
557# CONFIG_HFS_FS is not set 574# CONFIG_HFS_FS is not set
@@ -561,21 +578,21 @@ CONFIG_SYSFS=y
561# CONFIG_EFS_FS is not set 578# CONFIG_EFS_FS is not set
562# CONFIG_JFFS2_FS is not set 579# CONFIG_JFFS2_FS is not set
563# CONFIG_CRAMFS is not set 580# CONFIG_CRAMFS is not set
581# CONFIG_SQUASHFS is not set
564# CONFIG_VXFS_FS is not set 582# CONFIG_VXFS_FS is not set
565# CONFIG_MINIX_FS is not set 583# CONFIG_MINIX_FS is not set
584# CONFIG_OMFS_FS is not set
566# CONFIG_HPFS_FS is not set 585# CONFIG_HPFS_FS is not set
567# CONFIG_QNX4FS_FS is not set 586# CONFIG_QNX4FS_FS is not set
568CONFIG_ROMFS_FS=y 587CONFIG_ROMFS_FS=y
588# CONFIG_ROMFS_BACKED_BY_BLOCK is not set
589CONFIG_ROMFS_BACKED_BY_MTD=y
590# CONFIG_ROMFS_BACKED_BY_BOTH is not set
591CONFIG_ROMFS_ON_MTD=y
569# CONFIG_SYSV_FS is not set 592# CONFIG_SYSV_FS is not set
570# CONFIG_UFS_FS is not set 593# CONFIG_UFS_FS is not set
571CONFIG_NETWORK_FILESYSTEMS=y 594# CONFIG_NILFS2_FS is not set
572# CONFIG_NFS_FS is not set 595# CONFIG_NETWORK_FILESYSTEMS is not set
573# CONFIG_NFSD is not set
574# CONFIG_SMB_FS is not set
575# CONFIG_CIFS is not set
576# CONFIG_NCP_FS is not set
577# CONFIG_CODA_FS is not set
578# CONFIG_AFS_FS is not set
579 596
580# 597#
581# Partition Types 598# Partition Types
@@ -598,10 +615,14 @@ CONFIG_FRAME_WARN=1024
598# CONFIG_HEADERS_CHECK is not set 615# CONFIG_HEADERS_CHECK is not set
599# CONFIG_DEBUG_KERNEL is not set 616# CONFIG_DEBUG_KERNEL is not set
600# CONFIG_DEBUG_BUGVERBOSE is not set 617# CONFIG_DEBUG_BUGVERBOSE is not set
618# CONFIG_DEBUG_MEMORY_INIT is not set
619# CONFIG_RCU_CPU_STALL_DETECTOR is not set
620CONFIG_SYSCTL_SYSCALL_CHECK=y
601# CONFIG_SAMPLES is not set 621# CONFIG_SAMPLES is not set
602# CONFIG_FULLDEBUG is not set 622# CONFIG_FULLDEBUG is not set
603# CONFIG_HIGHPROFILE is not set 623# CONFIG_HIGHPROFILE is not set
604# CONFIG_BOOTPARAM is not set 624CONFIG_BOOTPARAM=y
625CONFIG_BOOTPARAM_STRING="root=/dev/mtdblock0"
605# CONFIG_NO_KERNEL_MSG is not set 626# CONFIG_NO_KERNEL_MSG is not set
606# CONFIG_BDM_DISABLE is not set 627# CONFIG_BDM_DISABLE is not set
607 628
@@ -610,18 +631,22 @@ CONFIG_FRAME_WARN=1024
610# 631#
611# CONFIG_KEYS is not set 632# CONFIG_KEYS is not set
612# CONFIG_SECURITY is not set 633# CONFIG_SECURITY is not set
634# CONFIG_SECURITYFS is not set
613# CONFIG_SECURITY_FILE_CAPABILITIES is not set 635# CONFIG_SECURITY_FILE_CAPABILITIES is not set
614# CONFIG_CRYPTO is not set 636# CONFIG_CRYPTO is not set
637# CONFIG_BINARY_PRINTF is not set
615 638
616# 639#
617# Library routines 640# Library routines
618# 641#
619# CONFIG_GENERIC_FIND_FIRST_BIT is not set 642CONFIG_GENERIC_FIND_LAST_BIT=y
620# CONFIG_CRC_CCITT is not set 643# CONFIG_CRC_CCITT is not set
621# CONFIG_CRC16 is not set 644# CONFIG_CRC16 is not set
645# CONFIG_CRC_T10DIF is not set
622# CONFIG_CRC_ITU_T is not set 646# CONFIG_CRC_ITU_T is not set
623# CONFIG_CRC32 is not set 647# CONFIG_CRC32 is not set
624# CONFIG_CRC7 is not set 648# CONFIG_CRC7 is not set
625# CONFIG_LIBCRC32C is not set 649# CONFIG_LIBCRC32C is not set
626CONFIG_HAS_IOMEM=y 650CONFIG_HAS_IOMEM=y
627CONFIG_HAS_DMA=y 651CONFIG_HAS_DMA=y
652CONFIG_NLATTR=y
diff --git a/arch/m68knommu/configs/m5307c3_defconfig b/arch/m68knommu/configs/m5307c3_defconfig
index fe2acdfa4d76..3a3f6733ae43 100644
--- a/arch/m68knommu/configs/m5307c3_defconfig
+++ b/arch/m68knommu/configs/m5307c3_defconfig
@@ -1,6 +1,6 @@
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-rc1 3# Linux kernel version: 2.6.30-rc2
4# 4#
5CONFIG_M68K=y 5CONFIG_M68K=y
6# CONFIG_MMU is not set 6# CONFIG_MMU is not set
@@ -15,9 +15,10 @@ CONFIG_GENERIC_HWEIGHT=y
15CONFIG_GENERIC_HARDIRQS=y 15CONFIG_GENERIC_HARDIRQS=y
16CONFIG_GENERIC_CALIBRATE_DELAY=y 16CONFIG_GENERIC_CALIBRATE_DELAY=y
17CONFIG_GENERIC_TIME=y 17CONFIG_GENERIC_TIME=y
18CONFIG_GENERIC_CMOS_UPDATE=y
18CONFIG_TIME_LOW_RES=y 19CONFIG_TIME_LOW_RES=y
20# CONFIG_GENERIC_CLOCKEVENTS is not set
19CONFIG_NO_IOPORT=y 21CONFIG_NO_IOPORT=y
20CONFIG_ARCH_SUPPORTS_AOUT=y
21CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 22CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
22 23
23# 24#
@@ -33,10 +34,21 @@ CONFIG_LOCALVERSION_AUTO=y
33# CONFIG_BSD_PROCESS_ACCT is not set 34# CONFIG_BSD_PROCESS_ACCT is not set
34# CONFIG_TASKSTATS is not set 35# CONFIG_TASKSTATS is not set
35# CONFIG_AUDIT is not set 36# CONFIG_AUDIT is not set
37
38#
39# RCU Subsystem
40#
41CONFIG_CLASSIC_RCU=y
42# CONFIG_TREE_RCU is not set
43# CONFIG_PREEMPT_RCU is not set
44# CONFIG_TREE_RCU_TRACE is not set
45# CONFIG_PREEMPT_RCU_TRACE is not set
36# CONFIG_IKCONFIG is not set 46# CONFIG_IKCONFIG is not set
37CONFIG_LOG_BUF_SHIFT=14 47CONFIG_LOG_BUF_SHIFT=14
38# CONFIG_CGROUPS is not set
39# CONFIG_GROUP_SCHED is not set 48# CONFIG_GROUP_SCHED is not set
49# CONFIG_USER_SCHED is not set
50# CONFIG_CGROUP_SCHED is not set
51# CONFIG_CGROUPS is not set
40# CONFIG_SYSFS_DEPRECATED_V2 is not set 52# CONFIG_SYSFS_DEPRECATED_V2 is not set
41# CONFIG_RELAY is not set 53# CONFIG_RELAY is not set
42# CONFIG_NAMESPACES is not set 54# CONFIG_NAMESPACES is not set
@@ -44,44 +56,37 @@ CONFIG_LOG_BUF_SHIFT=14
44# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 56# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
45CONFIG_SYSCTL=y 57CONFIG_SYSCTL=y
46CONFIG_EMBEDDED=y 58CONFIG_EMBEDDED=y
47# CONFIG_UID16 is not set 59CONFIG_UID16=y
48# CONFIG_SYSCTL_SYSCALL is not set 60CONFIG_SYSCTL_SYSCALL=y
49# CONFIG_KALLSYMS is not set 61# CONFIG_KALLSYMS is not set
62# CONFIG_STRIP_ASM_SYMS is not set
50# CONFIG_HOTPLUG is not set 63# CONFIG_HOTPLUG is not set
51CONFIG_PRINTK=y 64CONFIG_PRINTK=y
52CONFIG_BUG=y 65CONFIG_BUG=y
53CONFIG_ELF_CORE=y 66CONFIG_ELF_CORE=y
54# CONFIG_COMPAT_BRK is not set
55CONFIG_BASE_FULL=y 67CONFIG_BASE_FULL=y
56# CONFIG_FUTEX is not set 68# CONFIG_FUTEX is not set
57# CONFIG_EPOLL is not set 69# CONFIG_EPOLL is not set
58# CONFIG_SIGNALFD is not set 70# CONFIG_SIGNALFD is not set
59# CONFIG_TIMERFD is not set 71# CONFIG_TIMERFD is not set
60# CONFIG_EVENTFD is not set 72# CONFIG_EVENTFD is not set
73# CONFIG_AIO is not set
61# CONFIG_VM_EVENT_COUNTERS is not set 74# CONFIG_VM_EVENT_COUNTERS is not set
62CONFIG_SLAB=y 75# CONFIG_SLUB_DEBUG is not set
63# CONFIG_SLUB is not set 76CONFIG_COMPAT_BRK=y
77# CONFIG_SLAB is not set
78CONFIG_SLUB=y
64# CONFIG_SLOB is not set 79# CONFIG_SLOB is not set
65# CONFIG_PROFILING is not set 80# CONFIG_PROFILING is not set
66# CONFIG_MARKERS is not set 81# CONFIG_MARKERS is not set
67# CONFIG_HAVE_OPROFILE is not set 82# CONFIG_SLOW_WORK is not set
68# CONFIG_HAVE_KPROBES is not set 83# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
69# CONFIG_HAVE_KRETPROBES is not set
70# CONFIG_HAVE_DMA_ATTRS is not set
71CONFIG_SLABINFO=y
72CONFIG_TINY_SHMEM=y
73CONFIG_BASE_SMALL=0 84CONFIG_BASE_SMALL=0
74CONFIG_MODULES=y 85# CONFIG_MODULES is not set
75CONFIG_MODULE_UNLOAD=y
76# CONFIG_MODULE_FORCE_UNLOAD is not set
77# CONFIG_MODVERSIONS is not set
78# CONFIG_MODULE_SRCVERSION_ALL is not set
79# CONFIG_KMOD is not set
80CONFIG_BLOCK=y 86CONFIG_BLOCK=y
81# CONFIG_LBD is not set 87# CONFIG_LBD is not set
82# CONFIG_BLK_DEV_IO_TRACE is not set
83# CONFIG_LSF is not set
84# CONFIG_BLK_DEV_BSG is not set 88# CONFIG_BLK_DEV_BSG is not set
89# CONFIG_BLK_DEV_INTEGRITY is not set
85 90
86# 91#
87# IO Schedulers 92# IO Schedulers
@@ -95,7 +100,7 @@ CONFIG_IOSCHED_NOOP=y
95# CONFIG_DEFAULT_CFQ is not set 100# CONFIG_DEFAULT_CFQ is not set
96CONFIG_DEFAULT_NOOP=y 101CONFIG_DEFAULT_NOOP=y
97CONFIG_DEFAULT_IOSCHED="noop" 102CONFIG_DEFAULT_IOSCHED="noop"
98CONFIG_CLASSIC_RCU=y 103# CONFIG_FREEZER is not set
99 104
100# 105#
101# Processor type and features 106# Processor type and features
@@ -127,12 +132,11 @@ CONFIG_CLOCK_DIV=2
127# 132#
128# CONFIG_ARN5307 is not set 133# CONFIG_ARN5307 is not set
129CONFIG_M5307C3=y 134CONFIG_M5307C3=y
130# CONFIG_eLIA is not set
131# CONFIG_SECUREEDGEMP3 is not set 135# CONFIG_SECUREEDGEMP3 is not set
132# CONFIG_CLEOPATRA is not set 136# CONFIG_CLEOPATRA is not set
133# CONFIG_NETtel is not set 137# CONFIG_NETtel is not set
134CONFIG_FREESCALE=y 138CONFIG_FREESCALE=y
135# CONFIG_4KSTACKS is not set 139CONFIG_4KSTACKS=y
136CONFIG_HZ=100 140CONFIG_HZ=100
137 141
138# 142#
@@ -153,45 +157,36 @@ CONFIG_RAMAUTOBIT=y
153# CONFIG_ROM is not set 157# CONFIG_ROM is not set
154CONFIG_RAMKERNEL=y 158CONFIG_RAMKERNEL=y
155# CONFIG_ROMKERNEL is not set 159# CONFIG_ROMKERNEL is not set
160CONFIG_PREEMPT_NONE=y
161# CONFIG_PREEMPT_VOLUNTARY is not set
162# CONFIG_PREEMPT is not set
156CONFIG_SELECT_MEMORY_MODEL=y 163CONFIG_SELECT_MEMORY_MODEL=y
157CONFIG_FLATMEM_MANUAL=y 164CONFIG_FLATMEM_MANUAL=y
158# CONFIG_DISCONTIGMEM_MANUAL is not set 165# CONFIG_DISCONTIGMEM_MANUAL is not set
159# CONFIG_SPARSEMEM_MANUAL is not set 166# CONFIG_SPARSEMEM_MANUAL is not set
160CONFIG_FLATMEM=y 167CONFIG_FLATMEM=y
161CONFIG_FLAT_NODE_MEM_MAP=y 168CONFIG_FLAT_NODE_MEM_MAP=y
162# CONFIG_SPARSEMEM_STATIC is not set
163# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
164CONFIG_PAGEFLAGS_EXTENDED=y 169CONFIG_PAGEFLAGS_EXTENDED=y
165CONFIG_SPLIT_PTLOCK_CPUS=4 170CONFIG_SPLIT_PTLOCK_CPUS=4
166# CONFIG_RESOURCES_64BIT is not set 171# CONFIG_PHYS_ADDR_T_64BIT is not set
167CONFIG_ZONE_DMA_FLAG=1 172CONFIG_ZONE_DMA_FLAG=1
168CONFIG_VIRT_TO_BUS=y 173CONFIG_VIRT_TO_BUS=y
174# CONFIG_UNEVICTABLE_LRU is not set
169CONFIG_ISA_DMA_API=y 175CONFIG_ISA_DMA_API=y
170 176
171# 177#
172# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
173#
174# CONFIG_PCI is not set
175# CONFIG_COMEMPCI is not set
176# CONFIG_ARCH_SUPPORTS_MSI is not set
177
178#
179# Executable file formats 178# Executable file formats
180# 179#
181CONFIG_BINFMT_FLAT=y 180CONFIG_BINFMT_FLAT=y
182# CONFIG_BINFMT_ZFLAT is not set 181# CONFIG_BINFMT_ZFLAT is not set
183# CONFIG_BINFMT_SHARED_FLAT is not set 182# CONFIG_BINFMT_SHARED_FLAT is not set
184# CONFIG_BINFMT_AOUT is not set 183# CONFIG_HAVE_AOUT is not set
185# CONFIG_BINFMT_MISC is not set 184# CONFIG_BINFMT_MISC is not set
186 185
187# 186#
188# Power management options 187# Power management options
189# 188#
190# CONFIG_PM is not set 189# CONFIG_PM is not set
191
192#
193# Networking
194#
195CONFIG_NET=y 190CONFIG_NET=y
196 191
197# 192#
@@ -232,6 +227,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
232# CONFIG_TIPC is not set 227# CONFIG_TIPC is not set
233# CONFIG_ATM is not set 228# CONFIG_ATM is not set
234# CONFIG_BRIDGE is not set 229# CONFIG_BRIDGE is not set
230# CONFIG_NET_DSA is not set
235# CONFIG_VLAN_8021Q is not set 231# CONFIG_VLAN_8021Q is not set
236# CONFIG_DECNET is not set 232# CONFIG_DECNET is not set
237# CONFIG_LLC2 is not set 233# CONFIG_LLC2 is not set
@@ -241,7 +237,9 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
241# CONFIG_LAPB is not set 237# CONFIG_LAPB is not set
242# CONFIG_ECONET is not set 238# CONFIG_ECONET is not set
243# CONFIG_WAN_ROUTER is not set 239# CONFIG_WAN_ROUTER is not set
240# CONFIG_PHONET is not set
244# CONFIG_NET_SCHED is not set 241# CONFIG_NET_SCHED is not set
242# CONFIG_DCB is not set
245 243
246# 244#
247# Network testing 245# Network testing
@@ -252,14 +250,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
252# CONFIG_IRDA is not set 250# CONFIG_IRDA is not set
253# CONFIG_BT is not set 251# CONFIG_BT is not set
254# CONFIG_AF_RXRPC is not set 252# CONFIG_AF_RXRPC is not set
255 253# CONFIG_WIRELESS is not set
256# 254# CONFIG_WIMAX is not set
257# Wireless
258#
259# CONFIG_CFG80211 is not set
260# CONFIG_WIRELESS_EXT is not set
261# CONFIG_MAC80211 is not set
262# CONFIG_IEEE80211 is not set
263# CONFIG_RFKILL is not set 255# CONFIG_RFKILL is not set
264# CONFIG_NET_9P is not set 256# CONFIG_NET_9P is not set
265 257
@@ -274,7 +266,79 @@ CONFIG_STANDALONE=y
274CONFIG_PREVENT_FIRMWARE_BUILD=y 266CONFIG_PREVENT_FIRMWARE_BUILD=y
275# CONFIG_SYS_HYPERVISOR is not set 267# CONFIG_SYS_HYPERVISOR is not set
276# CONFIG_CONNECTOR is not set 268# CONFIG_CONNECTOR is not set
277# CONFIG_MTD is not set 269CONFIG_MTD=y
270# CONFIG_MTD_DEBUG is not set
271# CONFIG_MTD_CONCAT is not set
272CONFIG_MTD_PARTITIONS=y
273# CONFIG_MTD_REDBOOT_PARTS is not set
274# CONFIG_MTD_CMDLINE_PARTS is not set
275# CONFIG_MTD_AR7_PARTS is not set
276
277#
278# User Modules And Translation Layers
279#
280CONFIG_MTD_CHAR=y
281CONFIG_MTD_BLKDEVS=y
282CONFIG_MTD_BLOCK=y
283# CONFIG_FTL is not set
284# CONFIG_NFTL is not set
285# CONFIG_INFTL is not set
286# CONFIG_RFD_FTL is not set
287# CONFIG_SSFDC is not set
288# CONFIG_MTD_OOPS is not set
289
290#
291# RAM/ROM/Flash chip drivers
292#
293# CONFIG_MTD_CFI is not set
294# CONFIG_MTD_JEDECPROBE is not set
295CONFIG_MTD_MAP_BANK_WIDTH_1=y
296CONFIG_MTD_MAP_BANK_WIDTH_2=y
297CONFIG_MTD_MAP_BANK_WIDTH_4=y
298# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
299# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
300# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
301CONFIG_MTD_CFI_I1=y
302CONFIG_MTD_CFI_I2=y
303# CONFIG_MTD_CFI_I4 is not set
304# CONFIG_MTD_CFI_I8 is not set
305CONFIG_MTD_RAM=y
306# CONFIG_MTD_ROM is not set
307# CONFIG_MTD_ABSENT is not set
308
309#
310# Mapping drivers for chip access
311#
312# CONFIG_MTD_COMPLEX_MAPPINGS is not set
313CONFIG_MTD_UCLINUX=y
314# CONFIG_MTD_PLATRAM is not set
315
316#
317# Self-contained MTD device drivers
318#
319# CONFIG_MTD_SLRAM is not set
320# CONFIG_MTD_PHRAM is not set
321# CONFIG_MTD_MTDRAM is not set
322# CONFIG_MTD_BLOCK2MTD is not set
323
324#
325# Disk-On-Chip Device Drivers
326#
327# CONFIG_MTD_DOC2000 is not set
328# CONFIG_MTD_DOC2001 is not set
329# CONFIG_MTD_DOC2001PLUS is not set
330# CONFIG_MTD_NAND is not set
331# CONFIG_MTD_ONENAND is not set
332
333#
334# LPDDR flash memory drivers
335#
336# CONFIG_MTD_LPDDR is not set
337
338#
339# UBI - Unsorted block images
340#
341# CONFIG_MTD_UBI is not set
278# CONFIG_PARPORT is not set 342# CONFIG_PARPORT is not set
279CONFIG_BLK_DEV=y 343CONFIG_BLK_DEV=y
280# CONFIG_BLK_DEV_COW_COMMON is not set 344# CONFIG_BLK_DEV_COW_COMMON is not set
@@ -286,6 +350,7 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
286# CONFIG_BLK_DEV_XIP is not set 350# CONFIG_BLK_DEV_XIP is not set
287# CONFIG_CDROM_PKTCDVD is not set 351# CONFIG_CDROM_PKTCDVD is not set
288# CONFIG_ATA_OVER_ETH is not set 352# CONFIG_ATA_OVER_ETH is not set
353# CONFIG_BLK_DEV_HD is not set
289# CONFIG_MISC_DEVICES is not set 354# CONFIG_MISC_DEVICES is not set
290CONFIG_HAVE_IDE=y 355CONFIG_HAVE_IDE=y
291# CONFIG_IDE is not set 356# CONFIG_IDE is not set
@@ -299,7 +364,7 @@ CONFIG_HAVE_IDE=y
299# CONFIG_SCSI_NETLINK is not set 364# CONFIG_SCSI_NETLINK is not set
300# CONFIG_MD is not set 365# CONFIG_MD is not set
301CONFIG_NETDEVICES=y 366CONFIG_NETDEVICES=y
302# CONFIG_NETDEVICES_MULTIQUEUE is not set 367CONFIG_COMPAT_NET_DEV_OPS=y
303# CONFIG_DUMMY is not set 368# CONFIG_DUMMY is not set
304# CONFIG_BONDING is not set 369# CONFIG_BONDING is not set
305# CONFIG_MACVLAN is not set 370# CONFIG_MACVLAN is not set
@@ -309,10 +374,15 @@ CONFIG_NETDEVICES=y
309# CONFIG_PHYLIB is not set 374# CONFIG_PHYLIB is not set
310CONFIG_NET_ETHERNET=y 375CONFIG_NET_ETHERNET=y
311# CONFIG_MII is not set 376# CONFIG_MII is not set
377# CONFIG_ETHOC is not set
378# CONFIG_DNET is not set
312# CONFIG_IBM_NEW_EMAC_ZMII is not set 379# CONFIG_IBM_NEW_EMAC_ZMII is not set
313# CONFIG_IBM_NEW_EMAC_RGMII is not set 380# CONFIG_IBM_NEW_EMAC_RGMII is not set
314# CONFIG_IBM_NEW_EMAC_TAH is not set 381# CONFIG_IBM_NEW_EMAC_TAH is not set
315# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 382# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
383# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
384# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
385# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
316# CONFIG_B44 is not set 386# CONFIG_B44 is not set
317# CONFIG_NETDEV_1000 is not set 387# CONFIG_NETDEV_1000 is not set
318# CONFIG_NETDEV_10000 is not set 388# CONFIG_NETDEV_10000 is not set
@@ -322,8 +392,10 @@ CONFIG_NET_ETHERNET=y
322# 392#
323# CONFIG_WLAN_PRE80211 is not set 393# CONFIG_WLAN_PRE80211 is not set
324# CONFIG_WLAN_80211 is not set 394# CONFIG_WLAN_80211 is not set
325# CONFIG_IWLWIFI is not set 395
326# CONFIG_IWLWIFI_LEDS is not set 396#
397# Enable WiMAX (Networking options) to see the WiMAX drivers
398#
327# CONFIG_WAN is not set 399# CONFIG_WAN is not set
328CONFIG_PPP=y 400CONFIG_PPP=y
329# CONFIG_PPP_MULTILINK is not set 401# CONFIG_PPP_MULTILINK is not set
@@ -381,7 +453,7 @@ CONFIG_INPUT=y
381# Character devices 453# Character devices
382# 454#
383# CONFIG_VT is not set 455# CONFIG_VT is not set
384# CONFIG_DEVKMEM is not set 456CONFIG_DEVKMEM=y
385# CONFIG_SERIAL_NONSTANDARD is not set 457# CONFIG_SERIAL_NONSTANDARD is not set
386 458
387# 459#
@@ -394,13 +466,12 @@ CONFIG_INPUT=y
394# 466#
395CONFIG_SERIAL_CORE=y 467CONFIG_SERIAL_CORE=y
396CONFIG_SERIAL_CORE_CONSOLE=y 468CONFIG_SERIAL_CORE_CONSOLE=y
397# CONFIG_SERIAL_COLDFIRE is not set
398CONFIG_SERIAL_MCF=y 469CONFIG_SERIAL_MCF=y
399CONFIG_SERIAL_MCF_BAUDRATE=19200 470CONFIG_SERIAL_MCF_BAUDRATE=19200
400CONFIG_SERIAL_MCF_CONSOLE=y 471CONFIG_SERIAL_MCF_CONSOLE=y
401CONFIG_UNIX98_PTYS=y 472CONFIG_UNIX98_PTYS=y
402CONFIG_LEGACY_PTYS=y 473# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
403CONFIG_LEGACY_PTY_COUNT=256 474# CONFIG_LEGACY_PTYS is not set
404# CONFIG_IPMI_HANDLER is not set 475# CONFIG_IPMI_HANDLER is not set
405# CONFIG_HW_RANDOM is not set 476# CONFIG_HW_RANDOM is not set
406# CONFIG_GEN_RTC is not set 477# CONFIG_GEN_RTC is not set
@@ -413,19 +484,23 @@ CONFIG_LEGACY_PTY_COUNT=256
413# CONFIG_POWER_SUPPLY is not set 484# CONFIG_POWER_SUPPLY is not set
414# CONFIG_HWMON is not set 485# CONFIG_HWMON is not set
415# CONFIG_THERMAL is not set 486# CONFIG_THERMAL is not set
487# CONFIG_THERMAL_HWMON is not set
416# CONFIG_WATCHDOG is not set 488# CONFIG_WATCHDOG is not set
489CONFIG_SSB_POSSIBLE=y
417 490
418# 491#
419# Sonics Silicon Backplane 492# Sonics Silicon Backplane
420# 493#
421CONFIG_SSB_POSSIBLE=y
422# CONFIG_SSB is not set 494# CONFIG_SSB is not set
423 495
424# 496#
425# Multifunction device drivers 497# Multifunction device drivers
426# 498#
499# CONFIG_MFD_CORE is not set
427# CONFIG_MFD_SM501 is not set 500# CONFIG_MFD_SM501 is not set
428# CONFIG_HTC_PASIC3 is not set 501# CONFIG_HTC_PASIC3 is not set
502# CONFIG_MFD_TMIO is not set
503# CONFIG_REGULATOR is not set
429 504
430# 505#
431# Multimedia devices 506# Multimedia devices
@@ -436,6 +511,7 @@ CONFIG_SSB_POSSIBLE=y
436# 511#
437# CONFIG_VIDEO_DEV is not set 512# CONFIG_VIDEO_DEV is not set
438# CONFIG_DVB_CORE is not set 513# CONFIG_DVB_CORE is not set
514# CONFIG_VIDEO_MEDIA is not set
439 515
440# 516#
441# Multimedia drivers 517# Multimedia drivers
@@ -454,10 +530,6 @@ CONFIG_DAB=y
454# Display device support 530# Display device support
455# 531#
456# CONFIG_DISPLAY_SUPPORT is not set 532# CONFIG_DISPLAY_SUPPORT is not set
457
458#
459# Sound
460#
461# CONFIG_SOUND is not set 533# CONFIG_SOUND is not set
462# CONFIG_HID_SUPPORT is not set 534# CONFIG_HID_SUPPORT is not set
463# CONFIG_USB_SUPPORT is not set 535# CONFIG_USB_SUPPORT is not set
@@ -466,7 +538,10 @@ CONFIG_DAB=y
466# CONFIG_NEW_LEDS is not set 538# CONFIG_NEW_LEDS is not set
467# CONFIG_ACCESSIBILITY is not set 539# CONFIG_ACCESSIBILITY is not set
468# CONFIG_RTC_CLASS is not set 540# CONFIG_RTC_CLASS is not set
541# CONFIG_DMADEVICES is not set
542# CONFIG_AUXDISPLAY is not set
469# CONFIG_UIO is not set 543# CONFIG_UIO is not set
544# CONFIG_STAGING is not set
470 545
471# 546#
472# File systems 547# File systems
@@ -474,12 +549,14 @@ CONFIG_DAB=y
474CONFIG_EXT2_FS=y 549CONFIG_EXT2_FS=y
475# CONFIG_EXT2_FS_XATTR is not set 550# CONFIG_EXT2_FS_XATTR is not set
476# CONFIG_EXT3_FS is not set 551# CONFIG_EXT3_FS is not set
477# CONFIG_EXT4DEV_FS is not set 552# CONFIG_EXT4_FS is not set
478# CONFIG_REISERFS_FS is not set 553# CONFIG_REISERFS_FS is not set
479# CONFIG_JFS_FS is not set 554# CONFIG_JFS_FS is not set
480# CONFIG_FS_POSIX_ACL is not set 555# CONFIG_FS_POSIX_ACL is not set
556CONFIG_FILE_LOCKING=y
481# CONFIG_XFS_FS is not set 557# CONFIG_XFS_FS is not set
482# CONFIG_OCFS2_FS is not set 558# CONFIG_OCFS2_FS is not set
559# CONFIG_BTRFS_FS is not set
483# CONFIG_DNOTIFY is not set 560# CONFIG_DNOTIFY is not set
484# CONFIG_INOTIFY is not set 561# CONFIG_INOTIFY is not set
485# CONFIG_QUOTA is not set 562# CONFIG_QUOTA is not set
@@ -488,6 +565,11 @@ CONFIG_EXT2_FS=y
488# CONFIG_FUSE_FS is not set 565# CONFIG_FUSE_FS is not set
489 566
490# 567#
568# Caches
569#
570# CONFIG_FSCACHE is not set
571
572#
491# CD-ROM/DVD Filesystems 573# CD-ROM/DVD Filesystems
492# 574#
493# CONFIG_ISO9660_FS is not set 575# CONFIG_ISO9660_FS is not set
@@ -509,10 +591,7 @@ CONFIG_SYSFS=y
509# CONFIG_TMPFS is not set 591# CONFIG_TMPFS is not set
510# CONFIG_HUGETLB_PAGE is not set 592# CONFIG_HUGETLB_PAGE is not set
511# CONFIG_CONFIGFS_FS is not set 593# CONFIG_CONFIGFS_FS is not set
512 594CONFIG_MISC_FILESYSTEMS=y
513#
514# Miscellaneous filesystems
515#
516# CONFIG_ADFS_FS is not set 595# CONFIG_ADFS_FS is not set
517# CONFIG_AFFS_FS is not set 596# CONFIG_AFFS_FS is not set
518# CONFIG_HFS_FS is not set 597# CONFIG_HFS_FS is not set
@@ -520,14 +599,22 @@ CONFIG_SYSFS=y
520# CONFIG_BEFS_FS is not set 599# CONFIG_BEFS_FS is not set
521# CONFIG_BFS_FS is not set 600# CONFIG_BFS_FS is not set
522# CONFIG_EFS_FS is not set 601# CONFIG_EFS_FS is not set
602# CONFIG_JFFS2_FS is not set
523# CONFIG_CRAMFS is not set 603# CONFIG_CRAMFS is not set
604# CONFIG_SQUASHFS is not set
524# CONFIG_VXFS_FS is not set 605# CONFIG_VXFS_FS is not set
525# CONFIG_MINIX_FS is not set 606# CONFIG_MINIX_FS is not set
607# CONFIG_OMFS_FS is not set
526# CONFIG_HPFS_FS is not set 608# CONFIG_HPFS_FS is not set
527# CONFIG_QNX4FS_FS is not set 609# CONFIG_QNX4FS_FS is not set
528CONFIG_ROMFS_FS=y 610CONFIG_ROMFS_FS=y
611# CONFIG_ROMFS_BACKED_BY_BLOCK is not set
612CONFIG_ROMFS_BACKED_BY_MTD=y
613# CONFIG_ROMFS_BACKED_BY_BOTH is not set
614CONFIG_ROMFS_ON_MTD=y
529# CONFIG_SYSV_FS is not set 615# CONFIG_SYSV_FS is not set
530# CONFIG_UFS_FS is not set 616# CONFIG_UFS_FS is not set
617# CONFIG_NILFS2_FS is not set
531# CONFIG_NETWORK_FILESYSTEMS is not set 618# CONFIG_NETWORK_FILESYSTEMS is not set
532 619
533# 620#
@@ -551,10 +638,14 @@ CONFIG_FRAME_WARN=1024
551# CONFIG_HEADERS_CHECK is not set 638# CONFIG_HEADERS_CHECK is not set
552# CONFIG_DEBUG_KERNEL is not set 639# CONFIG_DEBUG_KERNEL is not set
553# CONFIG_DEBUG_BUGVERBOSE is not set 640# CONFIG_DEBUG_BUGVERBOSE is not set
641# CONFIG_DEBUG_MEMORY_INIT is not set
642# CONFIG_RCU_CPU_STALL_DETECTOR is not set
643CONFIG_SYSCTL_SYSCALL_CHECK=y
554# CONFIG_SAMPLES is not set 644# CONFIG_SAMPLES is not set
555CONFIG_FULLDEBUG=y 645CONFIG_FULLDEBUG=y
556# CONFIG_HIGHPROFILE is not set 646# CONFIG_HIGHPROFILE is not set
557# CONFIG_BOOTPARAM is not set 647CONFIG_BOOTPARAM=y
648CONFIG_BOOTPARAM_STRING="root=/dev/mtdblock0"
558# CONFIG_NO_KERNEL_MSG is not set 649# CONFIG_NO_KERNEL_MSG is not set
559# CONFIG_BDM_DISABLE is not set 650# CONFIG_BDM_DISABLE is not set
560 651
@@ -563,18 +654,22 @@ CONFIG_FULLDEBUG=y
563# 654#
564# CONFIG_KEYS is not set 655# CONFIG_KEYS is not set
565# CONFIG_SECURITY is not set 656# CONFIG_SECURITY is not set
657# CONFIG_SECURITYFS is not set
566# CONFIG_SECURITY_FILE_CAPABILITIES is not set 658# CONFIG_SECURITY_FILE_CAPABILITIES is not set
567# CONFIG_CRYPTO is not set 659# CONFIG_CRYPTO is not set
660# CONFIG_BINARY_PRINTF is not set
568 661
569# 662#
570# Library routines 663# Library routines
571# 664#
572# CONFIG_GENERIC_FIND_FIRST_BIT is not set 665CONFIG_GENERIC_FIND_LAST_BIT=y
573# CONFIG_CRC_CCITT is not set 666# CONFIG_CRC_CCITT is not set
574# CONFIG_CRC16 is not set 667# CONFIG_CRC16 is not set
668# CONFIG_CRC_T10DIF is not set
575# CONFIG_CRC_ITU_T is not set 669# CONFIG_CRC_ITU_T is not set
576# CONFIG_CRC32 is not set 670# CONFIG_CRC32 is not set
577# CONFIG_CRC7 is not set 671# CONFIG_CRC7 is not set
578# CONFIG_LIBCRC32C is not set 672# CONFIG_LIBCRC32C is not set
579CONFIG_HAS_IOMEM=y 673CONFIG_HAS_IOMEM=y
580CONFIG_HAS_DMA=y 674CONFIG_HAS_DMA=y
675CONFIG_NLATTR=y
diff --git a/arch/m68knommu/configs/m5407c3_defconfig b/arch/m68knommu/configs/m5407c3_defconfig
index 1118936d20e3..97b6cde2fc19 100644
--- a/arch/m68knommu/configs/m5407c3_defconfig
+++ b/arch/m68knommu/configs/m5407c3_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.26-rc1 3# Linux kernel version: 2.6.30-rc2
4# Wed May 7 10:25:16 2008 4# Thu Apr 23 09:21:40 2009
5# 5#
6CONFIG_M68K=y 6CONFIG_M68K=y
7# CONFIG_MMU is not set 7# CONFIG_MMU is not set
@@ -16,9 +16,10 @@ CONFIG_GENERIC_HWEIGHT=y
16CONFIG_GENERIC_HARDIRQS=y 16CONFIG_GENERIC_HARDIRQS=y
17CONFIG_GENERIC_CALIBRATE_DELAY=y 17CONFIG_GENERIC_CALIBRATE_DELAY=y
18CONFIG_GENERIC_TIME=y 18CONFIG_GENERIC_TIME=y
19CONFIG_GENERIC_CMOS_UPDATE=y
19CONFIG_TIME_LOW_RES=y 20CONFIG_TIME_LOW_RES=y
21# CONFIG_GENERIC_CLOCKEVENTS is not set
20CONFIG_NO_IOPORT=y 22CONFIG_NO_IOPORT=y
21CONFIG_ARCH_SUPPORTS_AOUT=y
22CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 23CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
23 24
24# 25#
@@ -34,10 +35,19 @@ CONFIG_LOCALVERSION_AUTO=y
34# CONFIG_BSD_PROCESS_ACCT is not set 35# CONFIG_BSD_PROCESS_ACCT is not set
35# CONFIG_TASKSTATS is not set 36# CONFIG_TASKSTATS is not set
36# CONFIG_AUDIT is not set 37# CONFIG_AUDIT is not set
38
39#
40# RCU Subsystem
41#
42CONFIG_CLASSIC_RCU=y
43# CONFIG_TREE_RCU is not set
44# CONFIG_PREEMPT_RCU is not set
45# CONFIG_TREE_RCU_TRACE is not set
46# CONFIG_PREEMPT_RCU_TRACE is not set
37# CONFIG_IKCONFIG is not set 47# CONFIG_IKCONFIG is not set
38CONFIG_LOG_BUF_SHIFT=14 48CONFIG_LOG_BUF_SHIFT=14
39# CONFIG_CGROUPS is not set
40# CONFIG_GROUP_SCHED is not set 49# CONFIG_GROUP_SCHED is not set
50# CONFIG_CGROUPS is not set
41# CONFIG_SYSFS_DEPRECATED_V2 is not set 51# CONFIG_SYSFS_DEPRECATED_V2 is not set
42# CONFIG_RELAY is not set 52# CONFIG_RELAY is not set
43# CONFIG_NAMESPACES is not set 53# CONFIG_NAMESPACES is not set
@@ -45,44 +55,43 @@ CONFIG_LOG_BUF_SHIFT=14
45# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 55# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
46CONFIG_SYSCTL=y 56CONFIG_SYSCTL=y
47CONFIG_EMBEDDED=y 57CONFIG_EMBEDDED=y
48# CONFIG_UID16 is not set 58CONFIG_UID16=y
49# CONFIG_SYSCTL_SYSCALL is not set 59CONFIG_SYSCTL_SYSCALL=y
50# CONFIG_KALLSYMS is not set 60# CONFIG_KALLSYMS is not set
61# CONFIG_STRIP_ASM_SYMS is not set
51# CONFIG_HOTPLUG is not set 62# CONFIG_HOTPLUG is not set
52CONFIG_PRINTK=y 63CONFIG_PRINTK=y
53CONFIG_BUG=y 64CONFIG_BUG=y
54CONFIG_ELF_CORE=y 65CONFIG_ELF_CORE=y
55# CONFIG_COMPAT_BRK is not set
56CONFIG_BASE_FULL=y 66CONFIG_BASE_FULL=y
57# CONFIG_FUTEX is not set 67# CONFIG_FUTEX is not set
58# CONFIG_EPOLL is not set 68# CONFIG_EPOLL is not set
59# CONFIG_SIGNALFD is not set 69# CONFIG_SIGNALFD is not set
60# CONFIG_TIMERFD is not set 70# CONFIG_TIMERFD is not set
61# CONFIG_EVENTFD is not set 71# CONFIG_EVENTFD is not set
72# CONFIG_AIO is not set
62# CONFIG_VM_EVENT_COUNTERS is not set 73# CONFIG_VM_EVENT_COUNTERS is not set
63CONFIG_SLAB=y 74CONFIG_SLUB_DEBUG=y
64# CONFIG_SLUB is not set 75CONFIG_COMPAT_BRK=y
76# CONFIG_SLAB is not set
77CONFIG_SLUB=y
65# CONFIG_SLOB is not set 78# CONFIG_SLOB is not set
66# CONFIG_PROFILING is not set 79# CONFIG_PROFILING is not set
67# CONFIG_MARKERS is not set 80# CONFIG_MARKERS is not set
68# CONFIG_HAVE_OPROFILE is not set 81# CONFIG_SLOW_WORK is not set
69# CONFIG_HAVE_KPROBES is not set 82# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
70# CONFIG_HAVE_KRETPROBES is not set
71# CONFIG_HAVE_DMA_ATTRS is not set
72CONFIG_SLABINFO=y 83CONFIG_SLABINFO=y
73CONFIG_TINY_SHMEM=y
74CONFIG_BASE_SMALL=0 84CONFIG_BASE_SMALL=0
75CONFIG_MODULES=y 85CONFIG_MODULES=y
86# CONFIG_MODULE_FORCE_LOAD is not set
76CONFIG_MODULE_UNLOAD=y 87CONFIG_MODULE_UNLOAD=y
77# CONFIG_MODULE_FORCE_UNLOAD is not set 88# CONFIG_MODULE_FORCE_UNLOAD is not set
78# CONFIG_MODVERSIONS is not set 89# CONFIG_MODVERSIONS is not set
79# CONFIG_MODULE_SRCVERSION_ALL is not set 90# CONFIG_MODULE_SRCVERSION_ALL is not set
80# CONFIG_KMOD is not set
81CONFIG_BLOCK=y 91CONFIG_BLOCK=y
82# CONFIG_LBD is not set 92# CONFIG_LBD is not set
83# CONFIG_BLK_DEV_IO_TRACE is not set
84# CONFIG_LSF is not set
85# CONFIG_BLK_DEV_BSG is not set 93# CONFIG_BLK_DEV_BSG is not set
94# CONFIG_BLK_DEV_INTEGRITY is not set
86 95
87# 96#
88# IO Schedulers 97# IO Schedulers
@@ -96,7 +105,7 @@ CONFIG_IOSCHED_NOOP=y
96# CONFIG_DEFAULT_CFQ is not set 105# CONFIG_DEFAULT_CFQ is not set
97CONFIG_DEFAULT_NOOP=y 106CONFIG_DEFAULT_NOOP=y
98CONFIG_DEFAULT_IOSCHED="noop" 107CONFIG_DEFAULT_IOSCHED="noop"
99CONFIG_CLASSIC_RCU=y 108# CONFIG_FREEZER is not set
100 109
101# 110#
102# Processor type and features 111# Processor type and features
@@ -149,45 +158,36 @@ CONFIG_RAMAUTOBIT=y
149# CONFIG_ROM is not set 158# CONFIG_ROM is not set
150CONFIG_RAMKERNEL=y 159CONFIG_RAMKERNEL=y
151# CONFIG_ROMKERNEL is not set 160# CONFIG_ROMKERNEL is not set
161CONFIG_PREEMPT_NONE=y
162# CONFIG_PREEMPT_VOLUNTARY is not set
163# CONFIG_PREEMPT is not set
152CONFIG_SELECT_MEMORY_MODEL=y 164CONFIG_SELECT_MEMORY_MODEL=y
153CONFIG_FLATMEM_MANUAL=y 165CONFIG_FLATMEM_MANUAL=y
154# CONFIG_DISCONTIGMEM_MANUAL is not set 166# CONFIG_DISCONTIGMEM_MANUAL is not set
155# CONFIG_SPARSEMEM_MANUAL is not set 167# CONFIG_SPARSEMEM_MANUAL is not set
156CONFIG_FLATMEM=y 168CONFIG_FLATMEM=y
157CONFIG_FLAT_NODE_MEM_MAP=y 169CONFIG_FLAT_NODE_MEM_MAP=y
158# CONFIG_SPARSEMEM_STATIC is not set
159# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
160CONFIG_PAGEFLAGS_EXTENDED=y 170CONFIG_PAGEFLAGS_EXTENDED=y
161CONFIG_SPLIT_PTLOCK_CPUS=4 171CONFIG_SPLIT_PTLOCK_CPUS=4
162# CONFIG_RESOURCES_64BIT is not set 172# CONFIG_PHYS_ADDR_T_64BIT is not set
163CONFIG_ZONE_DMA_FLAG=1 173CONFIG_ZONE_DMA_FLAG=1
164CONFIG_VIRT_TO_BUS=y 174CONFIG_VIRT_TO_BUS=y
175# CONFIG_UNEVICTABLE_LRU is not set
165CONFIG_ISA_DMA_API=y 176CONFIG_ISA_DMA_API=y
166 177
167# 178#
168# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
169#
170# CONFIG_PCI is not set
171# CONFIG_COMEMPCI is not set
172# CONFIG_ARCH_SUPPORTS_MSI is not set
173
174#
175# Executable file formats 179# Executable file formats
176# 180#
177CONFIG_BINFMT_FLAT=y 181CONFIG_BINFMT_FLAT=y
178# CONFIG_BINFMT_ZFLAT is not set 182# CONFIG_BINFMT_ZFLAT is not set
179# CONFIG_BINFMT_SHARED_FLAT is not set 183# CONFIG_BINFMT_SHARED_FLAT is not set
180# CONFIG_BINFMT_AOUT is not set 184# CONFIG_HAVE_AOUT is not set
181# CONFIG_BINFMT_MISC is not set 185# CONFIG_BINFMT_MISC is not set
182 186
183# 187#
184# Power management options 188# Power management options
185# 189#
186# CONFIG_PM is not set 190# CONFIG_PM is not set
187
188#
189# Networking
190#
191CONFIG_NET=y 191CONFIG_NET=y
192 192
193# 193#
@@ -228,6 +228,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
228# CONFIG_TIPC is not set 228# CONFIG_TIPC is not set
229# CONFIG_ATM is not set 229# CONFIG_ATM is not set
230# CONFIG_BRIDGE is not set 230# CONFIG_BRIDGE is not set
231# CONFIG_NET_DSA is not set
231# CONFIG_VLAN_8021Q is not set 232# CONFIG_VLAN_8021Q is not set
232# CONFIG_DECNET is not set 233# CONFIG_DECNET is not set
233# CONFIG_LLC2 is not set 234# CONFIG_LLC2 is not set
@@ -237,7 +238,9 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
237# CONFIG_LAPB is not set 238# CONFIG_LAPB is not set
238# CONFIG_ECONET is not set 239# CONFIG_ECONET is not set
239# CONFIG_WAN_ROUTER is not set 240# CONFIG_WAN_ROUTER is not set
241# CONFIG_PHONET is not set
240# CONFIG_NET_SCHED is not set 242# CONFIG_NET_SCHED is not set
243# CONFIG_DCB is not set
241 244
242# 245#
243# Network testing 246# Network testing
@@ -248,14 +251,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
248# CONFIG_IRDA is not set 251# CONFIG_IRDA is not set
249# CONFIG_BT is not set 252# CONFIG_BT is not set
250# CONFIG_AF_RXRPC is not set 253# CONFIG_AF_RXRPC is not set
251 254# CONFIG_WIRELESS is not set
252# 255# CONFIG_WIMAX is not set
253# Wireless
254#
255# CONFIG_CFG80211 is not set
256# CONFIG_WIRELESS_EXT is not set
257# CONFIG_MAC80211 is not set
258# CONFIG_IEEE80211 is not set
259# CONFIG_RFKILL is not set 256# CONFIG_RFKILL is not set
260# CONFIG_NET_9P is not set 257# CONFIG_NET_9P is not set
261 258
@@ -274,6 +271,7 @@ CONFIG_MTD=y
274# CONFIG_MTD_DEBUG is not set 271# CONFIG_MTD_DEBUG is not set
275# CONFIG_MTD_CONCAT is not set 272# CONFIG_MTD_CONCAT is not set
276CONFIG_MTD_PARTITIONS=y 273CONFIG_MTD_PARTITIONS=y
274# CONFIG_MTD_TESTS is not set
277# CONFIG_MTD_REDBOOT_PARTS is not set 275# CONFIG_MTD_REDBOOT_PARTS is not set
278# CONFIG_MTD_CMDLINE_PARTS is not set 276# CONFIG_MTD_CMDLINE_PARTS is not set
279# CONFIG_MTD_AR7_PARTS is not set 277# CONFIG_MTD_AR7_PARTS is not set
@@ -335,6 +333,11 @@ CONFIG_MTD_UCLINUX=y
335# CONFIG_MTD_ONENAND is not set 333# CONFIG_MTD_ONENAND is not set
336 334
337# 335#
336# LPDDR flash memory drivers
337#
338# CONFIG_MTD_LPDDR is not set
339
340#
338# UBI - Unsorted block images 341# UBI - Unsorted block images
339# 342#
340# CONFIG_MTD_UBI is not set 343# CONFIG_MTD_UBI is not set
@@ -349,6 +352,7 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
349# CONFIG_BLK_DEV_XIP is not set 352# CONFIG_BLK_DEV_XIP is not set
350# CONFIG_CDROM_PKTCDVD is not set 353# CONFIG_CDROM_PKTCDVD is not set
351# CONFIG_ATA_OVER_ETH is not set 354# CONFIG_ATA_OVER_ETH is not set
355# CONFIG_BLK_DEV_HD is not set
352# CONFIG_MISC_DEVICES is not set 356# CONFIG_MISC_DEVICES is not set
353CONFIG_HAVE_IDE=y 357CONFIG_HAVE_IDE=y
354# CONFIG_IDE is not set 358# CONFIG_IDE is not set
@@ -362,7 +366,7 @@ CONFIG_HAVE_IDE=y
362# CONFIG_SCSI_NETLINK is not set 366# CONFIG_SCSI_NETLINK is not set
363# CONFIG_MD is not set 367# CONFIG_MD is not set
364CONFIG_NETDEVICES=y 368CONFIG_NETDEVICES=y
365# CONFIG_NETDEVICES_MULTIQUEUE is not set 369CONFIG_COMPAT_NET_DEV_OPS=y
366# CONFIG_DUMMY is not set 370# CONFIG_DUMMY is not set
367# CONFIG_BONDING is not set 371# CONFIG_BONDING is not set
368# CONFIG_MACVLAN is not set 372# CONFIG_MACVLAN is not set
@@ -372,10 +376,15 @@ CONFIG_NETDEVICES=y
372# CONFIG_PHYLIB is not set 376# CONFIG_PHYLIB is not set
373CONFIG_NET_ETHERNET=y 377CONFIG_NET_ETHERNET=y
374# CONFIG_MII is not set 378# CONFIG_MII is not set
379# CONFIG_ETHOC is not set
380# CONFIG_DNET is not set
375# CONFIG_IBM_NEW_EMAC_ZMII is not set 381# CONFIG_IBM_NEW_EMAC_ZMII is not set
376# CONFIG_IBM_NEW_EMAC_RGMII is not set 382# CONFIG_IBM_NEW_EMAC_RGMII is not set
377# CONFIG_IBM_NEW_EMAC_TAH is not set 383# CONFIG_IBM_NEW_EMAC_TAH is not set
378# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 384# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
385# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
386# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
387# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
379# CONFIG_B44 is not set 388# CONFIG_B44 is not set
380# CONFIG_NETDEV_1000 is not set 389# CONFIG_NETDEV_1000 is not set
381# CONFIG_NETDEV_10000 is not set 390# CONFIG_NETDEV_10000 is not set
@@ -385,8 +394,10 @@ CONFIG_NET_ETHERNET=y
385# 394#
386# CONFIG_WLAN_PRE80211 is not set 395# CONFIG_WLAN_PRE80211 is not set
387# CONFIG_WLAN_80211 is not set 396# CONFIG_WLAN_80211 is not set
388# CONFIG_IWLWIFI is not set 397
389# CONFIG_IWLWIFI_LEDS is not set 398#
399# Enable WiMAX (Networking options) to see the WiMAX drivers
400#
390# CONFIG_WAN is not set 401# CONFIG_WAN is not set
391CONFIG_PPP=y 402CONFIG_PPP=y
392# CONFIG_PPP_MULTILINK is not set 403# CONFIG_PPP_MULTILINK is not set
@@ -409,39 +420,22 @@ CONFIG_SLHC=y
409# 420#
410# Input device support 421# Input device support
411# 422#
412CONFIG_INPUT=y 423# CONFIG_INPUT is not set
413# CONFIG_INPUT_FF_MEMLESS is not set
414# CONFIG_INPUT_POLLDEV is not set
415
416#
417# Userland interfaces
418#
419# CONFIG_INPUT_MOUSEDEV is not set
420# CONFIG_INPUT_JOYDEV is not set
421# CONFIG_INPUT_EVDEV is not set
422# CONFIG_INPUT_EVBUG is not set
423
424#
425# Input Device Drivers
426#
427# CONFIG_INPUT_KEYBOARD is not set
428# CONFIG_INPUT_MOUSE is not set
429# CONFIG_INPUT_JOYSTICK is not set
430# CONFIG_INPUT_TABLET is not set
431# CONFIG_INPUT_TOUCHSCREEN is not set
432# CONFIG_INPUT_MISC is not set
433 424
434# 425#
435# Hardware I/O ports 426# Hardware I/O ports
436# 427#
437# CONFIG_SERIO is not set 428CONFIG_SERIO=y
429CONFIG_SERIO_SERPORT=y
430# CONFIG_SERIO_LIBPS2 is not set
431# CONFIG_SERIO_RAW is not set
438# CONFIG_GAMEPORT is not set 432# CONFIG_GAMEPORT is not set
439 433
440# 434#
441# Character devices 435# Character devices
442# 436#
443# CONFIG_VT is not set 437# CONFIG_VT is not set
444# CONFIG_DEVKMEM is not set 438CONFIG_DEVKMEM=y
445# CONFIG_SERIAL_NONSTANDARD is not set 439# CONFIG_SERIAL_NONSTANDARD is not set
446 440
447# 441#
@@ -454,7 +448,6 @@ CONFIG_INPUT=y
454# 448#
455CONFIG_SERIAL_CORE=y 449CONFIG_SERIAL_CORE=y
456CONFIG_SERIAL_CORE_CONSOLE=y 450CONFIG_SERIAL_CORE_CONSOLE=y
457# CONFIG_SERIAL_COLDFIRE is not set
458CONFIG_SERIAL_MCF=y 451CONFIG_SERIAL_MCF=y
459CONFIG_SERIAL_MCF_BAUDRATE=19200 452CONFIG_SERIAL_MCF_BAUDRATE=19200
460CONFIG_SERIAL_MCF_CONSOLE=y 453CONFIG_SERIAL_MCF_CONSOLE=y
@@ -473,19 +466,23 @@ CONFIG_LEGACY_PTY_COUNT=256
473# CONFIG_POWER_SUPPLY is not set 466# CONFIG_POWER_SUPPLY is not set
474# CONFIG_HWMON is not set 467# CONFIG_HWMON is not set
475# CONFIG_THERMAL is not set 468# CONFIG_THERMAL is not set
469# CONFIG_THERMAL_HWMON is not set
476# CONFIG_WATCHDOG is not set 470# CONFIG_WATCHDOG is not set
471CONFIG_SSB_POSSIBLE=y
477 472
478# 473#
479# Sonics Silicon Backplane 474# Sonics Silicon Backplane
480# 475#
481CONFIG_SSB_POSSIBLE=y
482# CONFIG_SSB is not set 476# CONFIG_SSB is not set
483 477
484# 478#
485# Multifunction device drivers 479# Multifunction device drivers
486# 480#
481# CONFIG_MFD_CORE is not set
487# CONFIG_MFD_SM501 is not set 482# CONFIG_MFD_SM501 is not set
488# CONFIG_HTC_PASIC3 is not set 483# CONFIG_HTC_PASIC3 is not set
484# CONFIG_MFD_TMIO is not set
485# CONFIG_REGULATOR is not set
489 486
490# 487#
491# Multimedia devices 488# Multimedia devices
@@ -496,6 +493,7 @@ CONFIG_SSB_POSSIBLE=y
496# 493#
497# CONFIG_VIDEO_DEV is not set 494# CONFIG_VIDEO_DEV is not set
498# CONFIG_DVB_CORE is not set 495# CONFIG_DVB_CORE is not set
496# CONFIG_VIDEO_MEDIA is not set
499 497
500# 498#
501# Multimedia drivers 499# Multimedia drivers
@@ -514,19 +512,17 @@ CONFIG_DAB=y
514# Display device support 512# Display device support
515# 513#
516# CONFIG_DISPLAY_SUPPORT is not set 514# CONFIG_DISPLAY_SUPPORT is not set
517
518#
519# Sound
520#
521# CONFIG_SOUND is not set 515# CONFIG_SOUND is not set
522# CONFIG_HID_SUPPORT is not set
523# CONFIG_USB_SUPPORT is not set 516# CONFIG_USB_SUPPORT is not set
524# CONFIG_MMC is not set 517# CONFIG_MMC is not set
525# CONFIG_MEMSTICK is not set 518# CONFIG_MEMSTICK is not set
526# CONFIG_NEW_LEDS is not set 519# CONFIG_NEW_LEDS is not set
527# CONFIG_ACCESSIBILITY is not set 520# CONFIG_ACCESSIBILITY is not set
528# CONFIG_RTC_CLASS is not set 521# CONFIG_RTC_CLASS is not set
522# CONFIG_DMADEVICES is not set
523# CONFIG_AUXDISPLAY is not set
529# CONFIG_UIO is not set 524# CONFIG_UIO is not set
525# CONFIG_STAGING is not set
530 526
531# 527#
532# File systems 528# File systems
@@ -534,12 +530,14 @@ CONFIG_DAB=y
534CONFIG_EXT2_FS=y 530CONFIG_EXT2_FS=y
535# CONFIG_EXT2_FS_XATTR is not set 531# CONFIG_EXT2_FS_XATTR is not set
536# CONFIG_EXT3_FS is not set 532# CONFIG_EXT3_FS is not set
537# CONFIG_EXT4DEV_FS is not set 533# CONFIG_EXT4_FS is not set
538# CONFIG_REISERFS_FS is not set 534# CONFIG_REISERFS_FS is not set
539# CONFIG_JFS_FS is not set 535# CONFIG_JFS_FS is not set
540# CONFIG_FS_POSIX_ACL is not set 536# CONFIG_FS_POSIX_ACL is not set
537# CONFIG_FILE_LOCKING is not set
541# CONFIG_XFS_FS is not set 538# CONFIG_XFS_FS is not set
542# CONFIG_OCFS2_FS is not set 539# CONFIG_OCFS2_FS is not set
540# CONFIG_BTRFS_FS is not set
543# CONFIG_DNOTIFY is not set 541# CONFIG_DNOTIFY is not set
544# CONFIG_INOTIFY is not set 542# CONFIG_INOTIFY is not set
545# CONFIG_QUOTA is not set 543# CONFIG_QUOTA is not set
@@ -548,6 +546,11 @@ CONFIG_EXT2_FS=y
548# CONFIG_FUSE_FS is not set 546# CONFIG_FUSE_FS is not set
549 547
550# 548#
549# Caches
550#
551# CONFIG_FSCACHE is not set
552
553#
551# CD-ROM/DVD Filesystems 554# CD-ROM/DVD Filesystems
552# 555#
553# CONFIG_ISO9660_FS is not set 556# CONFIG_ISO9660_FS is not set
@@ -569,10 +572,7 @@ CONFIG_SYSFS=y
569# CONFIG_TMPFS is not set 572# CONFIG_TMPFS is not set
570# CONFIG_HUGETLB_PAGE is not set 573# CONFIG_HUGETLB_PAGE is not set
571# CONFIG_CONFIGFS_FS is not set 574# CONFIG_CONFIGFS_FS is not set
572 575CONFIG_MISC_FILESYSTEMS=y
573#
574# Miscellaneous filesystems
575#
576# CONFIG_ADFS_FS is not set 576# CONFIG_ADFS_FS is not set
577# CONFIG_AFFS_FS is not set 577# CONFIG_AFFS_FS is not set
578# CONFIG_HFS_FS is not set 578# CONFIG_HFS_FS is not set
@@ -582,13 +582,20 @@ CONFIG_SYSFS=y
582# CONFIG_EFS_FS is not set 582# CONFIG_EFS_FS is not set
583# CONFIG_JFFS2_FS is not set 583# CONFIG_JFFS2_FS is not set
584# CONFIG_CRAMFS is not set 584# CONFIG_CRAMFS is not set
585# CONFIG_SQUASHFS is not set
585# CONFIG_VXFS_FS is not set 586# CONFIG_VXFS_FS is not set
586# CONFIG_MINIX_FS is not set 587# CONFIG_MINIX_FS is not set
588# CONFIG_OMFS_FS is not set
587# CONFIG_HPFS_FS is not set 589# CONFIG_HPFS_FS is not set
588# CONFIG_QNX4FS_FS is not set 590# CONFIG_QNX4FS_FS is not set
589CONFIG_ROMFS_FS=y 591CONFIG_ROMFS_FS=y
592# CONFIG_ROMFS_BACKED_BY_BLOCK is not set
593CONFIG_ROMFS_BACKED_BY_MTD=y
594# CONFIG_ROMFS_BACKED_BY_BOTH is not set
595CONFIG_ROMFS_ON_MTD=y
590# CONFIG_SYSV_FS is not set 596# CONFIG_SYSV_FS is not set
591# CONFIG_UFS_FS is not set 597# CONFIG_UFS_FS is not set
598# CONFIG_NILFS2_FS is not set
592# CONFIG_NETWORK_FILESYSTEMS is not set 599# CONFIG_NETWORK_FILESYSTEMS is not set
593 600
594# 601#
@@ -611,11 +618,17 @@ CONFIG_FRAME_WARN=1024
611# CONFIG_DEBUG_FS is not set 618# CONFIG_DEBUG_FS is not set
612# CONFIG_HEADERS_CHECK is not set 619# CONFIG_HEADERS_CHECK is not set
613# CONFIG_DEBUG_KERNEL is not set 620# CONFIG_DEBUG_KERNEL is not set
621# CONFIG_SLUB_DEBUG_ON is not set
622# CONFIG_SLUB_STATS is not set
614# CONFIG_DEBUG_BUGVERBOSE is not set 623# CONFIG_DEBUG_BUGVERBOSE is not set
624# CONFIG_DEBUG_MEMORY_INIT is not set
625# CONFIG_RCU_CPU_STALL_DETECTOR is not set
626CONFIG_SYSCTL_SYSCALL_CHECK=y
615# CONFIG_SAMPLES is not set 627# CONFIG_SAMPLES is not set
616# CONFIG_FULLDEBUG is not set 628# CONFIG_FULLDEBUG is not set
617# CONFIG_HIGHPROFILE is not set 629# CONFIG_HIGHPROFILE is not set
618# CONFIG_BOOTPARAM is not set 630CONFIG_BOOTPARAM=y
631CONFIG_BOOTPARAM_STRING="root=/dev/mtdblock0"
619# CONFIG_NO_KERNEL_MSG is not set 632# CONFIG_NO_KERNEL_MSG is not set
620# CONFIG_BDM_DISABLE is not set 633# CONFIG_BDM_DISABLE is not set
621 634
@@ -624,18 +637,22 @@ CONFIG_FRAME_WARN=1024
624# 637#
625# CONFIG_KEYS is not set 638# CONFIG_KEYS is not set
626# CONFIG_SECURITY is not set 639# CONFIG_SECURITY is not set
640# CONFIG_SECURITYFS is not set
627# CONFIG_SECURITY_FILE_CAPABILITIES is not set 641# CONFIG_SECURITY_FILE_CAPABILITIES is not set
628# CONFIG_CRYPTO is not set 642# CONFIG_CRYPTO is not set
643# CONFIG_BINARY_PRINTF is not set
629 644
630# 645#
631# Library routines 646# Library routines
632# 647#
633# CONFIG_GENERIC_FIND_FIRST_BIT is not set 648CONFIG_GENERIC_FIND_LAST_BIT=y
634# CONFIG_CRC_CCITT is not set 649# CONFIG_CRC_CCITT is not set
635# CONFIG_CRC16 is not set 650# CONFIG_CRC16 is not set
651# CONFIG_CRC_T10DIF is not set
636# CONFIG_CRC_ITU_T is not set 652# CONFIG_CRC_ITU_T is not set
637# CONFIG_CRC32 is not set 653# CONFIG_CRC32 is not set
638# CONFIG_CRC7 is not set 654# CONFIG_CRC7 is not set
639# CONFIG_LIBCRC32C is not set 655# CONFIG_LIBCRC32C is not set
640CONFIG_HAS_IOMEM=y 656CONFIG_HAS_IOMEM=y
641CONFIG_HAS_DMA=y 657CONFIG_HAS_DMA=y
658CONFIG_NLATTR=y
diff --git a/arch/m68knommu/kernel/asm-offsets.c b/arch/m68knommu/kernel/asm-offsets.c
index c785d07c02cc..f500dd6935d6 100644
--- a/arch/m68knommu/kernel/asm-offsets.c
+++ b/arch/m68knommu/kernel/asm-offsets.c
@@ -30,9 +30,6 @@ int main(void)
30 DEFINE(TASK_MM, offsetof(struct task_struct, mm)); 30 DEFINE(TASK_MM, offsetof(struct task_struct, mm));
31 DEFINE(TASK_ACTIVE_MM, offsetof(struct task_struct, active_mm)); 31 DEFINE(TASK_ACTIVE_MM, offsetof(struct task_struct, active_mm));
32 32
33 /* offsets into the kernel_stat struct */
34 DEFINE(STAT_IRQ, offsetof(struct kernel_stat, irqs));
35
36 /* offsets into the irq_cpustat_t struct */ 33 /* offsets into the irq_cpustat_t struct */
37 DEFINE(CPUSTAT_SOFTIRQ_PENDING, offsetof(irq_cpustat_t, __softirq_pending)); 34 DEFINE(CPUSTAT_SOFTIRQ_PENDING, offsetof(irq_cpustat_t, __softirq_pending));
38 35
@@ -69,9 +66,6 @@ int main(void)
69 DEFINE(PT_VECTOR, offsetof(struct pt_regs, pc) + 4); 66 DEFINE(PT_VECTOR, offsetof(struct pt_regs, pc) + 4);
70#endif 67#endif
71 68
72 /* offsets into the kernel_stat struct */
73 DEFINE(STAT_IRQ, offsetof(struct kernel_stat, irqs));
74
75 /* signal defines */ 69 /* signal defines */
76 DEFINE(SIGSEGV, SIGSEGV); 70 DEFINE(SIGSEGV, SIGSEGV);
77 DEFINE(SEGV_MAPERR, SEGV_MAPERR); 71 DEFINE(SEGV_MAPERR, SEGV_MAPERR);
diff --git a/arch/m68knommu/kernel/dma.c b/arch/m68knommu/kernel/dma.c
index 936125806638..aaf38bbbb6cd 100644
--- a/arch/m68knommu/kernel/dma.c
+++ b/arch/m68knommu/kernel/dma.c
@@ -7,10 +7,9 @@
7 7
8#include <linux/types.h> 8#include <linux/types.h>
9#include <linux/mm.h> 9#include <linux/mm.h>
10#include <linux/string.h>
11#include <linux/device.h> 10#include <linux/device.h>
12#include <linux/dma-mapping.h> 11#include <linux/dma-mapping.h>
13#include <asm/io.h> 12#include <asm/cacheflush.h>
14 13
15void *dma_alloc_coherent(struct device *dev, size_t size, 14void *dma_alloc_coherent(struct device *dev, size_t size,
16 dma_addr_t *dma_handle, gfp_t gfp) 15 dma_addr_t *dma_handle, gfp_t gfp)
@@ -36,7 +35,39 @@ void dma_free_coherent(struct device *dev, size_t size,
36 free_pages((unsigned long)vaddr, get_order(size)); 35 free_pages((unsigned long)vaddr, get_order(size));
37} 36}
38 37
39void dma_sync_single_for_cpu(struct device *dev, dma_addr_t handle, size_t size, enum dma_data_direction dir) 38void dma_sync_single_for_device(struct device *dev, dma_addr_t handle,
39 size_t size, enum dma_data_direction dir)
40{ 40{
41 switch (dir) {
42 case DMA_TO_DEVICE:
43 flush_dcache_range(handle, size);
44 break;
45 case DMA_FROM_DEVICE:
46 /* Should be clear already */
47 break;
48 default:
49 if (printk_ratelimit())
50 printk("dma_sync_single_for_device: unsupported dir %u\n", dir);
51 break;
52 }
53}
54
55EXPORT_SYMBOL(dma_sync_single_for_device);
56dma_addr_t dma_map_single(struct device *dev, void *addr, size_t size,
57 enum dma_data_direction dir)
58{
59 dma_addr_t handle = virt_to_phys(addr);
60 flush_dcache_range(handle, size);
61 return handle;
41} 62}
63EXPORT_SYMBOL(dma_map_single);
42 64
65dma_addr_t dma_map_page(struct device *dev, struct page *page,
66 unsigned long offset, size_t size,
67 enum dma_data_direction dir)
68{
69 dma_addr_t handle = page_to_phys(page) + offset;
70 dma_sync_single_for_device(dev, handle, size, dir);
71 return handle;
72}
73EXPORT_SYMBOL(dma_map_page);
diff --git a/arch/m68knommu/kernel/syscalltable.S b/arch/m68knommu/kernel/syscalltable.S
index 1017e76f3711..c0b8782832fd 100644
--- a/arch/m68knommu/kernel/syscalltable.S
+++ b/arch/m68knommu/kernel/syscalltable.S
@@ -347,6 +347,8 @@ ENTRY(sys_call_table)
347 .long sys_dup3 347 .long sys_dup3
348 .long sys_pipe2 348 .long sys_pipe2
349 .long sys_inotify_init1 349 .long sys_inotify_init1
350 .long sys_preadv
351 .long sys_pwritev /* 330 */
350 352
351 .rept NR_syscalls-(.-sys_call_table)/4 353 .rept NR_syscalls-(.-sys_call_table)/4
352 .long sys_ni_syscall 354 .long sys_ni_syscall
diff --git a/arch/m68knommu/kernel/vmlinux.lds.S b/arch/m68knommu/kernel/vmlinux.lds.S
index 69ba9b10767a..b7fe505e358d 100644
--- a/arch/m68knommu/kernel/vmlinux.lds.S
+++ b/arch/m68knommu/kernel/vmlinux.lds.S
@@ -147,6 +147,8 @@ SECTIONS {
147 . = ALIGN(4); 147 . = ALIGN(4);
148 _sdata = . ; 148 _sdata = . ;
149 DATA_DATA 149 DATA_DATA
150 . = ALIGN(32);
151 *(.data.cacheline_aligned)
150 . = ALIGN(8192) ; 152 . = ALIGN(8192) ;
151 *(.data.init_task) 153 *(.data.init_task)
152 _edata = . ; 154 _edata = . ;
diff --git a/arch/m68knommu/platform/527x/config.c b/arch/m68knommu/platform/527x/config.c
index 49343fb157b0..428b15922ef5 100644
--- a/arch/m68knommu/platform/527x/config.c
+++ b/arch/m68knommu/platform/527x/config.c
@@ -189,10 +189,15 @@ static void __init m527x_fec_init(void)
189 m527x_fec_irq_init(0); 189 m527x_fec_irq_init(0);
190 190
191 /* Set multi-function pins to ethernet mode for fec0 */ 191 /* Set multi-function pins to ethernet mode for fec0 */
192#if defined(CONFIG_M5271)
193 v = readb(MCF_IPSBAR + 0x100047);
194 writeb(v | 0xf0, MCF_IPSBAR + 0x100047);
195#else
192 par = readw(MCF_IPSBAR + 0x100082); 196 par = readw(MCF_IPSBAR + 0x100082);
193 writew(par | 0xf00, MCF_IPSBAR + 0x100082); 197 writew(par | 0xf00, MCF_IPSBAR + 0x100082);
194 v = readb(MCF_IPSBAR + 0x100078); 198 v = readb(MCF_IPSBAR + 0x100078);
195 writeb(v | 0xc0, MCF_IPSBAR + 0x100078); 199 writeb(v | 0xc0, MCF_IPSBAR + 0x100078);
200#endif
196 201
197#ifdef CONFIG_FEC2 202#ifdef CONFIG_FEC2
198 m527x_fec_irq_init(1); 203 m527x_fec_irq_init(1);
diff --git a/arch/microblaze/Makefile b/arch/microblaze/Makefile
index 0dcbb9832974..aaadfa701da3 100644
--- a/arch/microblaze/Makefile
+++ b/arch/microblaze/Makefile
@@ -26,21 +26,19 @@ ifeq (,$(findstring spartan2,$(CONFIG_XILINX_MICROBLAZE0_FAMILY)))
26endif 26endif
27CPUFLAGS-$(CONFIG_XILINX_MICROBLAZE0_USE_DIV) += -mno-xl-soft-div 27CPUFLAGS-$(CONFIG_XILINX_MICROBLAZE0_USE_DIV) += -mno-xl-soft-div
28CPUFLAGS-$(CONFIG_XILINX_MICROBLAZE0_USE_BARREL) += -mxl-barrel-shift 28CPUFLAGS-$(CONFIG_XILINX_MICROBLAZE0_USE_BARREL) += -mxl-barrel-shift
29CPUFLAGS-$(CONFIG_XILINX_MICROBLAZE0_USE_PCMP) += -mxl-pattern-compare 29CPUFLAGS-$(CONFIG_XILINX_MICROBLAZE0_USE_PCMP_INSTR) += -mxl-pattern-compare
30 30
31CPUFLAGS-1 += $(call cc-option,-mcpu=v$(CPU_VER)) 31CPUFLAGS-1 += $(call cc-option,-mcpu=v$(CPU_VER))
32 32
33# The various CONFIG_XILINX cpu features options are integers 0/1/2... 33# The various CONFIG_XILINX cpu features options are integers 0/1/2...
34# rather than bools y/n 34# rather than bools y/n
35CFLAGS += $(CPUFLAGS-1)
36CFLAGS += $(CPUFLAGS-2)
37 35
38# r31 holds current when in kernel mode 36# r31 holds current when in kernel mode
39CFLAGS += -ffixed-r31 37CFLAGS_KERNEL += -ffixed-r31 $(CPUFLAGS-1) $(CPUFLAGS-2)
40 38
41LDFLAGS_BLOB := --format binary --oformat elf32-microblaze 39LDFLAGS_BLOB := --format binary --oformat elf32-microblaze
42 40
43LIBGCC := $(shell $(CC) $(CFLAGS) -print-libgcc-file-name) 41LIBGCC := $(shell $(CC) $(CFLAGS_KERNEL) -print-libgcc-file-name)
44 42
45head-y := arch/microblaze/kernel/head.o 43head-y := arch/microblaze/kernel/head.o
46libs-y += arch/microblaze/lib/ $(LIBGCC) 44libs-y += arch/microblaze/lib/ $(LIBGCC)
diff --git a/arch/microblaze/include/asm/cache.h b/arch/microblaze/include/asm/cache.h
index c4c64b43c074..c209c47509d5 100644
--- a/arch/microblaze/include/asm/cache.h
+++ b/arch/microblaze/include/asm/cache.h
@@ -37,9 +37,4 @@ void _invalidate_dcache(unsigned int addr);
37#define __disable_dcache() _disable_dcache() 37#define __disable_dcache() _disable_dcache()
38#define __invalidate_dcache(addr) _invalidate_dcache(addr) 38#define __invalidate_dcache(addr) _invalidate_dcache(addr)
39 39
40/* FIXME - I don't think this is right */
41#ifdef CONFIG_XILINX_UNCACHED_SHADOW
42#define UNCACHED_SHADOW_MASK (CONFIG_XILINX_ERAM_SIZE)
43#endif
44
45#endif /* _ASM_MICROBLAZE_CACHE_H */ 40#endif /* _ASM_MICROBLAZE_CACHE_H */
diff --git a/arch/microblaze/include/asm/entry.h b/arch/microblaze/include/asm/entry.h
index 7f57e42ee467..e4c3aef884df 100644
--- a/arch/microblaze/include/asm/entry.h
+++ b/arch/microblaze/include/asm/entry.h
@@ -29,7 +29,9 @@ DECLARE_PER_CPU(unsigned int, KM); /* Kernel/user mode */
29DECLARE_PER_CPU(unsigned int, ENTRY_SP); /* Saved SP on kernel entry */ 29DECLARE_PER_CPU(unsigned int, ENTRY_SP); /* Saved SP on kernel entry */
30DECLARE_PER_CPU(unsigned int, R11_SAVE); /* Temp variable for entry */ 30DECLARE_PER_CPU(unsigned int, R11_SAVE); /* Temp variable for entry */
31DECLARE_PER_CPU(unsigned int, CURRENT_SAVE); /* Saved current pointer */ 31DECLARE_PER_CPU(unsigned int, CURRENT_SAVE); /* Saved current pointer */
32DECLARE_PER_CPU(unsigned int, SYSCALL_SAVE); /* Saved syscall number */
33# endif /* __ASSEMBLY__ */ 32# endif /* __ASSEMBLY__ */
34 33
34/* noMMU hasn't any space for args */
35# define STATE_SAVE_ARG_SPACE (0)
36
35#endif /* _ASM_MICROBLAZE_ENTRY_H */ 37#endif /* _ASM_MICROBLAZE_ENTRY_H */
diff --git a/arch/microblaze/include/asm/exceptions.h b/arch/microblaze/include/asm/exceptions.h
index 4cdd2159f470..24ca540e77c0 100644
--- a/arch/microblaze/include/asm/exceptions.h
+++ b/arch/microblaze/include/asm/exceptions.h
@@ -61,6 +61,9 @@
61asmlinkage void full_exception(struct pt_regs *regs, unsigned int type, 61asmlinkage void full_exception(struct pt_regs *regs, unsigned int type,
62 int fsr, int addr); 62 int fsr, int addr);
63 63
64void die(const char *str, struct pt_regs *fp, long err);
65void _exception(int signr, struct pt_regs *regs, int code, unsigned long addr);
66
64#if defined(CONFIG_XMON) 67#if defined(CONFIG_XMON)
65extern void xmon(struct pt_regs *regs); 68extern void xmon(struct pt_regs *regs);
66extern int xmon_bpt(struct pt_regs *regs); 69extern int xmon_bpt(struct pt_regs *regs);
diff --git a/arch/microblaze/include/asm/processor.h b/arch/microblaze/include/asm/processor.h
index d8e15434ba21..9329029d2614 100644
--- a/arch/microblaze/include/asm/processor.h
+++ b/arch/microblaze/include/asm/processor.h
@@ -15,6 +15,8 @@
15#include <asm/setup.h> 15#include <asm/setup.h>
16#include <asm/registers.h> 16#include <asm/registers.h>
17#include <asm/segment.h> 17#include <asm/segment.h>
18#include <asm/entry.h>
19#include <asm/current.h>
18 20
19# ifndef __ASSEMBLY__ 21# ifndef __ASSEMBLY__
20/* from kernel/cpu/mb.c */ 22/* from kernel/cpu/mb.c */
@@ -26,6 +28,12 @@ extern const struct seq_operations cpuinfo_op;
26 28
27# endif /* __ASSEMBLY__ */ 29# endif /* __ASSEMBLY__ */
28 30
31#define task_pt_regs(tsk) \
32 (((struct pt_regs *)(THREAD_SIZE + task_stack_page(tsk))) - 1)
33
34/* Do necessary setup to start up a newly executed thread. */
35void start_thread(struct pt_regs *regs, unsigned long pc, unsigned long usp);
36
29/* 37/*
30 * User space process size: memory size 38 * User space process size: memory size
31 * 39 *
@@ -55,16 +63,6 @@ struct task_struct;
55struct thread_struct { }; 63struct thread_struct { };
56# define INIT_THREAD { } 64# define INIT_THREAD { }
57 65
58/* Do necessary setup to start up a newly executed thread. */
59static inline void start_thread(struct pt_regs *regs,
60 unsigned long pc,
61 unsigned long usp)
62{
63 regs->pc = pc;
64 regs->r1 = usp;
65 regs->kernel_mode = 0;
66}
67
68/* Free all resources held by a thread. */ 66/* Free all resources held by a thread. */
69static inline void release_thread(struct task_struct *dead_task) 67static inline void release_thread(struct task_struct *dead_task)
70{ 68{
@@ -84,9 +82,6 @@ extern unsigned long get_wchan(struct task_struct *p);
84 */ 82 */
85extern int kernel_thread(int (*fn)(void *), void *arg, unsigned long flags); 83extern int kernel_thread(int (*fn)(void *), void *arg, unsigned long flags);
86 84
87# define task_pt_regs(tsk) \
88 (((struct pt_regs *)(THREAD_SIZE + task_stack_page(tsk))) - 1)
89
90# define KSTK_EIP(tsk) (0) 85# define KSTK_EIP(tsk) (0)
91# define KSTK_ESP(tsk) (0) 86# define KSTK_ESP(tsk) (0)
92 87
diff --git a/arch/microblaze/include/asm/ptrace.h b/arch/microblaze/include/asm/ptrace.h
index f1f03486428a..55015bce5e47 100644
--- a/arch/microblaze/include/asm/ptrace.h
+++ b/arch/microblaze/include/asm/ptrace.h
@@ -52,10 +52,10 @@ struct pt_regs {
52 microblaze_reg_t ear; 52 microblaze_reg_t ear;
53 microblaze_reg_t esr; 53 microblaze_reg_t esr;
54 microblaze_reg_t fsr; 54 microblaze_reg_t fsr;
55 int kernel_mode; 55 int pt_mode;
56}; 56};
57 57
58#define kernel_mode(regs) ((regs)->kernel_mode) 58#define kernel_mode(regs) ((regs)->pt_mode)
59#define user_mode(regs) (!kernel_mode(regs)) 59#define user_mode(regs) (!kernel_mode(regs))
60 60
61#define instruction_pointer(regs) ((regs)->pc) 61#define instruction_pointer(regs) ((regs)->pc)
diff --git a/arch/microblaze/include/asm/unistd.h b/arch/microblaze/include/asm/unistd.h
index d9d3903fde3f..b5e2f5fa5c53 100644
--- a/arch/microblaze/include/asm/unistd.h
+++ b/arch/microblaze/include/asm/unistd.h
@@ -378,8 +378,10 @@
378#define __NR_sendmsg 360 /* new */ 378#define __NR_sendmsg 360 /* new */
379#define __NR_recvmsg 361 /* new */ 379#define __NR_recvmsg 361 /* new */
380#define __NR_accept04 362 /* new */ 380#define __NR_accept04 362 /* new */
381#define __NR_preadv 363 /* new */
382#define __NR_pwritev 364 /* new */
381 383
382#define __NR_syscalls 363 384#define __NR_syscalls 365
383 385
384#ifdef __KERNEL__ 386#ifdef __KERNEL__
385#ifndef __ASSEMBLY__ 387#ifndef __ASSEMBLY__
diff --git a/arch/microblaze/kernel/asm-offsets.c b/arch/microblaze/kernel/asm-offsets.c
index 38e1a2e8ad0c..aabd9e9423a6 100644
--- a/arch/microblaze/kernel/asm-offsets.c
+++ b/arch/microblaze/kernel/asm-offsets.c
@@ -57,7 +57,7 @@ int main(int argc, char *argv[])
57 DEFINE(PT_R29, offsetof(struct pt_regs, r29)); 57 DEFINE(PT_R29, offsetof(struct pt_regs, r29));
58 DEFINE(PT_R30, offsetof(struct pt_regs, r30)); 58 DEFINE(PT_R30, offsetof(struct pt_regs, r30));
59 DEFINE(PT_R31, offsetof(struct pt_regs, r31)); 59 DEFINE(PT_R31, offsetof(struct pt_regs, r31));
60 DEFINE(PT_MODE, offsetof(struct pt_regs, kernel_mode)); 60 DEFINE(PT_MODE, offsetof(struct pt_regs, pt_mode));
61 BLANK(); 61 BLANK();
62 62
63 /* Magic offsets for PTRACE PEEK/POKE etc */ 63 /* Magic offsets for PTRACE PEEK/POKE etc */
diff --git a/arch/microblaze/kernel/cpu/cache.c b/arch/microblaze/kernel/cpu/cache.c
index be9fecca4f91..af866a450125 100644
--- a/arch/microblaze/kernel/cpu/cache.c
+++ b/arch/microblaze/kernel/cpu/cache.c
@@ -100,7 +100,6 @@ void _enable_dcache(void)
100 100
101void _disable_dcache(void) 101void _disable_dcache(void)
102{ 102{
103 if (cpuinfo.use_dcache) {
104#if CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR 103#if CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR
105 __asm__ __volatile__ (" \ 104 __asm__ __volatile__ (" \
106 msrclr r0, %0; \ 105 msrclr r0, %0; \
@@ -119,12 +118,10 @@ void _disable_dcache(void)
119 : "i" (MSR_DCE) \ 118 : "i" (MSR_DCE) \
120 : "memory", "r12"); 119 : "memory", "r12");
121#endif 120#endif
122 }
123} 121}
124 122
125void _invalidate_dcache(unsigned int addr) 123void _invalidate_dcache(unsigned int addr)
126{ 124{
127 if (cpuinfo.use_dcache)
128 __asm__ __volatile__ (" \ 125 __asm__ __volatile__ (" \
129 wdc %0, r0" \ 126 wdc %0, r0" \
130 : \ 127 : \
diff --git a/arch/microblaze/kernel/cpu/cpuinfo-pvr-full.c b/arch/microblaze/kernel/cpu/cpuinfo-pvr-full.c
index cf7424a6bb87..153f57c57b6d 100644
--- a/arch/microblaze/kernel/cpu/cpuinfo-pvr-full.c
+++ b/arch/microblaze/kernel/cpu/cpuinfo-pvr-full.c
@@ -30,6 +30,13 @@ void set_cpuinfo_pvr_full(struct cpuinfo *ci, struct device_node *cpu)
30 int temp; /* for saving temp value */ 30 int temp; /* for saving temp value */
31 get_pvr(&pvr); 31 get_pvr(&pvr);
32 32
33 CI(ver_code, VERSION);
34 if (!ci->ver_code) {
35 printk(KERN_ERR "ERROR: MB has broken PVR regs "
36 "-> use DTS setting\n");
37 return;
38 }
39
33 temp = PVR_USE_BARREL(pvr) | PVR_USE_MSR_INSTR(pvr) |\ 40 temp = PVR_USE_BARREL(pvr) | PVR_USE_MSR_INSTR(pvr) |\
34 PVR_USE_PCMP_INSTR(pvr) | PVR_USE_DIV(pvr); 41 PVR_USE_PCMP_INSTR(pvr) | PVR_USE_DIV(pvr);
35 if (ci->use_instr != temp) 42 if (ci->use_instr != temp)
@@ -60,8 +67,6 @@ void set_cpuinfo_pvr_full(struct cpuinfo *ci, struct device_node *cpu)
60 67
61 CI(mmu, USE_MMU); 68 CI(mmu, USE_MMU);
62 69
63 CI(ver_code, VERSION);
64
65 CI(use_icache, USE_ICACHE); 70 CI(use_icache, USE_ICACHE);
66 CI(icache_tagbits, ICACHE_ADDR_TAG_BITS); 71 CI(icache_tagbits, ICACHE_ADDR_TAG_BITS);
67 CI(icache_write, ICACHE_ALLOW_WR); 72 CI(icache_write, ICACHE_ALLOW_WR);
diff --git a/arch/microblaze/kernel/cpu/cpuinfo.c b/arch/microblaze/kernel/cpu/cpuinfo.c
index 4a740dfcf6da..a10bea119b94 100644
--- a/arch/microblaze/kernel/cpu/cpuinfo.c
+++ b/arch/microblaze/kernel/cpu/cpuinfo.c
@@ -71,7 +71,7 @@ void __init setup_cpuinfo(void)
71 __func__); 71 __func__);
72 set_cpuinfo_static(&cpuinfo, cpu); 72 set_cpuinfo_static(&cpuinfo, cpu);
73 break; 73 break;
74/* FIXME I found weird behavior with MB 7.00.a/b 74/* FIXME I found weird behavior with MB 7.00.a/b 7.10.a
75 * please do not use FULL PVR with MMU */ 75 * please do not use FULL PVR with MMU */
76 case 1: 76 case 1:
77 printk(KERN_INFO "%s: Using full CPU PVR support\n", 77 printk(KERN_INFO "%s: Using full CPU PVR support\n",
diff --git a/arch/microblaze/kernel/cpu/mb.c b/arch/microblaze/kernel/cpu/mb.c
index 3b6212bdc8dc..4dcfccdbc364 100644
--- a/arch/microblaze/kernel/cpu/mb.c
+++ b/arch/microblaze/kernel/cpu/mb.c
@@ -115,8 +115,8 @@ static int show_cpuinfo(struct seq_file *m, void *v)
115 cpuinfo.hw_debug ? "yes" : "no"); 115 cpuinfo.hw_debug ? "yes" : "no");
116 116
117 count += seq_printf(m, 117 count += seq_printf(m,
118 "PVR-USR1:\t%x\n" 118 "PVR-USR1:\t%02x\n"
119 "PVR-USR2:\t%x\n", 119 "PVR-USR2:\t%08x\n",
120 cpuinfo.pvr_user1, 120 cpuinfo.pvr_user1,
121 cpuinfo.pvr_user2); 121 cpuinfo.pvr_user2);
122 122
diff --git a/arch/microblaze/kernel/early_printk.c b/arch/microblaze/kernel/early_printk.c
index 62cc78993f44..4b0f0fdb9ca0 100644
--- a/arch/microblaze/kernel/early_printk.c
+++ b/arch/microblaze/kernel/early_printk.c
@@ -36,7 +36,7 @@ static void early_printk_putc(char c)
36 36
37 unsigned retries = 10000; 37 unsigned retries = 10000;
38 /* read status bit - 0x8 offset */ 38 /* read status bit - 0x8 offset */
39 while (retries-- && (in_be32(base_addr + 8) & (1 << 3))) 39 while (--retries && (in_be32(base_addr + 8) & (1 << 3)))
40 ; 40 ;
41 41
42 /* Only attempt the iowrite if we didn't timeout */ 42 /* Only attempt the iowrite if we didn't timeout */
diff --git a/arch/microblaze/kernel/process.c b/arch/microblaze/kernel/process.c
index 436f26ccbfa9..07d4fa339eda 100644
--- a/arch/microblaze/kernel/process.c
+++ b/arch/microblaze/kernel/process.c
@@ -18,7 +18,7 @@
18 18
19void show_regs(struct pt_regs *regs) 19void show_regs(struct pt_regs *regs)
20{ 20{
21 printk(KERN_INFO " Registers dump: mode=%X\r\n", regs->kernel_mode); 21 printk(KERN_INFO " Registers dump: mode=%X\r\n", regs->pt_mode);
22 printk(KERN_INFO " r1=%08lX, r2=%08lX, r3=%08lX, r4=%08lX\n", 22 printk(KERN_INFO " r1=%08lX, r2=%08lX, r3=%08lX, r4=%08lX\n",
23 regs->r1, regs->r2, regs->r3, regs->r4); 23 regs->r1, regs->r2, regs->r3, regs->r4);
24 printk(KERN_INFO " r5=%08lX, r6=%08lX, r7=%08lX, r8=%08lX\n", 24 printk(KERN_INFO " r5=%08lX, r6=%08lX, r7=%08lX, r8=%08lX\n",
@@ -37,8 +37,6 @@ void show_regs(struct pt_regs *regs)
37 regs->r29, regs->r30, regs->r31, regs->pc); 37 regs->r29, regs->r30, regs->r31, regs->pc);
38 printk(KERN_INFO " msr=%08lX, ear=%08lX, esr=%08lX, fsr=%08lX\n", 38 printk(KERN_INFO " msr=%08lX, ear=%08lX, esr=%08lX, fsr=%08lX\n",
39 regs->msr, regs->ear, regs->esr, regs->fsr); 39 regs->msr, regs->ear, regs->esr, regs->fsr);
40 while (1)
41 ;
42} 40}
43 41
44void (*pm_idle)(void); 42void (*pm_idle)(void);
@@ -163,7 +161,6 @@ static void kernel_thread_helper(int (*fn)(void *), void *arg)
163int kernel_thread(int (*fn)(void *), void *arg, unsigned long flags) 161int kernel_thread(int (*fn)(void *), void *arg, unsigned long flags)
164{ 162{
165 struct pt_regs regs; 163 struct pt_regs regs;
166 int ret;
167 164
168 memset(&regs, 0, sizeof(regs)); 165 memset(&regs, 0, sizeof(regs));
169 /* store them in non-volatile registers */ 166 /* store them in non-volatile registers */
@@ -171,12 +168,10 @@ int kernel_thread(int (*fn)(void *), void *arg, unsigned long flags)
171 regs.r6 = (unsigned long)arg; 168 regs.r6 = (unsigned long)arg;
172 local_save_flags(regs.msr); 169 local_save_flags(regs.msr);
173 regs.pc = (unsigned long)kernel_thread_helper; 170 regs.pc = (unsigned long)kernel_thread_helper;
174 regs.kernel_mode = 1; 171 regs.pt_mode = 1;
175 172
176 ret = do_fork(flags | CLONE_VM | CLONE_UNTRACED, 0, 173 return do_fork(flags | CLONE_VM | CLONE_UNTRACED, 0,
177 &regs, 0, NULL, NULL); 174 &regs, 0, NULL, NULL);
178
179 return ret;
180} 175}
181 176
182unsigned long get_wchan(struct task_struct *p) 177unsigned long get_wchan(struct task_struct *p)
@@ -184,3 +179,12 @@ unsigned long get_wchan(struct task_struct *p)
184/* TBD (used by procfs) */ 179/* TBD (used by procfs) */
185 return 0; 180 return 0;
186} 181}
182
183/* Set up a thread for executing a new program */
184void start_thread(struct pt_regs *regs, unsigned long pc, unsigned long usp)
185{
186 set_fs(USER_DS);
187 regs->pc = pc;
188 regs->r1 = usp;
189 regs->pt_mode = 0;
190}
diff --git a/arch/microblaze/kernel/signal.c b/arch/microblaze/kernel/signal.c
index 3889cf45fa71..40d36931e363 100644
--- a/arch/microblaze/kernel/signal.c
+++ b/arch/microblaze/kernel/signal.c
@@ -178,7 +178,9 @@ restore_sigcontext(struct pt_regs *regs, struct sigcontext *sc, int *rval_p)
178 178
179asmlinkage int sys_sigreturn(struct pt_regs *regs) 179asmlinkage int sys_sigreturn(struct pt_regs *regs)
180{ 180{
181 struct sigframe *frame = (struct sigframe *)regs->r1; 181 struct sigframe *frame =
182 (struct sigframe *)(regs->r1 + STATE_SAVE_ARG_SPACE);
183
182 sigset_t set; 184 sigset_t set;
183 int rval; 185 int rval;
184 186
@@ -209,7 +211,9 @@ badframe:
209 211
210asmlinkage int sys_rt_sigreturn(struct pt_regs *regs) 212asmlinkage int sys_rt_sigreturn(struct pt_regs *regs)
211{ 213{
212 struct rt_sigframe *frame = (struct rt_sigframe *)regs->r1; 214 struct rt_sigframe *frame =
215 (struct rt_sigframe *)(regs->r1 + STATE_SAVE_ARG_SPACE);
216
213 sigset_t set; 217 sigset_t set;
214 stack_t st; 218 stack_t st;
215 int rval; 219 int rval;
@@ -336,7 +340,8 @@ static void setup_frame(int sig, struct k_sigaction *ka,
336 goto give_sigsegv; 340 goto give_sigsegv;
337 341
338 /* Set up registers for signal handler */ 342 /* Set up registers for signal handler */
339 regs->r1 = (unsigned long) frame; 343 regs->r1 = (unsigned long) frame - STATE_SAVE_ARG_SPACE;
344
340 /* Signal handler args: */ 345 /* Signal handler args: */
341 regs->r5 = signal; /* Arg 0: signum */ 346 regs->r5 = signal; /* Arg 0: signum */
342 regs->r6 = (unsigned long) &frame->sc; /* arg 1: sigcontext */ 347 regs->r6 = (unsigned long) &frame->sc; /* arg 1: sigcontext */
@@ -414,7 +419,8 @@ static void setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
414 goto give_sigsegv; 419 goto give_sigsegv;
415 420
416 /* Set up registers for signal handler */ 421 /* Set up registers for signal handler */
417 regs->r1 = (unsigned long) frame; 422 regs->r1 = (unsigned long) frame - STATE_SAVE_ARG_SPACE;
423
418 /* Signal handler args: */ 424 /* Signal handler args: */
419 regs->r5 = signal; /* arg 0: signum */ 425 regs->r5 = signal; /* arg 0: signum */
420 regs->r6 = (unsigned long) &frame->info; /* arg 1: siginfo */ 426 regs->r6 = (unsigned long) &frame->info; /* arg 1: siginfo */
diff --git a/arch/microblaze/kernel/syscall_table.S b/arch/microblaze/kernel/syscall_table.S
index 529b0dbf4fe9..3bb42ec924c2 100644
--- a/arch/microblaze/kernel/syscall_table.S
+++ b/arch/microblaze/kernel/syscall_table.S
@@ -363,3 +363,5 @@ ENTRY(sys_call_table)
363 .long sys_sendmsg /* 360 */ 363 .long sys_sendmsg /* 360 */
364 .long sys_recvmsg 364 .long sys_recvmsg
365 .long sys_ni_syscall 365 .long sys_ni_syscall
366 .long sys_ni_syscall
367 .long sys_ni_syscall
diff --git a/arch/microblaze/kernel/timer.c b/arch/microblaze/kernel/timer.c
index 05a497eefd78..bdfa2f9f0c81 100644
--- a/arch/microblaze/kernel/timer.c
+++ b/arch/microblaze/kernel/timer.c
@@ -176,7 +176,7 @@ static __init void microblaze_clockevent_init(void)
176 clockevents_register_device(&clockevent_microblaze_timer); 176 clockevents_register_device(&clockevent_microblaze_timer);
177} 177}
178 178
179static cycle_t microblaze_read(void) 179static cycle_t microblaze_read(struct clocksource *cs)
180{ 180{
181 /* reading actual value of timer 1 */ 181 /* reading actual value of timer 1 */
182 return (cycle_t) (in_be32(TIMER_BASE + TCR1)); 182 return (cycle_t) (in_be32(TIMER_BASE + TCR1));
diff --git a/arch/microblaze/kernel/traps.c b/arch/microblaze/kernel/traps.c
index fbdc533c61e3..293ef486013a 100644
--- a/arch/microblaze/kernel/traps.c
+++ b/arch/microblaze/kernel/traps.c
@@ -34,7 +34,7 @@ static int kstack_depth_to_print = 24;
34 34
35static int __init kstack_setup(char *s) 35static int __init kstack_setup(char *s)
36{ 36{
37 kstack_depth_to_print = strict_strtoul(s, 0, 0); 37 kstack_depth_to_print = strict_strtoul(s, 0, NULL);
38 38
39 return 1; 39 return 1;
40} 40}
diff --git a/arch/mn10300/configs/asb2303_defconfig b/arch/mn10300/configs/asb2303_defconfig
index 3aa8906b3dea..3acce23708b0 100644
--- a/arch/mn10300/configs/asb2303_defconfig
+++ b/arch/mn10300/configs/asb2303_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.25-rc2 3# Linux kernel version: 2.6.30-rc2
4# Tue Feb 19 18:52:24 2008 4# Sat Apr 18 11:13:22 2009
5# 5#
6CONFIG_MN10300=y 6CONFIG_MN10300=y
7CONFIG_AM33=y 7CONFIG_AM33=y
@@ -18,7 +18,6 @@ CONFIG_GENERIC_TIME=y
18CONFIG_GENERIC_BUG=y 18CONFIG_GENERIC_BUG=y
19CONFIG_QUICKLIST=y 19CONFIG_QUICKLIST=y
20CONFIG_ARCH_HAS_ILOG2_U32=y 20CONFIG_ARCH_HAS_ILOG2_U32=y
21# CONFIG_ARCH_SUPPORTS_AOUT is not set
22CONFIG_GENERIC_HARDIRQS=y 21CONFIG_GENERIC_HARDIRQS=y
23# CONFIG_HOTPLUG_CPU is not set 22# CONFIG_HOTPLUG_CPU is not set
24CONFIG_HZ=1000 23CONFIG_HZ=1000
@@ -40,52 +39,58 @@ CONFIG_BSD_PROCESS_ACCT=y
40# CONFIG_BSD_PROCESS_ACCT_V3 is not set 39# CONFIG_BSD_PROCESS_ACCT_V3 is not set
41# CONFIG_TASKSTATS is not set 40# CONFIG_TASKSTATS is not set
42# CONFIG_AUDIT is not set 41# CONFIG_AUDIT is not set
42
43#
44# RCU Subsystem
45#
46CONFIG_CLASSIC_RCU=y
47# CONFIG_TREE_RCU is not set
48# CONFIG_PREEMPT_RCU is not set
49# CONFIG_TREE_RCU_TRACE is not set
50# CONFIG_PREEMPT_RCU_TRACE is not set
43# CONFIG_IKCONFIG is not set 51# CONFIG_IKCONFIG is not set
44CONFIG_LOG_BUF_SHIFT=14 52CONFIG_LOG_BUF_SHIFT=14
45# CONFIG_CGROUPS is not set
46# CONFIG_GROUP_SCHED is not set 53# CONFIG_GROUP_SCHED is not set
47# CONFIG_USER_SCHED is not set 54# CONFIG_CGROUPS is not set
48# CONFIG_CGROUP_SCHED is not set 55# CONFIG_SYSFS_DEPRECATED_V2 is not set
49# CONFIG_SYSFS_DEPRECATED is not set
50# CONFIG_RELAY is not set 56# CONFIG_RELAY is not set
51# CONFIG_NAMESPACES is not set 57# CONFIG_NAMESPACES is not set
52# CONFIG_BLK_DEV_INITRD is not set 58# CONFIG_BLK_DEV_INITRD is not set
53# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 59# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
54CONFIG_SYSCTL=y 60CONFIG_SYSCTL=y
61CONFIG_ANON_INODES=y
55CONFIG_EMBEDDED=y 62CONFIG_EMBEDDED=y
56CONFIG_SYSCTL_SYSCALL=y 63CONFIG_SYSCTL_SYSCALL=y
57# CONFIG_KALLSYMS is not set 64# CONFIG_KALLSYMS is not set
65CONFIG_STRIP_ASM_SYMS=y
58# CONFIG_HOTPLUG is not set 66# CONFIG_HOTPLUG is not set
59CONFIG_PRINTK=y 67CONFIG_PRINTK=y
60CONFIG_BUG=y 68CONFIG_BUG=y
61CONFIG_ELF_CORE=y 69CONFIG_ELF_CORE=y
62CONFIG_COMPAT_BRK=y
63CONFIG_BASE_FULL=y 70CONFIG_BASE_FULL=y
64CONFIG_FUTEX=y 71CONFIG_FUTEX=y
65CONFIG_ANON_INODES=y
66CONFIG_EPOLL=y 72CONFIG_EPOLL=y
67CONFIG_SIGNALFD=y 73CONFIG_SIGNALFD=y
68CONFIG_TIMERFD=y 74CONFIG_TIMERFD=y
69CONFIG_EVENTFD=y 75CONFIG_EVENTFD=y
70CONFIG_SHMEM=y 76CONFIG_SHMEM=y
77CONFIG_AIO=y
71# CONFIG_VM_EVENT_COUNTERS is not set 78# CONFIG_VM_EVENT_COUNTERS is not set
79CONFIG_COMPAT_BRK=y
72CONFIG_SLAB=y 80CONFIG_SLAB=y
73# CONFIG_SLUB is not set 81# CONFIG_SLUB is not set
74# CONFIG_SLOB is not set 82# CONFIG_SLOB is not set
75CONFIG_PROFILING=y 83CONFIG_PROFILING=y
76# CONFIG_MARKERS is not set 84# CONFIG_MARKERS is not set
77CONFIG_OPROFILE=y 85CONFIG_HAVE_OPROFILE=y
78# CONFIG_HAVE_OPROFILE is not set 86# CONFIG_SLOW_WORK is not set
79# CONFIG_HAVE_KPROBES is not set 87# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
80# CONFIG_PROC_PAGE_MONITOR is not set
81CONFIG_SLABINFO=y 88CONFIG_SLABINFO=y
82CONFIG_RT_MUTEXES=y 89CONFIG_RT_MUTEXES=y
83# CONFIG_TINY_SHMEM is not set
84CONFIG_BASE_SMALL=0 90CONFIG_BASE_SMALL=0
85# CONFIG_MODULES is not set 91# CONFIG_MODULES is not set
86# CONFIG_BLOCK is not set 92# CONFIG_BLOCK is not set
87CONFIG_CLASSIC_RCU=y 93# CONFIG_FREEZER is not set
88# CONFIG_PREEMPT_RCU is not set
89 94
90# 95#
91# Matsushita MN10300 system setup 96# Matsushita MN10300 system setup
@@ -107,7 +112,6 @@ CONFIG_INTERRUPT_VECTOR_BASE=0x90000000
107CONFIG_KERNEL_TEXT_ADDRESS=0x90001000 112CONFIG_KERNEL_TEXT_ADDRESS=0x90001000
108CONFIG_KERNEL_ZIMAGE_BASE_ADDRESS=0x90700000 113CONFIG_KERNEL_ZIMAGE_BASE_ADDRESS=0x90700000
109CONFIG_PREEMPT=y 114CONFIG_PREEMPT=y
110CONFIG_PREEMPT_BKL=y
111CONFIG_MN10300_CURRENT_IN_E2=y 115CONFIG_MN10300_CURRENT_IN_E2=y
112CONFIG_MN10300_USING_JTAG=y 116CONFIG_MN10300_USING_JTAG=y
113CONFIG_MN10300_RTC=y 117CONFIG_MN10300_RTC=y
@@ -135,13 +139,15 @@ CONFIG_FLATMEM_MANUAL=y
135# CONFIG_SPARSEMEM_MANUAL is not set 139# CONFIG_SPARSEMEM_MANUAL is not set
136CONFIG_FLATMEM=y 140CONFIG_FLATMEM=y
137CONFIG_FLAT_NODE_MEM_MAP=y 141CONFIG_FLAT_NODE_MEM_MAP=y
138# CONFIG_SPARSEMEM_STATIC is not set 142CONFIG_PAGEFLAGS_EXTENDED=y
139# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
140CONFIG_SPLIT_PTLOCK_CPUS=4 143CONFIG_SPLIT_PTLOCK_CPUS=4
141# CONFIG_RESOURCES_64BIT is not set 144# CONFIG_PHYS_ADDR_T_64BIT is not set
142CONFIG_ZONE_DMA_FLAG=0 145CONFIG_ZONE_DMA_FLAG=0
143CONFIG_NR_QUICK=1 146CONFIG_NR_QUICK=1
144CONFIG_VIRT_TO_BUS=y 147CONFIG_VIRT_TO_BUS=y
148CONFIG_UNEVICTABLE_LRU=y
149CONFIG_HAVE_MLOCK=y
150CONFIG_HAVE_MLOCKED_PAGE_BIT=y
145 151
146# 152#
147# Power management options 153# Power management options
@@ -152,11 +158,9 @@ CONFIG_VIRT_TO_BUS=y
152# Executable formats 158# Executable formats
153# 159#
154CONFIG_BINFMT_ELF=y 160CONFIG_BINFMT_ELF=y
161# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
162# CONFIG_HAVE_AOUT is not set
155# CONFIG_BINFMT_MISC is not set 163# CONFIG_BINFMT_MISC is not set
156
157#
158# Networking
159#
160CONFIG_NET=y 164CONFIG_NET=y
161 165
162# 166#
@@ -194,8 +198,6 @@ CONFIG_TCP_CONG_CUBIC=y
194CONFIG_DEFAULT_TCP_CONG="cubic" 198CONFIG_DEFAULT_TCP_CONG="cubic"
195# CONFIG_TCP_MD5SIG is not set 199# CONFIG_TCP_MD5SIG is not set
196# CONFIG_IPV6 is not set 200# CONFIG_IPV6 is not set
197# CONFIG_INET6_XFRM_TUNNEL is not set
198# CONFIG_INET6_TUNNEL is not set
199# CONFIG_NETWORK_SECMARK is not set 201# CONFIG_NETWORK_SECMARK is not set
200# CONFIG_NETFILTER is not set 202# CONFIG_NETFILTER is not set
201# CONFIG_IP_DCCP is not set 203# CONFIG_IP_DCCP is not set
@@ -203,6 +205,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
203# CONFIG_TIPC is not set 205# CONFIG_TIPC is not set
204# CONFIG_ATM is not set 206# CONFIG_ATM is not set
205# CONFIG_BRIDGE is not set 207# CONFIG_BRIDGE is not set
208# CONFIG_NET_DSA is not set
206# CONFIG_VLAN_8021Q is not set 209# CONFIG_VLAN_8021Q is not set
207# CONFIG_DECNET is not set 210# CONFIG_DECNET is not set
208# CONFIG_LLC2 is not set 211# CONFIG_LLC2 is not set
@@ -212,7 +215,9 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
212# CONFIG_LAPB is not set 215# CONFIG_LAPB is not set
213# CONFIG_ECONET is not set 216# CONFIG_ECONET is not set
214# CONFIG_WAN_ROUTER is not set 217# CONFIG_WAN_ROUTER is not set
218# CONFIG_PHONET is not set
215# CONFIG_NET_SCHED is not set 219# CONFIG_NET_SCHED is not set
220# CONFIG_DCB is not set
216 221
217# 222#
218# Network testing 223# Network testing
@@ -223,14 +228,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
223# CONFIG_IRDA is not set 228# CONFIG_IRDA is not set
224# CONFIG_BT is not set 229# CONFIG_BT is not set
225# CONFIG_AF_RXRPC is not set 230# CONFIG_AF_RXRPC is not set
226 231# CONFIG_WIRELESS is not set
227# 232# CONFIG_WIMAX is not set
228# Wireless
229#
230# CONFIG_CFG80211 is not set
231# CONFIG_WIRELESS_EXT is not set
232# CONFIG_MAC80211 is not set
233# CONFIG_IEEE80211 is not set
234# CONFIG_RFKILL is not set 233# CONFIG_RFKILL is not set
235# CONFIG_NET_9P is not set 234# CONFIG_NET_9P is not set
236 235
@@ -255,6 +254,7 @@ CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
255CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y 254CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y
256# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set 255# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
257# CONFIG_MTD_CMDLINE_PARTS is not set 256# CONFIG_MTD_CMDLINE_PARTS is not set
257# CONFIG_MTD_AR7_PARTS is not set
258 258
259# 259#
260# User Modules And Translation Layers 260# User Modules And Translation Layers
@@ -297,9 +297,7 @@ CONFIG_MTD_CFI_UTIL=y
297# 297#
298# CONFIG_MTD_COMPLEX_MAPPINGS is not set 298# CONFIG_MTD_COMPLEX_MAPPINGS is not set
299CONFIG_MTD_PHYSMAP=y 299CONFIG_MTD_PHYSMAP=y
300CONFIG_MTD_PHYSMAP_START=0x8000000 300# CONFIG_MTD_PHYSMAP_COMPAT is not set
301CONFIG_MTD_PHYSMAP_LEN=0x0
302CONFIG_MTD_PHYSMAP_BANKWIDTH=2
303# CONFIG_MTD_PLATRAM is not set 301# CONFIG_MTD_PLATRAM is not set
304 302
305# 303#
@@ -319,14 +317,23 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2
319# CONFIG_MTD_ONENAND is not set 317# CONFIG_MTD_ONENAND is not set
320 318
321# 319#
320# LPDDR flash memory drivers
321#
322# CONFIG_MTD_LPDDR is not set
323
324#
322# UBI - Unsorted block images 325# UBI - Unsorted block images
323# 326#
324# CONFIG_MTD_UBI is not set 327# CONFIG_MTD_UBI is not set
325# CONFIG_PARPORT is not set 328# CONFIG_PARPORT is not set
326CONFIG_MISC_DEVICES=y 329CONFIG_MISC_DEVICES=y
327# CONFIG_EEPROM_93CX6 is not set
328# CONFIG_ENCLOSURE_SERVICES is not set 330# CONFIG_ENCLOSURE_SERVICES is not set
329# CONFIG_HAVE_IDE is not set 331# CONFIG_C2PORT is not set
332
333#
334# EEPROM support
335#
336# CONFIG_EEPROM_93CX6 is not set
330 337
331# 338#
332# SCSI device support 339# SCSI device support
@@ -334,7 +341,7 @@ CONFIG_MISC_DEVICES=y
334# CONFIG_SCSI_DMA is not set 341# CONFIG_SCSI_DMA is not set
335# CONFIG_SCSI_NETLINK is not set 342# CONFIG_SCSI_NETLINK is not set
336CONFIG_NETDEVICES=y 343CONFIG_NETDEVICES=y
337# CONFIG_NETDEVICES_MULTIQUEUE is not set 344CONFIG_COMPAT_NET_DEV_OPS=y
338# CONFIG_DUMMY is not set 345# CONFIG_DUMMY is not set
339# CONFIG_BONDING is not set 346# CONFIG_BONDING is not set
340# CONFIG_MACVLAN is not set 347# CONFIG_MACVLAN is not set
@@ -345,10 +352,15 @@ CONFIG_NETDEVICES=y
345CONFIG_NET_ETHERNET=y 352CONFIG_NET_ETHERNET=y
346CONFIG_MII=y 353CONFIG_MII=y
347CONFIG_SMC91X=y 354CONFIG_SMC91X=y
355# CONFIG_ETHOC is not set
356# CONFIG_DNET is not set
348# CONFIG_IBM_NEW_EMAC_ZMII is not set 357# CONFIG_IBM_NEW_EMAC_ZMII is not set
349# CONFIG_IBM_NEW_EMAC_RGMII is not set 358# CONFIG_IBM_NEW_EMAC_RGMII is not set
350# CONFIG_IBM_NEW_EMAC_TAH is not set 359# CONFIG_IBM_NEW_EMAC_TAH is not set
351# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 360# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
361# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
362# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
363# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
352# CONFIG_B44 is not set 364# CONFIG_B44 is not set
353# CONFIG_NETDEV_1000 is not set 365# CONFIG_NETDEV_1000 is not set
354# CONFIG_NETDEV_10000 is not set 366# CONFIG_NETDEV_10000 is not set
@@ -358,6 +370,10 @@ CONFIG_SMC91X=y
358# 370#
359# CONFIG_WLAN_PRE80211 is not set 371# CONFIG_WLAN_PRE80211 is not set
360# CONFIG_WLAN_80211 is not set 372# CONFIG_WLAN_80211 is not set
373
374#
375# Enable WiMAX (Networking options) to see the WiMAX drivers
376#
361# CONFIG_WAN is not set 377# CONFIG_WAN is not set
362# CONFIG_PPP is not set 378# CONFIG_PPP is not set
363# CONFIG_SLIP is not set 379# CONFIG_SLIP is not set
@@ -382,6 +398,7 @@ CONFIG_SMC91X=y
382# Character devices 398# Character devices
383# 399#
384# CONFIG_VT is not set 400# CONFIG_VT is not set
401CONFIG_DEVKMEM=y
385# CONFIG_SERIAL_NONSTANDARD is not set 402# CONFIG_SERIAL_NONSTANDARD is not set
386 403
387# 404#
@@ -403,6 +420,7 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y
403CONFIG_SERIAL_CORE=y 420CONFIG_SERIAL_CORE=y
404CONFIG_SERIAL_CORE_CONSOLE=y 421CONFIG_SERIAL_CORE_CONSOLE=y
405CONFIG_UNIX98_PTYS=y 422CONFIG_UNIX98_PTYS=y
423# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
406CONFIG_LEGACY_PTYS=y 424CONFIG_LEGACY_PTYS=y
407CONFIG_LEGACY_PTY_COUNT=256 425CONFIG_LEGACY_PTY_COUNT=256
408# CONFIG_IPMI_HANDLER is not set 426# CONFIG_IPMI_HANDLER is not set
@@ -411,34 +429,43 @@ CONFIG_RTC=y
411# CONFIG_R3964 is not set 429# CONFIG_R3964 is not set
412# CONFIG_TCG_TPM is not set 430# CONFIG_TCG_TPM is not set
413# CONFIG_I2C is not set 431# CONFIG_I2C is not set
414
415#
416# SPI support
417#
418# CONFIG_SPI is not set 432# CONFIG_SPI is not set
419# CONFIG_SPI_MASTER is not set
420# CONFIG_W1 is not set 433# CONFIG_W1 is not set
421# CONFIG_POWER_SUPPLY is not set 434# CONFIG_POWER_SUPPLY is not set
422# CONFIG_HWMON is not set 435# CONFIG_HWMON is not set
423# CONFIG_THERMAL is not set 436# CONFIG_THERMAL is not set
437# CONFIG_THERMAL_HWMON is not set
424# CONFIG_WATCHDOG is not set 438# CONFIG_WATCHDOG is not set
439CONFIG_SSB_POSSIBLE=y
425 440
426# 441#
427# Sonics Silicon Backplane 442# Sonics Silicon Backplane
428# 443#
429CONFIG_SSB_POSSIBLE=y
430# CONFIG_SSB is not set 444# CONFIG_SSB is not set
431 445
432# 446#
433# Multifunction device drivers 447# Multifunction device drivers
434# 448#
449# CONFIG_MFD_CORE is not set
435# CONFIG_MFD_SM501 is not set 450# CONFIG_MFD_SM501 is not set
451# CONFIG_HTC_PASIC3 is not set
452# CONFIG_MFD_TMIO is not set
453# CONFIG_REGULATOR is not set
436 454
437# 455#
438# Multimedia devices 456# Multimedia devices
439# 457#
458
459#
460# Multimedia core support
461#
440# CONFIG_VIDEO_DEV is not set 462# CONFIG_VIDEO_DEV is not set
441# CONFIG_DVB_CORE is not set 463# CONFIG_DVB_CORE is not set
464# CONFIG_VIDEO_MEDIA is not set
465
466#
467# Multimedia drivers
468#
442# CONFIG_DAB is not set 469# CONFIG_DAB is not set
443 470
444# 471#
@@ -453,21 +480,17 @@ CONFIG_SSB_POSSIBLE=y
453# Display device support 480# Display device support
454# 481#
455# CONFIG_DISPLAY_SUPPORT is not set 482# CONFIG_DISPLAY_SUPPORT is not set
456
457#
458# Sound
459#
460# CONFIG_SOUND is not set 483# CONFIG_SOUND is not set
461# CONFIG_USB_SUPPORT is not set 484# CONFIG_USB_SUPPORT is not set
462# CONFIG_MMC is not set 485# CONFIG_MMC is not set
463# CONFIG_MEMSTICK is not set 486# CONFIG_MEMSTICK is not set
464# CONFIG_NEW_LEDS is not set 487# CONFIG_NEW_LEDS is not set
488# CONFIG_ACCESSIBILITY is not set
465# CONFIG_RTC_CLASS is not set 489# CONFIG_RTC_CLASS is not set
466 490# CONFIG_DMADEVICES is not set
467# 491# CONFIG_AUXDISPLAY is not set
468# Userspace I/O
469#
470# CONFIG_UIO is not set 492# CONFIG_UIO is not set
493# CONFIG_STAGING is not set
471 494
472# 495#
473# File systems 496# File systems
@@ -481,20 +504,23 @@ CONFIG_INOTIFY_USER=y
481# CONFIG_FUSE_FS is not set 504# CONFIG_FUSE_FS is not set
482 505
483# 506#
507# Caches
508#
509# CONFIG_FSCACHE is not set
510
511#
484# Pseudo filesystems 512# Pseudo filesystems
485# 513#
486CONFIG_PROC_FS=y 514CONFIG_PROC_FS=y
487CONFIG_PROC_KCORE=y 515CONFIG_PROC_KCORE=y
488CONFIG_PROC_SYSCTL=y 516CONFIG_PROC_SYSCTL=y
517# CONFIG_PROC_PAGE_MONITOR is not set
489CONFIG_SYSFS=y 518CONFIG_SYSFS=y
490CONFIG_TMPFS=y 519CONFIG_TMPFS=y
491# CONFIG_TMPFS_POSIX_ACL is not set 520# CONFIG_TMPFS_POSIX_ACL is not set
492# CONFIG_HUGETLB_PAGE is not set 521# CONFIG_HUGETLB_PAGE is not set
493# CONFIG_CONFIGFS_FS is not set 522# CONFIG_CONFIGFS_FS is not set
494 523CONFIG_MISC_FILESYSTEMS=y
495#
496# Miscellaneous filesystems
497#
498CONFIG_JFFS2_FS=y 524CONFIG_JFFS2_FS=y
499CONFIG_JFFS2_FS_DEBUG=0 525CONFIG_JFFS2_FS_DEBUG=0
500CONFIG_JFFS2_FS_WRITEBUFFER=y 526CONFIG_JFFS2_FS_WRITEBUFFER=y
@@ -506,19 +532,17 @@ CONFIG_JFFS2_ZLIB=y
506# CONFIG_JFFS2_LZO is not set 532# CONFIG_JFFS2_LZO is not set
507CONFIG_JFFS2_RTIME=y 533CONFIG_JFFS2_RTIME=y
508# CONFIG_JFFS2_RUBIN is not set 534# CONFIG_JFFS2_RUBIN is not set
535# CONFIG_ROMFS_FS is not set
509CONFIG_NETWORK_FILESYSTEMS=y 536CONFIG_NETWORK_FILESYSTEMS=y
510CONFIG_NFS_FS=y 537CONFIG_NFS_FS=y
511CONFIG_NFS_V3=y 538CONFIG_NFS_V3=y
512# CONFIG_NFS_V3_ACL is not set 539# CONFIG_NFS_V3_ACL is not set
513# CONFIG_NFS_V4 is not set 540# CONFIG_NFS_V4 is not set
514# CONFIG_NFS_DIRECTIO is not set
515# CONFIG_NFSD is not set
516CONFIG_ROOT_NFS=y 541CONFIG_ROOT_NFS=y
517CONFIG_LOCKD=y 542CONFIG_LOCKD=y
518CONFIG_LOCKD_V4=y 543CONFIG_LOCKD_V4=y
519CONFIG_NFS_COMMON=y 544CONFIG_NFS_COMMON=y
520CONFIG_SUNRPC=y 545CONFIG_SUNRPC=y
521# CONFIG_SUNRPC_BIND34 is not set
522# CONFIG_RPCSEC_GSS_KRB5 is not set 546# CONFIG_RPCSEC_GSS_KRB5 is not set
523# CONFIG_RPCSEC_GSS_SPKM3 is not set 547# CONFIG_RPCSEC_GSS_SPKM3 is not set
524# CONFIG_SMB_FS is not set 548# CONFIG_SMB_FS is not set
@@ -535,12 +559,16 @@ CONFIG_SUNRPC=y
535# CONFIG_PRINTK_TIME is not set 559# CONFIG_PRINTK_TIME is not set
536CONFIG_ENABLE_WARN_DEPRECATED=y 560CONFIG_ENABLE_WARN_DEPRECATED=y
537CONFIG_ENABLE_MUST_CHECK=y 561CONFIG_ENABLE_MUST_CHECK=y
562CONFIG_FRAME_WARN=1024
538CONFIG_MAGIC_SYSRQ=y 563CONFIG_MAGIC_SYSRQ=y
539# CONFIG_UNUSED_SYMBOLS is not set 564# CONFIG_UNUSED_SYMBOLS is not set
540# CONFIG_DEBUG_FS is not set 565# CONFIG_DEBUG_FS is not set
541# CONFIG_HEADERS_CHECK is not set 566# CONFIG_HEADERS_CHECK is not set
542# CONFIG_DEBUG_KERNEL is not set 567# CONFIG_DEBUG_KERNEL is not set
543# CONFIG_DEBUG_BUGVERBOSE is not set 568# CONFIG_DEBUG_BUGVERBOSE is not set
569# CONFIG_DEBUG_MEMORY_INIT is not set
570# CONFIG_RCU_CPU_STALL_DETECTOR is not set
571# CONFIG_SYSCTL_SYSCALL_CHECK is not set
544# CONFIG_SAMPLES is not set 572# CONFIG_SAMPLES is not set
545 573
546# 574#
@@ -548,26 +576,26 @@ CONFIG_MAGIC_SYSRQ=y
548# 576#
549# CONFIG_KEYS is not set 577# CONFIG_KEYS is not set
550# CONFIG_SECURITY is not set 578# CONFIG_SECURITY is not set
579# CONFIG_SECURITYFS is not set
551# CONFIG_SECURITY_FILE_CAPABILITIES is not set 580# CONFIG_SECURITY_FILE_CAPABILITIES is not set
552# CONFIG_CRYPTO is not set 581# CONFIG_CRYPTO is not set
582# CONFIG_BINARY_PRINTF is not set
553 583
554# 584#
555# Library routines 585# Library routines
556# 586#
557CONFIG_BITREVERSE=y 587CONFIG_BITREVERSE=y
588CONFIG_GENERIC_FIND_LAST_BIT=y
558# CONFIG_CRC_CCITT is not set 589# CONFIG_CRC_CCITT is not set
559# CONFIG_CRC16 is not set 590# CONFIG_CRC16 is not set
591# CONFIG_CRC_T10DIF is not set
560# CONFIG_CRC_ITU_T is not set 592# CONFIG_CRC_ITU_T is not set
561CONFIG_CRC32=y 593CONFIG_CRC32=y
562# CONFIG_CRC7 is not set 594# CONFIG_CRC7 is not set
563# CONFIG_LIBCRC32C is not set 595# CONFIG_LIBCRC32C is not set
564CONFIG_ZLIB_INFLATE=y 596CONFIG_ZLIB_INFLATE=y
565CONFIG_ZLIB_DEFLATE=y 597CONFIG_ZLIB_DEFLATE=y
566CONFIG_PLIST=y
567CONFIG_HAS_IOMEM=y 598CONFIG_HAS_IOMEM=y
568CONFIG_HAS_IOPORT=y 599CONFIG_HAS_IOPORT=y
569CONFIG_HAS_DMA=y 600CONFIG_HAS_DMA=y
570 601CONFIG_NLATTR=y
571#
572# Profiling support
573#
diff --git a/arch/mn10300/kernel/head.S b/arch/mn10300/kernel/head.S
index 8a8309fbe3c4..14f27f3bfaf4 100644
--- a/arch/mn10300/kernel/head.S
+++ b/arch/mn10300/kernel/head.S
@@ -9,6 +9,7 @@
9 * 2 of the Licence, or (at your option) any later version. 9 * 2 of the Licence, or (at your option) any later version.
10 */ 10 */
11 11
12#include <linux/init.h>
12#include <linux/threads.h> 13#include <linux/threads.h>
13#include <linux/linkage.h> 14#include <linux/linkage.h>
14#include <linux/serial_reg.h> 15#include <linux/serial_reg.h>
@@ -19,7 +20,7 @@
19#include <asm/param.h> 20#include <asm/param.h>
20#include <unit/serial.h> 21#include <unit/serial.h>
21 22
22 .section .text.head,"ax" 23 __HEAD
23 24
24############################################################################### 25###############################################################################
25# 26#
diff --git a/arch/mn10300/kernel/vmlinux.lds.S b/arch/mn10300/kernel/vmlinux.lds.S
index b8259668f7dc..24de6b90f401 100644
--- a/arch/mn10300/kernel/vmlinux.lds.S
+++ b/arch/mn10300/kernel/vmlinux.lds.S
@@ -27,10 +27,7 @@ SECTIONS
27 _stext = .; 27 _stext = .;
28 _text = .; /* Text and read-only data */ 28 _text = .; /* Text and read-only data */
29 .text : { 29 .text : {
30 *( 30 HEAD_TEXT
31 .text.head
32 .text
33 )
34 TEXT_TEXT 31 TEXT_TEXT
35 SCHED_TEXT 32 SCHED_TEXT
36 LOCK_TEXT 33 LOCK_TEXT
diff --git a/arch/powerpc/boot/dts/lite5200b.dts b/arch/powerpc/boot/dts/lite5200b.dts
index c63e3566479e..d13cb11ce623 100644
--- a/arch/powerpc/boot/dts/lite5200b.dts
+++ b/arch/powerpc/boot/dts/lite5200b.dts
@@ -293,4 +293,43 @@
293 0x02000000 0 0xa0000000 0xa0000000 0 0x10000000 293 0x02000000 0 0xa0000000 0xa0000000 0 0x10000000
294 0x01000000 0 0x00000000 0xb0000000 0 0x01000000>; 294 0x01000000 0 0x00000000 0xb0000000 0 0x01000000>;
295 }; 295 };
296
297 localbus {
298 compatible = "fsl,mpc5200b-lpb","fsl,mpc5200-lpb","simple-bus";
299
300 #address-cells = <2>;
301 #size-cells = <1>;
302
303 ranges = <0 0 0xfe000000 0x02000000>;
304
305 flash@0,0 {
306 compatible = "cfi-flash";
307 reg = <0 0 0x02000000>;
308 bank-width = <1>;
309 #size-cells = <1>;
310 #address-cells = <1>;
311
312 partition@0 {
313 label = "kernel";
314 reg = <0x00000000 0x00200000>;
315 };
316 partition@200000 {
317 label = "rootfs";
318 reg = <0x00200000 0x01d00000>;
319 };
320 partition@1f00000 {
321 label = "u-boot";
322 reg = <0x01f00000 0x00060000>;
323 };
324 partition@1f60000 {
325 label = "u-boot-env";
326 reg = <0x01f60000 0x00020000>;
327 };
328 partition@1f80000 {
329 label = "dtb";
330 reg = <0x01f80000 0x00080000>;
331 };
332 };
333 };
334
296}; 335};
diff --git a/arch/powerpc/configs/52xx/cm5200_defconfig b/arch/powerpc/configs/52xx/cm5200_defconfig
index 1239c6132b4a..3838b77b8116 100644
--- a/arch/powerpc/configs/52xx/cm5200_defconfig
+++ b/arch/powerpc/configs/52xx/cm5200_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.29-rc2 3# Linux kernel version: 2.6.30-rc2
4# Mon Jan 26 21:41:58 2009 4# Sat Apr 18 00:47:44 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -14,6 +14,7 @@ CONFIG_6xx=y
14# CONFIG_40x is not set 14# CONFIG_40x is not set
15# CONFIG_44x is not set 15# CONFIG_44x is not set
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_PPC_BOOK3S=y
17CONFIG_PPC_FPU=y 18CONFIG_PPC_FPU=y
18# CONFIG_ALTIVEC is not set 19# CONFIG_ALTIVEC is not set
19CONFIG_PPC_STD_MMU=y 20CONFIG_PPC_STD_MMU=y
@@ -54,6 +55,7 @@ CONFIG_GENERIC_BUG=y
54CONFIG_DEFAULT_UIMAGE=y 55CONFIG_DEFAULT_UIMAGE=y
55# CONFIG_PPC_DCR_NATIVE is not set 56# CONFIG_PPC_DCR_NATIVE is not set
56# CONFIG_PPC_DCR_MMIO is not set 57# CONFIG_PPC_DCR_MMIO is not set
58CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
57CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 59CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
58 60
59# 61#
@@ -94,19 +96,22 @@ CONFIG_SYSFS_DEPRECATED_V2=y
94# CONFIG_NAMESPACES is not set 96# CONFIG_NAMESPACES is not set
95CONFIG_BLK_DEV_INITRD=y 97CONFIG_BLK_DEV_INITRD=y
96CONFIG_INITRAMFS_SOURCE="" 98CONFIG_INITRAMFS_SOURCE=""
99CONFIG_RD_GZIP=y
100# CONFIG_RD_BZIP2 is not set
101# CONFIG_RD_LZMA is not set
97# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 102# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
98CONFIG_SYSCTL=y 103CONFIG_SYSCTL=y
104CONFIG_ANON_INODES=y
99CONFIG_EMBEDDED=y 105CONFIG_EMBEDDED=y
100# CONFIG_SYSCTL_SYSCALL is not set 106# CONFIG_SYSCTL_SYSCALL is not set
101# CONFIG_KALLSYMS is not set 107# CONFIG_KALLSYMS is not set
108# CONFIG_STRIP_ASM_SYMS is not set
102CONFIG_HOTPLUG=y 109CONFIG_HOTPLUG=y
103CONFIG_PRINTK=y 110CONFIG_PRINTK=y
104CONFIG_BUG=y 111CONFIG_BUG=y
105CONFIG_ELF_CORE=y 112CONFIG_ELF_CORE=y
106CONFIG_COMPAT_BRK=y
107CONFIG_BASE_FULL=y 113CONFIG_BASE_FULL=y
108CONFIG_FUTEX=y 114CONFIG_FUTEX=y
109CONFIG_ANON_INODES=y
110# CONFIG_EPOLL is not set 115# CONFIG_EPOLL is not set
111CONFIG_SIGNALFD=y 116CONFIG_SIGNALFD=y
112CONFIG_TIMERFD=y 117CONFIG_TIMERFD=y
@@ -115,10 +120,12 @@ CONFIG_SHMEM=y
115CONFIG_AIO=y 120CONFIG_AIO=y
116CONFIG_VM_EVENT_COUNTERS=y 121CONFIG_VM_EVENT_COUNTERS=y
117CONFIG_SLUB_DEBUG=y 122CONFIG_SLUB_DEBUG=y
123CONFIG_COMPAT_BRK=y
118# CONFIG_SLAB is not set 124# CONFIG_SLAB is not set
119CONFIG_SLUB=y 125CONFIG_SLUB=y
120# CONFIG_SLOB is not set 126# CONFIG_SLOB is not set
121# CONFIG_PROFILING is not set 127# CONFIG_PROFILING is not set
128# CONFIG_MARKERS is not set
122CONFIG_HAVE_OPROFILE=y 129CONFIG_HAVE_OPROFILE=y
123CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 130CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
124CONFIG_HAVE_IOREMAP_PROT=y 131CONFIG_HAVE_IOREMAP_PROT=y
@@ -126,6 +133,7 @@ CONFIG_HAVE_KPROBES=y
126CONFIG_HAVE_KRETPROBES=y 133CONFIG_HAVE_KRETPROBES=y
127CONFIG_HAVE_ARCH_TRACEHOOK=y 134CONFIG_HAVE_ARCH_TRACEHOOK=y
128CONFIG_HAVE_CLK=y 135CONFIG_HAVE_CLK=y
136# CONFIG_SLOW_WORK is not set
129# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 137# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
130CONFIG_SLABINFO=y 138CONFIG_SLABINFO=y
131CONFIG_RT_MUTEXES=y 139CONFIG_RT_MUTEXES=y
@@ -133,7 +141,6 @@ CONFIG_BASE_SMALL=0
133# CONFIG_MODULES is not set 141# CONFIG_MODULES is not set
134CONFIG_BLOCK=y 142CONFIG_BLOCK=y
135# CONFIG_LBD is not set 143# CONFIG_LBD is not set
136# CONFIG_BLK_DEV_IO_TRACE is not set
137# CONFIG_BLK_DEV_BSG is not set 144# CONFIG_BLK_DEV_BSG is not set
138# CONFIG_BLK_DEV_INTEGRITY is not set 145# CONFIG_BLK_DEV_INTEGRITY is not set
139 146
@@ -154,8 +161,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
154# 161#
155# Platform support 162# Platform support
156# 163#
157CONFIG_PPC_MULTIPLATFORM=y
158CONFIG_CLASSIC32=y
159# CONFIG_PPC_CHRP is not set 164# CONFIG_PPC_CHRP is not set
160# CONFIG_MPC5121_ADS is not set 165# CONFIG_MPC5121_ADS is not set
161# CONFIG_MPC5121_GENERIC is not set 166# CONFIG_MPC5121_GENERIC is not set
@@ -163,6 +168,7 @@ CONFIG_PPC_MPC52xx=y
163CONFIG_PPC_MPC5200_SIMPLE=y 168CONFIG_PPC_MPC5200_SIMPLE=y
164# CONFIG_PPC_EFIKA is not set 169# CONFIG_PPC_EFIKA is not set
165# CONFIG_PPC_LITE5200 is not set 170# CONFIG_PPC_LITE5200 is not set
171# CONFIG_PPC_MEDIA5200 is not set
166# CONFIG_PPC_MPC5200_BUGFIX is not set 172# CONFIG_PPC_MPC5200_BUGFIX is not set
167# CONFIG_PPC_MPC5200_GPIO is not set 173# CONFIG_PPC_MPC5200_GPIO is not set
168# CONFIG_PPC_PMAC is not set 174# CONFIG_PPC_PMAC is not set
@@ -173,6 +179,8 @@ CONFIG_PPC_MPC5200_SIMPLE=y
173# CONFIG_PPC_83xx is not set 179# CONFIG_PPC_83xx is not set
174# CONFIG_PPC_86xx is not set 180# CONFIG_PPC_86xx is not set
175# CONFIG_EMBEDDED6xx is not set 181# CONFIG_EMBEDDED6xx is not set
182# CONFIG_AMIGAONE is not set
183CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
176# CONFIG_IPIC is not set 184# CONFIG_IPIC is not set
177# CONFIG_MPIC is not set 185# CONFIG_MPIC is not set
178# CONFIG_MPIC_WEIRD is not set 186# CONFIG_MPIC_WEIRD is not set
@@ -232,9 +240,12 @@ CONFIG_ZONE_DMA_FLAG=1
232CONFIG_BOUNCE=y 240CONFIG_BOUNCE=y
233CONFIG_VIRT_TO_BUS=y 241CONFIG_VIRT_TO_BUS=y
234CONFIG_UNEVICTABLE_LRU=y 242CONFIG_UNEVICTABLE_LRU=y
243CONFIG_HAVE_MLOCK=y
244CONFIG_HAVE_MLOCKED_PAGE_BIT=y
235CONFIG_PPC_4K_PAGES=y 245CONFIG_PPC_4K_PAGES=y
236# CONFIG_PPC_16K_PAGES is not set 246# CONFIG_PPC_16K_PAGES is not set
237# CONFIG_PPC_64K_PAGES is not set 247# CONFIG_PPC_64K_PAGES is not set
248# CONFIG_PPC_256K_PAGES is not set
238CONFIG_FORCE_MAX_ZONEORDER=11 249CONFIG_FORCE_MAX_ZONEORDER=11
239CONFIG_PROC_DEVICETREE=y 250CONFIG_PROC_DEVICETREE=y
240# CONFIG_CMDLINE_BOOL is not set 251# CONFIG_CMDLINE_BOOL is not set
@@ -275,7 +286,6 @@ CONFIG_NET=y
275# 286#
276# Networking options 287# Networking options
277# 288#
278CONFIG_COMPAT_NET_DEV_OPS=y
279CONFIG_PACKET=y 289CONFIG_PACKET=y
280# CONFIG_PACKET_MMAP is not set 290# CONFIG_PACKET_MMAP is not set
281CONFIG_UNIX=y 291CONFIG_UNIX=y
@@ -331,6 +341,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
331# CONFIG_LAPB is not set 341# CONFIG_LAPB is not set
332# CONFIG_ECONET is not set 342# CONFIG_ECONET is not set
333# CONFIG_WAN_ROUTER is not set 343# CONFIG_WAN_ROUTER is not set
344# CONFIG_PHONET is not set
334# CONFIG_NET_SCHED is not set 345# CONFIG_NET_SCHED is not set
335# CONFIG_DCB is not set 346# CONFIG_DCB is not set
336 347
@@ -343,7 +354,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
343# CONFIG_IRDA is not set 354# CONFIG_IRDA is not set
344# CONFIG_BT is not set 355# CONFIG_BT is not set
345# CONFIG_AF_RXRPC is not set 356# CONFIG_AF_RXRPC is not set
346# CONFIG_PHONET is not set
347# CONFIG_WIRELESS is not set 357# CONFIG_WIRELESS is not set
348# CONFIG_WIMAX is not set 358# CONFIG_WIMAX is not set
349# CONFIG_RFKILL is not set 359# CONFIG_RFKILL is not set
@@ -440,7 +450,6 @@ CONFIG_MTD_PHYSMAP_OF=y
440# LPDDR flash memory drivers 450# LPDDR flash memory drivers
441# 451#
442# CONFIG_MTD_LPDDR is not set 452# CONFIG_MTD_LPDDR is not set
443# CONFIG_MTD_QINFO_PROBE is not set
444 453
445# 454#
446# UBI - Unsorted block images 455# UBI - Unsorted block images
@@ -505,10 +514,12 @@ CONFIG_CHR_DEV_SG=y
505# CONFIG_SCSI_SRP_ATTRS is not set 514# CONFIG_SCSI_SRP_ATTRS is not set
506# CONFIG_SCSI_LOWLEVEL is not set 515# CONFIG_SCSI_LOWLEVEL is not set
507# CONFIG_SCSI_DH is not set 516# CONFIG_SCSI_DH is not set
517# CONFIG_SCSI_OSD_INITIATOR is not set
508# CONFIG_ATA is not set 518# CONFIG_ATA is not set
509# CONFIG_MD is not set 519# CONFIG_MD is not set
510# CONFIG_MACINTOSH_DRIVERS is not set 520# CONFIG_MACINTOSH_DRIVERS is not set
511CONFIG_NETDEVICES=y 521CONFIG_NETDEVICES=y
522CONFIG_COMPAT_NET_DEV_OPS=y
512# CONFIG_DUMMY is not set 523# CONFIG_DUMMY is not set
513# CONFIG_BONDING is not set 524# CONFIG_BONDING is not set
514# CONFIG_MACVLAN is not set 525# CONFIG_MACVLAN is not set
@@ -537,6 +548,8 @@ CONFIG_LXT_PHY=y
537# CONFIG_MDIO_BITBANG is not set 548# CONFIG_MDIO_BITBANG is not set
538CONFIG_NET_ETHERNET=y 549CONFIG_NET_ETHERNET=y
539# CONFIG_MII is not set 550# CONFIG_MII is not set
551# CONFIG_ETHOC is not set
552# CONFIG_DNET is not set
540# CONFIG_IBM_NEW_EMAC_ZMII is not set 553# CONFIG_IBM_NEW_EMAC_ZMII is not set
541# CONFIG_IBM_NEW_EMAC_RGMII is not set 554# CONFIG_IBM_NEW_EMAC_RGMII is not set
542# CONFIG_IBM_NEW_EMAC_TAH is not set 555# CONFIG_IBM_NEW_EMAC_TAH is not set
@@ -555,7 +568,6 @@ CONFIG_FEC_MPC52xx_MDIO=y
555# 568#
556# CONFIG_WLAN_PRE80211 is not set 569# CONFIG_WLAN_PRE80211 is not set
557# CONFIG_WLAN_80211 is not set 570# CONFIG_WLAN_80211 is not set
558# CONFIG_IWLWIFI_LEDS is not set
559 571
560# 572#
561# Enable WiMAX (Networking options) to see the WiMAX drivers 573# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -657,7 +669,6 @@ CONFIG_I2C_MPC=y
657# CONFIG_SENSORS_PCF8574 is not set 669# CONFIG_SENSORS_PCF8574 is not set
658# CONFIG_PCF8575 is not set 670# CONFIG_PCF8575 is not set
659# CONFIG_SENSORS_PCA9539 is not set 671# CONFIG_SENSORS_PCA9539 is not set
660# CONFIG_SENSORS_PCF8591 is not set
661# CONFIG_SENSORS_MAX6875 is not set 672# CONFIG_SENSORS_MAX6875 is not set
662# CONFIG_SENSORS_TSL2550 is not set 673# CONFIG_SENSORS_TSL2550 is not set
663# CONFIG_I2C_DEBUG_CORE is not set 674# CONFIG_I2C_DEBUG_CORE is not set
@@ -786,11 +797,11 @@ CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
786# CONFIG_USB_TMC is not set 797# CONFIG_USB_TMC is not set
787 798
788# 799#
789# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; 800# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
790# 801#
791 802
792# 803#
793# see USB_STORAGE Help for more information 804# also be needed; see USB_STORAGE Help for more info
794# 805#
795CONFIG_USB_STORAGE=y 806CONFIG_USB_STORAGE=y
796# CONFIG_USB_STORAGE_DEBUG is not set 807# CONFIG_USB_STORAGE_DEBUG is not set
@@ -831,7 +842,6 @@ CONFIG_USB_STORAGE=y
831# CONFIG_USB_LED is not set 842# CONFIG_USB_LED is not set
832# CONFIG_USB_CYPRESS_CY7C63 is not set 843# CONFIG_USB_CYPRESS_CY7C63 is not set
833# CONFIG_USB_CYTHERM is not set 844# CONFIG_USB_CYTHERM is not set
834# CONFIG_USB_PHIDGET is not set
835# CONFIG_USB_IDMOUSE is not set 845# CONFIG_USB_IDMOUSE is not set
836# CONFIG_USB_FTDI_ELAN is not set 846# CONFIG_USB_FTDI_ELAN is not set
837# CONFIG_USB_APPLEDISPLAY is not set 847# CONFIG_USB_APPLEDISPLAY is not set
@@ -846,6 +856,7 @@ CONFIG_USB_STORAGE=y
846# 856#
847# OTG and related infrastructure 857# OTG and related infrastructure
848# 858#
859# CONFIG_NOP_USB_XCEIV is not set
849# CONFIG_MMC is not set 860# CONFIG_MMC is not set
850# CONFIG_MEMSTICK is not set 861# CONFIG_MEMSTICK is not set
851# CONFIG_NEW_LEDS is not set 862# CONFIG_NEW_LEDS is not set
@@ -853,6 +864,7 @@ CONFIG_USB_STORAGE=y
853# CONFIG_EDAC is not set 864# CONFIG_EDAC is not set
854# CONFIG_RTC_CLASS is not set 865# CONFIG_RTC_CLASS is not set
855# CONFIG_DMADEVICES is not set 866# CONFIG_DMADEVICES is not set
867# CONFIG_AUXDISPLAY is not set
856# CONFIG_UIO is not set 868# CONFIG_UIO is not set
857# CONFIG_STAGING is not set 869# CONFIG_STAGING is not set
858 870
@@ -863,6 +875,7 @@ CONFIG_EXT2_FS=y
863# CONFIG_EXT2_FS_XATTR is not set 875# CONFIG_EXT2_FS_XATTR is not set
864# CONFIG_EXT2_FS_XIP is not set 876# CONFIG_EXT2_FS_XIP is not set
865CONFIG_EXT3_FS=y 877CONFIG_EXT3_FS=y
878# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
866CONFIG_EXT3_FS_XATTR=y 879CONFIG_EXT3_FS_XATTR=y
867# CONFIG_EXT3_FS_POSIX_ACL is not set 880# CONFIG_EXT3_FS_POSIX_ACL is not set
868# CONFIG_EXT3_FS_SECURITY is not set 881# CONFIG_EXT3_FS_SECURITY is not set
@@ -885,6 +898,11 @@ CONFIG_INOTIFY_USER=y
885# CONFIG_FUSE_FS is not set 898# CONFIG_FUSE_FS is not set
886 899
887# 900#
901# Caches
902#
903# CONFIG_FSCACHE is not set
904
905#
888# CD-ROM/DVD Filesystems 906# CD-ROM/DVD Filesystems
889# 907#
890# CONFIG_ISO9660_FS is not set 908# CONFIG_ISO9660_FS is not set
@@ -941,6 +959,7 @@ CONFIG_CRAMFS=y
941# CONFIG_ROMFS_FS is not set 959# CONFIG_ROMFS_FS is not set
942# CONFIG_SYSV_FS is not set 960# CONFIG_SYSV_FS is not set
943# CONFIG_UFS_FS is not set 961# CONFIG_UFS_FS is not set
962# CONFIG_NILFS2_FS is not set
944CONFIG_NETWORK_FILESYSTEMS=y 963CONFIG_NETWORK_FILESYSTEMS=y
945CONFIG_NFS_FS=y 964CONFIG_NFS_FS=y
946CONFIG_NFS_V3=y 965CONFIG_NFS_V3=y
@@ -953,7 +972,6 @@ CONFIG_LOCKD_V4=y
953CONFIG_NFS_COMMON=y 972CONFIG_NFS_COMMON=y
954CONFIG_SUNRPC=y 973CONFIG_SUNRPC=y
955CONFIG_SUNRPC_GSS=y 974CONFIG_SUNRPC_GSS=y
956# CONFIG_SUNRPC_REGISTER_V4 is not set
957CONFIG_RPCSEC_GSS_KRB5=y 975CONFIG_RPCSEC_GSS_KRB5=y
958# CONFIG_RPCSEC_GSS_SPKM3 is not set 976# CONFIG_RPCSEC_GSS_SPKM3 is not set
959# CONFIG_SMB_FS is not set 977# CONFIG_SMB_FS is not set
@@ -1024,6 +1042,7 @@ CONFIG_NLS_ISO8859_1=y
1024# CONFIG_NLS_KOI8_U is not set 1042# CONFIG_NLS_KOI8_U is not set
1025# CONFIG_NLS_UTF8 is not set 1043# CONFIG_NLS_UTF8 is not set
1026# CONFIG_DLM is not set 1044# CONFIG_DLM is not set
1045# CONFIG_BINARY_PRINTF is not set
1027 1046
1028# 1047#
1029# Library routines 1048# Library routines
@@ -1039,11 +1058,12 @@ CONFIG_CRC32=y
1039# CONFIG_LIBCRC32C is not set 1058# CONFIG_LIBCRC32C is not set
1040CONFIG_ZLIB_INFLATE=y 1059CONFIG_ZLIB_INFLATE=y
1041CONFIG_ZLIB_DEFLATE=y 1060CONFIG_ZLIB_DEFLATE=y
1042CONFIG_PLIST=y 1061CONFIG_DECOMPRESS_GZIP=y
1043CONFIG_HAS_IOMEM=y 1062CONFIG_HAS_IOMEM=y
1044CONFIG_HAS_IOPORT=y 1063CONFIG_HAS_IOPORT=y
1045CONFIG_HAS_DMA=y 1064CONFIG_HAS_DMA=y
1046CONFIG_HAVE_LMB=y 1065CONFIG_HAVE_LMB=y
1066CONFIG_NLATTR=y
1047 1067
1048# 1068#
1049# Kernel hacking 1069# Kernel hacking
@@ -1061,6 +1081,9 @@ CONFIG_DEBUG_KERNEL=y
1061CONFIG_DETECT_SOFTLOCKUP=y 1081CONFIG_DETECT_SOFTLOCKUP=y
1062# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set 1082# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
1063CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 1083CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
1084CONFIG_DETECT_HUNG_TASK=y
1085# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
1086CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
1064CONFIG_SCHED_DEBUG=y 1087CONFIG_SCHED_DEBUG=y
1065# CONFIG_SCHEDSTATS is not set 1088# CONFIG_SCHEDSTATS is not set
1066# CONFIG_TIMER_STATS is not set 1089# CONFIG_TIMER_STATS is not set
@@ -1089,9 +1112,12 @@ CONFIG_SCHED_DEBUG=y
1089# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 1112# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1090# CONFIG_FAULT_INJECTION is not set 1113# CONFIG_FAULT_INJECTION is not set
1091# CONFIG_LATENCYTOP is not set 1114# CONFIG_LATENCYTOP is not set
1115# CONFIG_DEBUG_PAGEALLOC is not set
1092CONFIG_HAVE_FUNCTION_TRACER=y 1116CONFIG_HAVE_FUNCTION_TRACER=y
1117CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
1093CONFIG_HAVE_DYNAMIC_FTRACE=y 1118CONFIG_HAVE_DYNAMIC_FTRACE=y
1094CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1119CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1120CONFIG_TRACING_SUPPORT=y
1095 1121
1096# 1122#
1097# Tracers 1123# Tracers
@@ -1099,17 +1125,19 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1099# CONFIG_FUNCTION_TRACER is not set 1125# CONFIG_FUNCTION_TRACER is not set
1100# CONFIG_SCHED_TRACER is not set 1126# CONFIG_SCHED_TRACER is not set
1101# CONFIG_CONTEXT_SWITCH_TRACER is not set 1127# CONFIG_CONTEXT_SWITCH_TRACER is not set
1128# CONFIG_EVENT_TRACER is not set
1102# CONFIG_BOOT_TRACER is not set 1129# CONFIG_BOOT_TRACER is not set
1103# CONFIG_TRACE_BRANCH_PROFILING is not set 1130# CONFIG_TRACE_BRANCH_PROFILING is not set
1104# CONFIG_STACK_TRACER is not set 1131# CONFIG_STACK_TRACER is not set
1105# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1132# CONFIG_KMEMTRACE is not set
1133# CONFIG_WORKQUEUE_TRACER is not set
1134# CONFIG_BLK_DEV_IO_TRACE is not set
1106# CONFIG_SAMPLES is not set 1135# CONFIG_SAMPLES is not set
1107CONFIG_HAVE_ARCH_KGDB=y 1136CONFIG_HAVE_ARCH_KGDB=y
1108# CONFIG_KGDB is not set 1137# CONFIG_KGDB is not set
1109CONFIG_PRINT_STACK_DEPTH=64 1138CONFIG_PRINT_STACK_DEPTH=64
1110# CONFIG_DEBUG_STACKOVERFLOW is not set 1139# CONFIG_DEBUG_STACKOVERFLOW is not set
1111# CONFIG_DEBUG_STACK_USAGE is not set 1140# CONFIG_DEBUG_STACK_USAGE is not set
1112# CONFIG_DEBUG_PAGEALLOC is not set
1113# CONFIG_CODE_PATCHING_SELFTEST is not set 1141# CONFIG_CODE_PATCHING_SELFTEST is not set
1114# CONFIG_FTR_FIXUP_SELFTEST is not set 1142# CONFIG_FTR_FIXUP_SELFTEST is not set
1115# CONFIG_MSI_BITMAP_SELFTEST is not set 1143# CONFIG_MSI_BITMAP_SELFTEST is not set
@@ -1140,10 +1168,12 @@ CONFIG_CRYPTO_BLKCIPHER2=y
1140CONFIG_CRYPTO_HASH=y 1168CONFIG_CRYPTO_HASH=y
1141CONFIG_CRYPTO_HASH2=y 1169CONFIG_CRYPTO_HASH2=y
1142CONFIG_CRYPTO_RNG2=y 1170CONFIG_CRYPTO_RNG2=y
1171CONFIG_CRYPTO_PCOMP=y
1143CONFIG_CRYPTO_MANAGER=y 1172CONFIG_CRYPTO_MANAGER=y
1144CONFIG_CRYPTO_MANAGER2=y 1173CONFIG_CRYPTO_MANAGER2=y
1145# CONFIG_CRYPTO_GF128MUL is not set 1174# CONFIG_CRYPTO_GF128MUL is not set
1146# CONFIG_CRYPTO_NULL is not set 1175# CONFIG_CRYPTO_NULL is not set
1176CONFIG_CRYPTO_WORKQUEUE=y
1147# CONFIG_CRYPTO_CRYPTD is not set 1177# CONFIG_CRYPTO_CRYPTD is not set
1148# CONFIG_CRYPTO_AUTHENC is not set 1178# CONFIG_CRYPTO_AUTHENC is not set
1149 1179
@@ -1211,6 +1241,7 @@ CONFIG_CRYPTO_DES=y
1211# Compression 1241# Compression
1212# 1242#
1213# CONFIG_CRYPTO_DEFLATE is not set 1243# CONFIG_CRYPTO_DEFLATE is not set
1244# CONFIG_CRYPTO_ZLIB is not set
1214# CONFIG_CRYPTO_LZO is not set 1245# CONFIG_CRYPTO_LZO is not set
1215 1246
1216# 1247#
diff --git a/arch/powerpc/configs/52xx/lite5200b_defconfig b/arch/powerpc/configs/52xx/lite5200b_defconfig
index b7b880562906..29b0f34488f5 100644
--- a/arch/powerpc/configs/52xx/lite5200b_defconfig
+++ b/arch/powerpc/configs/52xx/lite5200b_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.29-rc2 3# Linux kernel version: 2.6.30-rc2
4# Mon Jan 26 21:41:14 2009 4# Sat Apr 18 00:48:04 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -14,6 +14,7 @@ CONFIG_6xx=y
14# CONFIG_40x is not set 14# CONFIG_40x is not set
15# CONFIG_44x is not set 15# CONFIG_44x is not set
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_PPC_BOOK3S=y
17CONFIG_PPC_FPU=y 18CONFIG_PPC_FPU=y
18# CONFIG_ALTIVEC is not set 19# CONFIG_ALTIVEC is not set
19CONFIG_PPC_STD_MMU=y 20CONFIG_PPC_STD_MMU=y
@@ -55,6 +56,7 @@ CONFIG_DEFAULT_UIMAGE=y
55CONFIG_ARCH_SUSPEND_POSSIBLE=y 56CONFIG_ARCH_SUSPEND_POSSIBLE=y
56# CONFIG_PPC_DCR_NATIVE is not set 57# CONFIG_PPC_DCR_NATIVE is not set
57# CONFIG_PPC_DCR_MMIO is not set 58# CONFIG_PPC_DCR_MMIO is not set
59CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
58CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 60CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
59 61
60# 62#
@@ -95,19 +97,22 @@ CONFIG_SYSFS_DEPRECATED_V2=y
95# CONFIG_NAMESPACES is not set 97# CONFIG_NAMESPACES is not set
96CONFIG_BLK_DEV_INITRD=y 98CONFIG_BLK_DEV_INITRD=y
97CONFIG_INITRAMFS_SOURCE="" 99CONFIG_INITRAMFS_SOURCE=""
100CONFIG_RD_GZIP=y
101# CONFIG_RD_BZIP2 is not set
102# CONFIG_RD_LZMA is not set
98# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 103# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
99CONFIG_SYSCTL=y 104CONFIG_SYSCTL=y
105CONFIG_ANON_INODES=y
100CONFIG_EMBEDDED=y 106CONFIG_EMBEDDED=y
101# CONFIG_SYSCTL_SYSCALL is not set 107# CONFIG_SYSCTL_SYSCALL is not set
102# CONFIG_KALLSYMS is not set 108# CONFIG_KALLSYMS is not set
109# CONFIG_STRIP_ASM_SYMS is not set
103CONFIG_HOTPLUG=y 110CONFIG_HOTPLUG=y
104CONFIG_PRINTK=y 111CONFIG_PRINTK=y
105CONFIG_BUG=y 112CONFIG_BUG=y
106CONFIG_ELF_CORE=y 113CONFIG_ELF_CORE=y
107CONFIG_COMPAT_BRK=y
108CONFIG_BASE_FULL=y 114CONFIG_BASE_FULL=y
109CONFIG_FUTEX=y 115CONFIG_FUTEX=y
110CONFIG_ANON_INODES=y
111# CONFIG_EPOLL is not set 116# CONFIG_EPOLL is not set
112CONFIG_SIGNALFD=y 117CONFIG_SIGNALFD=y
113CONFIG_TIMERFD=y 118CONFIG_TIMERFD=y
@@ -117,10 +122,12 @@ CONFIG_AIO=y
117CONFIG_VM_EVENT_COUNTERS=y 122CONFIG_VM_EVENT_COUNTERS=y
118CONFIG_PCI_QUIRKS=y 123CONFIG_PCI_QUIRKS=y
119CONFIG_SLUB_DEBUG=y 124CONFIG_SLUB_DEBUG=y
125CONFIG_COMPAT_BRK=y
120# CONFIG_SLAB is not set 126# CONFIG_SLAB is not set
121CONFIG_SLUB=y 127CONFIG_SLUB=y
122# CONFIG_SLOB is not set 128# CONFIG_SLOB is not set
123# CONFIG_PROFILING is not set 129# CONFIG_PROFILING is not set
130# CONFIG_MARKERS is not set
124CONFIG_HAVE_OPROFILE=y 131CONFIG_HAVE_OPROFILE=y
125CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 132CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
126CONFIG_HAVE_IOREMAP_PROT=y 133CONFIG_HAVE_IOREMAP_PROT=y
@@ -128,6 +135,7 @@ CONFIG_HAVE_KPROBES=y
128CONFIG_HAVE_KRETPROBES=y 135CONFIG_HAVE_KRETPROBES=y
129CONFIG_HAVE_ARCH_TRACEHOOK=y 136CONFIG_HAVE_ARCH_TRACEHOOK=y
130CONFIG_HAVE_CLK=y 137CONFIG_HAVE_CLK=y
138# CONFIG_SLOW_WORK is not set
131# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 139# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
132CONFIG_SLABINFO=y 140CONFIG_SLABINFO=y
133CONFIG_RT_MUTEXES=y 141CONFIG_RT_MUTEXES=y
@@ -140,7 +148,6 @@ CONFIG_MODULE_UNLOAD=y
140# CONFIG_MODULE_SRCVERSION_ALL is not set 148# CONFIG_MODULE_SRCVERSION_ALL is not set
141CONFIG_BLOCK=y 149CONFIG_BLOCK=y
142# CONFIG_LBD is not set 150# CONFIG_LBD is not set
143# CONFIG_BLK_DEV_IO_TRACE is not set
144# CONFIG_BLK_DEV_BSG is not set 151# CONFIG_BLK_DEV_BSG is not set
145# CONFIG_BLK_DEV_INTEGRITY is not set 152# CONFIG_BLK_DEV_INTEGRITY is not set
146 153
@@ -161,8 +168,6 @@ CONFIG_FREEZER=y
161# 168#
162# Platform support 169# Platform support
163# 170#
164CONFIG_PPC_MULTIPLATFORM=y
165CONFIG_CLASSIC32=y
166# CONFIG_PPC_CHRP is not set 171# CONFIG_PPC_CHRP is not set
167# CONFIG_MPC5121_ADS is not set 172# CONFIG_MPC5121_ADS is not set
168# CONFIG_MPC5121_GENERIC is not set 173# CONFIG_MPC5121_GENERIC is not set
@@ -170,6 +175,7 @@ CONFIG_PPC_MPC52xx=y
170CONFIG_PPC_MPC5200_SIMPLE=y 175CONFIG_PPC_MPC5200_SIMPLE=y
171# CONFIG_PPC_EFIKA is not set 176# CONFIG_PPC_EFIKA is not set
172CONFIG_PPC_LITE5200=y 177CONFIG_PPC_LITE5200=y
178# CONFIG_PPC_MEDIA5200 is not set
173# CONFIG_PPC_MPC5200_BUGFIX is not set 179# CONFIG_PPC_MPC5200_BUGFIX is not set
174# CONFIG_PPC_MPC5200_GPIO is not set 180# CONFIG_PPC_MPC5200_GPIO is not set
175# CONFIG_PPC_PMAC is not set 181# CONFIG_PPC_PMAC is not set
@@ -180,6 +186,8 @@ CONFIG_PPC_LITE5200=y
180# CONFIG_PPC_83xx is not set 186# CONFIG_PPC_83xx is not set
181# CONFIG_PPC_86xx is not set 187# CONFIG_PPC_86xx is not set
182# CONFIG_EMBEDDED6xx is not set 188# CONFIG_EMBEDDED6xx is not set
189# CONFIG_AMIGAONE is not set
190CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
183# CONFIG_IPIC is not set 191# CONFIG_IPIC is not set
184# CONFIG_MPIC is not set 192# CONFIG_MPIC is not set
185# CONFIG_MPIC_WEIRD is not set 193# CONFIG_MPIC_WEIRD is not set
@@ -241,9 +249,12 @@ CONFIG_ZONE_DMA_FLAG=1
241CONFIG_BOUNCE=y 249CONFIG_BOUNCE=y
242CONFIG_VIRT_TO_BUS=y 250CONFIG_VIRT_TO_BUS=y
243CONFIG_UNEVICTABLE_LRU=y 251CONFIG_UNEVICTABLE_LRU=y
252CONFIG_HAVE_MLOCK=y
253CONFIG_HAVE_MLOCKED_PAGE_BIT=y
244CONFIG_PPC_4K_PAGES=y 254CONFIG_PPC_4K_PAGES=y
245# CONFIG_PPC_16K_PAGES is not set 255# CONFIG_PPC_16K_PAGES is not set
246# CONFIG_PPC_64K_PAGES is not set 256# CONFIG_PPC_64K_PAGES is not set
257# CONFIG_PPC_256K_PAGES is not set
247CONFIG_FORCE_MAX_ZONEORDER=11 258CONFIG_FORCE_MAX_ZONEORDER=11
248CONFIG_PROC_DEVICETREE=y 259CONFIG_PROC_DEVICETREE=y
249# CONFIG_CMDLINE_BOOL is not set 260# CONFIG_CMDLINE_BOOL is not set
@@ -272,6 +283,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
272CONFIG_PCI_LEGACY=y 283CONFIG_PCI_LEGACY=y
273# CONFIG_PCI_DEBUG is not set 284# CONFIG_PCI_DEBUG is not set
274# CONFIG_PCI_STUB is not set 285# CONFIG_PCI_STUB is not set
286# CONFIG_PCI_IOV is not set
275# CONFIG_PCCARD is not set 287# CONFIG_PCCARD is not set
276# CONFIG_HOTPLUG_PCI is not set 288# CONFIG_HOTPLUG_PCI is not set
277# CONFIG_HAS_RAPIDIO is not set 289# CONFIG_HAS_RAPIDIO is not set
@@ -294,7 +306,6 @@ CONFIG_NET=y
294# 306#
295# Networking options 307# Networking options
296# 308#
297CONFIG_COMPAT_NET_DEV_OPS=y
298CONFIG_PACKET=y 309CONFIG_PACKET=y
299# CONFIG_PACKET_MMAP is not set 310# CONFIG_PACKET_MMAP is not set
300CONFIG_UNIX=y 311CONFIG_UNIX=y
@@ -350,6 +361,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
350# CONFIG_LAPB is not set 361# CONFIG_LAPB is not set
351# CONFIG_ECONET is not set 362# CONFIG_ECONET is not set
352# CONFIG_WAN_ROUTER is not set 363# CONFIG_WAN_ROUTER is not set
364# CONFIG_PHONET is not set
353# CONFIG_NET_SCHED is not set 365# CONFIG_NET_SCHED is not set
354# CONFIG_DCB is not set 366# CONFIG_DCB is not set
355 367
@@ -362,7 +374,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
362# CONFIG_IRDA is not set 374# CONFIG_IRDA is not set
363# CONFIG_BT is not set 375# CONFIG_BT is not set
364# CONFIG_AF_RXRPC is not set 376# CONFIG_AF_RXRPC is not set
365# CONFIG_PHONET is not set
366# CONFIG_WIRELESS is not set 377# CONFIG_WIRELESS is not set
367# CONFIG_WIMAX is not set 378# CONFIG_WIMAX is not set
368# CONFIG_RFKILL is not set 379# CONFIG_RFKILL is not set
@@ -412,6 +423,7 @@ CONFIG_MISC_DEVICES=y
412# CONFIG_ICS932S401 is not set 423# CONFIG_ICS932S401 is not set
413# CONFIG_ENCLOSURE_SERVICES is not set 424# CONFIG_ENCLOSURE_SERVICES is not set
414# CONFIG_HP_ILO is not set 425# CONFIG_HP_ILO is not set
426# CONFIG_ISL29003 is not set
415# CONFIG_C2PORT is not set 427# CONFIG_C2PORT is not set
416 428
417# 429#
@@ -477,9 +489,11 @@ CONFIG_SCSI_LOWLEVEL=y
477# CONFIG_MEGARAID_NEWGEN is not set 489# CONFIG_MEGARAID_NEWGEN is not set
478# CONFIG_MEGARAID_LEGACY is not set 490# CONFIG_MEGARAID_LEGACY is not set
479# CONFIG_MEGARAID_SAS is not set 491# CONFIG_MEGARAID_SAS is not set
492# CONFIG_SCSI_MPT2SAS is not set
480# CONFIG_SCSI_HPTIOP is not set 493# CONFIG_SCSI_HPTIOP is not set
481# CONFIG_SCSI_BUSLOGIC is not set 494# CONFIG_SCSI_BUSLOGIC is not set
482# CONFIG_LIBFC is not set 495# CONFIG_LIBFC is not set
496# CONFIG_LIBFCOE is not set
483# CONFIG_FCOE is not set 497# CONFIG_FCOE is not set
484# CONFIG_SCSI_DMX3191D is not set 498# CONFIG_SCSI_DMX3191D is not set
485# CONFIG_SCSI_EATA is not set 499# CONFIG_SCSI_EATA is not set
@@ -502,6 +516,7 @@ CONFIG_SCSI_LOWLEVEL=y
502# CONFIG_SCSI_DEBUG is not set 516# CONFIG_SCSI_DEBUG is not set
503# CONFIG_SCSI_SRP is not set 517# CONFIG_SCSI_SRP is not set
504# CONFIG_SCSI_DH is not set 518# CONFIG_SCSI_DH is not set
519# CONFIG_SCSI_OSD_INITIATOR is not set
505CONFIG_ATA=y 520CONFIG_ATA=y
506# CONFIG_ATA_NONSTANDARD is not set 521# CONFIG_ATA_NONSTANDARD is not set
507CONFIG_SATA_PMP=y 522CONFIG_SATA_PMP=y
@@ -578,6 +593,7 @@ CONFIG_PATA_MPC52xx=y
578# CONFIG_I2O is not set 593# CONFIG_I2O is not set
579# CONFIG_MACINTOSH_DRIVERS is not set 594# CONFIG_MACINTOSH_DRIVERS is not set
580CONFIG_NETDEVICES=y 595CONFIG_NETDEVICES=y
596CONFIG_COMPAT_NET_DEV_OPS=y
581# CONFIG_DUMMY is not set 597# CONFIG_DUMMY is not set
582# CONFIG_BONDING is not set 598# CONFIG_BONDING is not set
583# CONFIG_MACVLAN is not set 599# CONFIG_MACVLAN is not set
@@ -611,6 +627,8 @@ CONFIG_NET_ETHERNET=y
611# CONFIG_SUNGEM is not set 627# CONFIG_SUNGEM is not set
612# CONFIG_CASSINI is not set 628# CONFIG_CASSINI is not set
613# CONFIG_NET_VENDOR_3COM is not set 629# CONFIG_NET_VENDOR_3COM is not set
630# CONFIG_ETHOC is not set
631# CONFIG_DNET is not set
614# CONFIG_NET_TULIP is not set 632# CONFIG_NET_TULIP is not set
615# CONFIG_HP100 is not set 633# CONFIG_HP100 is not set
616# CONFIG_IBM_NEW_EMAC_ZMII is not set 634# CONFIG_IBM_NEW_EMAC_ZMII is not set
@@ -632,6 +650,7 @@ CONFIG_NETDEV_1000=y
632# CONFIG_E1000E is not set 650# CONFIG_E1000E is not set
633# CONFIG_IP1000 is not set 651# CONFIG_IP1000 is not set
634# CONFIG_IGB is not set 652# CONFIG_IGB is not set
653# CONFIG_IGBVF is not set
635# CONFIG_NS83820 is not set 654# CONFIG_NS83820 is not set
636# CONFIG_HAMACHI is not set 655# CONFIG_HAMACHI is not set
637# CONFIG_YELLOWFIN is not set 656# CONFIG_YELLOWFIN is not set
@@ -642,10 +661,10 @@ CONFIG_NETDEV_1000=y
642# CONFIG_VIA_VELOCITY is not set 661# CONFIG_VIA_VELOCITY is not set
643# CONFIG_TIGON3 is not set 662# CONFIG_TIGON3 is not set
644# CONFIG_BNX2 is not set 663# CONFIG_BNX2 is not set
645# CONFIG_MV643XX_ETH is not set
646# CONFIG_QLA3XXX is not set 664# CONFIG_QLA3XXX is not set
647# CONFIG_ATL1 is not set 665# CONFIG_ATL1 is not set
648# CONFIG_ATL1E is not set 666# CONFIG_ATL1E is not set
667# CONFIG_ATL1C is not set
649# CONFIG_JME is not set 668# CONFIG_JME is not set
650CONFIG_NETDEV_10000=y 669CONFIG_NETDEV_10000=y
651# CONFIG_CHELSIO_T1 is not set 670# CONFIG_CHELSIO_T1 is not set
@@ -655,6 +674,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
655# CONFIG_IXGBE is not set 674# CONFIG_IXGBE is not set
656# CONFIG_IXGB is not set 675# CONFIG_IXGB is not set
657# CONFIG_S2IO is not set 676# CONFIG_S2IO is not set
677# CONFIG_VXGE is not set
658# CONFIG_MYRI10GE is not set 678# CONFIG_MYRI10GE is not set
659# CONFIG_NETXEN_NIC is not set 679# CONFIG_NETXEN_NIC is not set
660# CONFIG_NIU is not set 680# CONFIG_NIU is not set
@@ -664,6 +684,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
664# CONFIG_BNX2X is not set 684# CONFIG_BNX2X is not set
665# CONFIG_QLGE is not set 685# CONFIG_QLGE is not set
666# CONFIG_SFC is not set 686# CONFIG_SFC is not set
687# CONFIG_BE2NET is not set
667# CONFIG_TR is not set 688# CONFIG_TR is not set
668 689
669# 690#
@@ -671,7 +692,6 @@ CONFIG_CHELSIO_T3_DEPENDS=y
671# 692#
672# CONFIG_WLAN_PRE80211 is not set 693# CONFIG_WLAN_PRE80211 is not set
673# CONFIG_WLAN_80211 is not set 694# CONFIG_WLAN_80211 is not set
674# CONFIG_IWLWIFI_LEDS is not set
675 695
676# 696#
677# Enable WiMAX (Networking options) to see the WiMAX drivers 697# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -795,7 +815,6 @@ CONFIG_I2C_MPC=y
795# CONFIG_SENSORS_PCF8574 is not set 815# CONFIG_SENSORS_PCF8574 is not set
796# CONFIG_PCF8575 is not set 816# CONFIG_PCF8575 is not set
797# CONFIG_SENSORS_PCA9539 is not set 817# CONFIG_SENSORS_PCA9539 is not set
798# CONFIG_SENSORS_PCF8591 is not set
799# CONFIG_SENSORS_MAX6875 is not set 818# CONFIG_SENSORS_MAX6875 is not set
800# CONFIG_SENSORS_TSL2550 is not set 819# CONFIG_SENSORS_TSL2550 is not set
801# CONFIG_I2C_DEBUG_CORE is not set 820# CONFIG_I2C_DEBUG_CORE is not set
@@ -876,7 +895,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
876# 895#
877 896
878# 897#
879# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; 898# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
880# 899#
881# CONFIG_USB_GADGET is not set 900# CONFIG_USB_GADGET is not set
882 901
@@ -892,6 +911,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
892# CONFIG_EDAC is not set 911# CONFIG_EDAC is not set
893# CONFIG_RTC_CLASS is not set 912# CONFIG_RTC_CLASS is not set
894# CONFIG_DMADEVICES is not set 913# CONFIG_DMADEVICES is not set
914# CONFIG_AUXDISPLAY is not set
895# CONFIG_UIO is not set 915# CONFIG_UIO is not set
896# CONFIG_STAGING is not set 916# CONFIG_STAGING is not set
897 917
@@ -902,6 +922,7 @@ CONFIG_EXT2_FS=y
902# CONFIG_EXT2_FS_XATTR is not set 922# CONFIG_EXT2_FS_XATTR is not set
903# CONFIG_EXT2_FS_XIP is not set 923# CONFIG_EXT2_FS_XIP is not set
904CONFIG_EXT3_FS=y 924CONFIG_EXT3_FS=y
925# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
905CONFIG_EXT3_FS_XATTR=y 926CONFIG_EXT3_FS_XATTR=y
906# CONFIG_EXT3_FS_POSIX_ACL is not set 927# CONFIG_EXT3_FS_POSIX_ACL is not set
907# CONFIG_EXT3_FS_SECURITY is not set 928# CONFIG_EXT3_FS_SECURITY is not set
@@ -924,6 +945,11 @@ CONFIG_INOTIFY_USER=y
924# CONFIG_FUSE_FS is not set 945# CONFIG_FUSE_FS is not set
925 946
926# 947#
948# Caches
949#
950# CONFIG_FSCACHE is not set
951
952#
927# CD-ROM/DVD Filesystems 953# CD-ROM/DVD Filesystems
928# 954#
929# CONFIG_ISO9660_FS is not set 955# CONFIG_ISO9660_FS is not set
@@ -966,6 +992,7 @@ CONFIG_MISC_FILESYSTEMS=y
966# CONFIG_ROMFS_FS is not set 992# CONFIG_ROMFS_FS is not set
967# CONFIG_SYSV_FS is not set 993# CONFIG_SYSV_FS is not set
968# CONFIG_UFS_FS is not set 994# CONFIG_UFS_FS is not set
995# CONFIG_NILFS2_FS is not set
969CONFIG_NETWORK_FILESYSTEMS=y 996CONFIG_NETWORK_FILESYSTEMS=y
970CONFIG_NFS_FS=y 997CONFIG_NFS_FS=y
971CONFIG_NFS_V3=y 998CONFIG_NFS_V3=y
@@ -978,7 +1005,6 @@ CONFIG_LOCKD_V4=y
978CONFIG_NFS_COMMON=y 1005CONFIG_NFS_COMMON=y
979CONFIG_SUNRPC=y 1006CONFIG_SUNRPC=y
980CONFIG_SUNRPC_GSS=y 1007CONFIG_SUNRPC_GSS=y
981# CONFIG_SUNRPC_REGISTER_V4 is not set
982CONFIG_RPCSEC_GSS_KRB5=y 1008CONFIG_RPCSEC_GSS_KRB5=y
983# CONFIG_RPCSEC_GSS_SPKM3 is not set 1009# CONFIG_RPCSEC_GSS_SPKM3 is not set
984# CONFIG_SMB_FS is not set 1010# CONFIG_SMB_FS is not set
@@ -994,6 +1020,7 @@ CONFIG_RPCSEC_GSS_KRB5=y
994CONFIG_MSDOS_PARTITION=y 1020CONFIG_MSDOS_PARTITION=y
995# CONFIG_NLS is not set 1021# CONFIG_NLS is not set
996# CONFIG_DLM is not set 1022# CONFIG_DLM is not set
1023# CONFIG_BINARY_PRINTF is not set
997 1024
998# 1025#
999# Library routines 1026# Library routines
@@ -1007,11 +1034,13 @@ CONFIG_GENERIC_FIND_LAST_BIT=y
1007CONFIG_CRC32=y 1034CONFIG_CRC32=y
1008# CONFIG_CRC7 is not set 1035# CONFIG_CRC7 is not set
1009# CONFIG_LIBCRC32C is not set 1036# CONFIG_LIBCRC32C is not set
1010CONFIG_PLIST=y 1037CONFIG_ZLIB_INFLATE=y
1038CONFIG_DECOMPRESS_GZIP=y
1011CONFIG_HAS_IOMEM=y 1039CONFIG_HAS_IOMEM=y
1012CONFIG_HAS_IOPORT=y 1040CONFIG_HAS_IOPORT=y
1013CONFIG_HAS_DMA=y 1041CONFIG_HAS_DMA=y
1014CONFIG_HAVE_LMB=y 1042CONFIG_HAVE_LMB=y
1043CONFIG_NLATTR=y
1015 1044
1016# 1045#
1017# Kernel hacking 1046# Kernel hacking
@@ -1029,6 +1058,9 @@ CONFIG_DEBUG_KERNEL=y
1029CONFIG_DETECT_SOFTLOCKUP=y 1058CONFIG_DETECT_SOFTLOCKUP=y
1030# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set 1059# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
1031CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 1060CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
1061CONFIG_DETECT_HUNG_TASK=y
1062# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
1063CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
1032CONFIG_SCHED_DEBUG=y 1064CONFIG_SCHED_DEBUG=y
1033# CONFIG_SCHEDSTATS is not set 1065# CONFIG_SCHEDSTATS is not set
1034# CONFIG_TIMER_STATS is not set 1066# CONFIG_TIMER_STATS is not set
@@ -1057,9 +1089,12 @@ CONFIG_DEBUG_INFO=y
1057# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 1089# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1058# CONFIG_FAULT_INJECTION is not set 1090# CONFIG_FAULT_INJECTION is not set
1059# CONFIG_LATENCYTOP is not set 1091# CONFIG_LATENCYTOP is not set
1092# CONFIG_DEBUG_PAGEALLOC is not set
1060CONFIG_HAVE_FUNCTION_TRACER=y 1093CONFIG_HAVE_FUNCTION_TRACER=y
1094CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
1061CONFIG_HAVE_DYNAMIC_FTRACE=y 1095CONFIG_HAVE_DYNAMIC_FTRACE=y
1062CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1096CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1097CONFIG_TRACING_SUPPORT=y
1063 1098
1064# 1099#
1065# Tracers 1100# Tracers
@@ -1067,17 +1102,19 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1067# CONFIG_FUNCTION_TRACER is not set 1102# CONFIG_FUNCTION_TRACER is not set
1068# CONFIG_SCHED_TRACER is not set 1103# CONFIG_SCHED_TRACER is not set
1069# CONFIG_CONTEXT_SWITCH_TRACER is not set 1104# CONFIG_CONTEXT_SWITCH_TRACER is not set
1105# CONFIG_EVENT_TRACER is not set
1070# CONFIG_BOOT_TRACER is not set 1106# CONFIG_BOOT_TRACER is not set
1071# CONFIG_TRACE_BRANCH_PROFILING is not set 1107# CONFIG_TRACE_BRANCH_PROFILING is not set
1072# CONFIG_STACK_TRACER is not set 1108# CONFIG_STACK_TRACER is not set
1073# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1109# CONFIG_KMEMTRACE is not set
1110# CONFIG_WORKQUEUE_TRACER is not set
1111# CONFIG_BLK_DEV_IO_TRACE is not set
1074# CONFIG_SAMPLES is not set 1112# CONFIG_SAMPLES is not set
1075CONFIG_HAVE_ARCH_KGDB=y 1113CONFIG_HAVE_ARCH_KGDB=y
1076# CONFIG_KGDB is not set 1114# CONFIG_KGDB is not set
1077CONFIG_PRINT_STACK_DEPTH=64 1115CONFIG_PRINT_STACK_DEPTH=64
1078# CONFIG_DEBUG_STACKOVERFLOW is not set 1116# CONFIG_DEBUG_STACKOVERFLOW is not set
1079# CONFIG_DEBUG_STACK_USAGE is not set 1117# CONFIG_DEBUG_STACK_USAGE is not set
1080# CONFIG_DEBUG_PAGEALLOC is not set
1081# CONFIG_CODE_PATCHING_SELFTEST is not set 1118# CONFIG_CODE_PATCHING_SELFTEST is not set
1082# CONFIG_FTR_FIXUP_SELFTEST is not set 1119# CONFIG_FTR_FIXUP_SELFTEST is not set
1083# CONFIG_MSI_BITMAP_SELFTEST is not set 1120# CONFIG_MSI_BITMAP_SELFTEST is not set
@@ -1108,10 +1145,12 @@ CONFIG_CRYPTO_BLKCIPHER2=y
1108CONFIG_CRYPTO_HASH=y 1145CONFIG_CRYPTO_HASH=y
1109CONFIG_CRYPTO_HASH2=y 1146CONFIG_CRYPTO_HASH2=y
1110CONFIG_CRYPTO_RNG2=y 1147CONFIG_CRYPTO_RNG2=y
1148CONFIG_CRYPTO_PCOMP=y
1111CONFIG_CRYPTO_MANAGER=y 1149CONFIG_CRYPTO_MANAGER=y
1112CONFIG_CRYPTO_MANAGER2=y 1150CONFIG_CRYPTO_MANAGER2=y
1113# CONFIG_CRYPTO_GF128MUL is not set 1151# CONFIG_CRYPTO_GF128MUL is not set
1114# CONFIG_CRYPTO_NULL is not set 1152# CONFIG_CRYPTO_NULL is not set
1153CONFIG_CRYPTO_WORKQUEUE=y
1115# CONFIG_CRYPTO_CRYPTD is not set 1154# CONFIG_CRYPTO_CRYPTD is not set
1116# CONFIG_CRYPTO_AUTHENC is not set 1155# CONFIG_CRYPTO_AUTHENC is not set
1117# CONFIG_CRYPTO_TEST is not set 1156# CONFIG_CRYPTO_TEST is not set
@@ -1180,6 +1219,7 @@ CONFIG_CRYPTO_DES=y
1180# Compression 1219# Compression
1181# 1220#
1182# CONFIG_CRYPTO_DEFLATE is not set 1221# CONFIG_CRYPTO_DEFLATE is not set
1222# CONFIG_CRYPTO_ZLIB is not set
1183# CONFIG_CRYPTO_LZO is not set 1223# CONFIG_CRYPTO_LZO is not set
1184 1224
1185# 1225#
diff --git a/arch/powerpc/configs/52xx/motionpro_defconfig b/arch/powerpc/configs/52xx/motionpro_defconfig
index fb10f22fd0d2..07b6b266ea95 100644
--- a/arch/powerpc/configs/52xx/motionpro_defconfig
+++ b/arch/powerpc/configs/52xx/motionpro_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.29-rc2 3# Linux kernel version: 2.6.30-rc2
4# Mon Jan 26 21:42:29 2009 4# Sat Apr 18 00:48:22 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -14,6 +14,7 @@ CONFIG_6xx=y
14# CONFIG_40x is not set 14# CONFIG_40x is not set
15# CONFIG_44x is not set 15# CONFIG_44x is not set
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_PPC_BOOK3S=y
17CONFIG_PPC_FPU=y 18CONFIG_PPC_FPU=y
18# CONFIG_ALTIVEC is not set 19# CONFIG_ALTIVEC is not set
19CONFIG_PPC_STD_MMU=y 20CONFIG_PPC_STD_MMU=y
@@ -54,6 +55,7 @@ CONFIG_GENERIC_BUG=y
54CONFIG_DEFAULT_UIMAGE=y 55CONFIG_DEFAULT_UIMAGE=y
55# CONFIG_PPC_DCR_NATIVE is not set 56# CONFIG_PPC_DCR_NATIVE is not set
56# CONFIG_PPC_DCR_MMIO is not set 57# CONFIG_PPC_DCR_MMIO is not set
58CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
57CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 59CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
58 60
59# 61#
@@ -94,19 +96,22 @@ CONFIG_SYSFS_DEPRECATED_V2=y
94# CONFIG_NAMESPACES is not set 96# CONFIG_NAMESPACES is not set
95CONFIG_BLK_DEV_INITRD=y 97CONFIG_BLK_DEV_INITRD=y
96CONFIG_INITRAMFS_SOURCE="" 98CONFIG_INITRAMFS_SOURCE=""
99CONFIG_RD_GZIP=y
100# CONFIG_RD_BZIP2 is not set
101# CONFIG_RD_LZMA is not set
97# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 102# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
98CONFIG_SYSCTL=y 103CONFIG_SYSCTL=y
104CONFIG_ANON_INODES=y
99CONFIG_EMBEDDED=y 105CONFIG_EMBEDDED=y
100# CONFIG_SYSCTL_SYSCALL is not set 106# CONFIG_SYSCTL_SYSCALL is not set
101# CONFIG_KALLSYMS is not set 107# CONFIG_KALLSYMS is not set
108# CONFIG_STRIP_ASM_SYMS is not set
102CONFIG_HOTPLUG=y 109CONFIG_HOTPLUG=y
103CONFIG_PRINTK=y 110CONFIG_PRINTK=y
104CONFIG_BUG=y 111CONFIG_BUG=y
105CONFIG_ELF_CORE=y 112CONFIG_ELF_CORE=y
106CONFIG_COMPAT_BRK=y
107CONFIG_BASE_FULL=y 113CONFIG_BASE_FULL=y
108CONFIG_FUTEX=y 114CONFIG_FUTEX=y
109CONFIG_ANON_INODES=y
110# CONFIG_EPOLL is not set 115# CONFIG_EPOLL is not set
111CONFIG_SIGNALFD=y 116CONFIG_SIGNALFD=y
112CONFIG_TIMERFD=y 117CONFIG_TIMERFD=y
@@ -115,10 +120,12 @@ CONFIG_SHMEM=y
115CONFIG_AIO=y 120CONFIG_AIO=y
116CONFIG_VM_EVENT_COUNTERS=y 121CONFIG_VM_EVENT_COUNTERS=y
117CONFIG_SLUB_DEBUG=y 122CONFIG_SLUB_DEBUG=y
123CONFIG_COMPAT_BRK=y
118# CONFIG_SLAB is not set 124# CONFIG_SLAB is not set
119CONFIG_SLUB=y 125CONFIG_SLUB=y
120# CONFIG_SLOB is not set 126# CONFIG_SLOB is not set
121# CONFIG_PROFILING is not set 127# CONFIG_PROFILING is not set
128# CONFIG_MARKERS is not set
122CONFIG_HAVE_OPROFILE=y 129CONFIG_HAVE_OPROFILE=y
123CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 130CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
124CONFIG_HAVE_IOREMAP_PROT=y 131CONFIG_HAVE_IOREMAP_PROT=y
@@ -126,6 +133,7 @@ CONFIG_HAVE_KPROBES=y
126CONFIG_HAVE_KRETPROBES=y 133CONFIG_HAVE_KRETPROBES=y
127CONFIG_HAVE_ARCH_TRACEHOOK=y 134CONFIG_HAVE_ARCH_TRACEHOOK=y
128CONFIG_HAVE_CLK=y 135CONFIG_HAVE_CLK=y
136# CONFIG_SLOW_WORK is not set
129# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 137# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
130CONFIG_SLABINFO=y 138CONFIG_SLABINFO=y
131CONFIG_RT_MUTEXES=y 139CONFIG_RT_MUTEXES=y
@@ -133,7 +141,6 @@ CONFIG_BASE_SMALL=0
133# CONFIG_MODULES is not set 141# CONFIG_MODULES is not set
134CONFIG_BLOCK=y 142CONFIG_BLOCK=y
135# CONFIG_LBD is not set 143# CONFIG_LBD is not set
136# CONFIG_BLK_DEV_IO_TRACE is not set
137# CONFIG_BLK_DEV_BSG is not set 144# CONFIG_BLK_DEV_BSG is not set
138# CONFIG_BLK_DEV_INTEGRITY is not set 145# CONFIG_BLK_DEV_INTEGRITY is not set
139 146
@@ -154,8 +161,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
154# 161#
155# Platform support 162# Platform support
156# 163#
157CONFIG_PPC_MULTIPLATFORM=y
158CONFIG_CLASSIC32=y
159# CONFIG_PPC_CHRP is not set 164# CONFIG_PPC_CHRP is not set
160# CONFIG_MPC5121_ADS is not set 165# CONFIG_MPC5121_ADS is not set
161# CONFIG_MPC5121_GENERIC is not set 166# CONFIG_MPC5121_GENERIC is not set
@@ -163,6 +168,7 @@ CONFIG_PPC_MPC52xx=y
163CONFIG_PPC_MPC5200_SIMPLE=y 168CONFIG_PPC_MPC5200_SIMPLE=y
164# CONFIG_PPC_EFIKA is not set 169# CONFIG_PPC_EFIKA is not set
165# CONFIG_PPC_LITE5200 is not set 170# CONFIG_PPC_LITE5200 is not set
171# CONFIG_PPC_MEDIA5200 is not set
166# CONFIG_PPC_MPC5200_BUGFIX is not set 172# CONFIG_PPC_MPC5200_BUGFIX is not set
167# CONFIG_PPC_MPC5200_GPIO is not set 173# CONFIG_PPC_MPC5200_GPIO is not set
168# CONFIG_PPC_PMAC is not set 174# CONFIG_PPC_PMAC is not set
@@ -173,6 +179,8 @@ CONFIG_PPC_MPC5200_SIMPLE=y
173# CONFIG_PPC_83xx is not set 179# CONFIG_PPC_83xx is not set
174# CONFIG_PPC_86xx is not set 180# CONFIG_PPC_86xx is not set
175# CONFIG_EMBEDDED6xx is not set 181# CONFIG_EMBEDDED6xx is not set
182# CONFIG_AMIGAONE is not set
183CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
176# CONFIG_IPIC is not set 184# CONFIG_IPIC is not set
177# CONFIG_MPIC is not set 185# CONFIG_MPIC is not set
178# CONFIG_MPIC_WEIRD is not set 186# CONFIG_MPIC_WEIRD is not set
@@ -233,9 +241,12 @@ CONFIG_ZONE_DMA_FLAG=1
233CONFIG_BOUNCE=y 241CONFIG_BOUNCE=y
234CONFIG_VIRT_TO_BUS=y 242CONFIG_VIRT_TO_BUS=y
235CONFIG_UNEVICTABLE_LRU=y 243CONFIG_UNEVICTABLE_LRU=y
244CONFIG_HAVE_MLOCK=y
245CONFIG_HAVE_MLOCKED_PAGE_BIT=y
236CONFIG_PPC_4K_PAGES=y 246CONFIG_PPC_4K_PAGES=y
237# CONFIG_PPC_16K_PAGES is not set 247# CONFIG_PPC_16K_PAGES is not set
238# CONFIG_PPC_64K_PAGES is not set 248# CONFIG_PPC_64K_PAGES is not set
249# CONFIG_PPC_256K_PAGES is not set
239CONFIG_FORCE_MAX_ZONEORDER=11 250CONFIG_FORCE_MAX_ZONEORDER=11
240CONFIG_PROC_DEVICETREE=y 251CONFIG_PROC_DEVICETREE=y
241# CONFIG_CMDLINE_BOOL is not set 252# CONFIG_CMDLINE_BOOL is not set
@@ -276,7 +287,6 @@ CONFIG_NET=y
276# 287#
277# Networking options 288# Networking options
278# 289#
279CONFIG_COMPAT_NET_DEV_OPS=y
280CONFIG_PACKET=y 290CONFIG_PACKET=y
281# CONFIG_PACKET_MMAP is not set 291# CONFIG_PACKET_MMAP is not set
282CONFIG_UNIX=y 292CONFIG_UNIX=y
@@ -332,6 +342,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
332# CONFIG_LAPB is not set 342# CONFIG_LAPB is not set
333# CONFIG_ECONET is not set 343# CONFIG_ECONET is not set
334# CONFIG_WAN_ROUTER is not set 344# CONFIG_WAN_ROUTER is not set
345# CONFIG_PHONET is not set
335# CONFIG_NET_SCHED is not set 346# CONFIG_NET_SCHED is not set
336# CONFIG_DCB is not set 347# CONFIG_DCB is not set
337 348
@@ -344,7 +355,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
344# CONFIG_IRDA is not set 355# CONFIG_IRDA is not set
345# CONFIG_BT is not set 356# CONFIG_BT is not set
346# CONFIG_AF_RXRPC is not set 357# CONFIG_AF_RXRPC is not set
347# CONFIG_PHONET is not set
348# CONFIG_WIRELESS is not set 358# CONFIG_WIRELESS is not set
349# CONFIG_WIMAX is not set 359# CONFIG_WIMAX is not set
350# CONFIG_RFKILL is not set 360# CONFIG_RFKILL is not set
@@ -441,7 +451,6 @@ CONFIG_MTD_ROM=y
441# LPDDR flash memory drivers 451# LPDDR flash memory drivers
442# 452#
443# CONFIG_MTD_LPDDR is not set 453# CONFIG_MTD_LPDDR is not set
444# CONFIG_MTD_QINFO_PROBE is not set
445 454
446# 455#
447# UBI - Unsorted block images 456# UBI - Unsorted block images
@@ -466,6 +475,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
466CONFIG_MISC_DEVICES=y 475CONFIG_MISC_DEVICES=y
467# CONFIG_ICS932S401 is not set 476# CONFIG_ICS932S401 is not set
468# CONFIG_ENCLOSURE_SERVICES is not set 477# CONFIG_ENCLOSURE_SERVICES is not set
478# CONFIG_ISL29003 is not set
469# CONFIG_C2PORT is not set 479# CONFIG_C2PORT is not set
470 480
471# 481#
@@ -516,8 +526,10 @@ CONFIG_CHR_DEV_SG=y
516CONFIG_SCSI_LOWLEVEL=y 526CONFIG_SCSI_LOWLEVEL=y
517# CONFIG_ISCSI_TCP is not set 527# CONFIG_ISCSI_TCP is not set
518# CONFIG_LIBFC is not set 528# CONFIG_LIBFC is not set
529# CONFIG_LIBFCOE is not set
519# CONFIG_SCSI_DEBUG is not set 530# CONFIG_SCSI_DEBUG is not set
520# CONFIG_SCSI_DH is not set 531# CONFIG_SCSI_DH is not set
532# CONFIG_SCSI_OSD_INITIATOR is not set
521CONFIG_ATA=y 533CONFIG_ATA=y
522# CONFIG_ATA_NONSTANDARD is not set 534# CONFIG_ATA_NONSTANDARD is not set
523CONFIG_SATA_PMP=y 535CONFIG_SATA_PMP=y
@@ -528,6 +540,7 @@ CONFIG_PATA_MPC52xx=y
528# CONFIG_MD is not set 540# CONFIG_MD is not set
529# CONFIG_MACINTOSH_DRIVERS is not set 541# CONFIG_MACINTOSH_DRIVERS is not set
530CONFIG_NETDEVICES=y 542CONFIG_NETDEVICES=y
543CONFIG_COMPAT_NET_DEV_OPS=y
531# CONFIG_DUMMY is not set 544# CONFIG_DUMMY is not set
532# CONFIG_BONDING is not set 545# CONFIG_BONDING is not set
533# CONFIG_MACVLAN is not set 546# CONFIG_MACVLAN is not set
@@ -556,6 +569,8 @@ CONFIG_ICPLUS_PHY=y
556CONFIG_MDIO_BITBANG=y 569CONFIG_MDIO_BITBANG=y
557CONFIG_NET_ETHERNET=y 570CONFIG_NET_ETHERNET=y
558CONFIG_MII=y 571CONFIG_MII=y
572# CONFIG_ETHOC is not set
573# CONFIG_DNET is not set
559# CONFIG_IBM_NEW_EMAC_ZMII is not set 574# CONFIG_IBM_NEW_EMAC_ZMII is not set
560# CONFIG_IBM_NEW_EMAC_RGMII is not set 575# CONFIG_IBM_NEW_EMAC_RGMII is not set
561# CONFIG_IBM_NEW_EMAC_TAH is not set 576# CONFIG_IBM_NEW_EMAC_TAH is not set
@@ -574,7 +589,6 @@ CONFIG_FEC_MPC52xx_MDIO=y
574# 589#
575# CONFIG_WLAN_PRE80211 is not set 590# CONFIG_WLAN_PRE80211 is not set
576# CONFIG_WLAN_80211 is not set 591# CONFIG_WLAN_80211 is not set
577# CONFIG_IWLWIFI_LEDS is not set
578 592
579# 593#
580# Enable WiMAX (Networking options) to see the WiMAX drivers 594# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -665,7 +679,6 @@ CONFIG_I2C_MPC=y
665# CONFIG_SENSORS_PCF8574 is not set 679# CONFIG_SENSORS_PCF8574 is not set
666# CONFIG_PCF8575 is not set 680# CONFIG_PCF8575 is not set
667# CONFIG_SENSORS_PCA9539 is not set 681# CONFIG_SENSORS_PCA9539 is not set
668# CONFIG_SENSORS_PCF8591 is not set
669# CONFIG_SENSORS_MAX6875 is not set 682# CONFIG_SENSORS_MAX6875 is not set
670# CONFIG_SENSORS_TSL2550 is not set 683# CONFIG_SENSORS_TSL2550 is not set
671# CONFIG_I2C_DEBUG_CORE is not set 684# CONFIG_I2C_DEBUG_CORE is not set
@@ -696,6 +709,7 @@ CONFIG_HWMON=y
696# CONFIG_SENSORS_F71805F is not set 709# CONFIG_SENSORS_F71805F is not set
697# CONFIG_SENSORS_F71882FG is not set 710# CONFIG_SENSORS_F71882FG is not set
698# CONFIG_SENSORS_F75375S is not set 711# CONFIG_SENSORS_F75375S is not set
712# CONFIG_SENSORS_G760A is not set
699# CONFIG_SENSORS_GL518SM is not set 713# CONFIG_SENSORS_GL518SM is not set
700# CONFIG_SENSORS_GL520SM is not set 714# CONFIG_SENSORS_GL520SM is not set
701# CONFIG_SENSORS_IT87 is not set 715# CONFIG_SENSORS_IT87 is not set
@@ -710,11 +724,14 @@ CONFIG_HWMON=y
710# CONFIG_SENSORS_LM90 is not set 724# CONFIG_SENSORS_LM90 is not set
711# CONFIG_SENSORS_LM92 is not set 725# CONFIG_SENSORS_LM92 is not set
712# CONFIG_SENSORS_LM93 is not set 726# CONFIG_SENSORS_LM93 is not set
727# CONFIG_SENSORS_LTC4215 is not set
713# CONFIG_SENSORS_LTC4245 is not set 728# CONFIG_SENSORS_LTC4245 is not set
729# CONFIG_SENSORS_LM95241 is not set
714# CONFIG_SENSORS_MAX1619 is not set 730# CONFIG_SENSORS_MAX1619 is not set
715# CONFIG_SENSORS_MAX6650 is not set 731# CONFIG_SENSORS_MAX6650 is not set
716# CONFIG_SENSORS_PC87360 is not set 732# CONFIG_SENSORS_PC87360 is not set
717# CONFIG_SENSORS_PC87427 is not set 733# CONFIG_SENSORS_PC87427 is not set
734# CONFIG_SENSORS_PCF8591 is not set
718# CONFIG_SENSORS_DME1737 is not set 735# CONFIG_SENSORS_DME1737 is not set
719# CONFIG_SENSORS_SMSC47M1 is not set 736# CONFIG_SENSORS_SMSC47M1 is not set
720# CONFIG_SENSORS_SMSC47M192 is not set 737# CONFIG_SENSORS_SMSC47M192 is not set
@@ -800,7 +817,9 @@ CONFIG_LEDS_CLASS=y
800# 817#
801# LED drivers 818# LED drivers
802# 819#
820# CONFIG_LEDS_LP5521 is not set
803# CONFIG_LEDS_PCA955X is not set 821# CONFIG_LEDS_PCA955X is not set
822# CONFIG_LEDS_BD2802 is not set
804 823
805# 824#
806# LED Triggers 825# LED Triggers
@@ -810,6 +829,10 @@ CONFIG_LEDS_TRIGGER_TIMER=y
810# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set 829# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
811# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set 830# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
812# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set 831# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set
832
833#
834# iptables trigger is under Netfilter config (LED target)
835#
813# CONFIG_ACCESSIBILITY is not set 836# CONFIG_ACCESSIBILITY is not set
814# CONFIG_EDAC is not set 837# CONFIG_EDAC is not set
815CONFIG_RTC_LIB=y 838CONFIG_RTC_LIB=y
@@ -866,8 +889,9 @@ CONFIG_RTC_DRV_DS1307=y
866# 889#
867# on-CPU RTC drivers 890# on-CPU RTC drivers
868# 891#
869# CONFIG_RTC_DRV_PPC is not set 892# CONFIG_RTC_DRV_GENERIC is not set
870# CONFIG_DMADEVICES is not set 893# CONFIG_DMADEVICES is not set
894# CONFIG_AUXDISPLAY is not set
871# CONFIG_UIO is not set 895# CONFIG_UIO is not set
872# CONFIG_STAGING is not set 896# CONFIG_STAGING is not set
873 897
@@ -878,6 +902,7 @@ CONFIG_EXT2_FS=y
878# CONFIG_EXT2_FS_XATTR is not set 902# CONFIG_EXT2_FS_XATTR is not set
879# CONFIG_EXT2_FS_XIP is not set 903# CONFIG_EXT2_FS_XIP is not set
880CONFIG_EXT3_FS=y 904CONFIG_EXT3_FS=y
905# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
881CONFIG_EXT3_FS_XATTR=y 906CONFIG_EXT3_FS_XATTR=y
882# CONFIG_EXT3_FS_POSIX_ACL is not set 907# CONFIG_EXT3_FS_POSIX_ACL is not set
883# CONFIG_EXT3_FS_SECURITY is not set 908# CONFIG_EXT3_FS_SECURITY is not set
@@ -900,6 +925,11 @@ CONFIG_INOTIFY_USER=y
900# CONFIG_FUSE_FS is not set 925# CONFIG_FUSE_FS is not set
901 926
902# 927#
928# Caches
929#
930# CONFIG_FSCACHE is not set
931
932#
903# CD-ROM/DVD Filesystems 933# CD-ROM/DVD Filesystems
904# 934#
905# CONFIG_ISO9660_FS is not set 935# CONFIG_ISO9660_FS is not set
@@ -956,6 +986,7 @@ CONFIG_CRAMFS=y
956# CONFIG_ROMFS_FS is not set 986# CONFIG_ROMFS_FS is not set
957# CONFIG_SYSV_FS is not set 987# CONFIG_SYSV_FS is not set
958# CONFIG_UFS_FS is not set 988# CONFIG_UFS_FS is not set
989# CONFIG_NILFS2_FS is not set
959CONFIG_NETWORK_FILESYSTEMS=y 990CONFIG_NETWORK_FILESYSTEMS=y
960CONFIG_NFS_FS=y 991CONFIG_NFS_FS=y
961CONFIG_NFS_V3=y 992CONFIG_NFS_V3=y
@@ -968,7 +999,6 @@ CONFIG_LOCKD_V4=y
968CONFIG_NFS_COMMON=y 999CONFIG_NFS_COMMON=y
969CONFIG_SUNRPC=y 1000CONFIG_SUNRPC=y
970CONFIG_SUNRPC_GSS=y 1001CONFIG_SUNRPC_GSS=y
971# CONFIG_SUNRPC_REGISTER_V4 is not set
972CONFIG_RPCSEC_GSS_KRB5=y 1002CONFIG_RPCSEC_GSS_KRB5=y
973# CONFIG_RPCSEC_GSS_SPKM3 is not set 1003# CONFIG_RPCSEC_GSS_SPKM3 is not set
974# CONFIG_SMB_FS is not set 1004# CONFIG_SMB_FS is not set
@@ -1039,6 +1069,7 @@ CONFIG_NLS_ISO8859_1=y
1039# CONFIG_NLS_KOI8_U is not set 1069# CONFIG_NLS_KOI8_U is not set
1040# CONFIG_NLS_UTF8 is not set 1070# CONFIG_NLS_UTF8 is not set
1041# CONFIG_DLM is not set 1071# CONFIG_DLM is not set
1072# CONFIG_BINARY_PRINTF is not set
1042 1073
1043# 1074#
1044# Library routines 1075# Library routines
@@ -1054,11 +1085,12 @@ CONFIG_CRC32=y
1054# CONFIG_LIBCRC32C is not set 1085# CONFIG_LIBCRC32C is not set
1055CONFIG_ZLIB_INFLATE=y 1086CONFIG_ZLIB_INFLATE=y
1056CONFIG_ZLIB_DEFLATE=y 1087CONFIG_ZLIB_DEFLATE=y
1057CONFIG_PLIST=y 1088CONFIG_DECOMPRESS_GZIP=y
1058CONFIG_HAS_IOMEM=y 1089CONFIG_HAS_IOMEM=y
1059CONFIG_HAS_IOPORT=y 1090CONFIG_HAS_IOPORT=y
1060CONFIG_HAS_DMA=y 1091CONFIG_HAS_DMA=y
1061CONFIG_HAVE_LMB=y 1092CONFIG_HAVE_LMB=y
1093CONFIG_NLATTR=y
1062 1094
1063# 1095#
1064# Kernel hacking 1096# Kernel hacking
@@ -1076,6 +1108,9 @@ CONFIG_DEBUG_KERNEL=y
1076CONFIG_DETECT_SOFTLOCKUP=y 1108CONFIG_DETECT_SOFTLOCKUP=y
1077# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set 1109# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
1078CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 1110CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
1111CONFIG_DETECT_HUNG_TASK=y
1112# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
1113CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
1079CONFIG_SCHED_DEBUG=y 1114CONFIG_SCHED_DEBUG=y
1080# CONFIG_SCHEDSTATS is not set 1115# CONFIG_SCHEDSTATS is not set
1081# CONFIG_TIMER_STATS is not set 1116# CONFIG_TIMER_STATS is not set
@@ -1104,9 +1139,12 @@ CONFIG_DEBUG_INFO=y
1104# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 1139# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1105# CONFIG_FAULT_INJECTION is not set 1140# CONFIG_FAULT_INJECTION is not set
1106# CONFIG_LATENCYTOP is not set 1141# CONFIG_LATENCYTOP is not set
1142# CONFIG_DEBUG_PAGEALLOC is not set
1107CONFIG_HAVE_FUNCTION_TRACER=y 1143CONFIG_HAVE_FUNCTION_TRACER=y
1144CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
1108CONFIG_HAVE_DYNAMIC_FTRACE=y 1145CONFIG_HAVE_DYNAMIC_FTRACE=y
1109CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1146CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1147CONFIG_TRACING_SUPPORT=y
1110 1148
1111# 1149#
1112# Tracers 1150# Tracers
@@ -1114,17 +1152,19 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1114# CONFIG_FUNCTION_TRACER is not set 1152# CONFIG_FUNCTION_TRACER is not set
1115# CONFIG_SCHED_TRACER is not set 1153# CONFIG_SCHED_TRACER is not set
1116# CONFIG_CONTEXT_SWITCH_TRACER is not set 1154# CONFIG_CONTEXT_SWITCH_TRACER is not set
1155# CONFIG_EVENT_TRACER is not set
1117# CONFIG_BOOT_TRACER is not set 1156# CONFIG_BOOT_TRACER is not set
1118# CONFIG_TRACE_BRANCH_PROFILING is not set 1157# CONFIG_TRACE_BRANCH_PROFILING is not set
1119# CONFIG_STACK_TRACER is not set 1158# CONFIG_STACK_TRACER is not set
1120# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1159# CONFIG_KMEMTRACE is not set
1160# CONFIG_WORKQUEUE_TRACER is not set
1161# CONFIG_BLK_DEV_IO_TRACE is not set
1121# CONFIG_SAMPLES is not set 1162# CONFIG_SAMPLES is not set
1122CONFIG_HAVE_ARCH_KGDB=y 1163CONFIG_HAVE_ARCH_KGDB=y
1123# CONFIG_KGDB is not set 1164# CONFIG_KGDB is not set
1124CONFIG_PRINT_STACK_DEPTH=64 1165CONFIG_PRINT_STACK_DEPTH=64
1125# CONFIG_DEBUG_STACKOVERFLOW is not set 1166# CONFIG_DEBUG_STACKOVERFLOW is not set
1126# CONFIG_DEBUG_STACK_USAGE is not set 1167# CONFIG_DEBUG_STACK_USAGE is not set
1127# CONFIG_DEBUG_PAGEALLOC is not set
1128# CONFIG_CODE_PATCHING_SELFTEST is not set 1168# CONFIG_CODE_PATCHING_SELFTEST is not set
1129# CONFIG_FTR_FIXUP_SELFTEST is not set 1169# CONFIG_FTR_FIXUP_SELFTEST is not set
1130# CONFIG_MSI_BITMAP_SELFTEST is not set 1170# CONFIG_MSI_BITMAP_SELFTEST is not set
@@ -1155,10 +1195,12 @@ CONFIG_CRYPTO_BLKCIPHER2=y
1155CONFIG_CRYPTO_HASH=y 1195CONFIG_CRYPTO_HASH=y
1156CONFIG_CRYPTO_HASH2=y 1196CONFIG_CRYPTO_HASH2=y
1157CONFIG_CRYPTO_RNG2=y 1197CONFIG_CRYPTO_RNG2=y
1198CONFIG_CRYPTO_PCOMP=y
1158CONFIG_CRYPTO_MANAGER=y 1199CONFIG_CRYPTO_MANAGER=y
1159CONFIG_CRYPTO_MANAGER2=y 1200CONFIG_CRYPTO_MANAGER2=y
1160# CONFIG_CRYPTO_GF128MUL is not set 1201# CONFIG_CRYPTO_GF128MUL is not set
1161# CONFIG_CRYPTO_NULL is not set 1202# CONFIG_CRYPTO_NULL is not set
1203CONFIG_CRYPTO_WORKQUEUE=y
1162# CONFIG_CRYPTO_CRYPTD is not set 1204# CONFIG_CRYPTO_CRYPTD is not set
1163# CONFIG_CRYPTO_AUTHENC is not set 1205# CONFIG_CRYPTO_AUTHENC is not set
1164 1206
@@ -1226,6 +1268,7 @@ CONFIG_CRYPTO_DES=y
1226# Compression 1268# Compression
1227# 1269#
1228# CONFIG_CRYPTO_DEFLATE is not set 1270# CONFIG_CRYPTO_DEFLATE is not set
1271# CONFIG_CRYPTO_ZLIB is not set
1229# CONFIG_CRYPTO_LZO is not set 1272# CONFIG_CRYPTO_LZO is not set
1230 1273
1231# 1274#
diff --git a/arch/powerpc/configs/52xx/pcm030_defconfig b/arch/powerpc/configs/52xx/pcm030_defconfig
index 00944c09a0ae..afb1a3d1ef0a 100644
--- a/arch/powerpc/configs/52xx/pcm030_defconfig
+++ b/arch/powerpc/configs/52xx/pcm030_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.29-rc2 3# Linux kernel version: 2.6.30-rc2
4# Mon Jan 26 21:41:33 2009 4# Sat Apr 18 00:48:42 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -14,6 +14,7 @@ CONFIG_6xx=y
14# CONFIG_40x is not set 14# CONFIG_40x is not set
15# CONFIG_44x is not set 15# CONFIG_44x is not set
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_PPC_BOOK3S=y
17CONFIG_PPC_FPU=y 18CONFIG_PPC_FPU=y
18# CONFIG_ALTIVEC is not set 19# CONFIG_ALTIVEC is not set
19CONFIG_PPC_STD_MMU=y 20CONFIG_PPC_STD_MMU=y
@@ -54,6 +55,7 @@ CONFIG_GENERIC_BUG=y
54CONFIG_DEFAULT_UIMAGE=y 55CONFIG_DEFAULT_UIMAGE=y
55# CONFIG_PPC_DCR_NATIVE is not set 56# CONFIG_PPC_DCR_NATIVE is not set
56# CONFIG_PPC_DCR_MMIO is not set 57# CONFIG_PPC_DCR_MMIO is not set
58CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
57CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 59CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
58 60
59# 61#
@@ -69,6 +71,7 @@ CONFIG_LOCALVERSION="trunk"
69CONFIG_SYSVIPC=y 71CONFIG_SYSVIPC=y
70CONFIG_SYSVIPC_SYSCTL=y 72CONFIG_SYSVIPC_SYSCTL=y
71CONFIG_POSIX_MQUEUE=y 73CONFIG_POSIX_MQUEUE=y
74CONFIG_POSIX_MQUEUE_SYSCTL=y
72# CONFIG_BSD_PROCESS_ACCT is not set 75# CONFIG_BSD_PROCESS_ACCT is not set
73# CONFIG_TASKSTATS is not set 76# CONFIG_TASKSTATS is not set
74# CONFIG_AUDIT is not set 77# CONFIG_AUDIT is not set
@@ -97,18 +100,18 @@ CONFIG_SYSFS_DEPRECATED_V2=y
97# CONFIG_BLK_DEV_INITRD is not set 100# CONFIG_BLK_DEV_INITRD is not set
98# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 101# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
99CONFIG_SYSCTL=y 102CONFIG_SYSCTL=y
103CONFIG_ANON_INODES=y
100CONFIG_EMBEDDED=y 104CONFIG_EMBEDDED=y
101# CONFIG_SYSCTL_SYSCALL is not set 105# CONFIG_SYSCTL_SYSCALL is not set
102CONFIG_KALLSYMS=y 106CONFIG_KALLSYMS=y
103# CONFIG_KALLSYMS_EXTRA_PASS is not set 107# CONFIG_KALLSYMS_EXTRA_PASS is not set
108# CONFIG_STRIP_ASM_SYMS is not set
104CONFIG_HOTPLUG=y 109CONFIG_HOTPLUG=y
105CONFIG_PRINTK=y 110CONFIG_PRINTK=y
106CONFIG_BUG=y 111CONFIG_BUG=y
107CONFIG_ELF_CORE=y 112CONFIG_ELF_CORE=y
108CONFIG_COMPAT_BRK=y
109CONFIG_BASE_FULL=y 113CONFIG_BASE_FULL=y
110CONFIG_FUTEX=y 114CONFIG_FUTEX=y
111CONFIG_ANON_INODES=y
112CONFIG_EPOLL=y 115CONFIG_EPOLL=y
113CONFIG_SIGNALFD=y 116CONFIG_SIGNALFD=y
114CONFIG_TIMERFD=y 117CONFIG_TIMERFD=y
@@ -117,10 +120,12 @@ CONFIG_SHMEM=y
117CONFIG_AIO=y 120CONFIG_AIO=y
118# CONFIG_VM_EVENT_COUNTERS is not set 121# CONFIG_VM_EVENT_COUNTERS is not set
119CONFIG_PCI_QUIRKS=y 122CONFIG_PCI_QUIRKS=y
123CONFIG_COMPAT_BRK=y
120CONFIG_SLAB=y 124CONFIG_SLAB=y
121# CONFIG_SLUB is not set 125# CONFIG_SLUB is not set
122# CONFIG_SLOB is not set 126# CONFIG_SLOB is not set
123# CONFIG_PROFILING is not set 127# CONFIG_PROFILING is not set
128# CONFIG_MARKERS is not set
124CONFIG_HAVE_OPROFILE=y 129CONFIG_HAVE_OPROFILE=y
125# CONFIG_KPROBES is not set 130# CONFIG_KPROBES is not set
126CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 131CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -129,6 +134,7 @@ CONFIG_HAVE_KPROBES=y
129CONFIG_HAVE_KRETPROBES=y 134CONFIG_HAVE_KRETPROBES=y
130CONFIG_HAVE_ARCH_TRACEHOOK=y 135CONFIG_HAVE_ARCH_TRACEHOOK=y
131CONFIG_HAVE_CLK=y 136CONFIG_HAVE_CLK=y
137# CONFIG_SLOW_WORK is not set
132# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 138# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
133CONFIG_SLABINFO=y 139CONFIG_SLABINFO=y
134CONFIG_RT_MUTEXES=y 140CONFIG_RT_MUTEXES=y
@@ -141,7 +147,6 @@ CONFIG_MODULE_UNLOAD=y
141# CONFIG_MODULE_SRCVERSION_ALL is not set 147# CONFIG_MODULE_SRCVERSION_ALL is not set
142CONFIG_BLOCK=y 148CONFIG_BLOCK=y
143# CONFIG_LBD is not set 149# CONFIG_LBD is not set
144# CONFIG_BLK_DEV_IO_TRACE is not set
145# CONFIG_BLK_DEV_BSG is not set 150# CONFIG_BLK_DEV_BSG is not set
146# CONFIG_BLK_DEV_INTEGRITY is not set 151# CONFIG_BLK_DEV_INTEGRITY is not set
147 152
@@ -162,8 +167,6 @@ CONFIG_DEFAULT_IOSCHED="noop"
162# 167#
163# Platform support 168# Platform support
164# 169#
165CONFIG_PPC_MULTIPLATFORM=y
166CONFIG_CLASSIC32=y
167# CONFIG_PPC_CHRP is not set 170# CONFIG_PPC_CHRP is not set
168# CONFIG_MPC5121_ADS is not set 171# CONFIG_MPC5121_ADS is not set
169# CONFIG_MPC5121_GENERIC is not set 172# CONFIG_MPC5121_GENERIC is not set
@@ -171,6 +174,7 @@ CONFIG_PPC_MPC52xx=y
171CONFIG_PPC_MPC5200_SIMPLE=y 174CONFIG_PPC_MPC5200_SIMPLE=y
172# CONFIG_PPC_EFIKA is not set 175# CONFIG_PPC_EFIKA is not set
173# CONFIG_PPC_LITE5200 is not set 176# CONFIG_PPC_LITE5200 is not set
177# CONFIG_PPC_MEDIA5200 is not set
174# CONFIG_PPC_MPC5200_BUGFIX is not set 178# CONFIG_PPC_MPC5200_BUGFIX is not set
175# CONFIG_PPC_MPC5200_GPIO is not set 179# CONFIG_PPC_MPC5200_GPIO is not set
176# CONFIG_PPC_PMAC is not set 180# CONFIG_PPC_PMAC is not set
@@ -181,6 +185,8 @@ CONFIG_PPC_MPC5200_SIMPLE=y
181# CONFIG_PPC_83xx is not set 185# CONFIG_PPC_83xx is not set
182# CONFIG_PPC_86xx is not set 186# CONFIG_PPC_86xx is not set
183# CONFIG_EMBEDDED6xx is not set 187# CONFIG_EMBEDDED6xx is not set
188# CONFIG_AMIGAONE is not set
189CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
184# CONFIG_IPIC is not set 190# CONFIG_IPIC is not set
185# CONFIG_MPIC is not set 191# CONFIG_MPIC is not set
186# CONFIG_MPIC_WEIRD is not set 192# CONFIG_MPIC_WEIRD is not set
@@ -242,9 +248,12 @@ CONFIG_ZONE_DMA_FLAG=1
242CONFIG_BOUNCE=y 248CONFIG_BOUNCE=y
243CONFIG_VIRT_TO_BUS=y 249CONFIG_VIRT_TO_BUS=y
244CONFIG_UNEVICTABLE_LRU=y 250CONFIG_UNEVICTABLE_LRU=y
251CONFIG_HAVE_MLOCK=y
252CONFIG_HAVE_MLOCKED_PAGE_BIT=y
245CONFIG_PPC_4K_PAGES=y 253CONFIG_PPC_4K_PAGES=y
246# CONFIG_PPC_16K_PAGES is not set 254# CONFIG_PPC_16K_PAGES is not set
247# CONFIG_PPC_64K_PAGES is not set 255# CONFIG_PPC_64K_PAGES is not set
256# CONFIG_PPC_256K_PAGES is not set
248CONFIG_FORCE_MAX_ZONEORDER=11 257CONFIG_FORCE_MAX_ZONEORDER=11
249CONFIG_PROC_DEVICETREE=y 258CONFIG_PROC_DEVICETREE=y
250# CONFIG_CMDLINE_BOOL is not set 259# CONFIG_CMDLINE_BOOL is not set
@@ -268,6 +277,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
268# CONFIG_PCI_MSI is not set 277# CONFIG_PCI_MSI is not set
269CONFIG_PCI_LEGACY=y 278CONFIG_PCI_LEGACY=y
270# CONFIG_PCI_STUB is not set 279# CONFIG_PCI_STUB is not set
280# CONFIG_PCI_IOV is not set
271# CONFIG_PCCARD is not set 281# CONFIG_PCCARD is not set
272# CONFIG_HOTPLUG_PCI is not set 282# CONFIG_HOTPLUG_PCI is not set
273# CONFIG_HAS_RAPIDIO is not set 283# CONFIG_HAS_RAPIDIO is not set
@@ -290,7 +300,6 @@ CONFIG_NET=y
290# 300#
291# Networking options 301# Networking options
292# 302#
293CONFIG_COMPAT_NET_DEV_OPS=y
294CONFIG_PACKET=y 303CONFIG_PACKET=y
295# CONFIG_PACKET_MMAP is not set 304# CONFIG_PACKET_MMAP is not set
296CONFIG_UNIX=y 305CONFIG_UNIX=y
@@ -340,6 +349,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
340# CONFIG_LAPB is not set 349# CONFIG_LAPB is not set
341# CONFIG_ECONET is not set 350# CONFIG_ECONET is not set
342# CONFIG_WAN_ROUTER is not set 351# CONFIG_WAN_ROUTER is not set
352# CONFIG_PHONET is not set
343# CONFIG_NET_SCHED is not set 353# CONFIG_NET_SCHED is not set
344# CONFIG_DCB is not set 354# CONFIG_DCB is not set
345 355
@@ -352,7 +362,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
352# CONFIG_IRDA is not set 362# CONFIG_IRDA is not set
353# CONFIG_BT is not set 363# CONFIG_BT is not set
354# CONFIG_AF_RXRPC is not set 364# CONFIG_AF_RXRPC is not set
355# CONFIG_PHONET is not set
356# CONFIG_WIRELESS is not set 365# CONFIG_WIRELESS is not set
357# CONFIG_WIMAX is not set 366# CONFIG_WIMAX is not set
358# CONFIG_RFKILL is not set 367# CONFIG_RFKILL is not set
@@ -451,7 +460,6 @@ CONFIG_MTD_PHYSMAP=y
451# LPDDR flash memory drivers 460# LPDDR flash memory drivers
452# 461#
453# CONFIG_MTD_LPDDR is not set 462# CONFIG_MTD_LPDDR is not set
454# CONFIG_MTD_QINFO_PROBE is not set
455 463
456# 464#
457# UBI - Unsorted block images 465# UBI - Unsorted block images
@@ -504,6 +512,7 @@ CONFIG_SCSI_WAIT_SCAN=m
504# CONFIG_SCSI_SRP_ATTRS is not set 512# CONFIG_SCSI_SRP_ATTRS is not set
505# CONFIG_SCSI_LOWLEVEL is not set 513# CONFIG_SCSI_LOWLEVEL is not set
506# CONFIG_SCSI_DH is not set 514# CONFIG_SCSI_DH is not set
515# CONFIG_SCSI_OSD_INITIATOR is not set
507CONFIG_ATA=m 516CONFIG_ATA=m
508# CONFIG_ATA_NONSTANDARD is not set 517# CONFIG_ATA_NONSTANDARD is not set
509CONFIG_SATA_PMP=y 518CONFIG_SATA_PMP=y
@@ -580,6 +589,7 @@ CONFIG_PATA_MPC52xx=m
580# CONFIG_I2O is not set 589# CONFIG_I2O is not set
581# CONFIG_MACINTOSH_DRIVERS is not set 590# CONFIG_MACINTOSH_DRIVERS is not set
582CONFIG_NETDEVICES=y 591CONFIG_NETDEVICES=y
592CONFIG_COMPAT_NET_DEV_OPS=y
583# CONFIG_DUMMY is not set 593# CONFIG_DUMMY is not set
584# CONFIG_BONDING is not set 594# CONFIG_BONDING is not set
585# CONFIG_MACVLAN is not set 595# CONFIG_MACVLAN is not set
@@ -613,6 +623,8 @@ CONFIG_MII=y
613# CONFIG_SUNGEM is not set 623# CONFIG_SUNGEM is not set
614# CONFIG_CASSINI is not set 624# CONFIG_CASSINI is not set
615# CONFIG_NET_VENDOR_3COM is not set 625# CONFIG_NET_VENDOR_3COM is not set
626# CONFIG_ETHOC is not set
627# CONFIG_DNET is not set
616# CONFIG_NET_TULIP is not set 628# CONFIG_NET_TULIP is not set
617# CONFIG_HP100 is not set 629# CONFIG_HP100 is not set
618# CONFIG_IBM_NEW_EMAC_ZMII is not set 630# CONFIG_IBM_NEW_EMAC_ZMII is not set
@@ -636,7 +648,6 @@ CONFIG_FEC_MPC52xx_MDIO=y
636# 648#
637# CONFIG_WLAN_PRE80211 is not set 649# CONFIG_WLAN_PRE80211 is not set
638# CONFIG_WLAN_80211 is not set 650# CONFIG_WLAN_80211 is not set
639# CONFIG_IWLWIFI_LEDS is not set
640 651
641# 652#
642# Enable WiMAX (Networking options) to see the WiMAX drivers 653# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -702,6 +713,7 @@ CONFIG_UNIX98_PTYS=y
702# CONFIG_HVC_UDBG is not set 713# CONFIG_HVC_UDBG is not set
703# CONFIG_IPMI_HANDLER is not set 714# CONFIG_IPMI_HANDLER is not set
704CONFIG_HW_RANDOM=y 715CONFIG_HW_RANDOM=y
716# CONFIG_HW_RANDOM_TIMERIOMEM is not set
705# CONFIG_NVRAM is not set 717# CONFIG_NVRAM is not set
706# CONFIG_R3964 is not set 718# CONFIG_R3964 is not set
707# CONFIG_APPLICOM is not set 719# CONFIG_APPLICOM is not set
@@ -767,7 +779,6 @@ CONFIG_I2C_MPC=y
767# CONFIG_SENSORS_PCF8574 is not set 779# CONFIG_SENSORS_PCF8574 is not set
768# CONFIG_PCF8575 is not set 780# CONFIG_PCF8575 is not set
769# CONFIG_SENSORS_PCA9539 is not set 781# CONFIG_SENSORS_PCA9539 is not set
770# CONFIG_SENSORS_PCF8591 is not set
771# CONFIG_SENSORS_MAX6875 is not set 782# CONFIG_SENSORS_MAX6875 is not set
772# CONFIG_SENSORS_TSL2550 is not set 783# CONFIG_SENSORS_TSL2550 is not set
773# CONFIG_I2C_DEBUG_CORE is not set 784# CONFIG_I2C_DEBUG_CORE is not set
@@ -889,11 +900,11 @@ CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
889# CONFIG_USB_TMC is not set 900# CONFIG_USB_TMC is not set
890 901
891# 902#
892# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; 903# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
893# 904#
894 905
895# 906#
896# see USB_STORAGE Help for more information 907# also be needed; see USB_STORAGE Help for more info
897# 908#
898CONFIG_USB_STORAGE=m 909CONFIG_USB_STORAGE=m
899# CONFIG_USB_STORAGE_DEBUG is not set 910# CONFIG_USB_STORAGE_DEBUG is not set
@@ -934,7 +945,6 @@ CONFIG_USB_STORAGE=m
934# CONFIG_USB_LED is not set 945# CONFIG_USB_LED is not set
935# CONFIG_USB_CYPRESS_CY7C63 is not set 946# CONFIG_USB_CYPRESS_CY7C63 is not set
936# CONFIG_USB_CYTHERM is not set 947# CONFIG_USB_CYTHERM is not set
937# CONFIG_USB_PHIDGET is not set
938# CONFIG_USB_IDMOUSE is not set 948# CONFIG_USB_IDMOUSE is not set
939# CONFIG_USB_FTDI_ELAN is not set 949# CONFIG_USB_FTDI_ELAN is not set
940# CONFIG_USB_APPLEDISPLAY is not set 950# CONFIG_USB_APPLEDISPLAY is not set
@@ -949,6 +959,7 @@ CONFIG_USB_STORAGE=m
949# 959#
950# OTG and related infrastructure 960# OTG and related infrastructure
951# 961#
962# CONFIG_NOP_USB_XCEIV is not set
952# CONFIG_UWB is not set 963# CONFIG_UWB is not set
953# CONFIG_MMC is not set 964# CONFIG_MMC is not set
954# CONFIG_MEMSTICK is not set 965# CONFIG_MEMSTICK is not set
@@ -1007,8 +1018,9 @@ CONFIG_RTC_DRV_PCF8563=m
1007# 1018#
1008# on-CPU RTC drivers 1019# on-CPU RTC drivers
1009# 1020#
1010# CONFIG_RTC_DRV_PPC is not set 1021# CONFIG_RTC_DRV_GENERIC is not set
1011# CONFIG_DMADEVICES is not set 1022# CONFIG_DMADEVICES is not set
1023# CONFIG_AUXDISPLAY is not set
1012# CONFIG_UIO is not set 1024# CONFIG_UIO is not set
1013# CONFIG_STAGING is not set 1025# CONFIG_STAGING is not set
1014 1026
@@ -1019,6 +1031,7 @@ CONFIG_EXT2_FS=m
1019# CONFIG_EXT2_FS_XATTR is not set 1031# CONFIG_EXT2_FS_XATTR is not set
1020# CONFIG_EXT2_FS_XIP is not set 1032# CONFIG_EXT2_FS_XIP is not set
1021CONFIG_EXT3_FS=m 1033CONFIG_EXT3_FS=m
1034# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
1022CONFIG_EXT3_FS_XATTR=y 1035CONFIG_EXT3_FS_XATTR=y
1023# CONFIG_EXT3_FS_POSIX_ACL is not set 1036# CONFIG_EXT3_FS_POSIX_ACL is not set
1024# CONFIG_EXT3_FS_SECURITY is not set 1037# CONFIG_EXT3_FS_SECURITY is not set
@@ -1040,6 +1053,11 @@ CONFIG_FILE_LOCKING=y
1040# CONFIG_FUSE_FS is not set 1053# CONFIG_FUSE_FS is not set
1041 1054
1042# 1055#
1056# Caches
1057#
1058# CONFIG_FSCACHE is not set
1059
1060#
1043# CD-ROM/DVD Filesystems 1061# CD-ROM/DVD Filesystems
1044# 1062#
1045# CONFIG_ISO9660_FS is not set 1063# CONFIG_ISO9660_FS is not set
@@ -1096,6 +1114,7 @@ CONFIG_JFFS2_RTIME=y
1096# CONFIG_ROMFS_FS is not set 1114# CONFIG_ROMFS_FS is not set
1097# CONFIG_SYSV_FS is not set 1115# CONFIG_SYSV_FS is not set
1098# CONFIG_UFS_FS is not set 1116# CONFIG_UFS_FS is not set
1117# CONFIG_NILFS2_FS is not set
1099CONFIG_NETWORK_FILESYSTEMS=y 1118CONFIG_NETWORK_FILESYSTEMS=y
1100CONFIG_NFS_FS=y 1119CONFIG_NFS_FS=y
1101CONFIG_NFS_V3=y 1120CONFIG_NFS_V3=y
@@ -1107,7 +1126,6 @@ CONFIG_LOCKD=y
1107CONFIG_LOCKD_V4=y 1126CONFIG_LOCKD_V4=y
1108CONFIG_NFS_COMMON=y 1127CONFIG_NFS_COMMON=y
1109CONFIG_SUNRPC=y 1128CONFIG_SUNRPC=y
1110# CONFIG_SUNRPC_REGISTER_V4 is not set
1111# CONFIG_RPCSEC_GSS_KRB5 is not set 1129# CONFIG_RPCSEC_GSS_KRB5 is not set
1112# CONFIG_RPCSEC_GSS_SPKM3 is not set 1130# CONFIG_RPCSEC_GSS_SPKM3 is not set
1113# CONFIG_SMB_FS is not set 1131# CONFIG_SMB_FS is not set
@@ -1162,6 +1180,7 @@ CONFIG_NLS_ISO8859_1=y
1162# CONFIG_NLS_KOI8_U is not set 1180# CONFIG_NLS_KOI8_U is not set
1163# CONFIG_NLS_UTF8 is not set 1181# CONFIG_NLS_UTF8 is not set
1164# CONFIG_DLM is not set 1182# CONFIG_DLM is not set
1183# CONFIG_BINARY_PRINTF is not set
1165 1184
1166# 1185#
1167# Library routines 1186# Library routines
@@ -1177,11 +1196,11 @@ CONFIG_CRC32=y
1177# CONFIG_LIBCRC32C is not set 1196# CONFIG_LIBCRC32C is not set
1178CONFIG_ZLIB_INFLATE=y 1197CONFIG_ZLIB_INFLATE=y
1179CONFIG_ZLIB_DEFLATE=y 1198CONFIG_ZLIB_DEFLATE=y
1180CONFIG_PLIST=y
1181CONFIG_HAS_IOMEM=y 1199CONFIG_HAS_IOMEM=y
1182CONFIG_HAS_IOPORT=y 1200CONFIG_HAS_IOPORT=y
1183CONFIG_HAS_DMA=y 1201CONFIG_HAS_DMA=y
1184CONFIG_HAVE_LMB=y 1202CONFIG_HAVE_LMB=y
1203CONFIG_NLATTR=y
1185 1204
1186# 1205#
1187# Kernel hacking 1206# Kernel hacking
@@ -1200,13 +1219,25 @@ CONFIG_FRAME_WARN=1024
1200# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1219# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1201# CONFIG_LATENCYTOP is not set 1220# CONFIG_LATENCYTOP is not set
1202CONFIG_HAVE_FUNCTION_TRACER=y 1221CONFIG_HAVE_FUNCTION_TRACER=y
1222CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
1203CONFIG_HAVE_DYNAMIC_FTRACE=y 1223CONFIG_HAVE_DYNAMIC_FTRACE=y
1204CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1224CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1225CONFIG_TRACING_SUPPORT=y
1205 1226
1206# 1227#
1207# Tracers 1228# Tracers
1208# 1229#
1209# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1230# CONFIG_FUNCTION_TRACER is not set
1231# CONFIG_PREEMPT_TRACER is not set
1232# CONFIG_SCHED_TRACER is not set
1233# CONFIG_CONTEXT_SWITCH_TRACER is not set
1234# CONFIG_EVENT_TRACER is not set
1235# CONFIG_BOOT_TRACER is not set
1236# CONFIG_TRACE_BRANCH_PROFILING is not set
1237# CONFIG_STACK_TRACER is not set
1238# CONFIG_KMEMTRACE is not set
1239# CONFIG_WORKQUEUE_TRACER is not set
1240# CONFIG_BLK_DEV_IO_TRACE is not set
1210# CONFIG_SAMPLES is not set 1241# CONFIG_SAMPLES is not set
1211CONFIG_HAVE_ARCH_KGDB=y 1242CONFIG_HAVE_ARCH_KGDB=y
1212CONFIG_PRINT_STACK_DEPTH=64 1243CONFIG_PRINT_STACK_DEPTH=64
diff --git a/arch/powerpc/configs/52xx/tqm5200_defconfig b/arch/powerpc/configs/52xx/tqm5200_defconfig
index 65237ad6f07e..8585c7c12861 100644
--- a/arch/powerpc/configs/52xx/tqm5200_defconfig
+++ b/arch/powerpc/configs/52xx/tqm5200_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.29-rc2 3# Linux kernel version: 2.6.30-rc2
4# Mon Jan 26 21:42:58 2009 4# Sat Apr 18 00:48:57 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -14,6 +14,7 @@ CONFIG_6xx=y
14# CONFIG_40x is not set 14# CONFIG_40x is not set
15# CONFIG_44x is not set 15# CONFIG_44x is not set
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_PPC_BOOK3S=y
17CONFIG_PPC_FPU=y 18CONFIG_PPC_FPU=y
18# CONFIG_ALTIVEC is not set 19# CONFIG_ALTIVEC is not set
19CONFIG_PPC_STD_MMU=y 20CONFIG_PPC_STD_MMU=y
@@ -54,6 +55,7 @@ CONFIG_GENERIC_BUG=y
54CONFIG_DEFAULT_UIMAGE=y 55CONFIG_DEFAULT_UIMAGE=y
55# CONFIG_PPC_DCR_NATIVE is not set 56# CONFIG_PPC_DCR_NATIVE is not set
56# CONFIG_PPC_DCR_MMIO is not set 57# CONFIG_PPC_DCR_MMIO is not set
58CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
57CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 59CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
58 60
59# 61#
@@ -94,19 +96,22 @@ CONFIG_SYSFS_DEPRECATED_V2=y
94# CONFIG_NAMESPACES is not set 96# CONFIG_NAMESPACES is not set
95CONFIG_BLK_DEV_INITRD=y 97CONFIG_BLK_DEV_INITRD=y
96CONFIG_INITRAMFS_SOURCE="" 98CONFIG_INITRAMFS_SOURCE=""
99CONFIG_RD_GZIP=y
100# CONFIG_RD_BZIP2 is not set
101# CONFIG_RD_LZMA is not set
97# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 102# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
98CONFIG_SYSCTL=y 103CONFIG_SYSCTL=y
104CONFIG_ANON_INODES=y
99CONFIG_EMBEDDED=y 105CONFIG_EMBEDDED=y
100# CONFIG_SYSCTL_SYSCALL is not set 106# CONFIG_SYSCTL_SYSCALL is not set
101# CONFIG_KALLSYMS is not set 107# CONFIG_KALLSYMS is not set
108# CONFIG_STRIP_ASM_SYMS is not set
102CONFIG_HOTPLUG=y 109CONFIG_HOTPLUG=y
103CONFIG_PRINTK=y 110CONFIG_PRINTK=y
104CONFIG_BUG=y 111CONFIG_BUG=y
105CONFIG_ELF_CORE=y 112CONFIG_ELF_CORE=y
106CONFIG_COMPAT_BRK=y
107CONFIG_BASE_FULL=y 113CONFIG_BASE_FULL=y
108CONFIG_FUTEX=y 114CONFIG_FUTEX=y
109CONFIG_ANON_INODES=y
110# CONFIG_EPOLL is not set 115# CONFIG_EPOLL is not set
111CONFIG_SIGNALFD=y 116CONFIG_SIGNALFD=y
112CONFIG_TIMERFD=y 117CONFIG_TIMERFD=y
@@ -115,10 +120,12 @@ CONFIG_SHMEM=y
115CONFIG_AIO=y 120CONFIG_AIO=y
116CONFIG_VM_EVENT_COUNTERS=y 121CONFIG_VM_EVENT_COUNTERS=y
117CONFIG_SLUB_DEBUG=y 122CONFIG_SLUB_DEBUG=y
123CONFIG_COMPAT_BRK=y
118# CONFIG_SLAB is not set 124# CONFIG_SLAB is not set
119CONFIG_SLUB=y 125CONFIG_SLUB=y
120# CONFIG_SLOB is not set 126# CONFIG_SLOB is not set
121# CONFIG_PROFILING is not set 127# CONFIG_PROFILING is not set
128# CONFIG_MARKERS is not set
122CONFIG_HAVE_OPROFILE=y 129CONFIG_HAVE_OPROFILE=y
123CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 130CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
124CONFIG_HAVE_IOREMAP_PROT=y 131CONFIG_HAVE_IOREMAP_PROT=y
@@ -126,6 +133,7 @@ CONFIG_HAVE_KPROBES=y
126CONFIG_HAVE_KRETPROBES=y 133CONFIG_HAVE_KRETPROBES=y
127CONFIG_HAVE_ARCH_TRACEHOOK=y 134CONFIG_HAVE_ARCH_TRACEHOOK=y
128CONFIG_HAVE_CLK=y 135CONFIG_HAVE_CLK=y
136# CONFIG_SLOW_WORK is not set
129# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 137# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
130CONFIG_SLABINFO=y 138CONFIG_SLABINFO=y
131CONFIG_RT_MUTEXES=y 139CONFIG_RT_MUTEXES=y
@@ -138,7 +146,6 @@ CONFIG_MODVERSIONS=y
138# CONFIG_MODULE_SRCVERSION_ALL is not set 146# CONFIG_MODULE_SRCVERSION_ALL is not set
139CONFIG_BLOCK=y 147CONFIG_BLOCK=y
140# CONFIG_LBD is not set 148# CONFIG_LBD is not set
141# CONFIG_BLK_DEV_IO_TRACE is not set
142# CONFIG_BLK_DEV_BSG is not set 149# CONFIG_BLK_DEV_BSG is not set
143# CONFIG_BLK_DEV_INTEGRITY is not set 150# CONFIG_BLK_DEV_INTEGRITY is not set
144 151
@@ -159,8 +166,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
159# 166#
160# Platform support 167# Platform support
161# 168#
162CONFIG_PPC_MULTIPLATFORM=y
163CONFIG_CLASSIC32=y
164# CONFIG_PPC_CHRP is not set 169# CONFIG_PPC_CHRP is not set
165# CONFIG_MPC5121_ADS is not set 170# CONFIG_MPC5121_ADS is not set
166# CONFIG_MPC5121_GENERIC is not set 171# CONFIG_MPC5121_GENERIC is not set
@@ -168,6 +173,7 @@ CONFIG_PPC_MPC52xx=y
168CONFIG_PPC_MPC5200_SIMPLE=y 173CONFIG_PPC_MPC5200_SIMPLE=y
169# CONFIG_PPC_EFIKA is not set 174# CONFIG_PPC_EFIKA is not set
170# CONFIG_PPC_LITE5200 is not set 175# CONFIG_PPC_LITE5200 is not set
176# CONFIG_PPC_MEDIA5200 is not set
171CONFIG_PPC_MPC5200_BUGFIX=y 177CONFIG_PPC_MPC5200_BUGFIX=y
172# CONFIG_PPC_MPC5200_GPIO is not set 178# CONFIG_PPC_MPC5200_GPIO is not set
173# CONFIG_PPC_PMAC is not set 179# CONFIG_PPC_PMAC is not set
@@ -178,6 +184,8 @@ CONFIG_PPC_MPC5200_BUGFIX=y
178# CONFIG_PPC_83xx is not set 184# CONFIG_PPC_83xx is not set
179# CONFIG_PPC_86xx is not set 185# CONFIG_PPC_86xx is not set
180# CONFIG_EMBEDDED6xx is not set 186# CONFIG_EMBEDDED6xx is not set
187# CONFIG_AMIGAONE is not set
188CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
181# CONFIG_IPIC is not set 189# CONFIG_IPIC is not set
182# CONFIG_MPIC is not set 190# CONFIG_MPIC is not set
183# CONFIG_MPIC_WEIRD is not set 191# CONFIG_MPIC_WEIRD is not set
@@ -238,9 +246,12 @@ CONFIG_ZONE_DMA_FLAG=1
238CONFIG_BOUNCE=y 246CONFIG_BOUNCE=y
239CONFIG_VIRT_TO_BUS=y 247CONFIG_VIRT_TO_BUS=y
240CONFIG_UNEVICTABLE_LRU=y 248CONFIG_UNEVICTABLE_LRU=y
249CONFIG_HAVE_MLOCK=y
250CONFIG_HAVE_MLOCKED_PAGE_BIT=y
241CONFIG_PPC_4K_PAGES=y 251CONFIG_PPC_4K_PAGES=y
242# CONFIG_PPC_16K_PAGES is not set 252# CONFIG_PPC_16K_PAGES is not set
243# CONFIG_PPC_64K_PAGES is not set 253# CONFIG_PPC_64K_PAGES is not set
254# CONFIG_PPC_256K_PAGES is not set
244CONFIG_FORCE_MAX_ZONEORDER=11 255CONFIG_FORCE_MAX_ZONEORDER=11
245CONFIG_PROC_DEVICETREE=y 256CONFIG_PROC_DEVICETREE=y
246# CONFIG_CMDLINE_BOOL is not set 257# CONFIG_CMDLINE_BOOL is not set
@@ -281,7 +292,6 @@ CONFIG_NET=y
281# 292#
282# Networking options 293# Networking options
283# 294#
284CONFIG_COMPAT_NET_DEV_OPS=y
285CONFIG_PACKET=y 295CONFIG_PACKET=y
286# CONFIG_PACKET_MMAP is not set 296# CONFIG_PACKET_MMAP is not set
287CONFIG_UNIX=y 297CONFIG_UNIX=y
@@ -337,6 +347,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
337# CONFIG_LAPB is not set 347# CONFIG_LAPB is not set
338# CONFIG_ECONET is not set 348# CONFIG_ECONET is not set
339# CONFIG_WAN_ROUTER is not set 349# CONFIG_WAN_ROUTER is not set
350# CONFIG_PHONET is not set
340# CONFIG_NET_SCHED is not set 351# CONFIG_NET_SCHED is not set
341# CONFIG_DCB is not set 352# CONFIG_DCB is not set
342 353
@@ -349,7 +360,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
349# CONFIG_IRDA is not set 360# CONFIG_IRDA is not set
350# CONFIG_BT is not set 361# CONFIG_BT is not set
351# CONFIG_AF_RXRPC is not set 362# CONFIG_AF_RXRPC is not set
352# CONFIG_PHONET is not set
353# CONFIG_WIRELESS is not set 363# CONFIG_WIRELESS is not set
354# CONFIG_WIMAX is not set 364# CONFIG_WIMAX is not set
355# CONFIG_RFKILL is not set 365# CONFIG_RFKILL is not set
@@ -447,7 +457,6 @@ CONFIG_MTD_PHYSMAP_OF=y
447# LPDDR flash memory drivers 457# LPDDR flash memory drivers
448# 458#
449# CONFIG_MTD_LPDDR is not set 459# CONFIG_MTD_LPDDR is not set
450# CONFIG_MTD_QINFO_PROBE is not set
451 460
452# 461#
453# UBI - Unsorted block images 462# UBI - Unsorted block images
@@ -514,8 +523,10 @@ CONFIG_SCSI_WAIT_SCAN=m
514CONFIG_SCSI_LOWLEVEL=y 523CONFIG_SCSI_LOWLEVEL=y
515# CONFIG_ISCSI_TCP is not set 524# CONFIG_ISCSI_TCP is not set
516# CONFIG_LIBFC is not set 525# CONFIG_LIBFC is not set
526# CONFIG_LIBFCOE is not set
517# CONFIG_SCSI_DEBUG is not set 527# CONFIG_SCSI_DEBUG is not set
518# CONFIG_SCSI_DH is not set 528# CONFIG_SCSI_DH is not set
529# CONFIG_SCSI_OSD_INITIATOR is not set
519CONFIG_ATA=y 530CONFIG_ATA=y
520# CONFIG_ATA_NONSTANDARD is not set 531# CONFIG_ATA_NONSTANDARD is not set
521CONFIG_SATA_PMP=y 532CONFIG_SATA_PMP=y
@@ -527,6 +538,7 @@ CONFIG_PATA_PLATFORM=y
527# CONFIG_MD is not set 538# CONFIG_MD is not set
528# CONFIG_MACINTOSH_DRIVERS is not set 539# CONFIG_MACINTOSH_DRIVERS is not set
529CONFIG_NETDEVICES=y 540CONFIG_NETDEVICES=y
541CONFIG_COMPAT_NET_DEV_OPS=y
530# CONFIG_DUMMY is not set 542# CONFIG_DUMMY is not set
531# CONFIG_BONDING is not set 543# CONFIG_BONDING is not set
532# CONFIG_MACVLAN is not set 544# CONFIG_MACVLAN is not set
@@ -555,6 +567,8 @@ CONFIG_LXT_PHY=y
555# CONFIG_MDIO_BITBANG is not set 567# CONFIG_MDIO_BITBANG is not set
556CONFIG_NET_ETHERNET=y 568CONFIG_NET_ETHERNET=y
557# CONFIG_MII is not set 569# CONFIG_MII is not set
570# CONFIG_ETHOC is not set
571# CONFIG_DNET is not set
558# CONFIG_IBM_NEW_EMAC_ZMII is not set 572# CONFIG_IBM_NEW_EMAC_ZMII is not set
559# CONFIG_IBM_NEW_EMAC_RGMII is not set 573# CONFIG_IBM_NEW_EMAC_RGMII is not set
560# CONFIG_IBM_NEW_EMAC_TAH is not set 574# CONFIG_IBM_NEW_EMAC_TAH is not set
@@ -573,7 +587,6 @@ CONFIG_FEC_MPC52xx_MDIO=y
573# 587#
574# CONFIG_WLAN_PRE80211 is not set 588# CONFIG_WLAN_PRE80211 is not set
575# CONFIG_WLAN_80211 is not set 589# CONFIG_WLAN_80211 is not set
576# CONFIG_IWLWIFI_LEDS is not set
577 590
578# 591#
579# Enable WiMAX (Networking options) to see the WiMAX drivers 592# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -675,7 +688,6 @@ CONFIG_I2C_MPC=y
675# CONFIG_SENSORS_PCF8574 is not set 688# CONFIG_SENSORS_PCF8574 is not set
676# CONFIG_PCF8575 is not set 689# CONFIG_PCF8575 is not set
677# CONFIG_SENSORS_PCA9539 is not set 690# CONFIG_SENSORS_PCA9539 is not set
678# CONFIG_SENSORS_PCF8591 is not set
679# CONFIG_SENSORS_MAX6875 is not set 691# CONFIG_SENSORS_MAX6875 is not set
680# CONFIG_SENSORS_TSL2550 is not set 692# CONFIG_SENSORS_TSL2550 is not set
681# CONFIG_I2C_DEBUG_CORE is not set 693# CONFIG_I2C_DEBUG_CORE is not set
@@ -706,6 +718,7 @@ CONFIG_HWMON=y
706# CONFIG_SENSORS_F71805F is not set 718# CONFIG_SENSORS_F71805F is not set
707# CONFIG_SENSORS_F71882FG is not set 719# CONFIG_SENSORS_F71882FG is not set
708# CONFIG_SENSORS_F75375S is not set 720# CONFIG_SENSORS_F75375S is not set
721# CONFIG_SENSORS_G760A is not set
709# CONFIG_SENSORS_GL518SM is not set 722# CONFIG_SENSORS_GL518SM is not set
710# CONFIG_SENSORS_GL520SM is not set 723# CONFIG_SENSORS_GL520SM is not set
711# CONFIG_SENSORS_IT87 is not set 724# CONFIG_SENSORS_IT87 is not set
@@ -720,11 +733,14 @@ CONFIG_HWMON=y
720# CONFIG_SENSORS_LM90 is not set 733# CONFIG_SENSORS_LM90 is not set
721# CONFIG_SENSORS_LM92 is not set 734# CONFIG_SENSORS_LM92 is not set
722# CONFIG_SENSORS_LM93 is not set 735# CONFIG_SENSORS_LM93 is not set
736# CONFIG_SENSORS_LTC4215 is not set
723# CONFIG_SENSORS_LTC4245 is not set 737# CONFIG_SENSORS_LTC4245 is not set
738# CONFIG_SENSORS_LM95241 is not set
724# CONFIG_SENSORS_MAX1619 is not set 739# CONFIG_SENSORS_MAX1619 is not set
725# CONFIG_SENSORS_MAX6650 is not set 740# CONFIG_SENSORS_MAX6650 is not set
726# CONFIG_SENSORS_PC87360 is not set 741# CONFIG_SENSORS_PC87360 is not set
727# CONFIG_SENSORS_PC87427 is not set 742# CONFIG_SENSORS_PC87427 is not set
743# CONFIG_SENSORS_PCF8591 is not set
728# CONFIG_SENSORS_DME1737 is not set 744# CONFIG_SENSORS_DME1737 is not set
729# CONFIG_SENSORS_SMSC47M1 is not set 745# CONFIG_SENSORS_SMSC47M1 is not set
730# CONFIG_SENSORS_SMSC47M192 is not set 746# CONFIG_SENSORS_SMSC47M192 is not set
@@ -857,11 +873,11 @@ CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
857# CONFIG_USB_TMC is not set 873# CONFIG_USB_TMC is not set
858 874
859# 875#
860# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; 876# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
861# 877#
862 878
863# 879#
864# see USB_STORAGE Help for more information 880# also be needed; see USB_STORAGE Help for more info
865# 881#
866CONFIG_USB_STORAGE=y 882CONFIG_USB_STORAGE=y
867# CONFIG_USB_STORAGE_DEBUG is not set 883# CONFIG_USB_STORAGE_DEBUG is not set
@@ -902,7 +918,6 @@ CONFIG_USB_STORAGE=y
902# CONFIG_USB_LED is not set 918# CONFIG_USB_LED is not set
903# CONFIG_USB_CYPRESS_CY7C63 is not set 919# CONFIG_USB_CYPRESS_CY7C63 is not set
904# CONFIG_USB_CYTHERM is not set 920# CONFIG_USB_CYTHERM is not set
905# CONFIG_USB_PHIDGET is not set
906# CONFIG_USB_IDMOUSE is not set 921# CONFIG_USB_IDMOUSE is not set
907# CONFIG_USB_FTDI_ELAN is not set 922# CONFIG_USB_FTDI_ELAN is not set
908# CONFIG_USB_APPLEDISPLAY is not set 923# CONFIG_USB_APPLEDISPLAY is not set
@@ -917,6 +932,7 @@ CONFIG_USB_STORAGE=y
917# 932#
918# OTG and related infrastructure 933# OTG and related infrastructure
919# 934#
935# CONFIG_NOP_USB_XCEIV is not set
920# CONFIG_MMC is not set 936# CONFIG_MMC is not set
921# CONFIG_MEMSTICK is not set 937# CONFIG_MEMSTICK is not set
922# CONFIG_NEW_LEDS is not set 938# CONFIG_NEW_LEDS is not set
@@ -976,8 +992,9 @@ CONFIG_RTC_DRV_DS1307=y
976# 992#
977# on-CPU RTC drivers 993# on-CPU RTC drivers
978# 994#
979# CONFIG_RTC_DRV_PPC is not set 995# CONFIG_RTC_DRV_GENERIC is not set
980# CONFIG_DMADEVICES is not set 996# CONFIG_DMADEVICES is not set
997# CONFIG_AUXDISPLAY is not set
981# CONFIG_UIO is not set 998# CONFIG_UIO is not set
982# CONFIG_STAGING is not set 999# CONFIG_STAGING is not set
983 1000
@@ -988,6 +1005,7 @@ CONFIG_EXT2_FS=y
988# CONFIG_EXT2_FS_XATTR is not set 1005# CONFIG_EXT2_FS_XATTR is not set
989# CONFIG_EXT2_FS_XIP is not set 1006# CONFIG_EXT2_FS_XIP is not set
990CONFIG_EXT3_FS=y 1007CONFIG_EXT3_FS=y
1008# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
991CONFIG_EXT3_FS_XATTR=y 1009CONFIG_EXT3_FS_XATTR=y
992# CONFIG_EXT3_FS_POSIX_ACL is not set 1010# CONFIG_EXT3_FS_POSIX_ACL is not set
993# CONFIG_EXT3_FS_SECURITY is not set 1011# CONFIG_EXT3_FS_SECURITY is not set
@@ -1010,6 +1028,11 @@ CONFIG_INOTIFY_USER=y
1010# CONFIG_FUSE_FS is not set 1028# CONFIG_FUSE_FS is not set
1011 1029
1012# 1030#
1031# Caches
1032#
1033# CONFIG_FSCACHE is not set
1034
1035#
1013# CD-ROM/DVD Filesystems 1036# CD-ROM/DVD Filesystems
1014# 1037#
1015# CONFIG_ISO9660_FS is not set 1038# CONFIG_ISO9660_FS is not set
@@ -1066,6 +1089,7 @@ CONFIG_CRAMFS=y
1066# CONFIG_ROMFS_FS is not set 1089# CONFIG_ROMFS_FS is not set
1067# CONFIG_SYSV_FS is not set 1090# CONFIG_SYSV_FS is not set
1068# CONFIG_UFS_FS is not set 1091# CONFIG_UFS_FS is not set
1092# CONFIG_NILFS2_FS is not set
1069CONFIG_NETWORK_FILESYSTEMS=y 1093CONFIG_NETWORK_FILESYSTEMS=y
1070CONFIG_NFS_FS=y 1094CONFIG_NFS_FS=y
1071CONFIG_NFS_V3=y 1095CONFIG_NFS_V3=y
@@ -1078,7 +1102,6 @@ CONFIG_LOCKD_V4=y
1078CONFIG_NFS_COMMON=y 1102CONFIG_NFS_COMMON=y
1079CONFIG_SUNRPC=y 1103CONFIG_SUNRPC=y
1080CONFIG_SUNRPC_GSS=y 1104CONFIG_SUNRPC_GSS=y
1081# CONFIG_SUNRPC_REGISTER_V4 is not set
1082CONFIG_RPCSEC_GSS_KRB5=y 1105CONFIG_RPCSEC_GSS_KRB5=y
1083# CONFIG_RPCSEC_GSS_SPKM3 is not set 1106# CONFIG_RPCSEC_GSS_SPKM3 is not set
1084# CONFIG_SMB_FS is not set 1107# CONFIG_SMB_FS is not set
@@ -1149,6 +1172,7 @@ CONFIG_NLS_ISO8859_1=y
1149# CONFIG_NLS_KOI8_U is not set 1172# CONFIG_NLS_KOI8_U is not set
1150# CONFIG_NLS_UTF8 is not set 1173# CONFIG_NLS_UTF8 is not set
1151# CONFIG_DLM is not set 1174# CONFIG_DLM is not set
1175# CONFIG_BINARY_PRINTF is not set
1152 1176
1153# 1177#
1154# Library routines 1178# Library routines
@@ -1164,11 +1188,12 @@ CONFIG_CRC32=y
1164# CONFIG_LIBCRC32C is not set 1188# CONFIG_LIBCRC32C is not set
1165CONFIG_ZLIB_INFLATE=y 1189CONFIG_ZLIB_INFLATE=y
1166CONFIG_ZLIB_DEFLATE=y 1190CONFIG_ZLIB_DEFLATE=y
1167CONFIG_PLIST=y 1191CONFIG_DECOMPRESS_GZIP=y
1168CONFIG_HAS_IOMEM=y 1192CONFIG_HAS_IOMEM=y
1169CONFIG_HAS_IOPORT=y 1193CONFIG_HAS_IOPORT=y
1170CONFIG_HAS_DMA=y 1194CONFIG_HAS_DMA=y
1171CONFIG_HAVE_LMB=y 1195CONFIG_HAVE_LMB=y
1196CONFIG_NLATTR=y
1172 1197
1173# 1198#
1174# Kernel hacking 1199# Kernel hacking
@@ -1186,6 +1211,9 @@ CONFIG_DEBUG_KERNEL=y
1186CONFIG_DETECT_SOFTLOCKUP=y 1211CONFIG_DETECT_SOFTLOCKUP=y
1187# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set 1212# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
1188CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 1213CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
1214CONFIG_DETECT_HUNG_TASK=y
1215# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
1216CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
1189CONFIG_SCHED_DEBUG=y 1217CONFIG_SCHED_DEBUG=y
1190# CONFIG_SCHEDSTATS is not set 1218# CONFIG_SCHEDSTATS is not set
1191# CONFIG_TIMER_STATS is not set 1219# CONFIG_TIMER_STATS is not set
@@ -1214,9 +1242,12 @@ CONFIG_DEBUG_INFO=y
1214# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 1242# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1215# CONFIG_FAULT_INJECTION is not set 1243# CONFIG_FAULT_INJECTION is not set
1216# CONFIG_LATENCYTOP is not set 1244# CONFIG_LATENCYTOP is not set
1245# CONFIG_DEBUG_PAGEALLOC is not set
1217CONFIG_HAVE_FUNCTION_TRACER=y 1246CONFIG_HAVE_FUNCTION_TRACER=y
1247CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
1218CONFIG_HAVE_DYNAMIC_FTRACE=y 1248CONFIG_HAVE_DYNAMIC_FTRACE=y
1219CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1249CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1250CONFIG_TRACING_SUPPORT=y
1220 1251
1221# 1252#
1222# Tracers 1253# Tracers
@@ -1224,17 +1255,19 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1224# CONFIG_FUNCTION_TRACER is not set 1255# CONFIG_FUNCTION_TRACER is not set
1225# CONFIG_SCHED_TRACER is not set 1256# CONFIG_SCHED_TRACER is not set
1226# CONFIG_CONTEXT_SWITCH_TRACER is not set 1257# CONFIG_CONTEXT_SWITCH_TRACER is not set
1258# CONFIG_EVENT_TRACER is not set
1227# CONFIG_BOOT_TRACER is not set 1259# CONFIG_BOOT_TRACER is not set
1228# CONFIG_TRACE_BRANCH_PROFILING is not set 1260# CONFIG_TRACE_BRANCH_PROFILING is not set
1229# CONFIG_STACK_TRACER is not set 1261# CONFIG_STACK_TRACER is not set
1230# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1262# CONFIG_KMEMTRACE is not set
1263# CONFIG_WORKQUEUE_TRACER is not set
1264# CONFIG_BLK_DEV_IO_TRACE is not set
1231# CONFIG_SAMPLES is not set 1265# CONFIG_SAMPLES is not set
1232CONFIG_HAVE_ARCH_KGDB=y 1266CONFIG_HAVE_ARCH_KGDB=y
1233# CONFIG_KGDB is not set 1267# CONFIG_KGDB is not set
1234CONFIG_PRINT_STACK_DEPTH=64 1268CONFIG_PRINT_STACK_DEPTH=64
1235# CONFIG_DEBUG_STACKOVERFLOW is not set 1269# CONFIG_DEBUG_STACKOVERFLOW is not set
1236# CONFIG_DEBUG_STACK_USAGE is not set 1270# CONFIG_DEBUG_STACK_USAGE is not set
1237# CONFIG_DEBUG_PAGEALLOC is not set
1238# CONFIG_CODE_PATCHING_SELFTEST is not set 1271# CONFIG_CODE_PATCHING_SELFTEST is not set
1239# CONFIG_FTR_FIXUP_SELFTEST is not set 1272# CONFIG_FTR_FIXUP_SELFTEST is not set
1240# CONFIG_MSI_BITMAP_SELFTEST is not set 1273# CONFIG_MSI_BITMAP_SELFTEST is not set
@@ -1265,10 +1298,12 @@ CONFIG_CRYPTO_BLKCIPHER2=y
1265CONFIG_CRYPTO_HASH=y 1298CONFIG_CRYPTO_HASH=y
1266CONFIG_CRYPTO_HASH2=y 1299CONFIG_CRYPTO_HASH2=y
1267CONFIG_CRYPTO_RNG2=y 1300CONFIG_CRYPTO_RNG2=y
1301CONFIG_CRYPTO_PCOMP=y
1268CONFIG_CRYPTO_MANAGER=y 1302CONFIG_CRYPTO_MANAGER=y
1269CONFIG_CRYPTO_MANAGER2=y 1303CONFIG_CRYPTO_MANAGER2=y
1270# CONFIG_CRYPTO_GF128MUL is not set 1304# CONFIG_CRYPTO_GF128MUL is not set
1271# CONFIG_CRYPTO_NULL is not set 1305# CONFIG_CRYPTO_NULL is not set
1306CONFIG_CRYPTO_WORKQUEUE=y
1272# CONFIG_CRYPTO_CRYPTD is not set 1307# CONFIG_CRYPTO_CRYPTD is not set
1273# CONFIG_CRYPTO_AUTHENC is not set 1308# CONFIG_CRYPTO_AUTHENC is not set
1274# CONFIG_CRYPTO_TEST is not set 1309# CONFIG_CRYPTO_TEST is not set
@@ -1337,6 +1372,7 @@ CONFIG_CRYPTO_DES=y
1337# Compression 1372# Compression
1338# 1373#
1339# CONFIG_CRYPTO_DEFLATE is not set 1374# CONFIG_CRYPTO_DEFLATE is not set
1375# CONFIG_CRYPTO_ZLIB is not set
1340# CONFIG_CRYPTO_LZO is not set 1376# CONFIG_CRYPTO_LZO is not set
1341 1377
1342# 1378#
diff --git a/arch/powerpc/configs/85xx/mpc8536_ds_defconfig b/arch/powerpc/configs/85xx/mpc8536_ds_defconfig
deleted file mode 100644
index e31b6a4732ed..000000000000
--- a/arch/powerpc/configs/85xx/mpc8536_ds_defconfig
+++ /dev/null
@@ -1,1802 +0,0 @@
1#
2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.29-rc2
4# Mon Jan 26 15:36:04 2009
5#
6# CONFIG_PPC64 is not set
7
8#
9# Processor support
10#
11# CONFIG_6xx is not set
12CONFIG_PPC_85xx=y
13# CONFIG_PPC_8xx is not set
14# CONFIG_40x is not set
15# CONFIG_44x is not set
16# CONFIG_E200 is not set
17CONFIG_E500=y
18# CONFIG_PPC_E500MC is not set
19CONFIG_BOOKE=y
20CONFIG_FSL_BOOKE=y
21CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y
25# CONFIG_PPC_MM_SLICES is not set
26# CONFIG_SMP is not set
27CONFIG_PPC32=y
28CONFIG_WORD_SIZE=32
29# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
30CONFIG_MMU=y
31CONFIG_GENERIC_CMOS_UPDATE=y
32CONFIG_GENERIC_TIME=y
33CONFIG_GENERIC_TIME_VSYSCALL=y
34CONFIG_GENERIC_CLOCKEVENTS=y
35CONFIG_GENERIC_HARDIRQS=y
36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
37CONFIG_IRQ_PER_CPU=y
38CONFIG_STACKTRACE_SUPPORT=y
39CONFIG_HAVE_LATENCYTOP_SUPPORT=y
40CONFIG_LOCKDEP_SUPPORT=y
41CONFIG_RWSEM_XCHGADD_ALGORITHM=y
42CONFIG_ARCH_HAS_ILOG2_U32=y
43CONFIG_GENERIC_HWEIGHT=y
44CONFIG_GENERIC_CALIBRATE_DELAY=y
45CONFIG_GENERIC_FIND_NEXT_BIT=y
46# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
47CONFIG_PPC=y
48CONFIG_EARLY_PRINTK=y
49CONFIG_GENERIC_NVRAM=y
50CONFIG_SCHED_OMIT_FRAME_POINTER=y
51CONFIG_ARCH_MAY_HAVE_PC_FDC=y
52CONFIG_PPC_OF=y
53CONFIG_OF=y
54CONFIG_PPC_UDBG_16550=y
55# CONFIG_GENERIC_TBSYNC is not set
56CONFIG_AUDIT_ARCH=y
57CONFIG_GENERIC_BUG=y
58CONFIG_DEFAULT_UIMAGE=y
59# CONFIG_PPC_DCR_NATIVE is not set
60# CONFIG_PPC_DCR_MMIO is not set
61CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
62
63#
64# General setup
65#
66CONFIG_EXPERIMENTAL=y
67CONFIG_BROKEN_ON_SMP=y
68CONFIG_INIT_ENV_ARG_LIMIT=32
69CONFIG_LOCALVERSION=""
70CONFIG_LOCALVERSION_AUTO=y
71CONFIG_SWAP=y
72CONFIG_SYSVIPC=y
73CONFIG_SYSVIPC_SYSCTL=y
74CONFIG_POSIX_MQUEUE=y
75CONFIG_BSD_PROCESS_ACCT=y
76# CONFIG_BSD_PROCESS_ACCT_V3 is not set
77# CONFIG_TASKSTATS is not set
78CONFIG_AUDIT=y
79# CONFIG_AUDITSYSCALL is not set
80CONFIG_IKCONFIG=y
81CONFIG_IKCONFIG_PROC=y
82CONFIG_LOG_BUF_SHIFT=14
83CONFIG_GROUP_SCHED=y
84# CONFIG_FAIR_GROUP_SCHED is not set
85# CONFIG_RT_GROUP_SCHED is not set
86CONFIG_USER_SCHED=y
87# CONFIG_CGROUP_SCHED is not set
88# CONFIG_CGROUPS is not set
89CONFIG_SYSFS_DEPRECATED=y
90CONFIG_SYSFS_DEPRECATED_V2=y
91# CONFIG_RELAY is not set
92# CONFIG_NAMESPACES is not set
93CONFIG_BLK_DEV_INITRD=y
94CONFIG_INITRAMFS_SOURCE=""
95# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
96CONFIG_SYSCTL=y
97CONFIG_EMBEDDED=y
98CONFIG_SYSCTL_SYSCALL=y
99CONFIG_KALLSYMS=y
100CONFIG_KALLSYMS_ALL=y
101CONFIG_KALLSYMS_STRIP_GENERATED=y
102CONFIG_KALLSYMS_EXTRA_PASS=y
103CONFIG_HOTPLUG=y
104CONFIG_PRINTK=y
105CONFIG_BUG=y
106CONFIG_ELF_CORE=y
107CONFIG_COMPAT_BRK=y
108CONFIG_BASE_FULL=y
109CONFIG_FUTEX=y
110CONFIG_ANON_INODES=y
111CONFIG_EPOLL=y
112CONFIG_SIGNALFD=y
113CONFIG_TIMERFD=y
114CONFIG_EVENTFD=y
115CONFIG_SHMEM=y
116CONFIG_AIO=y
117CONFIG_VM_EVENT_COUNTERS=y
118CONFIG_PCI_QUIRKS=y
119CONFIG_SLUB_DEBUG=y
120# CONFIG_SLAB is not set
121CONFIG_SLUB=y
122# CONFIG_SLOB is not set
123# CONFIG_PROFILING is not set
124CONFIG_HAVE_OPROFILE=y
125# CONFIG_KPROBES is not set
126CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
127CONFIG_HAVE_IOREMAP_PROT=y
128CONFIG_HAVE_KPROBES=y
129CONFIG_HAVE_KRETPROBES=y
130CONFIG_HAVE_ARCH_TRACEHOOK=y
131# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
132CONFIG_SLABINFO=y
133CONFIG_RT_MUTEXES=y
134CONFIG_BASE_SMALL=0
135CONFIG_MODULES=y
136# CONFIG_MODULE_FORCE_LOAD is not set
137CONFIG_MODULE_UNLOAD=y
138CONFIG_MODULE_FORCE_UNLOAD=y
139CONFIG_MODVERSIONS=y
140# CONFIG_MODULE_SRCVERSION_ALL is not set
141CONFIG_BLOCK=y
142CONFIG_LBD=y
143# CONFIG_BLK_DEV_IO_TRACE is not set
144# CONFIG_BLK_DEV_BSG is not set
145# CONFIG_BLK_DEV_INTEGRITY is not set
146
147#
148# IO Schedulers
149#
150CONFIG_IOSCHED_NOOP=y
151CONFIG_IOSCHED_AS=y
152CONFIG_IOSCHED_DEADLINE=y
153CONFIG_IOSCHED_CFQ=y
154# CONFIG_DEFAULT_AS is not set
155# CONFIG_DEFAULT_DEADLINE is not set
156CONFIG_DEFAULT_CFQ=y
157# CONFIG_DEFAULT_NOOP is not set
158CONFIG_DEFAULT_IOSCHED="cfq"
159CONFIG_CLASSIC_RCU=y
160# CONFIG_TREE_RCU is not set
161# CONFIG_PREEMPT_RCU is not set
162# CONFIG_TREE_RCU_TRACE is not set
163# CONFIG_PREEMPT_RCU_TRACE is not set
164# CONFIG_FREEZER is not set
165
166#
167# Platform support
168#
169# CONFIG_PPC_CELL is not set
170# CONFIG_PPC_CELL_NATIVE is not set
171# CONFIG_PQ2ADS is not set
172CONFIG_MPC85xx=y
173# CONFIG_MPC8540_ADS is not set
174# CONFIG_MPC8560_ADS is not set
175# CONFIG_MPC85xx_CDS is not set
176# CONFIG_MPC85xx_MDS is not set
177CONFIG_MPC8536_DS=y
178# CONFIG_MPC85xx_DS is not set
179# CONFIG_KSI8560 is not set
180# CONFIG_STX_GP3 is not set
181# CONFIG_TQM8540 is not set
182# CONFIG_TQM8541 is not set
183# CONFIG_TQM8548 is not set
184# CONFIG_TQM8555 is not set
185# CONFIG_TQM8560 is not set
186# CONFIG_SBC8548 is not set
187# CONFIG_SBC8560 is not set
188# CONFIG_IPIC is not set
189CONFIG_MPIC=y
190# CONFIG_MPIC_WEIRD is not set
191# CONFIG_PPC_I8259 is not set
192# CONFIG_PPC_RTAS is not set
193# CONFIG_MMIO_NVRAM is not set
194# CONFIG_PPC_MPC106 is not set
195# CONFIG_PPC_970_NAP is not set
196# CONFIG_PPC_INDIRECT_IO is not set
197# CONFIG_GENERIC_IOMAP is not set
198# CONFIG_CPU_FREQ is not set
199# CONFIG_QUICC_ENGINE is not set
200# CONFIG_CPM2 is not set
201# CONFIG_FSL_ULI1575 is not set
202# CONFIG_MPC8xxx_GPIO is not set
203# CONFIG_SIMPLE_GPIO is not set
204
205#
206# Kernel options
207#
208CONFIG_HIGHMEM=y
209CONFIG_TICK_ONESHOT=y
210CONFIG_NO_HZ=y
211CONFIG_HIGH_RES_TIMERS=y
212CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
213# CONFIG_HZ_100 is not set
214CONFIG_HZ_250=y
215# CONFIG_HZ_300 is not set
216# CONFIG_HZ_1000 is not set
217CONFIG_HZ=250
218CONFIG_SCHED_HRTICK=y
219CONFIG_PREEMPT_NONE=y
220# CONFIG_PREEMPT_VOLUNTARY is not set
221# CONFIG_PREEMPT is not set
222CONFIG_BINFMT_ELF=y
223# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
224# CONFIG_HAVE_AOUT is not set
225CONFIG_BINFMT_MISC=m
226CONFIG_MATH_EMULATION=y
227# CONFIG_IOMMU_HELPER is not set
228CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
229CONFIG_ARCH_HAS_WALK_MEMORY=y
230CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
231CONFIG_ARCH_FLATMEM_ENABLE=y
232CONFIG_ARCH_POPULATES_NODE_MAP=y
233CONFIG_SELECT_MEMORY_MODEL=y
234CONFIG_FLATMEM_MANUAL=y
235# CONFIG_DISCONTIGMEM_MANUAL is not set
236# CONFIG_SPARSEMEM_MANUAL is not set
237CONFIG_FLATMEM=y
238CONFIG_FLAT_NODE_MEM_MAP=y
239CONFIG_PAGEFLAGS_EXTENDED=y
240CONFIG_SPLIT_PTLOCK_CPUS=4
241CONFIG_MIGRATION=y
242# CONFIG_PHYS_ADDR_T_64BIT is not set
243CONFIG_ZONE_DMA_FLAG=1
244CONFIG_BOUNCE=y
245CONFIG_VIRT_TO_BUS=y
246CONFIG_UNEVICTABLE_LRU=y
247CONFIG_PPC_4K_PAGES=y
248# CONFIG_PPC_16K_PAGES is not set
249# CONFIG_PPC_64K_PAGES is not set
250CONFIG_FORCE_MAX_ZONEORDER=11
251CONFIG_PROC_DEVICETREE=y
252# CONFIG_CMDLINE_BOOL is not set
253CONFIG_EXTRA_TARGETS=""
254# CONFIG_PM is not set
255CONFIG_SECCOMP=y
256CONFIG_ISA_DMA_API=y
257
258#
259# Bus options
260#
261CONFIG_ZONE_DMA=y
262CONFIG_PPC_INDIRECT_PCI=y
263CONFIG_FSL_SOC=y
264CONFIG_FSL_PCI=y
265CONFIG_PPC_PCI_CHOICE=y
266CONFIG_PCI=y
267CONFIG_PCI_DOMAINS=y
268CONFIG_PCI_SYSCALL=y
269# CONFIG_PCIEPORTBUS is not set
270CONFIG_ARCH_SUPPORTS_MSI=y
271# CONFIG_PCI_MSI is not set
272# CONFIG_PCI_LEGACY is not set
273# CONFIG_PCI_DEBUG is not set
274# CONFIG_PCI_STUB is not set
275# CONFIG_PCCARD is not set
276# CONFIG_HOTPLUG_PCI is not set
277# CONFIG_HAS_RAPIDIO is not set
278
279#
280# Advanced setup
281#
282# CONFIG_ADVANCED_OPTIONS is not set
283
284#
285# Default settings for advanced configuration options are used
286#
287CONFIG_LOWMEM_SIZE=0x30000000
288CONFIG_PAGE_OFFSET=0xc0000000
289CONFIG_KERNEL_START=0xc0000000
290CONFIG_PHYSICAL_START=0x00000000
291CONFIG_PHYSICAL_ALIGN=0x10000000
292CONFIG_TASK_SIZE=0xc0000000
293CONFIG_NET=y
294
295#
296# Networking options
297#
298CONFIG_COMPAT_NET_DEV_OPS=y
299CONFIG_PACKET=y
300# CONFIG_PACKET_MMAP is not set
301CONFIG_UNIX=y
302CONFIG_XFRM=y
303CONFIG_XFRM_USER=y
304# CONFIG_XFRM_SUB_POLICY is not set
305# CONFIG_XFRM_MIGRATE is not set
306# CONFIG_XFRM_STATISTICS is not set
307CONFIG_NET_KEY=m
308# CONFIG_NET_KEY_MIGRATE is not set
309CONFIG_INET=y
310CONFIG_IP_MULTICAST=y
311CONFIG_IP_ADVANCED_ROUTER=y
312CONFIG_ASK_IP_FIB_HASH=y
313# CONFIG_IP_FIB_TRIE is not set
314CONFIG_IP_FIB_HASH=y
315CONFIG_IP_MULTIPLE_TABLES=y
316CONFIG_IP_ROUTE_MULTIPATH=y
317CONFIG_IP_ROUTE_VERBOSE=y
318CONFIG_IP_PNP=y
319CONFIG_IP_PNP_DHCP=y
320CONFIG_IP_PNP_BOOTP=y
321CONFIG_IP_PNP_RARP=y
322CONFIG_NET_IPIP=y
323CONFIG_NET_IPGRE=y
324CONFIG_NET_IPGRE_BROADCAST=y
325CONFIG_IP_MROUTE=y
326CONFIG_IP_PIMSM_V1=y
327CONFIG_IP_PIMSM_V2=y
328CONFIG_ARPD=y
329# CONFIG_SYN_COOKIES is not set
330# CONFIG_INET_AH is not set
331# CONFIG_INET_ESP is not set
332# CONFIG_INET_IPCOMP is not set
333# CONFIG_INET_XFRM_TUNNEL is not set
334CONFIG_INET_TUNNEL=y
335# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
336# CONFIG_INET_XFRM_MODE_TUNNEL is not set
337# CONFIG_INET_XFRM_MODE_BEET is not set
338# CONFIG_INET_LRO is not set
339CONFIG_INET_DIAG=y
340CONFIG_INET_TCP_DIAG=y
341# CONFIG_TCP_CONG_ADVANCED is not set
342CONFIG_TCP_CONG_CUBIC=y
343CONFIG_DEFAULT_TCP_CONG="cubic"
344# CONFIG_TCP_MD5SIG is not set
345CONFIG_IPV6=y
346# CONFIG_IPV6_PRIVACY is not set
347# CONFIG_IPV6_ROUTER_PREF is not set
348# CONFIG_IPV6_OPTIMISTIC_DAD is not set
349# CONFIG_INET6_AH is not set
350# CONFIG_INET6_ESP is not set
351# CONFIG_INET6_IPCOMP is not set
352# CONFIG_IPV6_MIP6 is not set
353# CONFIG_INET6_XFRM_TUNNEL is not set
354# CONFIG_INET6_TUNNEL is not set
355CONFIG_INET6_XFRM_MODE_TRANSPORT=y
356CONFIG_INET6_XFRM_MODE_TUNNEL=y
357CONFIG_INET6_XFRM_MODE_BEET=y
358# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
359CONFIG_IPV6_SIT=y
360CONFIG_IPV6_NDISC_NODETYPE=y
361# CONFIG_IPV6_TUNNEL is not set
362# CONFIG_IPV6_MULTIPLE_TABLES is not set
363# CONFIG_IPV6_MROUTE is not set
364# CONFIG_NETWORK_SECMARK is not set
365# CONFIG_NETFILTER is not set
366# CONFIG_IP_DCCP is not set
367CONFIG_IP_SCTP=m
368# CONFIG_SCTP_DBG_MSG is not set
369# CONFIG_SCTP_DBG_OBJCNT is not set
370# CONFIG_SCTP_HMAC_NONE is not set
371# CONFIG_SCTP_HMAC_SHA1 is not set
372CONFIG_SCTP_HMAC_MD5=y
373# CONFIG_TIPC is not set
374# CONFIG_ATM is not set
375# CONFIG_BRIDGE is not set
376# CONFIG_NET_DSA is not set
377# CONFIG_VLAN_8021Q is not set
378# CONFIG_DECNET is not set
379# CONFIG_LLC2 is not set
380# CONFIG_IPX is not set
381# CONFIG_ATALK is not set
382# CONFIG_X25 is not set
383# CONFIG_LAPB is not set
384# CONFIG_ECONET is not set
385# CONFIG_WAN_ROUTER is not set
386# CONFIG_NET_SCHED is not set
387# CONFIG_DCB is not set
388
389#
390# Network testing
391#
392# CONFIG_NET_PKTGEN is not set
393# CONFIG_HAMRADIO is not set
394# CONFIG_CAN is not set
395# CONFIG_IRDA is not set
396# CONFIG_BT is not set
397# CONFIG_AF_RXRPC is not set
398# CONFIG_PHONET is not set
399CONFIG_FIB_RULES=y
400CONFIG_WIRELESS=y
401# CONFIG_CFG80211 is not set
402CONFIG_WIRELESS_OLD_REGULATORY=y
403# CONFIG_WIRELESS_EXT is not set
404# CONFIG_LIB80211 is not set
405# CONFIG_MAC80211 is not set
406# CONFIG_WIMAX is not set
407# CONFIG_RFKILL is not set
408# CONFIG_NET_9P is not set
409
410#
411# Device Drivers
412#
413
414#
415# Generic Driver Options
416#
417CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
418CONFIG_STANDALONE=y
419CONFIG_PREVENT_FIRMWARE_BUILD=y
420CONFIG_FW_LOADER=y
421CONFIG_FIRMWARE_IN_KERNEL=y
422CONFIG_EXTRA_FIRMWARE=""
423# CONFIG_DEBUG_DRIVER is not set
424# CONFIG_DEBUG_DEVRES is not set
425# CONFIG_SYS_HYPERVISOR is not set
426# CONFIG_CONNECTOR is not set
427# CONFIG_MTD is not set
428CONFIG_OF_DEVICE=y
429CONFIG_OF_I2C=y
430# CONFIG_PARPORT is not set
431CONFIG_BLK_DEV=y
432# CONFIG_BLK_DEV_FD is not set
433# CONFIG_BLK_CPQ_DA is not set
434# CONFIG_BLK_CPQ_CISS_DA is not set
435# CONFIG_BLK_DEV_DAC960 is not set
436# CONFIG_BLK_DEV_UMEM is not set
437# CONFIG_BLK_DEV_COW_COMMON is not set
438CONFIG_BLK_DEV_LOOP=y
439# CONFIG_BLK_DEV_CRYPTOLOOP is not set
440CONFIG_BLK_DEV_NBD=y
441# CONFIG_BLK_DEV_SX8 is not set
442# CONFIG_BLK_DEV_UB is not set
443CONFIG_BLK_DEV_RAM=y
444CONFIG_BLK_DEV_RAM_COUNT=16
445CONFIG_BLK_DEV_RAM_SIZE=524288
446# CONFIG_BLK_DEV_XIP is not set
447# CONFIG_CDROM_PKTCDVD is not set
448# CONFIG_ATA_OVER_ETH is not set
449# CONFIG_BLK_DEV_HD is not set
450CONFIG_MISC_DEVICES=y
451# CONFIG_PHANTOM is not set
452# CONFIG_EEPROM_93CX6 is not set
453# CONFIG_SGI_IOC4 is not set
454# CONFIG_TIFM_CORE is not set
455# CONFIG_ICS932S401 is not set
456# CONFIG_ENCLOSURE_SERVICES is not set
457# CONFIG_HP_ILO is not set
458# CONFIG_C2PORT is not set
459CONFIG_HAVE_IDE=y
460# CONFIG_IDE is not set
461
462#
463# SCSI device support
464#
465# CONFIG_RAID_ATTRS is not set
466CONFIG_SCSI=y
467CONFIG_SCSI_DMA=y
468# CONFIG_SCSI_TGT is not set
469# CONFIG_SCSI_NETLINK is not set
470CONFIG_SCSI_PROC_FS=y
471
472#
473# SCSI support type (disk, tape, CD-ROM)
474#
475CONFIG_BLK_DEV_SD=y
476CONFIG_CHR_DEV_ST=y
477# CONFIG_CHR_DEV_OSST is not set
478CONFIG_BLK_DEV_SR=y
479# CONFIG_BLK_DEV_SR_VENDOR is not set
480CONFIG_CHR_DEV_SG=y
481# CONFIG_CHR_DEV_SCH is not set
482
483#
484# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
485#
486CONFIG_SCSI_MULTI_LUN=y
487# CONFIG_SCSI_CONSTANTS is not set
488CONFIG_SCSI_LOGGING=y
489# CONFIG_SCSI_SCAN_ASYNC is not set
490CONFIG_SCSI_WAIT_SCAN=m
491
492#
493# SCSI Transports
494#
495# CONFIG_SCSI_SPI_ATTRS is not set
496# CONFIG_SCSI_FC_ATTRS is not set
497# CONFIG_SCSI_ISCSI_ATTRS is not set
498# CONFIG_SCSI_SAS_LIBSAS is not set
499# CONFIG_SCSI_SRP_ATTRS is not set
500CONFIG_SCSI_LOWLEVEL=y
501# CONFIG_ISCSI_TCP is not set
502# CONFIG_SCSI_CXGB3_ISCSI is not set
503# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
504# CONFIG_SCSI_3W_9XXX is not set
505# CONFIG_SCSI_ACARD is not set
506# CONFIG_SCSI_AACRAID is not set
507# CONFIG_SCSI_AIC7XXX is not set
508# CONFIG_SCSI_AIC7XXX_OLD is not set
509# CONFIG_SCSI_AIC79XX is not set
510# CONFIG_SCSI_AIC94XX is not set
511# CONFIG_SCSI_DPT_I2O is not set
512# CONFIG_SCSI_ADVANSYS is not set
513# CONFIG_SCSI_ARCMSR is not set
514# CONFIG_MEGARAID_NEWGEN is not set
515# CONFIG_MEGARAID_LEGACY is not set
516# CONFIG_MEGARAID_SAS is not set
517# CONFIG_SCSI_HPTIOP is not set
518# CONFIG_SCSI_BUSLOGIC is not set
519# CONFIG_LIBFC is not set
520# CONFIG_FCOE is not set
521# CONFIG_SCSI_DMX3191D is not set
522# CONFIG_SCSI_EATA is not set
523# CONFIG_SCSI_FUTURE_DOMAIN is not set
524# CONFIG_SCSI_GDTH is not set
525# CONFIG_SCSI_IPS is not set
526# CONFIG_SCSI_INITIO is not set
527# CONFIG_SCSI_INIA100 is not set
528# CONFIG_SCSI_MVSAS is not set
529# CONFIG_SCSI_STEX is not set
530# CONFIG_SCSI_SYM53C8XX_2 is not set
531# CONFIG_SCSI_IPR is not set
532# CONFIG_SCSI_QLOGIC_1280 is not set
533# CONFIG_SCSI_QLA_FC is not set
534# CONFIG_SCSI_QLA_ISCSI is not set
535# CONFIG_SCSI_LPFC is not set
536# CONFIG_SCSI_DC395x is not set
537# CONFIG_SCSI_DC390T is not set
538# CONFIG_SCSI_NSP32 is not set
539# CONFIG_SCSI_DEBUG is not set
540# CONFIG_SCSI_SRP is not set
541# CONFIG_SCSI_DH is not set
542CONFIG_ATA=y
543# CONFIG_ATA_NONSTANDARD is not set
544CONFIG_SATA_PMP=y
545# CONFIG_SATA_AHCI is not set
546CONFIG_SATA_SIL24=y
547CONFIG_SATA_FSL=y
548CONFIG_ATA_SFF=y
549# CONFIG_SATA_SVW is not set
550# CONFIG_ATA_PIIX is not set
551# CONFIG_SATA_MV is not set
552# CONFIG_SATA_NV is not set
553# CONFIG_PDC_ADMA is not set
554# CONFIG_SATA_QSTOR is not set
555# CONFIG_SATA_PROMISE is not set
556# CONFIG_SATA_SX4 is not set
557CONFIG_SATA_SIL=y
558# CONFIG_SATA_SIS is not set
559# CONFIG_SATA_ULI is not set
560# CONFIG_SATA_VIA is not set
561# CONFIG_SATA_VITESSE is not set
562# CONFIG_SATA_INIC162X is not set
563# CONFIG_PATA_ALI is not set
564# CONFIG_PATA_AMD is not set
565# CONFIG_PATA_ARTOP is not set
566# CONFIG_PATA_ATIIXP is not set
567# CONFIG_PATA_CMD640_PCI is not set
568# CONFIG_PATA_CMD64X is not set
569# CONFIG_PATA_CS5520 is not set
570# CONFIG_PATA_CS5530 is not set
571# CONFIG_PATA_CYPRESS is not set
572# CONFIG_PATA_EFAR is not set
573# CONFIG_ATA_GENERIC is not set
574# CONFIG_PATA_HPT366 is not set
575# CONFIG_PATA_HPT37X is not set
576# CONFIG_PATA_HPT3X2N is not set
577# CONFIG_PATA_HPT3X3 is not set
578# CONFIG_PATA_IT821X is not set
579# CONFIG_PATA_IT8213 is not set
580# CONFIG_PATA_JMICRON is not set
581# CONFIG_PATA_TRIFLEX is not set
582# CONFIG_PATA_MARVELL is not set
583# CONFIG_PATA_MPIIX is not set
584# CONFIG_PATA_OLDPIIX is not set
585# CONFIG_PATA_NETCELL is not set
586# CONFIG_PATA_NINJA32 is not set
587# CONFIG_PATA_NS87410 is not set
588# CONFIG_PATA_NS87415 is not set
589# CONFIG_PATA_OPTI is not set
590# CONFIG_PATA_OPTIDMA is not set
591# CONFIG_PATA_PDC_OLD is not set
592# CONFIG_PATA_RADISYS is not set
593# CONFIG_PATA_RZ1000 is not set
594# CONFIG_PATA_SC1200 is not set
595# CONFIG_PATA_SERVERWORKS is not set
596# CONFIG_PATA_PDC2027X is not set
597# CONFIG_PATA_SIL680 is not set
598# CONFIG_PATA_SIS is not set
599# CONFIG_PATA_VIA is not set
600# CONFIG_PATA_WINBOND is not set
601# CONFIG_PATA_PLATFORM is not set
602# CONFIG_PATA_SCH is not set
603# CONFIG_MD is not set
604# CONFIG_FUSION is not set
605
606#
607# IEEE 1394 (FireWire) support
608#
609
610#
611# Enable only one of the two stacks, unless you know what you are doing
612#
613# CONFIG_FIREWIRE is not set
614# CONFIG_IEEE1394 is not set
615# CONFIG_I2O is not set
616# CONFIG_MACINTOSH_DRIVERS is not set
617CONFIG_NETDEVICES=y
618CONFIG_DUMMY=y
619# CONFIG_BONDING is not set
620# CONFIG_MACVLAN is not set
621# CONFIG_EQUALIZER is not set
622# CONFIG_TUN is not set
623# CONFIG_VETH is not set
624# CONFIG_ARCNET is not set
625CONFIG_PHYLIB=y
626
627#
628# MII PHY device drivers
629#
630# CONFIG_MARVELL_PHY is not set
631# CONFIG_DAVICOM_PHY is not set
632# CONFIG_QSEMI_PHY is not set
633# CONFIG_LXT_PHY is not set
634# CONFIG_CICADA_PHY is not set
635CONFIG_VITESSE_PHY=y
636# CONFIG_SMSC_PHY is not set
637# CONFIG_BROADCOM_PHY is not set
638# CONFIG_ICPLUS_PHY is not set
639# CONFIG_REALTEK_PHY is not set
640# CONFIG_NATIONAL_PHY is not set
641# CONFIG_STE10XP is not set
642# CONFIG_LSI_ET1011C_PHY is not set
643# CONFIG_FIXED_PHY is not set
644# CONFIG_MDIO_BITBANG is not set
645CONFIG_NET_ETHERNET=y
646CONFIG_MII=y
647# CONFIG_HAPPYMEAL is not set
648# CONFIG_SUNGEM is not set
649# CONFIG_CASSINI is not set
650# CONFIG_NET_VENDOR_3COM is not set
651# CONFIG_NET_TULIP is not set
652# CONFIG_HP100 is not set
653# CONFIG_IBM_NEW_EMAC_ZMII is not set
654# CONFIG_IBM_NEW_EMAC_RGMII is not set
655# CONFIG_IBM_NEW_EMAC_TAH is not set
656# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
657# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
658# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
659# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
660# CONFIG_NET_PCI is not set
661# CONFIG_B44 is not set
662# CONFIG_ATL2 is not set
663CONFIG_NETDEV_1000=y
664# CONFIG_ACENIC is not set
665# CONFIG_DL2K is not set
666# CONFIG_E1000 is not set
667# CONFIG_E1000E is not set
668# CONFIG_IP1000 is not set
669# CONFIG_IGB is not set
670# CONFIG_NS83820 is not set
671# CONFIG_HAMACHI is not set
672# CONFIG_YELLOWFIN is not set
673# CONFIG_R8169 is not set
674# CONFIG_SIS190 is not set
675CONFIG_SKGE=y
676# CONFIG_SKGE_DEBUG is not set
677CONFIG_SKY2=y
678# CONFIG_SKY2_DEBUG is not set
679# CONFIG_VIA_VELOCITY is not set
680# CONFIG_TIGON3 is not set
681# CONFIG_BNX2 is not set
682CONFIG_GIANFAR=y
683# CONFIG_QLA3XXX is not set
684# CONFIG_ATL1 is not set
685# CONFIG_ATL1E is not set
686# CONFIG_JME is not set
687CONFIG_NETDEV_10000=y
688# CONFIG_CHELSIO_T1 is not set
689CONFIG_CHELSIO_T3_DEPENDS=y
690# CONFIG_CHELSIO_T3 is not set
691# CONFIG_ENIC is not set
692# CONFIG_IXGBE is not set
693# CONFIG_IXGB is not set
694# CONFIG_S2IO is not set
695# CONFIG_MYRI10GE is not set
696# CONFIG_NETXEN_NIC is not set
697# CONFIG_NIU is not set
698# CONFIG_MLX4_EN is not set
699# CONFIG_MLX4_CORE is not set
700# CONFIG_TEHUTI is not set
701# CONFIG_BNX2X is not set
702# CONFIG_QLGE is not set
703# CONFIG_SFC is not set
704# CONFIG_TR is not set
705
706#
707# Wireless LAN
708#
709# CONFIG_WLAN_PRE80211 is not set
710# CONFIG_WLAN_80211 is not set
711# CONFIG_IWLWIFI_LEDS is not set
712
713#
714# Enable WiMAX (Networking options) to see the WiMAX drivers
715#
716
717#
718# USB Network Adapters
719#
720# CONFIG_USB_CATC is not set
721# CONFIG_USB_KAWETH is not set
722# CONFIG_USB_PEGASUS is not set
723# CONFIG_USB_RTL8150 is not set
724# CONFIG_USB_USBNET is not set
725# CONFIG_WAN is not set
726# CONFIG_FDDI is not set
727# CONFIG_HIPPI is not set
728# CONFIG_PPP is not set
729# CONFIG_SLIP is not set
730# CONFIG_NET_FC is not set
731# CONFIG_NETCONSOLE is not set
732# CONFIG_NETPOLL is not set
733# CONFIG_NET_POLL_CONTROLLER is not set
734# CONFIG_ISDN is not set
735# CONFIG_PHONE is not set
736
737#
738# Input device support
739#
740CONFIG_INPUT=y
741CONFIG_INPUT_FF_MEMLESS=m
742# CONFIG_INPUT_POLLDEV is not set
743
744#
745# Userland interfaces
746#
747# CONFIG_INPUT_MOUSEDEV is not set
748# CONFIG_INPUT_JOYDEV is not set
749# CONFIG_INPUT_EVDEV is not set
750# CONFIG_INPUT_EVBUG is not set
751
752#
753# Input Device Drivers
754#
755# CONFIG_INPUT_KEYBOARD is not set
756# CONFIG_INPUT_MOUSE is not set
757# CONFIG_INPUT_JOYSTICK is not set
758# CONFIG_INPUT_TABLET is not set
759# CONFIG_INPUT_TOUCHSCREEN is not set
760# CONFIG_INPUT_MISC is not set
761
762#
763# Hardware I/O ports
764#
765CONFIG_SERIO=y
766CONFIG_SERIO_I8042=y
767CONFIG_SERIO_SERPORT=y
768# CONFIG_SERIO_PCIPS2 is not set
769CONFIG_SERIO_LIBPS2=y
770# CONFIG_SERIO_RAW is not set
771# CONFIG_SERIO_XILINX_XPS_PS2 is not set
772# CONFIG_GAMEPORT is not set
773
774#
775# Character devices
776#
777CONFIG_VT=y
778CONFIG_CONSOLE_TRANSLATIONS=y
779CONFIG_VT_CONSOLE=y
780CONFIG_HW_CONSOLE=y
781# CONFIG_VT_HW_CONSOLE_BINDING is not set
782CONFIG_DEVKMEM=y
783# CONFIG_SERIAL_NONSTANDARD is not set
784# CONFIG_NOZOMI is not set
785
786#
787# Serial drivers
788#
789CONFIG_SERIAL_8250=y
790CONFIG_SERIAL_8250_CONSOLE=y
791CONFIG_SERIAL_8250_PCI=y
792CONFIG_SERIAL_8250_NR_UARTS=2
793CONFIG_SERIAL_8250_RUNTIME_UARTS=2
794CONFIG_SERIAL_8250_EXTENDED=y
795CONFIG_SERIAL_8250_MANY_PORTS=y
796CONFIG_SERIAL_8250_SHARE_IRQ=y
797CONFIG_SERIAL_8250_DETECT_IRQ=y
798CONFIG_SERIAL_8250_RSA=y
799
800#
801# Non-8250 serial port support
802#
803# CONFIG_SERIAL_UARTLITE is not set
804CONFIG_SERIAL_CORE=y
805CONFIG_SERIAL_CORE_CONSOLE=y
806# CONFIG_SERIAL_JSM is not set
807# CONFIG_SERIAL_OF_PLATFORM is not set
808CONFIG_UNIX98_PTYS=y
809# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
810CONFIG_LEGACY_PTYS=y
811CONFIG_LEGACY_PTY_COUNT=256
812# CONFIG_HVC_UDBG is not set
813# CONFIG_IPMI_HANDLER is not set
814CONFIG_HW_RANDOM=y
815# CONFIG_NVRAM is not set
816# CONFIG_R3964 is not set
817# CONFIG_APPLICOM is not set
818# CONFIG_RAW_DRIVER is not set
819# CONFIG_TCG_TPM is not set
820CONFIG_DEVPORT=y
821CONFIG_I2C=y
822CONFIG_I2C_BOARDINFO=y
823# CONFIG_I2C_CHARDEV is not set
824CONFIG_I2C_HELPER_AUTO=y
825
826#
827# I2C Hardware Bus support
828#
829
830#
831# PC SMBus host controller drivers
832#
833# CONFIG_I2C_ALI1535 is not set
834# CONFIG_I2C_ALI1563 is not set
835# CONFIG_I2C_ALI15X3 is not set
836# CONFIG_I2C_AMD756 is not set
837# CONFIG_I2C_AMD8111 is not set
838# CONFIG_I2C_I801 is not set
839# CONFIG_I2C_ISCH is not set
840# CONFIG_I2C_PIIX4 is not set
841# CONFIG_I2C_NFORCE2 is not set
842# CONFIG_I2C_SIS5595 is not set
843# CONFIG_I2C_SIS630 is not set
844# CONFIG_I2C_SIS96X is not set
845# CONFIG_I2C_VIA is not set
846# CONFIG_I2C_VIAPRO is not set
847
848#
849# I2C system bus drivers (mostly embedded / system-on-chip)
850#
851CONFIG_I2C_MPC=y
852# CONFIG_I2C_OCORES is not set
853# CONFIG_I2C_SIMTEC is not set
854
855#
856# External I2C/SMBus adapter drivers
857#
858# CONFIG_I2C_PARPORT_LIGHT is not set
859# CONFIG_I2C_TAOS_EVM is not set
860# CONFIG_I2C_TINY_USB is not set
861
862#
863# Graphics adapter I2C/DDC channel drivers
864#
865# CONFIG_I2C_VOODOO3 is not set
866
867#
868# Other I2C/SMBus bus drivers
869#
870# CONFIG_I2C_PCA_PLATFORM is not set
871# CONFIG_I2C_STUB is not set
872
873#
874# Miscellaneous I2C Chip support
875#
876# CONFIG_DS1682 is not set
877# CONFIG_EEPROM_AT24 is not set
878CONFIG_EEPROM_LEGACY=y
879# CONFIG_SENSORS_PCF8574 is not set
880# CONFIG_PCF8575 is not set
881# CONFIG_SENSORS_PCA9539 is not set
882# CONFIG_SENSORS_PCF8591 is not set
883# CONFIG_SENSORS_MAX6875 is not set
884# CONFIG_SENSORS_TSL2550 is not set
885# CONFIG_I2C_DEBUG_CORE is not set
886# CONFIG_I2C_DEBUG_ALGO is not set
887# CONFIG_I2C_DEBUG_BUS is not set
888# CONFIG_I2C_DEBUG_CHIP is not set
889# CONFIG_SPI is not set
890CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
891# CONFIG_GPIOLIB is not set
892# CONFIG_W1 is not set
893# CONFIG_POWER_SUPPLY is not set
894# CONFIG_HWMON is not set
895CONFIG_THERMAL=y
896# CONFIG_WATCHDOG is not set
897CONFIG_SSB_POSSIBLE=y
898
899#
900# Sonics Silicon Backplane
901#
902# CONFIG_SSB is not set
903
904#
905# Multifunction device drivers
906#
907# CONFIG_MFD_CORE is not set
908# CONFIG_MFD_SM501 is not set
909# CONFIG_HTC_PASIC3 is not set
910# CONFIG_TWL4030_CORE is not set
911# CONFIG_MFD_TMIO is not set
912# CONFIG_PMIC_DA903X is not set
913# CONFIG_MFD_WM8400 is not set
914# CONFIG_MFD_WM8350_I2C is not set
915# CONFIG_MFD_PCF50633 is not set
916# CONFIG_REGULATOR is not set
917
918#
919# Multimedia devices
920#
921
922#
923# Multimedia core support
924#
925# CONFIG_VIDEO_DEV is not set
926CONFIG_DVB_CORE=m
927CONFIG_VIDEO_MEDIA=m
928
929#
930# Multimedia drivers
931#
932# CONFIG_MEDIA_ATTACH is not set
933CONFIG_MEDIA_TUNER=m
934# CONFIG_MEDIA_TUNER_CUSTOMIZE is not set
935CONFIG_MEDIA_TUNER_SIMPLE=m
936CONFIG_MEDIA_TUNER_TDA8290=m
937CONFIG_MEDIA_TUNER_TDA9887=m
938CONFIG_MEDIA_TUNER_TEA5761=m
939CONFIG_MEDIA_TUNER_TEA5767=m
940CONFIG_MEDIA_TUNER_MT20XX=m
941CONFIG_MEDIA_TUNER_XC2028=m
942CONFIG_MEDIA_TUNER_XC5000=m
943# CONFIG_DVB_DYNAMIC_MINORS is not set
944CONFIG_DVB_CAPTURE_DRIVERS=y
945
946#
947# Supported SAA7146 based PCI Adapters
948#
949# CONFIG_TTPCI_EEPROM is not set
950# CONFIG_DVB_BUDGET_CORE is not set
951
952#
953# Supported USB Adapters
954#
955# CONFIG_DVB_USB is not set
956# CONFIG_DVB_TTUSB_BUDGET is not set
957# CONFIG_DVB_TTUSB_DEC is not set
958# CONFIG_DVB_SIANO_SMS1XXX is not set
959
960#
961# Supported FlexCopII (B2C2) Adapters
962#
963# CONFIG_DVB_B2C2_FLEXCOP is not set
964
965#
966# Supported BT878 Adapters
967#
968
969#
970# Supported Pluto2 Adapters
971#
972# CONFIG_DVB_PLUTO2 is not set
973
974#
975# Supported SDMC DM1105 Adapters
976#
977# CONFIG_DVB_DM1105 is not set
978
979#
980# Supported DVB Frontends
981#
982
983#
984# Customise DVB Frontends
985#
986# CONFIG_DVB_FE_CUSTOMISE is not set
987
988#
989# Multistandard (satellite) frontends
990#
991# CONFIG_DVB_STB0899 is not set
992# CONFIG_DVB_STB6100 is not set
993
994#
995# DVB-S (satellite) frontends
996#
997# CONFIG_DVB_CX24110 is not set
998# CONFIG_DVB_CX24123 is not set
999# CONFIG_DVB_MT312 is not set
1000# CONFIG_DVB_S5H1420 is not set
1001# CONFIG_DVB_STV0288 is not set
1002# CONFIG_DVB_STB6000 is not set
1003# CONFIG_DVB_STV0299 is not set
1004# CONFIG_DVB_TDA8083 is not set
1005# CONFIG_DVB_TDA10086 is not set
1006# CONFIG_DVB_TDA8261 is not set
1007# CONFIG_DVB_VES1X93 is not set
1008# CONFIG_DVB_TUNER_ITD1000 is not set
1009# CONFIG_DVB_TUNER_CX24113 is not set
1010# CONFIG_DVB_TDA826X is not set
1011# CONFIG_DVB_TUA6100 is not set
1012# CONFIG_DVB_CX24116 is not set
1013# CONFIG_DVB_SI21XX is not set
1014
1015#
1016# DVB-T (terrestrial) frontends
1017#
1018# CONFIG_DVB_SP8870 is not set
1019# CONFIG_DVB_SP887X is not set
1020# CONFIG_DVB_CX22700 is not set
1021# CONFIG_DVB_CX22702 is not set
1022# CONFIG_DVB_DRX397XD is not set
1023# CONFIG_DVB_L64781 is not set
1024# CONFIG_DVB_TDA1004X is not set
1025# CONFIG_DVB_NXT6000 is not set
1026# CONFIG_DVB_MT352 is not set
1027# CONFIG_DVB_ZL10353 is not set
1028# CONFIG_DVB_DIB3000MB is not set
1029# CONFIG_DVB_DIB3000MC is not set
1030# CONFIG_DVB_DIB7000M is not set
1031# CONFIG_DVB_DIB7000P is not set
1032# CONFIG_DVB_TDA10048 is not set
1033
1034#
1035# DVB-C (cable) frontends
1036#
1037# CONFIG_DVB_VES1820 is not set
1038# CONFIG_DVB_TDA10021 is not set
1039# CONFIG_DVB_TDA10023 is not set
1040# CONFIG_DVB_STV0297 is not set
1041
1042#
1043# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
1044#
1045# CONFIG_DVB_NXT200X is not set
1046# CONFIG_DVB_OR51211 is not set
1047# CONFIG_DVB_OR51132 is not set
1048# CONFIG_DVB_BCM3510 is not set
1049# CONFIG_DVB_LGDT330X is not set
1050# CONFIG_DVB_LGDT3304 is not set
1051# CONFIG_DVB_S5H1409 is not set
1052# CONFIG_DVB_AU8522 is not set
1053# CONFIG_DVB_S5H1411 is not set
1054
1055#
1056# ISDB-T (terrestrial) frontends
1057#
1058# CONFIG_DVB_S921 is not set
1059
1060#
1061# Digital terrestrial only tuners/PLL
1062#
1063# CONFIG_DVB_PLL is not set
1064# CONFIG_DVB_TUNER_DIB0070 is not set
1065
1066#
1067# SEC control devices for DVB-S
1068#
1069# CONFIG_DVB_LNBP21 is not set
1070# CONFIG_DVB_ISL6405 is not set
1071# CONFIG_DVB_ISL6421 is not set
1072# CONFIG_DVB_LGS8GL5 is not set
1073
1074#
1075# Tools to develop new frontends
1076#
1077# CONFIG_DVB_DUMMY_FE is not set
1078# CONFIG_DVB_AF9013 is not set
1079CONFIG_DAB=y
1080# CONFIG_USB_DABUSB is not set
1081
1082#
1083# Graphics support
1084#
1085# CONFIG_AGP is not set
1086# CONFIG_DRM is not set
1087# CONFIG_VGASTATE is not set
1088CONFIG_VIDEO_OUTPUT_CONTROL=y
1089# CONFIG_FB is not set
1090# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
1091
1092#
1093# Display device support
1094#
1095# CONFIG_DISPLAY_SUPPORT is not set
1096
1097#
1098# Console display driver support
1099#
1100CONFIG_VGA_CONSOLE=y
1101# CONFIG_VGACON_SOFT_SCROLLBACK is not set
1102CONFIG_DUMMY_CONSOLE=y
1103CONFIG_SOUND=y
1104# CONFIG_SOUND_OSS_CORE is not set
1105CONFIG_SND=y
1106CONFIG_SND_TIMER=y
1107CONFIG_SND_PCM=y
1108# CONFIG_SND_SEQUENCER is not set
1109# CONFIG_SND_MIXER_OSS is not set
1110# CONFIG_SND_PCM_OSS is not set
1111# CONFIG_SND_HRTIMER is not set
1112# CONFIG_SND_DYNAMIC_MINORS is not set
1113CONFIG_SND_SUPPORT_OLD_API=y
1114CONFIG_SND_VERBOSE_PROCFS=y
1115# CONFIG_SND_VERBOSE_PRINTK is not set
1116# CONFIG_SND_DEBUG is not set
1117CONFIG_SND_VMASTER=y
1118CONFIG_SND_AC97_CODEC=y
1119CONFIG_SND_DRIVERS=y
1120# CONFIG_SND_DUMMY is not set
1121# CONFIG_SND_MTPAV is not set
1122# CONFIG_SND_SERIAL_U16550 is not set
1123# CONFIG_SND_MPU401 is not set
1124# CONFIG_SND_AC97_POWER_SAVE is not set
1125CONFIG_SND_PCI=y
1126# CONFIG_SND_AD1889 is not set
1127# CONFIG_SND_ALS300 is not set
1128# CONFIG_SND_ALS4000 is not set
1129# CONFIG_SND_ALI5451 is not set
1130# CONFIG_SND_ATIIXP is not set
1131# CONFIG_SND_ATIIXP_MODEM is not set
1132# CONFIG_SND_AU8810 is not set
1133# CONFIG_SND_AU8820 is not set
1134# CONFIG_SND_AU8830 is not set
1135# CONFIG_SND_AW2 is not set
1136# CONFIG_SND_AZT3328 is not set
1137# CONFIG_SND_BT87X is not set
1138# CONFIG_SND_CA0106 is not set
1139# CONFIG_SND_CMIPCI is not set
1140# CONFIG_SND_OXYGEN is not set
1141# CONFIG_SND_CS4281 is not set
1142# CONFIG_SND_CS46XX is not set
1143# CONFIG_SND_CS5530 is not set
1144# CONFIG_SND_DARLA20 is not set
1145# CONFIG_SND_GINA20 is not set
1146# CONFIG_SND_LAYLA20 is not set
1147# CONFIG_SND_DARLA24 is not set
1148# CONFIG_SND_GINA24 is not set
1149# CONFIG_SND_LAYLA24 is not set
1150# CONFIG_SND_MONA is not set
1151# CONFIG_SND_MIA is not set
1152# CONFIG_SND_ECHO3G is not set
1153# CONFIG_SND_INDIGO is not set
1154# CONFIG_SND_INDIGOIO is not set
1155# CONFIG_SND_INDIGODJ is not set
1156# CONFIG_SND_EMU10K1 is not set
1157# CONFIG_SND_EMU10K1X is not set
1158# CONFIG_SND_ENS1370 is not set
1159# CONFIG_SND_ENS1371 is not set
1160# CONFIG_SND_ES1938 is not set
1161# CONFIG_SND_ES1968 is not set
1162# CONFIG_SND_FM801 is not set
1163# CONFIG_SND_HDA_INTEL is not set
1164# CONFIG_SND_HDSP is not set
1165# CONFIG_SND_HDSPM is not set
1166# CONFIG_SND_HIFIER is not set
1167# CONFIG_SND_ICE1712 is not set
1168# CONFIG_SND_ICE1724 is not set
1169CONFIG_SND_INTEL8X0=y
1170# CONFIG_SND_INTEL8X0M is not set
1171# CONFIG_SND_KORG1212 is not set
1172# CONFIG_SND_MAESTRO3 is not set
1173# CONFIG_SND_MIXART is not set
1174# CONFIG_SND_NM256 is not set
1175# CONFIG_SND_PCXHR is not set
1176# CONFIG_SND_RIPTIDE is not set
1177# CONFIG_SND_RME32 is not set
1178# CONFIG_SND_RME96 is not set
1179# CONFIG_SND_RME9652 is not set
1180# CONFIG_SND_SONICVIBES is not set
1181# CONFIG_SND_TRIDENT is not set
1182# CONFIG_SND_VIA82XX is not set
1183# CONFIG_SND_VIA82XX_MODEM is not set
1184# CONFIG_SND_VIRTUOSO is not set
1185# CONFIG_SND_VX222 is not set
1186# CONFIG_SND_YMFPCI is not set
1187CONFIG_SND_PPC=y
1188CONFIG_SND_USB=y
1189# CONFIG_SND_USB_AUDIO is not set
1190# CONFIG_SND_USB_USX2Y is not set
1191# CONFIG_SND_USB_CAIAQ is not set
1192# CONFIG_SND_SOC is not set
1193# CONFIG_SOUND_PRIME is not set
1194CONFIG_AC97_BUS=y
1195CONFIG_HID_SUPPORT=y
1196CONFIG_HID=y
1197# CONFIG_HID_DEBUG is not set
1198# CONFIG_HIDRAW is not set
1199
1200#
1201# USB Input Devices
1202#
1203CONFIG_USB_HID=y
1204# CONFIG_HID_PID is not set
1205# CONFIG_USB_HIDDEV is not set
1206
1207#
1208# Special HID drivers
1209#
1210CONFIG_HID_COMPAT=y
1211CONFIG_HID_A4TECH=y
1212CONFIG_HID_APPLE=y
1213CONFIG_HID_BELKIN=y
1214CONFIG_HID_CHERRY=y
1215CONFIG_HID_CHICONY=y
1216CONFIG_HID_CYPRESS=y
1217CONFIG_HID_EZKEY=y
1218CONFIG_HID_GYRATION=y
1219CONFIG_HID_LOGITECH=y
1220# CONFIG_LOGITECH_FF is not set
1221# CONFIG_LOGIRUMBLEPAD2_FF is not set
1222CONFIG_HID_MICROSOFT=y
1223CONFIG_HID_MONTEREY=y
1224# CONFIG_HID_NTRIG is not set
1225CONFIG_HID_PANTHERLORD=y
1226# CONFIG_PANTHERLORD_FF is not set
1227CONFIG_HID_PETALYNX=y
1228CONFIG_HID_SAMSUNG=y
1229CONFIG_HID_SONY=y
1230CONFIG_HID_SUNPLUS=y
1231# CONFIG_GREENASIA_FF is not set
1232# CONFIG_HID_TOPSEED is not set
1233CONFIG_THRUSTMASTER_FF=m
1234CONFIG_ZEROPLUS_FF=m
1235CONFIG_USB_SUPPORT=y
1236CONFIG_USB_ARCH_HAS_HCD=y
1237CONFIG_USB_ARCH_HAS_OHCI=y
1238CONFIG_USB_ARCH_HAS_EHCI=y
1239CONFIG_USB=y
1240# CONFIG_USB_DEBUG is not set
1241# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
1242
1243#
1244# Miscellaneous USB options
1245#
1246CONFIG_USB_DEVICEFS=y
1247CONFIG_USB_DEVICE_CLASS=y
1248# CONFIG_USB_DYNAMIC_MINORS is not set
1249# CONFIG_USB_OTG is not set
1250# CONFIG_USB_OTG_WHITELIST is not set
1251# CONFIG_USB_OTG_BLACKLIST_HUB is not set
1252CONFIG_USB_MON=y
1253# CONFIG_USB_WUSB is not set
1254# CONFIG_USB_WUSB_CBAF is not set
1255
1256#
1257# USB Host Controller Drivers
1258#
1259# CONFIG_USB_C67X00_HCD is not set
1260CONFIG_USB_EHCI_HCD=y
1261CONFIG_USB_EHCI_ROOT_HUB_TT=y
1262# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1263CONFIG_USB_EHCI_FSL=y
1264CONFIG_USB_EHCI_HCD_PPC_OF=y
1265# CONFIG_USB_OXU210HP_HCD is not set
1266# CONFIG_USB_ISP116X_HCD is not set
1267# CONFIG_USB_ISP1760_HCD is not set
1268CONFIG_USB_OHCI_HCD=y
1269CONFIG_USB_OHCI_HCD_PPC_OF=y
1270CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
1271CONFIG_USB_OHCI_HCD_PPC_OF_LE=y
1272CONFIG_USB_OHCI_HCD_PCI=y
1273CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
1274CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
1275CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1276# CONFIG_USB_UHCI_HCD is not set
1277# CONFIG_USB_SL811_HCD is not set
1278# CONFIG_USB_R8A66597_HCD is not set
1279# CONFIG_USB_WHCI_HCD is not set
1280# CONFIG_USB_HWA_HCD is not set
1281
1282#
1283# USB Device Class drivers
1284#
1285# CONFIG_USB_ACM is not set
1286# CONFIG_USB_PRINTER is not set
1287# CONFIG_USB_WDM is not set
1288# CONFIG_USB_TMC is not set
1289
1290#
1291# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
1292#
1293
1294#
1295# see USB_STORAGE Help for more information
1296#
1297CONFIG_USB_STORAGE=y
1298# CONFIG_USB_STORAGE_DEBUG is not set
1299# CONFIG_USB_STORAGE_DATAFAB is not set
1300# CONFIG_USB_STORAGE_FREECOM is not set
1301# CONFIG_USB_STORAGE_ISD200 is not set
1302# CONFIG_USB_STORAGE_USBAT is not set
1303# CONFIG_USB_STORAGE_SDDR09 is not set
1304# CONFIG_USB_STORAGE_SDDR55 is not set
1305# CONFIG_USB_STORAGE_JUMPSHOT is not set
1306# CONFIG_USB_STORAGE_ALAUDA is not set
1307# CONFIG_USB_STORAGE_ONETOUCH is not set
1308# CONFIG_USB_STORAGE_KARMA is not set
1309# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
1310# CONFIG_USB_LIBUSUAL is not set
1311
1312#
1313# USB Imaging devices
1314#
1315# CONFIG_USB_MDC800 is not set
1316# CONFIG_USB_MICROTEK is not set
1317
1318#
1319# USB port drivers
1320#
1321# CONFIG_USB_SERIAL is not set
1322
1323#
1324# USB Miscellaneous drivers
1325#
1326# CONFIG_USB_EMI62 is not set
1327# CONFIG_USB_EMI26 is not set
1328# CONFIG_USB_ADUTUX is not set
1329# CONFIG_USB_SEVSEG is not set
1330# CONFIG_USB_RIO500 is not set
1331# CONFIG_USB_LEGOTOWER is not set
1332# CONFIG_USB_LCD is not set
1333# CONFIG_USB_BERRY_CHARGE is not set
1334# CONFIG_USB_LED is not set
1335# CONFIG_USB_CYPRESS_CY7C63 is not set
1336# CONFIG_USB_CYTHERM is not set
1337# CONFIG_USB_PHIDGET is not set
1338# CONFIG_USB_IDMOUSE is not set
1339# CONFIG_USB_FTDI_ELAN is not set
1340# CONFIG_USB_APPLEDISPLAY is not set
1341# CONFIG_USB_SISUSBVGA is not set
1342# CONFIG_USB_LD is not set
1343# CONFIG_USB_TRANCEVIBRATOR is not set
1344# CONFIG_USB_IOWARRIOR is not set
1345# CONFIG_USB_TEST is not set
1346# CONFIG_USB_ISIGHTFW is not set
1347# CONFIG_USB_VST is not set
1348# CONFIG_USB_GADGET is not set
1349
1350#
1351# OTG and related infrastructure
1352#
1353# CONFIG_UWB is not set
1354# CONFIG_MMC is not set
1355# CONFIG_MEMSTICK is not set
1356# CONFIG_NEW_LEDS is not set
1357# CONFIG_ACCESSIBILITY is not set
1358# CONFIG_INFINIBAND is not set
1359# CONFIG_EDAC is not set
1360CONFIG_RTC_LIB=y
1361CONFIG_RTC_CLASS=y
1362CONFIG_RTC_HCTOSYS=y
1363CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
1364# CONFIG_RTC_DEBUG is not set
1365
1366#
1367# RTC interfaces
1368#
1369CONFIG_RTC_INTF_SYSFS=y
1370CONFIG_RTC_INTF_PROC=y
1371CONFIG_RTC_INTF_DEV=y
1372# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
1373# CONFIG_RTC_DRV_TEST is not set
1374
1375#
1376# I2C RTC drivers
1377#
1378# CONFIG_RTC_DRV_DS1307 is not set
1379# CONFIG_RTC_DRV_DS1374 is not set
1380# CONFIG_RTC_DRV_DS1672 is not set
1381# CONFIG_RTC_DRV_MAX6900 is not set
1382# CONFIG_RTC_DRV_RS5C372 is not set
1383# CONFIG_RTC_DRV_ISL1208 is not set
1384# CONFIG_RTC_DRV_X1205 is not set
1385# CONFIG_RTC_DRV_PCF8563 is not set
1386# CONFIG_RTC_DRV_PCF8583 is not set
1387# CONFIG_RTC_DRV_M41T80 is not set
1388# CONFIG_RTC_DRV_S35390A is not set
1389# CONFIG_RTC_DRV_FM3130 is not set
1390# CONFIG_RTC_DRV_RX8581 is not set
1391
1392#
1393# SPI RTC drivers
1394#
1395
1396#
1397# Platform RTC drivers
1398#
1399CONFIG_RTC_DRV_CMOS=y
1400# CONFIG_RTC_DRV_DS1286 is not set
1401# CONFIG_RTC_DRV_DS1511 is not set
1402# CONFIG_RTC_DRV_DS1553 is not set
1403# CONFIG_RTC_DRV_DS1742 is not set
1404# CONFIG_RTC_DRV_STK17TA8 is not set
1405# CONFIG_RTC_DRV_M48T86 is not set
1406# CONFIG_RTC_DRV_M48T35 is not set
1407# CONFIG_RTC_DRV_M48T59 is not set
1408# CONFIG_RTC_DRV_BQ4802 is not set
1409# CONFIG_RTC_DRV_V3020 is not set
1410
1411#
1412# on-CPU RTC drivers
1413#
1414# CONFIG_RTC_DRV_PPC is not set
1415CONFIG_DMADEVICES=y
1416
1417#
1418# DMA Devices
1419#
1420CONFIG_FSL_DMA=y
1421CONFIG_DMA_ENGINE=y
1422
1423#
1424# DMA Clients
1425#
1426# CONFIG_NET_DMA is not set
1427# CONFIG_DMATEST is not set
1428# CONFIG_UIO is not set
1429# CONFIG_STAGING is not set
1430
1431#
1432# File systems
1433#
1434CONFIG_EXT2_FS=y
1435# CONFIG_EXT2_FS_XATTR is not set
1436# CONFIG_EXT2_FS_XIP is not set
1437CONFIG_EXT3_FS=y
1438CONFIG_EXT3_FS_XATTR=y
1439# CONFIG_EXT3_FS_POSIX_ACL is not set
1440# CONFIG_EXT3_FS_SECURITY is not set
1441# CONFIG_EXT4_FS is not set
1442CONFIG_JBD=y
1443# CONFIG_JBD_DEBUG is not set
1444CONFIG_FS_MBCACHE=y
1445# CONFIG_REISERFS_FS is not set
1446# CONFIG_JFS_FS is not set
1447# CONFIG_FS_POSIX_ACL is not set
1448CONFIG_FILE_LOCKING=y
1449# CONFIG_XFS_FS is not set
1450# CONFIG_GFS2_FS is not set
1451# CONFIG_OCFS2_FS is not set
1452# CONFIG_BTRFS_FS is not set
1453CONFIG_DNOTIFY=y
1454CONFIG_INOTIFY=y
1455CONFIG_INOTIFY_USER=y
1456# CONFIG_QUOTA is not set
1457# CONFIG_AUTOFS_FS is not set
1458# CONFIG_AUTOFS4_FS is not set
1459# CONFIG_FUSE_FS is not set
1460
1461#
1462# CD-ROM/DVD Filesystems
1463#
1464CONFIG_ISO9660_FS=m
1465CONFIG_JOLIET=y
1466CONFIG_ZISOFS=y
1467CONFIG_UDF_FS=m
1468CONFIG_UDF_NLS=y
1469
1470#
1471# DOS/FAT/NT Filesystems
1472#
1473CONFIG_FAT_FS=y
1474CONFIG_MSDOS_FS=m
1475CONFIG_VFAT_FS=y
1476CONFIG_FAT_DEFAULT_CODEPAGE=437
1477CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
1478CONFIG_NTFS_FS=y
1479# CONFIG_NTFS_DEBUG is not set
1480# CONFIG_NTFS_RW is not set
1481
1482#
1483# Pseudo filesystems
1484#
1485CONFIG_PROC_FS=y
1486CONFIG_PROC_KCORE=y
1487CONFIG_PROC_SYSCTL=y
1488CONFIG_PROC_PAGE_MONITOR=y
1489CONFIG_SYSFS=y
1490CONFIG_TMPFS=y
1491# CONFIG_TMPFS_POSIX_ACL is not set
1492# CONFIG_HUGETLB_PAGE is not set
1493# CONFIG_CONFIGFS_FS is not set
1494CONFIG_MISC_FILESYSTEMS=y
1495CONFIG_ADFS_FS=m
1496# CONFIG_ADFS_FS_RW is not set
1497CONFIG_AFFS_FS=m
1498CONFIG_HFS_FS=m
1499CONFIG_HFSPLUS_FS=m
1500CONFIG_BEFS_FS=m
1501# CONFIG_BEFS_DEBUG is not set
1502CONFIG_BFS_FS=m
1503CONFIG_EFS_FS=m
1504CONFIG_CRAMFS=y
1505# CONFIG_SQUASHFS is not set
1506CONFIG_VXFS_FS=m
1507# CONFIG_MINIX_FS is not set
1508# CONFIG_OMFS_FS is not set
1509CONFIG_HPFS_FS=m
1510CONFIG_QNX4FS_FS=m
1511# CONFIG_ROMFS_FS is not set
1512CONFIG_SYSV_FS=m
1513CONFIG_UFS_FS=m
1514# CONFIG_UFS_FS_WRITE is not set
1515# CONFIG_UFS_DEBUG is not set
1516CONFIG_NETWORK_FILESYSTEMS=y
1517CONFIG_NFS_FS=y
1518CONFIG_NFS_V3=y
1519# CONFIG_NFS_V3_ACL is not set
1520CONFIG_NFS_V4=y
1521CONFIG_ROOT_NFS=y
1522CONFIG_NFSD=y
1523# CONFIG_NFSD_V3 is not set
1524# CONFIG_NFSD_V4 is not set
1525CONFIG_LOCKD=y
1526CONFIG_LOCKD_V4=y
1527CONFIG_EXPORTFS=y
1528CONFIG_NFS_COMMON=y
1529CONFIG_SUNRPC=y
1530CONFIG_SUNRPC_GSS=y
1531# CONFIG_SUNRPC_REGISTER_V4 is not set
1532CONFIG_RPCSEC_GSS_KRB5=y
1533# CONFIG_RPCSEC_GSS_SPKM3 is not set
1534# CONFIG_SMB_FS is not set
1535# CONFIG_CIFS is not set
1536# CONFIG_NCP_FS is not set
1537# CONFIG_CODA_FS is not set
1538# CONFIG_AFS_FS is not set
1539
1540#
1541# Partition Types
1542#
1543CONFIG_PARTITION_ADVANCED=y
1544# CONFIG_ACORN_PARTITION is not set
1545# CONFIG_OSF_PARTITION is not set
1546# CONFIG_AMIGA_PARTITION is not set
1547# CONFIG_ATARI_PARTITION is not set
1548CONFIG_MAC_PARTITION=y
1549CONFIG_MSDOS_PARTITION=y
1550# CONFIG_BSD_DISKLABEL is not set
1551# CONFIG_MINIX_SUBPARTITION is not set
1552# CONFIG_SOLARIS_X86_PARTITION is not set
1553# CONFIG_UNIXWARE_DISKLABEL is not set
1554# CONFIG_LDM_PARTITION is not set
1555# CONFIG_SGI_PARTITION is not set
1556# CONFIG_ULTRIX_PARTITION is not set
1557# CONFIG_SUN_PARTITION is not set
1558# CONFIG_KARMA_PARTITION is not set
1559# CONFIG_EFI_PARTITION is not set
1560# CONFIG_SYSV68_PARTITION is not set
1561CONFIG_NLS=y
1562CONFIG_NLS_DEFAULT="iso8859-1"
1563# CONFIG_NLS_CODEPAGE_437 is not set
1564# CONFIG_NLS_CODEPAGE_737 is not set
1565# CONFIG_NLS_CODEPAGE_775 is not set
1566# CONFIG_NLS_CODEPAGE_850 is not set
1567# CONFIG_NLS_CODEPAGE_852 is not set
1568# CONFIG_NLS_CODEPAGE_855 is not set
1569# CONFIG_NLS_CODEPAGE_857 is not set
1570# CONFIG_NLS_CODEPAGE_860 is not set
1571# CONFIG_NLS_CODEPAGE_861 is not set
1572# CONFIG_NLS_CODEPAGE_862 is not set
1573# CONFIG_NLS_CODEPAGE_863 is not set
1574# CONFIG_NLS_CODEPAGE_864 is not set
1575# CONFIG_NLS_CODEPAGE_865 is not set
1576# CONFIG_NLS_CODEPAGE_866 is not set
1577# CONFIG_NLS_CODEPAGE_869 is not set
1578# CONFIG_NLS_CODEPAGE_936 is not set
1579# CONFIG_NLS_CODEPAGE_950 is not set
1580# CONFIG_NLS_CODEPAGE_932 is not set
1581# CONFIG_NLS_CODEPAGE_949 is not set
1582# CONFIG_NLS_CODEPAGE_874 is not set
1583# CONFIG_NLS_ISO8859_8 is not set
1584# CONFIG_NLS_CODEPAGE_1250 is not set
1585# CONFIG_NLS_CODEPAGE_1251 is not set
1586# CONFIG_NLS_ASCII is not set
1587# CONFIG_NLS_ISO8859_1 is not set
1588# CONFIG_NLS_ISO8859_2 is not set
1589# CONFIG_NLS_ISO8859_3 is not set
1590# CONFIG_NLS_ISO8859_4 is not set
1591# CONFIG_NLS_ISO8859_5 is not set
1592# CONFIG_NLS_ISO8859_6 is not set
1593# CONFIG_NLS_ISO8859_7 is not set
1594# CONFIG_NLS_ISO8859_9 is not set
1595# CONFIG_NLS_ISO8859_13 is not set
1596# CONFIG_NLS_ISO8859_14 is not set
1597# CONFIG_NLS_ISO8859_15 is not set
1598# CONFIG_NLS_KOI8_R is not set
1599# CONFIG_NLS_KOI8_U is not set
1600CONFIG_NLS_UTF8=m
1601# CONFIG_DLM is not set
1602
1603#
1604# Library routines
1605#
1606CONFIG_BITREVERSE=y
1607CONFIG_GENERIC_FIND_LAST_BIT=y
1608# CONFIG_CRC_CCITT is not set
1609# CONFIG_CRC16 is not set
1610CONFIG_CRC_T10DIF=y
1611CONFIG_CRC_ITU_T=m
1612CONFIG_CRC32=y
1613# CONFIG_CRC7 is not set
1614CONFIG_LIBCRC32C=m
1615CONFIG_ZLIB_INFLATE=y
1616CONFIG_PLIST=y
1617CONFIG_HAS_IOMEM=y
1618CONFIG_HAS_IOPORT=y
1619CONFIG_HAS_DMA=y
1620CONFIG_HAVE_LMB=y
1621
1622#
1623# Kernel hacking
1624#
1625# CONFIG_PRINTK_TIME is not set
1626CONFIG_ENABLE_WARN_DEPRECATED=y
1627CONFIG_ENABLE_MUST_CHECK=y
1628CONFIG_FRAME_WARN=1024
1629# CONFIG_MAGIC_SYSRQ is not set
1630# CONFIG_UNUSED_SYMBOLS is not set
1631CONFIG_DEBUG_FS=y
1632# CONFIG_HEADERS_CHECK is not set
1633CONFIG_DEBUG_KERNEL=y
1634# CONFIG_DEBUG_SHIRQ is not set
1635CONFIG_DETECT_SOFTLOCKUP=y
1636# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
1637CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
1638CONFIG_SCHED_DEBUG=y
1639# CONFIG_SCHEDSTATS is not set
1640# CONFIG_TIMER_STATS is not set
1641# CONFIG_DEBUG_OBJECTS is not set
1642# CONFIG_SLUB_DEBUG_ON is not set
1643# CONFIG_SLUB_STATS is not set
1644# CONFIG_DEBUG_RT_MUTEXES is not set
1645# CONFIG_RT_MUTEX_TESTER is not set
1646# CONFIG_DEBUG_SPINLOCK is not set
1647# CONFIG_DEBUG_MUTEXES is not set
1648# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1649# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1650# CONFIG_DEBUG_KOBJECT is not set
1651# CONFIG_DEBUG_HIGHMEM is not set
1652# CONFIG_DEBUG_BUGVERBOSE is not set
1653CONFIG_DEBUG_INFO=y
1654# CONFIG_DEBUG_VM is not set
1655# CONFIG_DEBUG_WRITECOUNT is not set
1656# CONFIG_DEBUG_MEMORY_INIT is not set
1657# CONFIG_DEBUG_LIST is not set
1658# CONFIG_DEBUG_SG is not set
1659# CONFIG_DEBUG_NOTIFIERS is not set
1660# CONFIG_BOOT_PRINTK_DELAY is not set
1661# CONFIG_RCU_TORTURE_TEST is not set
1662# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1663# CONFIG_BACKTRACE_SELF_TEST is not set
1664# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1665# CONFIG_FAULT_INJECTION is not set
1666# CONFIG_LATENCYTOP is not set
1667CONFIG_SYSCTL_SYSCALL_CHECK=y
1668CONFIG_HAVE_FUNCTION_TRACER=y
1669CONFIG_HAVE_DYNAMIC_FTRACE=y
1670CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1671
1672#
1673# Tracers
1674#
1675# CONFIG_FUNCTION_TRACER is not set
1676# CONFIG_SCHED_TRACER is not set
1677# CONFIG_CONTEXT_SWITCH_TRACER is not set
1678# CONFIG_BOOT_TRACER is not set
1679# CONFIG_TRACE_BRANCH_PROFILING is not set
1680# CONFIG_STACK_TRACER is not set
1681# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1682# CONFIG_SAMPLES is not set
1683CONFIG_HAVE_ARCH_KGDB=y
1684# CONFIG_KGDB is not set
1685CONFIG_PRINT_STACK_DEPTH=64
1686# CONFIG_DEBUG_STACKOVERFLOW is not set
1687# CONFIG_DEBUG_STACK_USAGE is not set
1688# CONFIG_DEBUG_PAGEALLOC is not set
1689# CONFIG_CODE_PATCHING_SELFTEST is not set
1690# CONFIG_FTR_FIXUP_SELFTEST is not set
1691# CONFIG_MSI_BITMAP_SELFTEST is not set
1692# CONFIG_XMON is not set
1693# CONFIG_IRQSTACKS is not set
1694# CONFIG_VIRQ_DEBUG is not set
1695# CONFIG_BDI_SWITCH is not set
1696# CONFIG_PPC_EARLY_DEBUG is not set
1697
1698#
1699# Security options
1700#
1701# CONFIG_KEYS is not set
1702# CONFIG_SECURITY is not set
1703# CONFIG_SECURITYFS is not set
1704# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1705CONFIG_CRYPTO=y
1706
1707#
1708# Crypto core or helper
1709#
1710# CONFIG_CRYPTO_FIPS is not set
1711CONFIG_CRYPTO_ALGAPI=y
1712CONFIG_CRYPTO_ALGAPI2=y
1713CONFIG_CRYPTO_AEAD=y
1714CONFIG_CRYPTO_AEAD2=y
1715CONFIG_CRYPTO_BLKCIPHER=y
1716CONFIG_CRYPTO_BLKCIPHER2=y
1717CONFIG_CRYPTO_HASH=y
1718CONFIG_CRYPTO_HASH2=y
1719CONFIG_CRYPTO_RNG2=y
1720CONFIG_CRYPTO_MANAGER=y
1721CONFIG_CRYPTO_MANAGER2=y
1722# CONFIG_CRYPTO_GF128MUL is not set
1723# CONFIG_CRYPTO_NULL is not set
1724# CONFIG_CRYPTO_CRYPTD is not set
1725CONFIG_CRYPTO_AUTHENC=y
1726# CONFIG_CRYPTO_TEST is not set
1727
1728#
1729# Authenticated Encryption with Associated Data
1730#
1731# CONFIG_CRYPTO_CCM is not set
1732# CONFIG_CRYPTO_GCM is not set
1733# CONFIG_CRYPTO_SEQIV is not set
1734
1735#
1736# Block modes
1737#
1738CONFIG_CRYPTO_CBC=y
1739# CONFIG_CRYPTO_CTR is not set
1740# CONFIG_CRYPTO_CTS is not set
1741# CONFIG_CRYPTO_ECB is not set
1742# CONFIG_CRYPTO_LRW is not set
1743CONFIG_CRYPTO_PCBC=m
1744# CONFIG_CRYPTO_XTS is not set
1745
1746#
1747# Hash modes
1748#
1749CONFIG_CRYPTO_HMAC=y
1750# CONFIG_CRYPTO_XCBC is not set
1751
1752#
1753# Digest
1754#
1755CONFIG_CRYPTO_CRC32C=m
1756# CONFIG_CRYPTO_MD4 is not set
1757CONFIG_CRYPTO_MD5=y
1758# CONFIG_CRYPTO_MICHAEL_MIC is not set
1759# CONFIG_CRYPTO_RMD128 is not set
1760# CONFIG_CRYPTO_RMD160 is not set
1761# CONFIG_CRYPTO_RMD256 is not set
1762# CONFIG_CRYPTO_RMD320 is not set
1763CONFIG_CRYPTO_SHA1=m
1764# CONFIG_CRYPTO_SHA256 is not set
1765# CONFIG_CRYPTO_SHA512 is not set
1766# CONFIG_CRYPTO_TGR192 is not set
1767# CONFIG_CRYPTO_WP512 is not set
1768
1769#
1770# Ciphers
1771#
1772# CONFIG_CRYPTO_AES is not set
1773# CONFIG_CRYPTO_ANUBIS is not set
1774# CONFIG_CRYPTO_ARC4 is not set
1775# CONFIG_CRYPTO_BLOWFISH is not set
1776# CONFIG_CRYPTO_CAMELLIA is not set
1777# CONFIG_CRYPTO_CAST5 is not set
1778# CONFIG_CRYPTO_CAST6 is not set
1779CONFIG_CRYPTO_DES=y
1780# CONFIG_CRYPTO_FCRYPT is not set
1781# CONFIG_CRYPTO_KHAZAD is not set
1782# CONFIG_CRYPTO_SALSA20 is not set
1783# CONFIG_CRYPTO_SEED is not set
1784# CONFIG_CRYPTO_SERPENT is not set
1785# CONFIG_CRYPTO_TEA is not set
1786# CONFIG_CRYPTO_TWOFISH is not set
1787
1788#
1789# Compression
1790#
1791# CONFIG_CRYPTO_DEFLATE is not set
1792# CONFIG_CRYPTO_LZO is not set
1793
1794#
1795# Random Number Generation
1796#
1797# CONFIG_CRYPTO_ANSI_CPRNG is not set
1798CONFIG_CRYPTO_HW=y
1799# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1800CONFIG_CRYPTO_DEV_TALITOS=y
1801# CONFIG_PPC_CLOCK is not set
1802# CONFIG_VIRTUALIZATION is not set
diff --git a/arch/powerpc/configs/85xx/mpc8544_ds_defconfig b/arch/powerpc/configs/85xx/mpc8544_ds_defconfig
deleted file mode 100644
index f6fa0b761cb3..000000000000
--- a/arch/powerpc/configs/85xx/mpc8544_ds_defconfig
+++ /dev/null
@@ -1,1802 +0,0 @@
1#
2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.29-rc2
4# Mon Jan 26 15:36:07 2009
5#
6# CONFIG_PPC64 is not set
7
8#
9# Processor support
10#
11# CONFIG_6xx is not set
12CONFIG_PPC_85xx=y
13# CONFIG_PPC_8xx is not set
14# CONFIG_40x is not set
15# CONFIG_44x is not set
16# CONFIG_E200 is not set
17CONFIG_E500=y
18# CONFIG_PPC_E500MC is not set
19CONFIG_BOOKE=y
20CONFIG_FSL_BOOKE=y
21CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y
25# CONFIG_PPC_MM_SLICES is not set
26# CONFIG_SMP is not set
27CONFIG_PPC32=y
28CONFIG_WORD_SIZE=32
29# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
30CONFIG_MMU=y
31CONFIG_GENERIC_CMOS_UPDATE=y
32CONFIG_GENERIC_TIME=y
33CONFIG_GENERIC_TIME_VSYSCALL=y
34CONFIG_GENERIC_CLOCKEVENTS=y
35CONFIG_GENERIC_HARDIRQS=y
36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
37CONFIG_IRQ_PER_CPU=y
38CONFIG_STACKTRACE_SUPPORT=y
39CONFIG_HAVE_LATENCYTOP_SUPPORT=y
40CONFIG_LOCKDEP_SUPPORT=y
41CONFIG_RWSEM_XCHGADD_ALGORITHM=y
42CONFIG_ARCH_HAS_ILOG2_U32=y
43CONFIG_GENERIC_HWEIGHT=y
44CONFIG_GENERIC_CALIBRATE_DELAY=y
45CONFIG_GENERIC_FIND_NEXT_BIT=y
46# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
47CONFIG_PPC=y
48CONFIG_EARLY_PRINTK=y
49CONFIG_GENERIC_NVRAM=y
50CONFIG_SCHED_OMIT_FRAME_POINTER=y
51CONFIG_ARCH_MAY_HAVE_PC_FDC=y
52CONFIG_PPC_OF=y
53CONFIG_OF=y
54CONFIG_PPC_UDBG_16550=y
55# CONFIG_GENERIC_TBSYNC is not set
56CONFIG_AUDIT_ARCH=y
57CONFIG_GENERIC_BUG=y
58CONFIG_DEFAULT_UIMAGE=y
59# CONFIG_PPC_DCR_NATIVE is not set
60# CONFIG_PPC_DCR_MMIO is not set
61CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
62
63#
64# General setup
65#
66CONFIG_EXPERIMENTAL=y
67CONFIG_BROKEN_ON_SMP=y
68CONFIG_INIT_ENV_ARG_LIMIT=32
69CONFIG_LOCALVERSION=""
70CONFIG_LOCALVERSION_AUTO=y
71CONFIG_SWAP=y
72CONFIG_SYSVIPC=y
73CONFIG_SYSVIPC_SYSCTL=y
74CONFIG_POSIX_MQUEUE=y
75CONFIG_BSD_PROCESS_ACCT=y
76# CONFIG_BSD_PROCESS_ACCT_V3 is not set
77# CONFIG_TASKSTATS is not set
78CONFIG_AUDIT=y
79# CONFIG_AUDITSYSCALL is not set
80CONFIG_IKCONFIG=y
81CONFIG_IKCONFIG_PROC=y
82CONFIG_LOG_BUF_SHIFT=14
83CONFIG_GROUP_SCHED=y
84# CONFIG_FAIR_GROUP_SCHED is not set
85# CONFIG_RT_GROUP_SCHED is not set
86CONFIG_USER_SCHED=y
87# CONFIG_CGROUP_SCHED is not set
88# CONFIG_CGROUPS is not set
89CONFIG_SYSFS_DEPRECATED=y
90CONFIG_SYSFS_DEPRECATED_V2=y
91# CONFIG_RELAY is not set
92# CONFIG_NAMESPACES is not set
93CONFIG_BLK_DEV_INITRD=y
94CONFIG_INITRAMFS_SOURCE=""
95# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
96CONFIG_SYSCTL=y
97CONFIG_EMBEDDED=y
98CONFIG_SYSCTL_SYSCALL=y
99CONFIG_KALLSYMS=y
100CONFIG_KALLSYMS_ALL=y
101CONFIG_KALLSYMS_STRIP_GENERATED=y
102CONFIG_KALLSYMS_EXTRA_PASS=y
103CONFIG_HOTPLUG=y
104CONFIG_PRINTK=y
105CONFIG_BUG=y
106CONFIG_ELF_CORE=y
107CONFIG_COMPAT_BRK=y
108CONFIG_BASE_FULL=y
109CONFIG_FUTEX=y
110CONFIG_ANON_INODES=y
111CONFIG_EPOLL=y
112CONFIG_SIGNALFD=y
113CONFIG_TIMERFD=y
114CONFIG_EVENTFD=y
115CONFIG_SHMEM=y
116CONFIG_AIO=y
117CONFIG_VM_EVENT_COUNTERS=y
118CONFIG_PCI_QUIRKS=y
119CONFIG_SLUB_DEBUG=y
120# CONFIG_SLAB is not set
121CONFIG_SLUB=y
122# CONFIG_SLOB is not set
123# CONFIG_PROFILING is not set
124CONFIG_HAVE_OPROFILE=y
125# CONFIG_KPROBES is not set
126CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
127CONFIG_HAVE_IOREMAP_PROT=y
128CONFIG_HAVE_KPROBES=y
129CONFIG_HAVE_KRETPROBES=y
130CONFIG_HAVE_ARCH_TRACEHOOK=y
131# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
132CONFIG_SLABINFO=y
133CONFIG_RT_MUTEXES=y
134CONFIG_BASE_SMALL=0
135CONFIG_MODULES=y
136# CONFIG_MODULE_FORCE_LOAD is not set
137CONFIG_MODULE_UNLOAD=y
138CONFIG_MODULE_FORCE_UNLOAD=y
139CONFIG_MODVERSIONS=y
140# CONFIG_MODULE_SRCVERSION_ALL is not set
141CONFIG_BLOCK=y
142CONFIG_LBD=y
143# CONFIG_BLK_DEV_IO_TRACE is not set
144# CONFIG_BLK_DEV_BSG is not set
145# CONFIG_BLK_DEV_INTEGRITY is not set
146
147#
148# IO Schedulers
149#
150CONFIG_IOSCHED_NOOP=y
151CONFIG_IOSCHED_AS=y
152CONFIG_IOSCHED_DEADLINE=y
153CONFIG_IOSCHED_CFQ=y
154# CONFIG_DEFAULT_AS is not set
155# CONFIG_DEFAULT_DEADLINE is not set
156CONFIG_DEFAULT_CFQ=y
157# CONFIG_DEFAULT_NOOP is not set
158CONFIG_DEFAULT_IOSCHED="cfq"
159CONFIG_CLASSIC_RCU=y
160# CONFIG_TREE_RCU is not set
161# CONFIG_PREEMPT_RCU is not set
162# CONFIG_TREE_RCU_TRACE is not set
163# CONFIG_PREEMPT_RCU_TRACE is not set
164# CONFIG_FREEZER is not set
165
166#
167# Platform support
168#
169# CONFIG_PPC_CELL is not set
170# CONFIG_PPC_CELL_NATIVE is not set
171# CONFIG_PQ2ADS is not set
172CONFIG_MPC85xx=y
173# CONFIG_MPC8540_ADS is not set
174# CONFIG_MPC8560_ADS is not set
175# CONFIG_MPC85xx_CDS is not set
176# CONFIG_MPC85xx_MDS is not set
177# CONFIG_MPC8536_DS is not set
178CONFIG_MPC85xx_DS=y
179# CONFIG_KSI8560 is not set
180# CONFIG_STX_GP3 is not set
181# CONFIG_TQM8540 is not set
182# CONFIG_TQM8541 is not set
183# CONFIG_TQM8548 is not set
184# CONFIG_TQM8555 is not set
185# CONFIG_TQM8560 is not set
186# CONFIG_SBC8548 is not set
187# CONFIG_SBC8560 is not set
188# CONFIG_IPIC is not set
189CONFIG_MPIC=y
190# CONFIG_MPIC_WEIRD is not set
191CONFIG_PPC_I8259=y
192# CONFIG_PPC_RTAS is not set
193# CONFIG_MMIO_NVRAM is not set
194# CONFIG_PPC_MPC106 is not set
195# CONFIG_PPC_970_NAP is not set
196# CONFIG_PPC_INDIRECT_IO is not set
197# CONFIG_GENERIC_IOMAP is not set
198# CONFIG_CPU_FREQ is not set
199# CONFIG_QUICC_ENGINE is not set
200# CONFIG_CPM2 is not set
201CONFIG_FSL_ULI1575=y
202# CONFIG_MPC8xxx_GPIO is not set
203# CONFIG_SIMPLE_GPIO is not set
204
205#
206# Kernel options
207#
208CONFIG_HIGHMEM=y
209CONFIG_TICK_ONESHOT=y
210CONFIG_NO_HZ=y
211CONFIG_HIGH_RES_TIMERS=y
212CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
213# CONFIG_HZ_100 is not set
214CONFIG_HZ_250=y
215# CONFIG_HZ_300 is not set
216# CONFIG_HZ_1000 is not set
217CONFIG_HZ=250
218CONFIG_SCHED_HRTICK=y
219CONFIG_PREEMPT_NONE=y
220# CONFIG_PREEMPT_VOLUNTARY is not set
221# CONFIG_PREEMPT is not set
222CONFIG_BINFMT_ELF=y
223# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
224# CONFIG_HAVE_AOUT is not set
225CONFIG_BINFMT_MISC=m
226CONFIG_MATH_EMULATION=y
227# CONFIG_IOMMU_HELPER is not set
228CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
229CONFIG_ARCH_HAS_WALK_MEMORY=y
230CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
231CONFIG_ARCH_FLATMEM_ENABLE=y
232CONFIG_ARCH_POPULATES_NODE_MAP=y
233CONFIG_SELECT_MEMORY_MODEL=y
234CONFIG_FLATMEM_MANUAL=y
235# CONFIG_DISCONTIGMEM_MANUAL is not set
236# CONFIG_SPARSEMEM_MANUAL is not set
237CONFIG_FLATMEM=y
238CONFIG_FLAT_NODE_MEM_MAP=y
239CONFIG_PAGEFLAGS_EXTENDED=y
240CONFIG_SPLIT_PTLOCK_CPUS=4
241CONFIG_MIGRATION=y
242# CONFIG_PHYS_ADDR_T_64BIT is not set
243CONFIG_ZONE_DMA_FLAG=1
244CONFIG_BOUNCE=y
245CONFIG_VIRT_TO_BUS=y
246CONFIG_UNEVICTABLE_LRU=y
247CONFIG_PPC_4K_PAGES=y
248# CONFIG_PPC_16K_PAGES is not set
249# CONFIG_PPC_64K_PAGES is not set
250CONFIG_FORCE_MAX_ZONEORDER=11
251CONFIG_PROC_DEVICETREE=y
252# CONFIG_CMDLINE_BOOL is not set
253CONFIG_EXTRA_TARGETS=""
254# CONFIG_PM is not set
255CONFIG_SECCOMP=y
256CONFIG_ISA_DMA_API=y
257
258#
259# Bus options
260#
261CONFIG_ZONE_DMA=y
262CONFIG_GENERIC_ISA_DMA=y
263CONFIG_PPC_INDIRECT_PCI=y
264CONFIG_FSL_SOC=y
265CONFIG_FSL_PCI=y
266CONFIG_PPC_PCI_CHOICE=y
267CONFIG_PCI=y
268CONFIG_PCI_DOMAINS=y
269CONFIG_PCI_SYSCALL=y
270# CONFIG_PCIEPORTBUS is not set
271CONFIG_ARCH_SUPPORTS_MSI=y
272# CONFIG_PCI_MSI is not set
273# CONFIG_PCI_LEGACY is not set
274# CONFIG_PCI_DEBUG is not set
275# CONFIG_PCI_STUB is not set
276# CONFIG_PCCARD is not set
277# CONFIG_HOTPLUG_PCI is not set
278# CONFIG_HAS_RAPIDIO is not set
279
280#
281# Advanced setup
282#
283# CONFIG_ADVANCED_OPTIONS is not set
284
285#
286# Default settings for advanced configuration options are used
287#
288CONFIG_LOWMEM_SIZE=0x30000000
289CONFIG_PAGE_OFFSET=0xc0000000
290CONFIG_KERNEL_START=0xc0000000
291CONFIG_PHYSICAL_START=0x00000000
292CONFIG_PHYSICAL_ALIGN=0x10000000
293CONFIG_TASK_SIZE=0xc0000000
294CONFIG_NET=y
295
296#
297# Networking options
298#
299CONFIG_COMPAT_NET_DEV_OPS=y
300CONFIG_PACKET=y
301# CONFIG_PACKET_MMAP is not set
302CONFIG_UNIX=y
303CONFIG_XFRM=y
304CONFIG_XFRM_USER=y
305# CONFIG_XFRM_SUB_POLICY is not set
306# CONFIG_XFRM_MIGRATE is not set
307# CONFIG_XFRM_STATISTICS is not set
308CONFIG_NET_KEY=m
309# CONFIG_NET_KEY_MIGRATE is not set
310CONFIG_INET=y
311CONFIG_IP_MULTICAST=y
312CONFIG_IP_ADVANCED_ROUTER=y
313CONFIG_ASK_IP_FIB_HASH=y
314# CONFIG_IP_FIB_TRIE is not set
315CONFIG_IP_FIB_HASH=y
316CONFIG_IP_MULTIPLE_TABLES=y
317CONFIG_IP_ROUTE_MULTIPATH=y
318CONFIG_IP_ROUTE_VERBOSE=y
319CONFIG_IP_PNP=y
320CONFIG_IP_PNP_DHCP=y
321CONFIG_IP_PNP_BOOTP=y
322CONFIG_IP_PNP_RARP=y
323CONFIG_NET_IPIP=y
324CONFIG_NET_IPGRE=y
325CONFIG_NET_IPGRE_BROADCAST=y
326CONFIG_IP_MROUTE=y
327CONFIG_IP_PIMSM_V1=y
328CONFIG_IP_PIMSM_V2=y
329CONFIG_ARPD=y
330# CONFIG_SYN_COOKIES is not set
331# CONFIG_INET_AH is not set
332# CONFIG_INET_ESP is not set
333# CONFIG_INET_IPCOMP is not set
334# CONFIG_INET_XFRM_TUNNEL is not set
335CONFIG_INET_TUNNEL=y
336# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
337# CONFIG_INET_XFRM_MODE_TUNNEL is not set
338# CONFIG_INET_XFRM_MODE_BEET is not set
339# CONFIG_INET_LRO is not set
340CONFIG_INET_DIAG=y
341CONFIG_INET_TCP_DIAG=y
342# CONFIG_TCP_CONG_ADVANCED is not set
343CONFIG_TCP_CONG_CUBIC=y
344CONFIG_DEFAULT_TCP_CONG="cubic"
345# CONFIG_TCP_MD5SIG is not set
346CONFIG_IPV6=y
347# CONFIG_IPV6_PRIVACY is not set
348# CONFIG_IPV6_ROUTER_PREF is not set
349# CONFIG_IPV6_OPTIMISTIC_DAD is not set
350# CONFIG_INET6_AH is not set
351# CONFIG_INET6_ESP is not set
352# CONFIG_INET6_IPCOMP is not set
353# CONFIG_IPV6_MIP6 is not set
354# CONFIG_INET6_XFRM_TUNNEL is not set
355# CONFIG_INET6_TUNNEL is not set
356CONFIG_INET6_XFRM_MODE_TRANSPORT=y
357CONFIG_INET6_XFRM_MODE_TUNNEL=y
358CONFIG_INET6_XFRM_MODE_BEET=y
359# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
360CONFIG_IPV6_SIT=y
361CONFIG_IPV6_NDISC_NODETYPE=y
362# CONFIG_IPV6_TUNNEL is not set
363# CONFIG_IPV6_MULTIPLE_TABLES is not set
364# CONFIG_IPV6_MROUTE is not set
365# CONFIG_NETWORK_SECMARK is not set
366# CONFIG_NETFILTER is not set
367# CONFIG_IP_DCCP is not set
368CONFIG_IP_SCTP=m
369# CONFIG_SCTP_DBG_MSG is not set
370# CONFIG_SCTP_DBG_OBJCNT is not set
371# CONFIG_SCTP_HMAC_NONE is not set
372# CONFIG_SCTP_HMAC_SHA1 is not set
373CONFIG_SCTP_HMAC_MD5=y
374# CONFIG_TIPC is not set
375# CONFIG_ATM is not set
376# CONFIG_BRIDGE is not set
377# CONFIG_NET_DSA is not set
378# CONFIG_VLAN_8021Q is not set
379# CONFIG_DECNET is not set
380# CONFIG_LLC2 is not set
381# CONFIG_IPX is not set
382# CONFIG_ATALK is not set
383# CONFIG_X25 is not set
384# CONFIG_LAPB is not set
385# CONFIG_ECONET is not set
386# CONFIG_WAN_ROUTER is not set
387# CONFIG_NET_SCHED is not set
388# CONFIG_DCB is not set
389
390#
391# Network testing
392#
393# CONFIG_NET_PKTGEN is not set
394# CONFIG_HAMRADIO is not set
395# CONFIG_CAN is not set
396# CONFIG_IRDA is not set
397# CONFIG_BT is not set
398# CONFIG_AF_RXRPC is not set
399# CONFIG_PHONET is not set
400CONFIG_FIB_RULES=y
401CONFIG_WIRELESS=y
402# CONFIG_CFG80211 is not set
403CONFIG_WIRELESS_OLD_REGULATORY=y
404# CONFIG_WIRELESS_EXT is not set
405# CONFIG_LIB80211 is not set
406# CONFIG_MAC80211 is not set
407# CONFIG_WIMAX is not set
408# CONFIG_RFKILL is not set
409# CONFIG_NET_9P is not set
410
411#
412# Device Drivers
413#
414
415#
416# Generic Driver Options
417#
418CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
419CONFIG_STANDALONE=y
420CONFIG_PREVENT_FIRMWARE_BUILD=y
421CONFIG_FW_LOADER=y
422CONFIG_FIRMWARE_IN_KERNEL=y
423CONFIG_EXTRA_FIRMWARE=""
424# CONFIG_DEBUG_DRIVER is not set
425# CONFIG_DEBUG_DEVRES is not set
426# CONFIG_SYS_HYPERVISOR is not set
427# CONFIG_CONNECTOR is not set
428# CONFIG_MTD is not set
429CONFIG_OF_DEVICE=y
430CONFIG_OF_I2C=y
431# CONFIG_PARPORT is not set
432CONFIG_BLK_DEV=y
433# CONFIG_BLK_DEV_FD is not set
434# CONFIG_BLK_CPQ_DA is not set
435# CONFIG_BLK_CPQ_CISS_DA is not set
436# CONFIG_BLK_DEV_DAC960 is not set
437# CONFIG_BLK_DEV_UMEM is not set
438# CONFIG_BLK_DEV_COW_COMMON is not set
439CONFIG_BLK_DEV_LOOP=y
440# CONFIG_BLK_DEV_CRYPTOLOOP is not set
441CONFIG_BLK_DEV_NBD=y
442# CONFIG_BLK_DEV_SX8 is not set
443# CONFIG_BLK_DEV_UB is not set
444CONFIG_BLK_DEV_RAM=y
445CONFIG_BLK_DEV_RAM_COUNT=16
446CONFIG_BLK_DEV_RAM_SIZE=131072
447# CONFIG_BLK_DEV_XIP is not set
448# CONFIG_CDROM_PKTCDVD is not set
449# CONFIG_ATA_OVER_ETH is not set
450# CONFIG_BLK_DEV_HD is not set
451CONFIG_MISC_DEVICES=y
452# CONFIG_PHANTOM is not set
453# CONFIG_EEPROM_93CX6 is not set
454# CONFIG_SGI_IOC4 is not set
455# CONFIG_TIFM_CORE is not set
456# CONFIG_ICS932S401 is not set
457# CONFIG_ENCLOSURE_SERVICES is not set
458# CONFIG_HP_ILO is not set
459# CONFIG_C2PORT is not set
460CONFIG_HAVE_IDE=y
461# CONFIG_IDE is not set
462
463#
464# SCSI device support
465#
466# CONFIG_RAID_ATTRS is not set
467CONFIG_SCSI=y
468CONFIG_SCSI_DMA=y
469# CONFIG_SCSI_TGT is not set
470# CONFIG_SCSI_NETLINK is not set
471CONFIG_SCSI_PROC_FS=y
472
473#
474# SCSI support type (disk, tape, CD-ROM)
475#
476CONFIG_BLK_DEV_SD=y
477CONFIG_CHR_DEV_ST=y
478# CONFIG_CHR_DEV_OSST is not set
479CONFIG_BLK_DEV_SR=y
480# CONFIG_BLK_DEV_SR_VENDOR is not set
481CONFIG_CHR_DEV_SG=y
482# CONFIG_CHR_DEV_SCH is not set
483
484#
485# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
486#
487CONFIG_SCSI_MULTI_LUN=y
488# CONFIG_SCSI_CONSTANTS is not set
489CONFIG_SCSI_LOGGING=y
490# CONFIG_SCSI_SCAN_ASYNC is not set
491CONFIG_SCSI_WAIT_SCAN=m
492
493#
494# SCSI Transports
495#
496# CONFIG_SCSI_SPI_ATTRS is not set
497# CONFIG_SCSI_FC_ATTRS is not set
498# CONFIG_SCSI_ISCSI_ATTRS is not set
499# CONFIG_SCSI_SAS_LIBSAS is not set
500# CONFIG_SCSI_SRP_ATTRS is not set
501CONFIG_SCSI_LOWLEVEL=y
502# CONFIG_ISCSI_TCP is not set
503# CONFIG_SCSI_CXGB3_ISCSI is not set
504# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
505# CONFIG_SCSI_3W_9XXX is not set
506# CONFIG_SCSI_ACARD is not set
507# CONFIG_SCSI_AACRAID is not set
508# CONFIG_SCSI_AIC7XXX is not set
509# CONFIG_SCSI_AIC7XXX_OLD is not set
510# CONFIG_SCSI_AIC79XX is not set
511# CONFIG_SCSI_AIC94XX is not set
512# CONFIG_SCSI_DPT_I2O is not set
513# CONFIG_SCSI_ADVANSYS is not set
514# CONFIG_SCSI_ARCMSR is not set
515# CONFIG_MEGARAID_NEWGEN is not set
516# CONFIG_MEGARAID_LEGACY is not set
517# CONFIG_MEGARAID_SAS is not set
518# CONFIG_SCSI_HPTIOP is not set
519# CONFIG_SCSI_BUSLOGIC is not set
520# CONFIG_LIBFC is not set
521# CONFIG_FCOE is not set
522# CONFIG_SCSI_DMX3191D is not set
523# CONFIG_SCSI_EATA is not set
524# CONFIG_SCSI_FUTURE_DOMAIN is not set
525# CONFIG_SCSI_GDTH is not set
526# CONFIG_SCSI_IPS is not set
527# CONFIG_SCSI_INITIO is not set
528# CONFIG_SCSI_INIA100 is not set
529# CONFIG_SCSI_MVSAS is not set
530# CONFIG_SCSI_STEX is not set
531# CONFIG_SCSI_SYM53C8XX_2 is not set
532# CONFIG_SCSI_IPR is not set
533# CONFIG_SCSI_QLOGIC_1280 is not set
534# CONFIG_SCSI_QLA_FC is not set
535# CONFIG_SCSI_QLA_ISCSI is not set
536# CONFIG_SCSI_LPFC is not set
537# CONFIG_SCSI_DC395x is not set
538# CONFIG_SCSI_DC390T is not set
539# CONFIG_SCSI_NSP32 is not set
540# CONFIG_SCSI_DEBUG is not set
541# CONFIG_SCSI_SRP is not set
542# CONFIG_SCSI_DH is not set
543CONFIG_ATA=y
544# CONFIG_ATA_NONSTANDARD is not set
545CONFIG_SATA_PMP=y
546CONFIG_SATA_AHCI=y
547# CONFIG_SATA_SIL24 is not set
548# CONFIG_SATA_FSL is not set
549CONFIG_ATA_SFF=y
550# CONFIG_SATA_SVW is not set
551# CONFIG_ATA_PIIX is not set
552# CONFIG_SATA_MV is not set
553# CONFIG_SATA_NV is not set
554# CONFIG_PDC_ADMA is not set
555# CONFIG_SATA_QSTOR is not set
556# CONFIG_SATA_PROMISE is not set
557# CONFIG_SATA_SX4 is not set
558# CONFIG_SATA_SIL is not set
559# CONFIG_SATA_SIS is not set
560# CONFIG_SATA_ULI is not set
561# CONFIG_SATA_VIA is not set
562# CONFIG_SATA_VITESSE is not set
563# CONFIG_SATA_INIC162X is not set
564CONFIG_PATA_ALI=y
565# CONFIG_PATA_AMD is not set
566# CONFIG_PATA_ARTOP is not set
567# CONFIG_PATA_ATIIXP is not set
568# CONFIG_PATA_CMD640_PCI is not set
569# CONFIG_PATA_CMD64X is not set
570# CONFIG_PATA_CS5520 is not set
571# CONFIG_PATA_CS5530 is not set
572# CONFIG_PATA_CYPRESS is not set
573# CONFIG_PATA_EFAR is not set
574# CONFIG_ATA_GENERIC is not set
575# CONFIG_PATA_HPT366 is not set
576# CONFIG_PATA_HPT37X is not set
577# CONFIG_PATA_HPT3X2N is not set
578# CONFIG_PATA_HPT3X3 is not set
579# CONFIG_PATA_IT821X is not set
580# CONFIG_PATA_IT8213 is not set
581# CONFIG_PATA_JMICRON is not set
582# CONFIG_PATA_TRIFLEX is not set
583# CONFIG_PATA_MARVELL is not set
584# CONFIG_PATA_MPIIX is not set
585# CONFIG_PATA_OLDPIIX is not set
586# CONFIG_PATA_NETCELL is not set
587# CONFIG_PATA_NINJA32 is not set
588# CONFIG_PATA_NS87410 is not set
589# CONFIG_PATA_NS87415 is not set
590# CONFIG_PATA_OPTI is not set
591# CONFIG_PATA_OPTIDMA is not set
592# CONFIG_PATA_PDC_OLD is not set
593# CONFIG_PATA_RADISYS is not set
594# CONFIG_PATA_RZ1000 is not set
595# CONFIG_PATA_SC1200 is not set
596# CONFIG_PATA_SERVERWORKS is not set
597# CONFIG_PATA_PDC2027X is not set
598# CONFIG_PATA_SIL680 is not set
599# CONFIG_PATA_SIS is not set
600# CONFIG_PATA_VIA is not set
601# CONFIG_PATA_WINBOND is not set
602# CONFIG_PATA_PLATFORM is not set
603# CONFIG_PATA_SCH is not set
604# CONFIG_MD is not set
605# CONFIG_FUSION is not set
606
607#
608# IEEE 1394 (FireWire) support
609#
610
611#
612# Enable only one of the two stacks, unless you know what you are doing
613#
614# CONFIG_FIREWIRE is not set
615# CONFIG_IEEE1394 is not set
616# CONFIG_I2O is not set
617# CONFIG_MACINTOSH_DRIVERS is not set
618CONFIG_NETDEVICES=y
619CONFIG_DUMMY=y
620# CONFIG_BONDING is not set
621# CONFIG_MACVLAN is not set
622# CONFIG_EQUALIZER is not set
623# CONFIG_TUN is not set
624# CONFIG_VETH is not set
625# CONFIG_ARCNET is not set
626CONFIG_PHYLIB=y
627
628#
629# MII PHY device drivers
630#
631# CONFIG_MARVELL_PHY is not set
632# CONFIG_DAVICOM_PHY is not set
633# CONFIG_QSEMI_PHY is not set
634# CONFIG_LXT_PHY is not set
635# CONFIG_CICADA_PHY is not set
636CONFIG_VITESSE_PHY=y
637# CONFIG_SMSC_PHY is not set
638# CONFIG_BROADCOM_PHY is not set
639# CONFIG_ICPLUS_PHY is not set
640# CONFIG_REALTEK_PHY is not set
641# CONFIG_NATIONAL_PHY is not set
642# CONFIG_STE10XP is not set
643# CONFIG_LSI_ET1011C_PHY is not set
644# CONFIG_FIXED_PHY is not set
645# CONFIG_MDIO_BITBANG is not set
646CONFIG_NET_ETHERNET=y
647CONFIG_MII=y
648# CONFIG_HAPPYMEAL is not set
649# CONFIG_SUNGEM is not set
650# CONFIG_CASSINI is not set
651# CONFIG_NET_VENDOR_3COM is not set
652# CONFIG_NET_TULIP is not set
653# CONFIG_HP100 is not set
654# CONFIG_IBM_NEW_EMAC_ZMII is not set
655# CONFIG_IBM_NEW_EMAC_RGMII is not set
656# CONFIG_IBM_NEW_EMAC_TAH is not set
657# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
658# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
659# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
660# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
661# CONFIG_NET_PCI is not set
662# CONFIG_B44 is not set
663# CONFIG_ATL2 is not set
664CONFIG_NETDEV_1000=y
665# CONFIG_ACENIC is not set
666# CONFIG_DL2K is not set
667# CONFIG_E1000 is not set
668# CONFIG_E1000E is not set
669# CONFIG_IP1000 is not set
670# CONFIG_IGB is not set
671# CONFIG_NS83820 is not set
672# CONFIG_HAMACHI is not set
673# CONFIG_YELLOWFIN is not set
674# CONFIG_R8169 is not set
675# CONFIG_SIS190 is not set
676# CONFIG_SKGE is not set
677# CONFIG_SKY2 is not set
678# CONFIG_VIA_VELOCITY is not set
679# CONFIG_TIGON3 is not set
680# CONFIG_BNX2 is not set
681CONFIG_GIANFAR=y
682# CONFIG_QLA3XXX is not set
683# CONFIG_ATL1 is not set
684# CONFIG_ATL1E is not set
685# CONFIG_JME is not set
686CONFIG_NETDEV_10000=y
687# CONFIG_CHELSIO_T1 is not set
688CONFIG_CHELSIO_T3_DEPENDS=y
689# CONFIG_CHELSIO_T3 is not set
690# CONFIG_ENIC is not set
691# CONFIG_IXGBE is not set
692# CONFIG_IXGB is not set
693# CONFIG_S2IO is not set
694# CONFIG_MYRI10GE is not set
695# CONFIG_NETXEN_NIC is not set
696# CONFIG_NIU is not set
697# CONFIG_MLX4_EN is not set
698# CONFIG_MLX4_CORE is not set
699# CONFIG_TEHUTI is not set
700# CONFIG_BNX2X is not set
701# CONFIG_QLGE is not set
702# CONFIG_SFC is not set
703# CONFIG_TR is not set
704
705#
706# Wireless LAN
707#
708# CONFIG_WLAN_PRE80211 is not set
709# CONFIG_WLAN_80211 is not set
710# CONFIG_IWLWIFI_LEDS is not set
711
712#
713# Enable WiMAX (Networking options) to see the WiMAX drivers
714#
715
716#
717# USB Network Adapters
718#
719# CONFIG_USB_CATC is not set
720# CONFIG_USB_KAWETH is not set
721# CONFIG_USB_PEGASUS is not set
722# CONFIG_USB_RTL8150 is not set
723# CONFIG_USB_USBNET is not set
724# CONFIG_WAN is not set
725# CONFIG_FDDI is not set
726# CONFIG_HIPPI is not set
727# CONFIG_PPP is not set
728# CONFIG_SLIP is not set
729# CONFIG_NET_FC is not set
730# CONFIG_NETCONSOLE is not set
731# CONFIG_NETPOLL is not set
732# CONFIG_NET_POLL_CONTROLLER is not set
733# CONFIG_ISDN is not set
734# CONFIG_PHONE is not set
735
736#
737# Input device support
738#
739CONFIG_INPUT=y
740CONFIG_INPUT_FF_MEMLESS=m
741# CONFIG_INPUT_POLLDEV is not set
742
743#
744# Userland interfaces
745#
746# CONFIG_INPUT_MOUSEDEV is not set
747# CONFIG_INPUT_JOYDEV is not set
748# CONFIG_INPUT_EVDEV is not set
749# CONFIG_INPUT_EVBUG is not set
750
751#
752# Input Device Drivers
753#
754# CONFIG_INPUT_KEYBOARD is not set
755# CONFIG_INPUT_MOUSE is not set
756# CONFIG_INPUT_JOYSTICK is not set
757# CONFIG_INPUT_TABLET is not set
758# CONFIG_INPUT_TOUCHSCREEN is not set
759# CONFIG_INPUT_MISC is not set
760
761#
762# Hardware I/O ports
763#
764CONFIG_SERIO=y
765CONFIG_SERIO_I8042=y
766CONFIG_SERIO_SERPORT=y
767# CONFIG_SERIO_PCIPS2 is not set
768CONFIG_SERIO_LIBPS2=y
769# CONFIG_SERIO_RAW is not set
770# CONFIG_SERIO_XILINX_XPS_PS2 is not set
771# CONFIG_GAMEPORT is not set
772
773#
774# Character devices
775#
776CONFIG_VT=y
777CONFIG_CONSOLE_TRANSLATIONS=y
778CONFIG_VT_CONSOLE=y
779CONFIG_HW_CONSOLE=y
780# CONFIG_VT_HW_CONSOLE_BINDING is not set
781CONFIG_DEVKMEM=y
782# CONFIG_SERIAL_NONSTANDARD is not set
783# CONFIG_NOZOMI is not set
784
785#
786# Serial drivers
787#
788CONFIG_SERIAL_8250=y
789CONFIG_SERIAL_8250_CONSOLE=y
790CONFIG_SERIAL_8250_PCI=y
791CONFIG_SERIAL_8250_NR_UARTS=2
792CONFIG_SERIAL_8250_RUNTIME_UARTS=2
793CONFIG_SERIAL_8250_EXTENDED=y
794CONFIG_SERIAL_8250_MANY_PORTS=y
795CONFIG_SERIAL_8250_SHARE_IRQ=y
796CONFIG_SERIAL_8250_DETECT_IRQ=y
797CONFIG_SERIAL_8250_RSA=y
798
799#
800# Non-8250 serial port support
801#
802# CONFIG_SERIAL_UARTLITE is not set
803CONFIG_SERIAL_CORE=y
804CONFIG_SERIAL_CORE_CONSOLE=y
805# CONFIG_SERIAL_JSM is not set
806# CONFIG_SERIAL_OF_PLATFORM is not set
807CONFIG_UNIX98_PTYS=y
808# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
809CONFIG_LEGACY_PTYS=y
810CONFIG_LEGACY_PTY_COUNT=256
811# CONFIG_HVC_UDBG is not set
812# CONFIG_IPMI_HANDLER is not set
813CONFIG_HW_RANDOM=y
814CONFIG_NVRAM=y
815# CONFIG_R3964 is not set
816# CONFIG_APPLICOM is not set
817# CONFIG_RAW_DRIVER is not set
818# CONFIG_TCG_TPM is not set
819CONFIG_DEVPORT=y
820CONFIG_I2C=y
821CONFIG_I2C_BOARDINFO=y
822# CONFIG_I2C_CHARDEV is not set
823CONFIG_I2C_HELPER_AUTO=y
824
825#
826# I2C Hardware Bus support
827#
828
829#
830# PC SMBus host controller drivers
831#
832# CONFIG_I2C_ALI1535 is not set
833# CONFIG_I2C_ALI1563 is not set
834# CONFIG_I2C_ALI15X3 is not set
835# CONFIG_I2C_AMD756 is not set
836# CONFIG_I2C_AMD8111 is not set
837# CONFIG_I2C_I801 is not set
838# CONFIG_I2C_ISCH is not set
839# CONFIG_I2C_PIIX4 is not set
840# CONFIG_I2C_NFORCE2 is not set
841# CONFIG_I2C_SIS5595 is not set
842# CONFIG_I2C_SIS630 is not set
843# CONFIG_I2C_SIS96X is not set
844# CONFIG_I2C_VIA is not set
845# CONFIG_I2C_VIAPRO is not set
846
847#
848# I2C system bus drivers (mostly embedded / system-on-chip)
849#
850CONFIG_I2C_MPC=y
851# CONFIG_I2C_OCORES is not set
852# CONFIG_I2C_SIMTEC is not set
853
854#
855# External I2C/SMBus adapter drivers
856#
857# CONFIG_I2C_PARPORT_LIGHT is not set
858# CONFIG_I2C_TAOS_EVM is not set
859# CONFIG_I2C_TINY_USB is not set
860
861#
862# Graphics adapter I2C/DDC channel drivers
863#
864# CONFIG_I2C_VOODOO3 is not set
865
866#
867# Other I2C/SMBus bus drivers
868#
869# CONFIG_I2C_PCA_PLATFORM is not set
870# CONFIG_I2C_STUB is not set
871
872#
873# Miscellaneous I2C Chip support
874#
875# CONFIG_DS1682 is not set
876# CONFIG_EEPROM_AT24 is not set
877CONFIG_EEPROM_LEGACY=y
878# CONFIG_SENSORS_PCF8574 is not set
879# CONFIG_PCF8575 is not set
880# CONFIG_SENSORS_PCA9539 is not set
881# CONFIG_SENSORS_PCF8591 is not set
882# CONFIG_SENSORS_MAX6875 is not set
883# CONFIG_SENSORS_TSL2550 is not set
884# CONFIG_I2C_DEBUG_CORE is not set
885# CONFIG_I2C_DEBUG_ALGO is not set
886# CONFIG_I2C_DEBUG_BUS is not set
887# CONFIG_I2C_DEBUG_CHIP is not set
888# CONFIG_SPI is not set
889CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
890# CONFIG_GPIOLIB is not set
891# CONFIG_W1 is not set
892# CONFIG_POWER_SUPPLY is not set
893# CONFIG_HWMON is not set
894# CONFIG_THERMAL is not set
895# CONFIG_THERMAL_HWMON is not set
896# CONFIG_WATCHDOG is not set
897CONFIG_SSB_POSSIBLE=y
898
899#
900# Sonics Silicon Backplane
901#
902# CONFIG_SSB is not set
903
904#
905# Multifunction device drivers
906#
907# CONFIG_MFD_CORE is not set
908# CONFIG_MFD_SM501 is not set
909# CONFIG_HTC_PASIC3 is not set
910# CONFIG_TWL4030_CORE is not set
911# CONFIG_MFD_TMIO is not set
912# CONFIG_PMIC_DA903X is not set
913# CONFIG_MFD_WM8400 is not set
914# CONFIG_MFD_WM8350_I2C is not set
915# CONFIG_MFD_PCF50633 is not set
916# CONFIG_REGULATOR is not set
917
918#
919# Multimedia devices
920#
921
922#
923# Multimedia core support
924#
925# CONFIG_VIDEO_DEV is not set
926CONFIG_DVB_CORE=m
927CONFIG_VIDEO_MEDIA=m
928
929#
930# Multimedia drivers
931#
932# CONFIG_MEDIA_ATTACH is not set
933CONFIG_MEDIA_TUNER=m
934# CONFIG_MEDIA_TUNER_CUSTOMIZE is not set
935CONFIG_MEDIA_TUNER_SIMPLE=m
936CONFIG_MEDIA_TUNER_TDA8290=m
937CONFIG_MEDIA_TUNER_TDA9887=m
938CONFIG_MEDIA_TUNER_TEA5761=m
939CONFIG_MEDIA_TUNER_TEA5767=m
940CONFIG_MEDIA_TUNER_MT20XX=m
941CONFIG_MEDIA_TUNER_XC2028=m
942CONFIG_MEDIA_TUNER_XC5000=m
943# CONFIG_DVB_DYNAMIC_MINORS is not set
944CONFIG_DVB_CAPTURE_DRIVERS=y
945
946#
947# Supported SAA7146 based PCI Adapters
948#
949# CONFIG_TTPCI_EEPROM is not set
950# CONFIG_DVB_BUDGET_CORE is not set
951
952#
953# Supported USB Adapters
954#
955# CONFIG_DVB_USB is not set
956# CONFIG_DVB_TTUSB_BUDGET is not set
957# CONFIG_DVB_TTUSB_DEC is not set
958# CONFIG_DVB_SIANO_SMS1XXX is not set
959
960#
961# Supported FlexCopII (B2C2) Adapters
962#
963# CONFIG_DVB_B2C2_FLEXCOP is not set
964
965#
966# Supported BT878 Adapters
967#
968
969#
970# Supported Pluto2 Adapters
971#
972# CONFIG_DVB_PLUTO2 is not set
973
974#
975# Supported SDMC DM1105 Adapters
976#
977# CONFIG_DVB_DM1105 is not set
978
979#
980# Supported DVB Frontends
981#
982
983#
984# Customise DVB Frontends
985#
986# CONFIG_DVB_FE_CUSTOMISE is not set
987
988#
989# Multistandard (satellite) frontends
990#
991# CONFIG_DVB_STB0899 is not set
992# CONFIG_DVB_STB6100 is not set
993
994#
995# DVB-S (satellite) frontends
996#
997# CONFIG_DVB_CX24110 is not set
998# CONFIG_DVB_CX24123 is not set
999# CONFIG_DVB_MT312 is not set
1000# CONFIG_DVB_S5H1420 is not set
1001# CONFIG_DVB_STV0288 is not set
1002# CONFIG_DVB_STB6000 is not set
1003# CONFIG_DVB_STV0299 is not set
1004# CONFIG_DVB_TDA8083 is not set
1005# CONFIG_DVB_TDA10086 is not set
1006# CONFIG_DVB_TDA8261 is not set
1007# CONFIG_DVB_VES1X93 is not set
1008# CONFIG_DVB_TUNER_ITD1000 is not set
1009# CONFIG_DVB_TUNER_CX24113 is not set
1010# CONFIG_DVB_TDA826X is not set
1011# CONFIG_DVB_TUA6100 is not set
1012# CONFIG_DVB_CX24116 is not set
1013# CONFIG_DVB_SI21XX is not set
1014
1015#
1016# DVB-T (terrestrial) frontends
1017#
1018# CONFIG_DVB_SP8870 is not set
1019# CONFIG_DVB_SP887X is not set
1020# CONFIG_DVB_CX22700 is not set
1021# CONFIG_DVB_CX22702 is not set
1022# CONFIG_DVB_DRX397XD is not set
1023# CONFIG_DVB_L64781 is not set
1024# CONFIG_DVB_TDA1004X is not set
1025# CONFIG_DVB_NXT6000 is not set
1026# CONFIG_DVB_MT352 is not set
1027# CONFIG_DVB_ZL10353 is not set
1028# CONFIG_DVB_DIB3000MB is not set
1029# CONFIG_DVB_DIB3000MC is not set
1030# CONFIG_DVB_DIB7000M is not set
1031# CONFIG_DVB_DIB7000P is not set
1032# CONFIG_DVB_TDA10048 is not set
1033
1034#
1035# DVB-C (cable) frontends
1036#
1037# CONFIG_DVB_VES1820 is not set
1038# CONFIG_DVB_TDA10021 is not set
1039# CONFIG_DVB_TDA10023 is not set
1040# CONFIG_DVB_STV0297 is not set
1041
1042#
1043# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
1044#
1045# CONFIG_DVB_NXT200X is not set
1046# CONFIG_DVB_OR51211 is not set
1047# CONFIG_DVB_OR51132 is not set
1048# CONFIG_DVB_BCM3510 is not set
1049# CONFIG_DVB_LGDT330X is not set
1050# CONFIG_DVB_LGDT3304 is not set
1051# CONFIG_DVB_S5H1409 is not set
1052# CONFIG_DVB_AU8522 is not set
1053# CONFIG_DVB_S5H1411 is not set
1054
1055#
1056# ISDB-T (terrestrial) frontends
1057#
1058# CONFIG_DVB_S921 is not set
1059
1060#
1061# Digital terrestrial only tuners/PLL
1062#
1063# CONFIG_DVB_PLL is not set
1064# CONFIG_DVB_TUNER_DIB0070 is not set
1065
1066#
1067# SEC control devices for DVB-S
1068#
1069# CONFIG_DVB_LNBP21 is not set
1070# CONFIG_DVB_ISL6405 is not set
1071# CONFIG_DVB_ISL6421 is not set
1072# CONFIG_DVB_LGS8GL5 is not set
1073
1074#
1075# Tools to develop new frontends
1076#
1077# CONFIG_DVB_DUMMY_FE is not set
1078# CONFIG_DVB_AF9013 is not set
1079CONFIG_DAB=y
1080# CONFIG_USB_DABUSB is not set
1081
1082#
1083# Graphics support
1084#
1085# CONFIG_AGP is not set
1086# CONFIG_DRM is not set
1087# CONFIG_VGASTATE is not set
1088CONFIG_VIDEO_OUTPUT_CONTROL=y
1089# CONFIG_FB is not set
1090# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
1091
1092#
1093# Display device support
1094#
1095# CONFIG_DISPLAY_SUPPORT is not set
1096
1097#
1098# Console display driver support
1099#
1100CONFIG_VGA_CONSOLE=y
1101# CONFIG_VGACON_SOFT_SCROLLBACK is not set
1102CONFIG_DUMMY_CONSOLE=y
1103CONFIG_SOUND=y
1104CONFIG_SOUND_OSS_CORE=y
1105CONFIG_SND=y
1106CONFIG_SND_TIMER=y
1107CONFIG_SND_PCM=y
1108# CONFIG_SND_SEQUENCER is not set
1109CONFIG_SND_OSSEMUL=y
1110CONFIG_SND_MIXER_OSS=y
1111CONFIG_SND_PCM_OSS=y
1112CONFIG_SND_PCM_OSS_PLUGINS=y
1113# CONFIG_SND_HRTIMER is not set
1114# CONFIG_SND_DYNAMIC_MINORS is not set
1115# CONFIG_SND_SUPPORT_OLD_API is not set
1116CONFIG_SND_VERBOSE_PROCFS=y
1117# CONFIG_SND_VERBOSE_PRINTK is not set
1118# CONFIG_SND_DEBUG is not set
1119CONFIG_SND_VMASTER=y
1120CONFIG_SND_AC97_CODEC=y
1121CONFIG_SND_DRIVERS=y
1122# CONFIG_SND_DUMMY is not set
1123# CONFIG_SND_MTPAV is not set
1124# CONFIG_SND_SERIAL_U16550 is not set
1125# CONFIG_SND_MPU401 is not set
1126# CONFIG_SND_AC97_POWER_SAVE is not set
1127CONFIG_SND_PCI=y
1128# CONFIG_SND_AD1889 is not set
1129# CONFIG_SND_ALS300 is not set
1130# CONFIG_SND_ALS4000 is not set
1131# CONFIG_SND_ALI5451 is not set
1132# CONFIG_SND_ATIIXP is not set
1133# CONFIG_SND_ATIIXP_MODEM is not set
1134# CONFIG_SND_AU8810 is not set
1135# CONFIG_SND_AU8820 is not set
1136# CONFIG_SND_AU8830 is not set
1137# CONFIG_SND_AW2 is not set
1138# CONFIG_SND_AZT3328 is not set
1139# CONFIG_SND_BT87X is not set
1140# CONFIG_SND_CA0106 is not set
1141# CONFIG_SND_CMIPCI is not set
1142# CONFIG_SND_OXYGEN is not set
1143# CONFIG_SND_CS4281 is not set
1144# CONFIG_SND_CS46XX is not set
1145# CONFIG_SND_CS5530 is not set
1146# CONFIG_SND_DARLA20 is not set
1147# CONFIG_SND_GINA20 is not set
1148# CONFIG_SND_LAYLA20 is not set
1149# CONFIG_SND_DARLA24 is not set
1150# CONFIG_SND_GINA24 is not set
1151# CONFIG_SND_LAYLA24 is not set
1152# CONFIG_SND_MONA is not set
1153# CONFIG_SND_MIA is not set
1154# CONFIG_SND_ECHO3G is not set
1155# CONFIG_SND_INDIGO is not set
1156# CONFIG_SND_INDIGOIO is not set
1157# CONFIG_SND_INDIGODJ is not set
1158# CONFIG_SND_EMU10K1 is not set
1159# CONFIG_SND_EMU10K1X is not set
1160# CONFIG_SND_ENS1370 is not set
1161# CONFIG_SND_ENS1371 is not set
1162# CONFIG_SND_ES1938 is not set
1163# CONFIG_SND_ES1968 is not set
1164# CONFIG_SND_FM801 is not set
1165# CONFIG_SND_HDA_INTEL is not set
1166# CONFIG_SND_HDSP is not set
1167# CONFIG_SND_HDSPM is not set
1168# CONFIG_SND_HIFIER is not set
1169# CONFIG_SND_ICE1712 is not set
1170# CONFIG_SND_ICE1724 is not set
1171CONFIG_SND_INTEL8X0=y
1172# CONFIG_SND_INTEL8X0M is not set
1173# CONFIG_SND_KORG1212 is not set
1174# CONFIG_SND_MAESTRO3 is not set
1175# CONFIG_SND_MIXART is not set
1176# CONFIG_SND_NM256 is not set
1177# CONFIG_SND_PCXHR is not set
1178# CONFIG_SND_RIPTIDE is not set
1179# CONFIG_SND_RME32 is not set
1180# CONFIG_SND_RME96 is not set
1181# CONFIG_SND_RME9652 is not set
1182# CONFIG_SND_SONICVIBES is not set
1183# CONFIG_SND_TRIDENT is not set
1184# CONFIG_SND_VIA82XX is not set
1185# CONFIG_SND_VIA82XX_MODEM is not set
1186# CONFIG_SND_VIRTUOSO is not set
1187# CONFIG_SND_VX222 is not set
1188# CONFIG_SND_YMFPCI is not set
1189CONFIG_SND_PPC=y
1190CONFIG_SND_USB=y
1191# CONFIG_SND_USB_AUDIO is not set
1192# CONFIG_SND_USB_USX2Y is not set
1193# CONFIG_SND_USB_CAIAQ is not set
1194# CONFIG_SND_SOC is not set
1195# CONFIG_SOUND_PRIME is not set
1196CONFIG_AC97_BUS=y
1197CONFIG_HID_SUPPORT=y
1198CONFIG_HID=y
1199# CONFIG_HID_DEBUG is not set
1200# CONFIG_HIDRAW is not set
1201
1202#
1203# USB Input Devices
1204#
1205CONFIG_USB_HID=y
1206# CONFIG_HID_PID is not set
1207# CONFIG_USB_HIDDEV is not set
1208
1209#
1210# Special HID drivers
1211#
1212CONFIG_HID_COMPAT=y
1213CONFIG_HID_A4TECH=y
1214CONFIG_HID_APPLE=y
1215CONFIG_HID_BELKIN=y
1216CONFIG_HID_CHERRY=y
1217CONFIG_HID_CHICONY=y
1218CONFIG_HID_CYPRESS=y
1219CONFIG_HID_EZKEY=y
1220CONFIG_HID_GYRATION=y
1221CONFIG_HID_LOGITECH=y
1222# CONFIG_LOGITECH_FF is not set
1223# CONFIG_LOGIRUMBLEPAD2_FF is not set
1224CONFIG_HID_MICROSOFT=y
1225CONFIG_HID_MONTEREY=y
1226# CONFIG_HID_NTRIG is not set
1227CONFIG_HID_PANTHERLORD=y
1228# CONFIG_PANTHERLORD_FF is not set
1229CONFIG_HID_PETALYNX=y
1230CONFIG_HID_SAMSUNG=y
1231CONFIG_HID_SONY=y
1232CONFIG_HID_SUNPLUS=y
1233# CONFIG_GREENASIA_FF is not set
1234# CONFIG_HID_TOPSEED is not set
1235CONFIG_THRUSTMASTER_FF=m
1236CONFIG_ZEROPLUS_FF=m
1237CONFIG_USB_SUPPORT=y
1238CONFIG_USB_ARCH_HAS_HCD=y
1239CONFIG_USB_ARCH_HAS_OHCI=y
1240CONFIG_USB_ARCH_HAS_EHCI=y
1241CONFIG_USB=y
1242# CONFIG_USB_DEBUG is not set
1243# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
1244
1245#
1246# Miscellaneous USB options
1247#
1248CONFIG_USB_DEVICEFS=y
1249CONFIG_USB_DEVICE_CLASS=y
1250# CONFIG_USB_DYNAMIC_MINORS is not set
1251# CONFIG_USB_OTG is not set
1252# CONFIG_USB_OTG_WHITELIST is not set
1253# CONFIG_USB_OTG_BLACKLIST_HUB is not set
1254CONFIG_USB_MON=y
1255# CONFIG_USB_WUSB is not set
1256# CONFIG_USB_WUSB_CBAF is not set
1257
1258#
1259# USB Host Controller Drivers
1260#
1261# CONFIG_USB_C67X00_HCD is not set
1262CONFIG_USB_EHCI_HCD=y
1263# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1264# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1265# CONFIG_USB_EHCI_FSL is not set
1266CONFIG_USB_EHCI_HCD_PPC_OF=y
1267# CONFIG_USB_OXU210HP_HCD is not set
1268# CONFIG_USB_ISP116X_HCD is not set
1269# CONFIG_USB_ISP1760_HCD is not set
1270CONFIG_USB_OHCI_HCD=y
1271CONFIG_USB_OHCI_HCD_PPC_OF=y
1272CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
1273CONFIG_USB_OHCI_HCD_PPC_OF_LE=y
1274CONFIG_USB_OHCI_HCD_PCI=y
1275CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
1276CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
1277CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1278# CONFIG_USB_UHCI_HCD is not set
1279# CONFIG_USB_SL811_HCD is not set
1280# CONFIG_USB_R8A66597_HCD is not set
1281# CONFIG_USB_WHCI_HCD is not set
1282# CONFIG_USB_HWA_HCD is not set
1283
1284#
1285# USB Device Class drivers
1286#
1287# CONFIG_USB_ACM is not set
1288# CONFIG_USB_PRINTER is not set
1289# CONFIG_USB_WDM is not set
1290# CONFIG_USB_TMC is not set
1291
1292#
1293# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
1294#
1295
1296#
1297# see USB_STORAGE Help for more information
1298#
1299CONFIG_USB_STORAGE=y
1300# CONFIG_USB_STORAGE_DEBUG is not set
1301# CONFIG_USB_STORAGE_DATAFAB is not set
1302# CONFIG_USB_STORAGE_FREECOM is not set
1303# CONFIG_USB_STORAGE_ISD200 is not set
1304# CONFIG_USB_STORAGE_USBAT is not set
1305# CONFIG_USB_STORAGE_SDDR09 is not set
1306# CONFIG_USB_STORAGE_SDDR55 is not set
1307# CONFIG_USB_STORAGE_JUMPSHOT is not set
1308# CONFIG_USB_STORAGE_ALAUDA is not set
1309# CONFIG_USB_STORAGE_ONETOUCH is not set
1310# CONFIG_USB_STORAGE_KARMA is not set
1311# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
1312# CONFIG_USB_LIBUSUAL is not set
1313
1314#
1315# USB Imaging devices
1316#
1317# CONFIG_USB_MDC800 is not set
1318# CONFIG_USB_MICROTEK is not set
1319
1320#
1321# USB port drivers
1322#
1323# CONFIG_USB_SERIAL is not set
1324
1325#
1326# USB Miscellaneous drivers
1327#
1328# CONFIG_USB_EMI62 is not set
1329# CONFIG_USB_EMI26 is not set
1330# CONFIG_USB_ADUTUX is not set
1331# CONFIG_USB_SEVSEG is not set
1332# CONFIG_USB_RIO500 is not set
1333# CONFIG_USB_LEGOTOWER is not set
1334# CONFIG_USB_LCD is not set
1335# CONFIG_USB_BERRY_CHARGE is not set
1336# CONFIG_USB_LED is not set
1337# CONFIG_USB_CYPRESS_CY7C63 is not set
1338# CONFIG_USB_CYTHERM is not set
1339# CONFIG_USB_PHIDGET is not set
1340# CONFIG_USB_IDMOUSE is not set
1341# CONFIG_USB_FTDI_ELAN is not set
1342# CONFIG_USB_APPLEDISPLAY is not set
1343# CONFIG_USB_SISUSBVGA is not set
1344# CONFIG_USB_LD is not set
1345# CONFIG_USB_TRANCEVIBRATOR is not set
1346# CONFIG_USB_IOWARRIOR is not set
1347# CONFIG_USB_TEST is not set
1348# CONFIG_USB_ISIGHTFW is not set
1349# CONFIG_USB_VST is not set
1350# CONFIG_USB_GADGET is not set
1351
1352#
1353# OTG and related infrastructure
1354#
1355# CONFIG_UWB is not set
1356# CONFIG_MMC is not set
1357# CONFIG_MEMSTICK is not set
1358# CONFIG_NEW_LEDS is not set
1359# CONFIG_ACCESSIBILITY is not set
1360# CONFIG_INFINIBAND is not set
1361# CONFIG_EDAC is not set
1362CONFIG_RTC_LIB=y
1363CONFIG_RTC_CLASS=y
1364CONFIG_RTC_HCTOSYS=y
1365CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
1366# CONFIG_RTC_DEBUG is not set
1367
1368#
1369# RTC interfaces
1370#
1371CONFIG_RTC_INTF_SYSFS=y
1372CONFIG_RTC_INTF_PROC=y
1373CONFIG_RTC_INTF_DEV=y
1374# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
1375# CONFIG_RTC_DRV_TEST is not set
1376
1377#
1378# I2C RTC drivers
1379#
1380# CONFIG_RTC_DRV_DS1307 is not set
1381# CONFIG_RTC_DRV_DS1374 is not set
1382# CONFIG_RTC_DRV_DS1672 is not set
1383# CONFIG_RTC_DRV_MAX6900 is not set
1384# CONFIG_RTC_DRV_RS5C372 is not set
1385# CONFIG_RTC_DRV_ISL1208 is not set
1386# CONFIG_RTC_DRV_X1205 is not set
1387# CONFIG_RTC_DRV_PCF8563 is not set
1388# CONFIG_RTC_DRV_PCF8583 is not set
1389# CONFIG_RTC_DRV_M41T80 is not set
1390# CONFIG_RTC_DRV_S35390A is not set
1391# CONFIG_RTC_DRV_FM3130 is not set
1392# CONFIG_RTC_DRV_RX8581 is not set
1393
1394#
1395# SPI RTC drivers
1396#
1397
1398#
1399# Platform RTC drivers
1400#
1401CONFIG_RTC_DRV_CMOS=y
1402# CONFIG_RTC_DRV_DS1286 is not set
1403# CONFIG_RTC_DRV_DS1511 is not set
1404# CONFIG_RTC_DRV_DS1553 is not set
1405# CONFIG_RTC_DRV_DS1742 is not set
1406# CONFIG_RTC_DRV_STK17TA8 is not set
1407# CONFIG_RTC_DRV_M48T86 is not set
1408# CONFIG_RTC_DRV_M48T35 is not set
1409# CONFIG_RTC_DRV_M48T59 is not set
1410# CONFIG_RTC_DRV_BQ4802 is not set
1411# CONFIG_RTC_DRV_V3020 is not set
1412
1413#
1414# on-CPU RTC drivers
1415#
1416# CONFIG_RTC_DRV_PPC is not set
1417CONFIG_DMADEVICES=y
1418
1419#
1420# DMA Devices
1421#
1422CONFIG_FSL_DMA=y
1423CONFIG_DMA_ENGINE=y
1424
1425#
1426# DMA Clients
1427#
1428# CONFIG_NET_DMA is not set
1429# CONFIG_DMATEST is not set
1430# CONFIG_UIO is not set
1431# CONFIG_STAGING is not set
1432
1433#
1434# File systems
1435#
1436CONFIG_EXT2_FS=y
1437# CONFIG_EXT2_FS_XATTR is not set
1438# CONFIG_EXT2_FS_XIP is not set
1439CONFIG_EXT3_FS=y
1440CONFIG_EXT3_FS_XATTR=y
1441# CONFIG_EXT3_FS_POSIX_ACL is not set
1442# CONFIG_EXT3_FS_SECURITY is not set
1443# CONFIG_EXT4_FS is not set
1444CONFIG_JBD=y
1445CONFIG_FS_MBCACHE=y
1446# CONFIG_REISERFS_FS is not set
1447# CONFIG_JFS_FS is not set
1448# CONFIG_FS_POSIX_ACL is not set
1449CONFIG_FILE_LOCKING=y
1450# CONFIG_XFS_FS is not set
1451# CONFIG_GFS2_FS is not set
1452# CONFIG_OCFS2_FS is not set
1453# CONFIG_BTRFS_FS is not set
1454CONFIG_DNOTIFY=y
1455CONFIG_INOTIFY=y
1456CONFIG_INOTIFY_USER=y
1457# CONFIG_QUOTA is not set
1458# CONFIG_AUTOFS_FS is not set
1459# CONFIG_AUTOFS4_FS is not set
1460# CONFIG_FUSE_FS is not set
1461
1462#
1463# CD-ROM/DVD Filesystems
1464#
1465CONFIG_ISO9660_FS=m
1466CONFIG_JOLIET=y
1467CONFIG_ZISOFS=y
1468CONFIG_UDF_FS=m
1469CONFIG_UDF_NLS=y
1470
1471#
1472# DOS/FAT/NT Filesystems
1473#
1474CONFIG_FAT_FS=y
1475CONFIG_MSDOS_FS=m
1476CONFIG_VFAT_FS=y
1477CONFIG_FAT_DEFAULT_CODEPAGE=437
1478CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
1479CONFIG_NTFS_FS=y
1480# CONFIG_NTFS_DEBUG is not set
1481# CONFIG_NTFS_RW is not set
1482
1483#
1484# Pseudo filesystems
1485#
1486CONFIG_PROC_FS=y
1487CONFIG_PROC_KCORE=y
1488CONFIG_PROC_SYSCTL=y
1489CONFIG_PROC_PAGE_MONITOR=y
1490CONFIG_SYSFS=y
1491CONFIG_TMPFS=y
1492# CONFIG_TMPFS_POSIX_ACL is not set
1493# CONFIG_HUGETLB_PAGE is not set
1494# CONFIG_CONFIGFS_FS is not set
1495CONFIG_MISC_FILESYSTEMS=y
1496CONFIG_ADFS_FS=m
1497# CONFIG_ADFS_FS_RW is not set
1498CONFIG_AFFS_FS=m
1499CONFIG_HFS_FS=m
1500CONFIG_HFSPLUS_FS=m
1501CONFIG_BEFS_FS=m
1502# CONFIG_BEFS_DEBUG is not set
1503CONFIG_BFS_FS=m
1504CONFIG_EFS_FS=m
1505CONFIG_CRAMFS=y
1506# CONFIG_SQUASHFS is not set
1507CONFIG_VXFS_FS=m
1508# CONFIG_MINIX_FS is not set
1509# CONFIG_OMFS_FS is not set
1510CONFIG_HPFS_FS=m
1511CONFIG_QNX4FS_FS=m
1512# CONFIG_ROMFS_FS is not set
1513CONFIG_SYSV_FS=m
1514CONFIG_UFS_FS=m
1515# CONFIG_UFS_FS_WRITE is not set
1516# CONFIG_UFS_DEBUG is not set
1517CONFIG_NETWORK_FILESYSTEMS=y
1518CONFIG_NFS_FS=y
1519CONFIG_NFS_V3=y
1520# CONFIG_NFS_V3_ACL is not set
1521CONFIG_NFS_V4=y
1522CONFIG_ROOT_NFS=y
1523CONFIG_NFSD=y
1524# CONFIG_NFSD_V3 is not set
1525# CONFIG_NFSD_V4 is not set
1526CONFIG_LOCKD=y
1527CONFIG_LOCKD_V4=y
1528CONFIG_EXPORTFS=y
1529CONFIG_NFS_COMMON=y
1530CONFIG_SUNRPC=y
1531CONFIG_SUNRPC_GSS=y
1532# CONFIG_SUNRPC_REGISTER_V4 is not set
1533CONFIG_RPCSEC_GSS_KRB5=y
1534# CONFIG_RPCSEC_GSS_SPKM3 is not set
1535# CONFIG_SMB_FS is not set
1536# CONFIG_CIFS is not set
1537# CONFIG_NCP_FS is not set
1538# CONFIG_CODA_FS is not set
1539# CONFIG_AFS_FS is not set
1540
1541#
1542# Partition Types
1543#
1544CONFIG_PARTITION_ADVANCED=y
1545# CONFIG_ACORN_PARTITION is not set
1546# CONFIG_OSF_PARTITION is not set
1547# CONFIG_AMIGA_PARTITION is not set
1548# CONFIG_ATARI_PARTITION is not set
1549CONFIG_MAC_PARTITION=y
1550CONFIG_MSDOS_PARTITION=y
1551# CONFIG_BSD_DISKLABEL is not set
1552# CONFIG_MINIX_SUBPARTITION is not set
1553# CONFIG_SOLARIS_X86_PARTITION is not set
1554# CONFIG_UNIXWARE_DISKLABEL is not set
1555# CONFIG_LDM_PARTITION is not set
1556# CONFIG_SGI_PARTITION is not set
1557# CONFIG_ULTRIX_PARTITION is not set
1558# CONFIG_SUN_PARTITION is not set
1559# CONFIG_KARMA_PARTITION is not set
1560# CONFIG_EFI_PARTITION is not set
1561# CONFIG_SYSV68_PARTITION is not set
1562CONFIG_NLS=y
1563CONFIG_NLS_DEFAULT="iso8859-1"
1564# CONFIG_NLS_CODEPAGE_437 is not set
1565# CONFIG_NLS_CODEPAGE_737 is not set
1566# CONFIG_NLS_CODEPAGE_775 is not set
1567# CONFIG_NLS_CODEPAGE_850 is not set
1568# CONFIG_NLS_CODEPAGE_852 is not set
1569# CONFIG_NLS_CODEPAGE_855 is not set
1570# CONFIG_NLS_CODEPAGE_857 is not set
1571# CONFIG_NLS_CODEPAGE_860 is not set
1572# CONFIG_NLS_CODEPAGE_861 is not set
1573# CONFIG_NLS_CODEPAGE_862 is not set
1574# CONFIG_NLS_CODEPAGE_863 is not set
1575# CONFIG_NLS_CODEPAGE_864 is not set
1576# CONFIG_NLS_CODEPAGE_865 is not set
1577# CONFIG_NLS_CODEPAGE_866 is not set
1578# CONFIG_NLS_CODEPAGE_869 is not set
1579# CONFIG_NLS_CODEPAGE_936 is not set
1580# CONFIG_NLS_CODEPAGE_950 is not set
1581# CONFIG_NLS_CODEPAGE_932 is not set
1582# CONFIG_NLS_CODEPAGE_949 is not set
1583# CONFIG_NLS_CODEPAGE_874 is not set
1584# CONFIG_NLS_ISO8859_8 is not set
1585# CONFIG_NLS_CODEPAGE_1250 is not set
1586# CONFIG_NLS_CODEPAGE_1251 is not set
1587# CONFIG_NLS_ASCII is not set
1588# CONFIG_NLS_ISO8859_1 is not set
1589# CONFIG_NLS_ISO8859_2 is not set
1590# CONFIG_NLS_ISO8859_3 is not set
1591# CONFIG_NLS_ISO8859_4 is not set
1592# CONFIG_NLS_ISO8859_5 is not set
1593# CONFIG_NLS_ISO8859_6 is not set
1594# CONFIG_NLS_ISO8859_7 is not set
1595# CONFIG_NLS_ISO8859_9 is not set
1596# CONFIG_NLS_ISO8859_13 is not set
1597# CONFIG_NLS_ISO8859_14 is not set
1598# CONFIG_NLS_ISO8859_15 is not set
1599# CONFIG_NLS_KOI8_R is not set
1600# CONFIG_NLS_KOI8_U is not set
1601CONFIG_NLS_UTF8=m
1602# CONFIG_DLM is not set
1603
1604#
1605# Library routines
1606#
1607CONFIG_BITREVERSE=y
1608CONFIG_GENERIC_FIND_LAST_BIT=y
1609# CONFIG_CRC_CCITT is not set
1610# CONFIG_CRC16 is not set
1611CONFIG_CRC_T10DIF=y
1612CONFIG_CRC_ITU_T=m
1613CONFIG_CRC32=y
1614# CONFIG_CRC7 is not set
1615CONFIG_LIBCRC32C=m
1616CONFIG_ZLIB_INFLATE=y
1617CONFIG_PLIST=y
1618CONFIG_HAS_IOMEM=y
1619CONFIG_HAS_IOPORT=y
1620CONFIG_HAS_DMA=y
1621CONFIG_HAVE_LMB=y
1622
1623#
1624# Kernel hacking
1625#
1626# CONFIG_PRINTK_TIME is not set
1627CONFIG_ENABLE_WARN_DEPRECATED=y
1628CONFIG_ENABLE_MUST_CHECK=y
1629CONFIG_FRAME_WARN=1024
1630# CONFIG_MAGIC_SYSRQ is not set
1631# CONFIG_UNUSED_SYMBOLS is not set
1632# CONFIG_DEBUG_FS is not set
1633# CONFIG_HEADERS_CHECK is not set
1634CONFIG_DEBUG_KERNEL=y
1635# CONFIG_DEBUG_SHIRQ is not set
1636CONFIG_DETECT_SOFTLOCKUP=y
1637# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
1638CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
1639CONFIG_SCHED_DEBUG=y
1640# CONFIG_SCHEDSTATS is not set
1641# CONFIG_TIMER_STATS is not set
1642# CONFIG_DEBUG_OBJECTS is not set
1643# CONFIG_SLUB_DEBUG_ON is not set
1644# CONFIG_SLUB_STATS is not set
1645# CONFIG_DEBUG_RT_MUTEXES is not set
1646# CONFIG_RT_MUTEX_TESTER is not set
1647# CONFIG_DEBUG_SPINLOCK is not set
1648# CONFIG_DEBUG_MUTEXES is not set
1649# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1650# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1651# CONFIG_DEBUG_KOBJECT is not set
1652# CONFIG_DEBUG_HIGHMEM is not set
1653# CONFIG_DEBUG_BUGVERBOSE is not set
1654CONFIG_DEBUG_INFO=y
1655# CONFIG_DEBUG_VM is not set
1656# CONFIG_DEBUG_WRITECOUNT is not set
1657# CONFIG_DEBUG_MEMORY_INIT is not set
1658# CONFIG_DEBUG_LIST is not set
1659# CONFIG_DEBUG_SG is not set
1660# CONFIG_DEBUG_NOTIFIERS is not set
1661# CONFIG_BOOT_PRINTK_DELAY is not set
1662# CONFIG_RCU_TORTURE_TEST is not set
1663# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1664# CONFIG_BACKTRACE_SELF_TEST is not set
1665# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1666# CONFIG_FAULT_INJECTION is not set
1667# CONFIG_LATENCYTOP is not set
1668CONFIG_SYSCTL_SYSCALL_CHECK=y
1669CONFIG_HAVE_FUNCTION_TRACER=y
1670CONFIG_HAVE_DYNAMIC_FTRACE=y
1671CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1672
1673#
1674# Tracers
1675#
1676# CONFIG_FUNCTION_TRACER is not set
1677# CONFIG_SCHED_TRACER is not set
1678# CONFIG_CONTEXT_SWITCH_TRACER is not set
1679# CONFIG_BOOT_TRACER is not set
1680# CONFIG_TRACE_BRANCH_PROFILING is not set
1681# CONFIG_STACK_TRACER is not set
1682# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1683# CONFIG_SAMPLES is not set
1684CONFIG_HAVE_ARCH_KGDB=y
1685# CONFIG_KGDB is not set
1686CONFIG_PRINT_STACK_DEPTH=64
1687# CONFIG_DEBUG_STACKOVERFLOW is not set
1688# CONFIG_DEBUG_STACK_USAGE is not set
1689# CONFIG_DEBUG_PAGEALLOC is not set
1690# CONFIG_CODE_PATCHING_SELFTEST is not set
1691# CONFIG_FTR_FIXUP_SELFTEST is not set
1692# CONFIG_MSI_BITMAP_SELFTEST is not set
1693# CONFIG_XMON is not set
1694# CONFIG_IRQSTACKS is not set
1695# CONFIG_BDI_SWITCH is not set
1696# CONFIG_PPC_EARLY_DEBUG is not set
1697
1698#
1699# Security options
1700#
1701# CONFIG_KEYS is not set
1702# CONFIG_SECURITY is not set
1703# CONFIG_SECURITYFS is not set
1704# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1705CONFIG_CRYPTO=y
1706
1707#
1708# Crypto core or helper
1709#
1710# CONFIG_CRYPTO_FIPS is not set
1711CONFIG_CRYPTO_ALGAPI=y
1712CONFIG_CRYPTO_ALGAPI2=y
1713CONFIG_CRYPTO_AEAD=y
1714CONFIG_CRYPTO_AEAD2=y
1715CONFIG_CRYPTO_BLKCIPHER=y
1716CONFIG_CRYPTO_BLKCIPHER2=y
1717CONFIG_CRYPTO_HASH=y
1718CONFIG_CRYPTO_HASH2=y
1719CONFIG_CRYPTO_RNG2=y
1720CONFIG_CRYPTO_MANAGER=y
1721CONFIG_CRYPTO_MANAGER2=y
1722# CONFIG_CRYPTO_GF128MUL is not set
1723# CONFIG_CRYPTO_NULL is not set
1724# CONFIG_CRYPTO_CRYPTD is not set
1725CONFIG_CRYPTO_AUTHENC=y
1726# CONFIG_CRYPTO_TEST is not set
1727
1728#
1729# Authenticated Encryption with Associated Data
1730#
1731# CONFIG_CRYPTO_CCM is not set
1732# CONFIG_CRYPTO_GCM is not set
1733# CONFIG_CRYPTO_SEQIV is not set
1734
1735#
1736# Block modes
1737#
1738CONFIG_CRYPTO_CBC=y
1739# CONFIG_CRYPTO_CTR is not set
1740# CONFIG_CRYPTO_CTS is not set
1741# CONFIG_CRYPTO_ECB is not set
1742# CONFIG_CRYPTO_LRW is not set
1743CONFIG_CRYPTO_PCBC=m
1744# CONFIG_CRYPTO_XTS is not set
1745
1746#
1747# Hash modes
1748#
1749CONFIG_CRYPTO_HMAC=y
1750# CONFIG_CRYPTO_XCBC is not set
1751
1752#
1753# Digest
1754#
1755CONFIG_CRYPTO_CRC32C=m
1756# CONFIG_CRYPTO_MD4 is not set
1757CONFIG_CRYPTO_MD5=y
1758# CONFIG_CRYPTO_MICHAEL_MIC is not set
1759# CONFIG_CRYPTO_RMD128 is not set
1760# CONFIG_CRYPTO_RMD160 is not set
1761# CONFIG_CRYPTO_RMD256 is not set
1762# CONFIG_CRYPTO_RMD320 is not set
1763CONFIG_CRYPTO_SHA1=m
1764# CONFIG_CRYPTO_SHA256 is not set
1765# CONFIG_CRYPTO_SHA512 is not set
1766# CONFIG_CRYPTO_TGR192 is not set
1767# CONFIG_CRYPTO_WP512 is not set
1768
1769#
1770# Ciphers
1771#
1772# CONFIG_CRYPTO_AES is not set
1773# CONFIG_CRYPTO_ANUBIS is not set
1774# CONFIG_CRYPTO_ARC4 is not set
1775# CONFIG_CRYPTO_BLOWFISH is not set
1776# CONFIG_CRYPTO_CAMELLIA is not set
1777# CONFIG_CRYPTO_CAST5 is not set
1778# CONFIG_CRYPTO_CAST6 is not set
1779CONFIG_CRYPTO_DES=y
1780# CONFIG_CRYPTO_FCRYPT is not set
1781# CONFIG_CRYPTO_KHAZAD is not set
1782# CONFIG_CRYPTO_SALSA20 is not set
1783# CONFIG_CRYPTO_SEED is not set
1784# CONFIG_CRYPTO_SERPENT is not set
1785# CONFIG_CRYPTO_TEA is not set
1786# CONFIG_CRYPTO_TWOFISH is not set
1787
1788#
1789# Compression
1790#
1791# CONFIG_CRYPTO_DEFLATE is not set
1792# CONFIG_CRYPTO_LZO is not set
1793
1794#
1795# Random Number Generation
1796#
1797# CONFIG_CRYPTO_ANSI_CPRNG is not set
1798CONFIG_CRYPTO_HW=y
1799# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1800CONFIG_CRYPTO_DEV_TALITOS=y
1801# CONFIG_PPC_CLOCK is not set
1802# CONFIG_VIRTUALIZATION is not set
diff --git a/arch/powerpc/configs/85xx/mpc8568mds_defconfig b/arch/powerpc/configs/85xx/mpc8568mds_defconfig
deleted file mode 100644
index 186c1010a135..000000000000
--- a/arch/powerpc/configs/85xx/mpc8568mds_defconfig
+++ /dev/null
@@ -1,1309 +0,0 @@
1#
2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.29-rc2
4# Mon Jan 26 15:36:10 2009
5#
6# CONFIG_PPC64 is not set
7
8#
9# Processor support
10#
11# CONFIG_6xx is not set
12CONFIG_PPC_85xx=y
13# CONFIG_PPC_8xx is not set
14# CONFIG_40x is not set
15# CONFIG_44x is not set
16# CONFIG_E200 is not set
17CONFIG_E500=y
18# CONFIG_PPC_E500MC is not set
19CONFIG_BOOKE=y
20CONFIG_FSL_BOOKE=y
21CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y
25# CONFIG_PPC_MM_SLICES is not set
26# CONFIG_SMP is not set
27CONFIG_PPC32=y
28CONFIG_WORD_SIZE=32
29# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
30CONFIG_MMU=y
31CONFIG_GENERIC_CMOS_UPDATE=y
32CONFIG_GENERIC_TIME=y
33CONFIG_GENERIC_TIME_VSYSCALL=y
34CONFIG_GENERIC_CLOCKEVENTS=y
35CONFIG_GENERIC_HARDIRQS=y
36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
37CONFIG_IRQ_PER_CPU=y
38CONFIG_STACKTRACE_SUPPORT=y
39CONFIG_HAVE_LATENCYTOP_SUPPORT=y
40CONFIG_LOCKDEP_SUPPORT=y
41CONFIG_RWSEM_XCHGADD_ALGORITHM=y
42CONFIG_ARCH_HAS_ILOG2_U32=y
43CONFIG_GENERIC_HWEIGHT=y
44CONFIG_GENERIC_CALIBRATE_DELAY=y
45CONFIG_GENERIC_FIND_NEXT_BIT=y
46# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
47CONFIG_PPC=y
48CONFIG_EARLY_PRINTK=y
49CONFIG_GENERIC_NVRAM=y
50CONFIG_SCHED_OMIT_FRAME_POINTER=y
51CONFIG_ARCH_MAY_HAVE_PC_FDC=y
52CONFIG_PPC_OF=y
53CONFIG_OF=y
54CONFIG_PPC_UDBG_16550=y
55# CONFIG_GENERIC_TBSYNC is not set
56CONFIG_AUDIT_ARCH=y
57CONFIG_GENERIC_BUG=y
58CONFIG_DEFAULT_UIMAGE=y
59# CONFIG_PPC_DCR_NATIVE is not set
60# CONFIG_PPC_DCR_MMIO is not set
61CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
62
63#
64# General setup
65#
66CONFIG_EXPERIMENTAL=y
67CONFIG_BROKEN_ON_SMP=y
68CONFIG_INIT_ENV_ARG_LIMIT=32
69CONFIG_LOCALVERSION=""
70CONFIG_LOCALVERSION_AUTO=y
71CONFIG_SWAP=y
72CONFIG_SYSVIPC=y
73CONFIG_SYSVIPC_SYSCTL=y
74# CONFIG_POSIX_MQUEUE is not set
75# CONFIG_BSD_PROCESS_ACCT is not set
76# CONFIG_TASKSTATS is not set
77# CONFIG_AUDIT is not set
78# CONFIG_IKCONFIG is not set
79CONFIG_LOG_BUF_SHIFT=14
80CONFIG_GROUP_SCHED=y
81# CONFIG_FAIR_GROUP_SCHED is not set
82# CONFIG_RT_GROUP_SCHED is not set
83CONFIG_USER_SCHED=y
84# CONFIG_CGROUP_SCHED is not set
85# CONFIG_CGROUPS is not set
86CONFIG_SYSFS_DEPRECATED=y
87CONFIG_SYSFS_DEPRECATED_V2=y
88# CONFIG_RELAY is not set
89# CONFIG_NAMESPACES is not set
90CONFIG_BLK_DEV_INITRD=y
91CONFIG_INITRAMFS_SOURCE=""
92# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
93CONFIG_SYSCTL=y
94CONFIG_EMBEDDED=y
95CONFIG_SYSCTL_SYSCALL=y
96# CONFIG_KALLSYMS is not set
97CONFIG_HOTPLUG=y
98CONFIG_PRINTK=y
99CONFIG_BUG=y
100CONFIG_ELF_CORE=y
101CONFIG_COMPAT_BRK=y
102CONFIG_BASE_FULL=y
103CONFIG_FUTEX=y
104CONFIG_ANON_INODES=y
105# CONFIG_EPOLL is not set
106CONFIG_SIGNALFD=y
107CONFIG_TIMERFD=y
108CONFIG_EVENTFD=y
109CONFIG_SHMEM=y
110CONFIG_AIO=y
111CONFIG_VM_EVENT_COUNTERS=y
112CONFIG_PCI_QUIRKS=y
113CONFIG_SLUB_DEBUG=y
114# CONFIG_SLAB is not set
115CONFIG_SLUB=y
116# CONFIG_SLOB is not set
117# CONFIG_PROFILING is not set
118CONFIG_HAVE_OPROFILE=y
119CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
120CONFIG_HAVE_IOREMAP_PROT=y
121CONFIG_HAVE_KPROBES=y
122CONFIG_HAVE_KRETPROBES=y
123CONFIG_HAVE_ARCH_TRACEHOOK=y
124# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
125CONFIG_SLABINFO=y
126CONFIG_RT_MUTEXES=y
127CONFIG_BASE_SMALL=0
128CONFIG_MODULES=y
129# CONFIG_MODULE_FORCE_LOAD is not set
130CONFIG_MODULE_UNLOAD=y
131# CONFIG_MODULE_FORCE_UNLOAD is not set
132# CONFIG_MODVERSIONS is not set
133# CONFIG_MODULE_SRCVERSION_ALL is not set
134CONFIG_BLOCK=y
135# CONFIG_LBD is not set
136# CONFIG_BLK_DEV_IO_TRACE is not set
137# CONFIG_BLK_DEV_BSG is not set
138# CONFIG_BLK_DEV_INTEGRITY is not set
139
140#
141# IO Schedulers
142#
143CONFIG_IOSCHED_NOOP=y
144CONFIG_IOSCHED_AS=y
145CONFIG_IOSCHED_DEADLINE=y
146CONFIG_IOSCHED_CFQ=y
147CONFIG_DEFAULT_AS=y
148# CONFIG_DEFAULT_DEADLINE is not set
149# CONFIG_DEFAULT_CFQ is not set
150# CONFIG_DEFAULT_NOOP is not set
151CONFIG_DEFAULT_IOSCHED="anticipatory"
152CONFIG_CLASSIC_RCU=y
153# CONFIG_TREE_RCU is not set
154# CONFIG_PREEMPT_RCU is not set
155# CONFIG_TREE_RCU_TRACE is not set
156# CONFIG_PREEMPT_RCU_TRACE is not set
157# CONFIG_FREEZER is not set
158
159#
160# Platform support
161#
162# CONFIG_PPC_CELL is not set
163# CONFIG_PPC_CELL_NATIVE is not set
164# CONFIG_PQ2ADS is not set
165CONFIG_MPC85xx=y
166# CONFIG_MPC8540_ADS is not set
167# CONFIG_MPC8560_ADS is not set
168# CONFIG_MPC85xx_CDS is not set
169CONFIG_MPC85xx_MDS=y
170# CONFIG_MPC8536_DS is not set
171# CONFIG_MPC85xx_DS is not set
172# CONFIG_KSI8560 is not set
173# CONFIG_STX_GP3 is not set
174# CONFIG_TQM8540 is not set
175# CONFIG_TQM8541 is not set
176# CONFIG_TQM8548 is not set
177# CONFIG_TQM8555 is not set
178# CONFIG_TQM8560 is not set
179# CONFIG_SBC8548 is not set
180# CONFIG_SBC8560 is not set
181# CONFIG_IPIC is not set
182CONFIG_MPIC=y
183# CONFIG_MPIC_WEIRD is not set
184# CONFIG_PPC_I8259 is not set
185# CONFIG_PPC_RTAS is not set
186# CONFIG_MMIO_NVRAM is not set
187# CONFIG_PPC_MPC106 is not set
188# CONFIG_PPC_970_NAP is not set
189# CONFIG_PPC_INDIRECT_IO is not set
190# CONFIG_GENERIC_IOMAP is not set
191# CONFIG_CPU_FREQ is not set
192CONFIG_QUICC_ENGINE=y
193# CONFIG_QE_GPIO is not set
194# CONFIG_CPM2 is not set
195# CONFIG_FSL_ULI1575 is not set
196# CONFIG_MPC8xxx_GPIO is not set
197# CONFIG_SIMPLE_GPIO is not set
198
199#
200# Kernel options
201#
202# CONFIG_HIGHMEM is not set
203CONFIG_TICK_ONESHOT=y
204CONFIG_NO_HZ=y
205CONFIG_HIGH_RES_TIMERS=y
206CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
207# CONFIG_HZ_100 is not set
208CONFIG_HZ_250=y
209# CONFIG_HZ_300 is not set
210# CONFIG_HZ_1000 is not set
211CONFIG_HZ=250
212CONFIG_SCHED_HRTICK=y
213CONFIG_PREEMPT_NONE=y
214# CONFIG_PREEMPT_VOLUNTARY is not set
215# CONFIG_PREEMPT is not set
216CONFIG_BINFMT_ELF=y
217# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
218# CONFIG_HAVE_AOUT is not set
219# CONFIG_BINFMT_MISC is not set
220CONFIG_MATH_EMULATION=y
221# CONFIG_IOMMU_HELPER is not set
222CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
223CONFIG_ARCH_HAS_WALK_MEMORY=y
224CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
225CONFIG_ARCH_FLATMEM_ENABLE=y
226CONFIG_ARCH_POPULATES_NODE_MAP=y
227CONFIG_SELECT_MEMORY_MODEL=y
228CONFIG_FLATMEM_MANUAL=y
229# CONFIG_DISCONTIGMEM_MANUAL is not set
230# CONFIG_SPARSEMEM_MANUAL is not set
231CONFIG_FLATMEM=y
232CONFIG_FLAT_NODE_MEM_MAP=y
233CONFIG_PAGEFLAGS_EXTENDED=y
234CONFIG_SPLIT_PTLOCK_CPUS=4
235CONFIG_MIGRATION=y
236# CONFIG_PHYS_ADDR_T_64BIT is not set
237CONFIG_ZONE_DMA_FLAG=1
238CONFIG_BOUNCE=y
239CONFIG_VIRT_TO_BUS=y
240CONFIG_UNEVICTABLE_LRU=y
241CONFIG_PPC_4K_PAGES=y
242# CONFIG_PPC_16K_PAGES is not set
243# CONFIG_PPC_64K_PAGES is not set
244CONFIG_FORCE_MAX_ZONEORDER=11
245CONFIG_PROC_DEVICETREE=y
246# CONFIG_CMDLINE_BOOL is not set
247CONFIG_EXTRA_TARGETS=""
248# CONFIG_PM is not set
249CONFIG_SECCOMP=y
250CONFIG_ISA_DMA_API=y
251
252#
253# Bus options
254#
255CONFIG_ZONE_DMA=y
256CONFIG_PPC_INDIRECT_PCI=y
257CONFIG_FSL_SOC=y
258CONFIG_FSL_PCI=y
259CONFIG_PPC_PCI_CHOICE=y
260CONFIG_PCI=y
261CONFIG_PCI_DOMAINS=y
262CONFIG_PCI_SYSCALL=y
263# CONFIG_PCIEPORTBUS is not set
264CONFIG_ARCH_SUPPORTS_MSI=y
265# CONFIG_PCI_MSI is not set
266# CONFIG_PCI_LEGACY is not set
267# CONFIG_PCI_DEBUG is not set
268# CONFIG_PCI_STUB is not set
269# CONFIG_PCCARD is not set
270# CONFIG_HOTPLUG_PCI is not set
271# CONFIG_HAS_RAPIDIO is not set
272
273#
274# Advanced setup
275#
276# CONFIG_ADVANCED_OPTIONS is not set
277
278#
279# Default settings for advanced configuration options are used
280#
281CONFIG_LOWMEM_SIZE=0x30000000
282CONFIG_PAGE_OFFSET=0xc0000000
283CONFIG_KERNEL_START=0xc0000000
284CONFIG_PHYSICAL_START=0x00000000
285CONFIG_PHYSICAL_ALIGN=0x10000000
286CONFIG_TASK_SIZE=0xc0000000
287CONFIG_NET=y
288
289#
290# Networking options
291#
292CONFIG_COMPAT_NET_DEV_OPS=y
293CONFIG_PACKET=y
294# CONFIG_PACKET_MMAP is not set
295CONFIG_UNIX=y
296CONFIG_XFRM=y
297# CONFIG_XFRM_USER is not set
298# CONFIG_XFRM_SUB_POLICY is not set
299# CONFIG_XFRM_MIGRATE is not set
300# CONFIG_XFRM_STATISTICS is not set
301# CONFIG_NET_KEY is not set
302CONFIG_INET=y
303CONFIG_IP_MULTICAST=y
304# CONFIG_IP_ADVANCED_ROUTER is not set
305CONFIG_IP_FIB_HASH=y
306CONFIG_IP_PNP=y
307CONFIG_IP_PNP_DHCP=y
308CONFIG_IP_PNP_BOOTP=y
309# CONFIG_IP_PNP_RARP is not set
310# CONFIG_NET_IPIP is not set
311# CONFIG_NET_IPGRE is not set
312# CONFIG_IP_MROUTE is not set
313# CONFIG_ARPD is not set
314CONFIG_SYN_COOKIES=y
315# CONFIG_INET_AH is not set
316# CONFIG_INET_ESP is not set
317# CONFIG_INET_IPCOMP is not set
318# CONFIG_INET_XFRM_TUNNEL is not set
319# CONFIG_INET_TUNNEL is not set
320CONFIG_INET_XFRM_MODE_TRANSPORT=y
321CONFIG_INET_XFRM_MODE_TUNNEL=y
322CONFIG_INET_XFRM_MODE_BEET=y
323# CONFIG_INET_LRO is not set
324CONFIG_INET_DIAG=y
325CONFIG_INET_TCP_DIAG=y
326# CONFIG_TCP_CONG_ADVANCED is not set
327CONFIG_TCP_CONG_CUBIC=y
328CONFIG_DEFAULT_TCP_CONG="cubic"
329# CONFIG_TCP_MD5SIG is not set
330# CONFIG_IPV6 is not set
331# CONFIG_NETWORK_SECMARK is not set
332# CONFIG_NETFILTER is not set
333# CONFIG_IP_DCCP is not set
334# CONFIG_IP_SCTP is not set
335# CONFIG_TIPC is not set
336# CONFIG_ATM is not set
337# CONFIG_BRIDGE is not set
338# CONFIG_NET_DSA is not set
339# CONFIG_VLAN_8021Q is not set
340# CONFIG_DECNET is not set
341# CONFIG_LLC2 is not set
342# CONFIG_IPX is not set
343# CONFIG_ATALK is not set
344# CONFIG_X25 is not set
345# CONFIG_LAPB is not set
346# CONFIG_ECONET is not set
347# CONFIG_WAN_ROUTER is not set
348# CONFIG_NET_SCHED is not set
349# CONFIG_DCB is not set
350
351#
352# Network testing
353#
354# CONFIG_NET_PKTGEN is not set
355# CONFIG_HAMRADIO is not set
356# CONFIG_CAN is not set
357# CONFIG_IRDA is not set
358# CONFIG_BT is not set
359# CONFIG_AF_RXRPC is not set
360# CONFIG_PHONET is not set
361CONFIG_WIRELESS=y
362# CONFIG_CFG80211 is not set
363CONFIG_WIRELESS_OLD_REGULATORY=y
364# CONFIG_WIRELESS_EXT is not set
365# CONFIG_LIB80211 is not set
366# CONFIG_MAC80211 is not set
367# CONFIG_WIMAX is not set
368# CONFIG_RFKILL is not set
369# CONFIG_NET_9P is not set
370
371#
372# Device Drivers
373#
374
375#
376# Generic Driver Options
377#
378CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
379CONFIG_STANDALONE=y
380CONFIG_PREVENT_FIRMWARE_BUILD=y
381# CONFIG_FW_LOADER is not set
382# CONFIG_DEBUG_DRIVER is not set
383# CONFIG_DEBUG_DEVRES is not set
384# CONFIG_SYS_HYPERVISOR is not set
385# CONFIG_CONNECTOR is not set
386# CONFIG_MTD is not set
387CONFIG_OF_DEVICE=y
388CONFIG_OF_I2C=y
389# CONFIG_PARPORT is not set
390CONFIG_BLK_DEV=y
391# CONFIG_BLK_DEV_FD is not set
392# CONFIG_BLK_CPQ_DA is not set
393# CONFIG_BLK_CPQ_CISS_DA is not set
394# CONFIG_BLK_DEV_DAC960 is not set
395# CONFIG_BLK_DEV_UMEM is not set
396# CONFIG_BLK_DEV_COW_COMMON is not set
397CONFIG_BLK_DEV_LOOP=y
398# CONFIG_BLK_DEV_CRYPTOLOOP is not set
399# CONFIG_BLK_DEV_NBD is not set
400# CONFIG_BLK_DEV_SX8 is not set
401CONFIG_BLK_DEV_RAM=y
402CONFIG_BLK_DEV_RAM_COUNT=16
403CONFIG_BLK_DEV_RAM_SIZE=32768
404# CONFIG_BLK_DEV_XIP is not set
405# CONFIG_CDROM_PKTCDVD is not set
406# CONFIG_ATA_OVER_ETH is not set
407# CONFIG_BLK_DEV_HD is not set
408CONFIG_MISC_DEVICES=y
409# CONFIG_PHANTOM is not set
410# CONFIG_EEPROM_93CX6 is not set
411# CONFIG_SGI_IOC4 is not set
412# CONFIG_TIFM_CORE is not set
413# CONFIG_ICS932S401 is not set
414# CONFIG_ENCLOSURE_SERVICES is not set
415# CONFIG_HP_ILO is not set
416# CONFIG_C2PORT is not set
417CONFIG_HAVE_IDE=y
418# CONFIG_IDE is not set
419
420#
421# SCSI device support
422#
423# CONFIG_RAID_ATTRS is not set
424CONFIG_SCSI=y
425CONFIG_SCSI_DMA=y
426# CONFIG_SCSI_TGT is not set
427# CONFIG_SCSI_NETLINK is not set
428CONFIG_SCSI_PROC_FS=y
429
430#
431# SCSI support type (disk, tape, CD-ROM)
432#
433# CONFIG_BLK_DEV_SD is not set
434# CONFIG_CHR_DEV_ST is not set
435# CONFIG_CHR_DEV_OSST is not set
436# CONFIG_BLK_DEV_SR is not set
437# CONFIG_CHR_DEV_SG is not set
438# CONFIG_CHR_DEV_SCH is not set
439
440#
441# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
442#
443# CONFIG_SCSI_MULTI_LUN is not set
444# CONFIG_SCSI_CONSTANTS is not set
445# CONFIG_SCSI_LOGGING is not set
446# CONFIG_SCSI_SCAN_ASYNC is not set
447CONFIG_SCSI_WAIT_SCAN=m
448
449#
450# SCSI Transports
451#
452# CONFIG_SCSI_SPI_ATTRS is not set
453# CONFIG_SCSI_FC_ATTRS is not set
454# CONFIG_SCSI_ISCSI_ATTRS is not set
455# CONFIG_SCSI_SAS_LIBSAS is not set
456# CONFIG_SCSI_SRP_ATTRS is not set
457CONFIG_SCSI_LOWLEVEL=y
458# CONFIG_ISCSI_TCP is not set
459# CONFIG_SCSI_CXGB3_ISCSI is not set
460# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
461# CONFIG_SCSI_3W_9XXX is not set
462# CONFIG_SCSI_ACARD is not set
463# CONFIG_SCSI_AACRAID is not set
464# CONFIG_SCSI_AIC7XXX is not set
465# CONFIG_SCSI_AIC7XXX_OLD is not set
466# CONFIG_SCSI_AIC79XX is not set
467# CONFIG_SCSI_AIC94XX is not set
468# CONFIG_SCSI_DPT_I2O is not set
469# CONFIG_SCSI_ADVANSYS is not set
470# CONFIG_SCSI_ARCMSR is not set
471# CONFIG_MEGARAID_NEWGEN is not set
472# CONFIG_MEGARAID_LEGACY is not set
473# CONFIG_MEGARAID_SAS is not set
474# CONFIG_SCSI_HPTIOP is not set
475# CONFIG_SCSI_BUSLOGIC is not set
476# CONFIG_LIBFC is not set
477# CONFIG_FCOE is not set
478# CONFIG_SCSI_DMX3191D is not set
479# CONFIG_SCSI_EATA is not set
480# CONFIG_SCSI_FUTURE_DOMAIN is not set
481# CONFIG_SCSI_GDTH is not set
482# CONFIG_SCSI_IPS is not set
483# CONFIG_SCSI_INITIO is not set
484# CONFIG_SCSI_INIA100 is not set
485# CONFIG_SCSI_MVSAS is not set
486# CONFIG_SCSI_STEX is not set
487# CONFIG_SCSI_SYM53C8XX_2 is not set
488# CONFIG_SCSI_QLOGIC_1280 is not set
489# CONFIG_SCSI_QLA_FC is not set
490# CONFIG_SCSI_QLA_ISCSI is not set
491# CONFIG_SCSI_LPFC is not set
492# CONFIG_SCSI_DC395x is not set
493# CONFIG_SCSI_DC390T is not set
494# CONFIG_SCSI_NSP32 is not set
495# CONFIG_SCSI_DEBUG is not set
496# CONFIG_SCSI_SRP is not set
497# CONFIG_SCSI_DH is not set
498# CONFIG_ATA is not set
499# CONFIG_MD is not set
500# CONFIG_FUSION is not set
501
502#
503# IEEE 1394 (FireWire) support
504#
505
506#
507# Enable only one of the two stacks, unless you know what you are doing
508#
509# CONFIG_FIREWIRE is not set
510# CONFIG_IEEE1394 is not set
511# CONFIG_I2O is not set
512# CONFIG_MACINTOSH_DRIVERS is not set
513CONFIG_NETDEVICES=y
514# CONFIG_DUMMY is not set
515# CONFIG_BONDING is not set
516# CONFIG_MACVLAN is not set
517# CONFIG_EQUALIZER is not set
518# CONFIG_TUN is not set
519# CONFIG_VETH is not set
520# CONFIG_ARCNET is not set
521CONFIG_PHYLIB=y
522
523#
524# MII PHY device drivers
525#
526CONFIG_MARVELL_PHY=y
527# CONFIG_DAVICOM_PHY is not set
528# CONFIG_QSEMI_PHY is not set
529# CONFIG_LXT_PHY is not set
530# CONFIG_CICADA_PHY is not set
531# CONFIG_VITESSE_PHY is not set
532# CONFIG_SMSC_PHY is not set
533# CONFIG_BROADCOM_PHY is not set
534# CONFIG_ICPLUS_PHY is not set
535# CONFIG_REALTEK_PHY is not set
536# CONFIG_NATIONAL_PHY is not set
537# CONFIG_STE10XP is not set
538# CONFIG_LSI_ET1011C_PHY is not set
539# CONFIG_FIXED_PHY is not set
540# CONFIG_MDIO_BITBANG is not set
541CONFIG_NET_ETHERNET=y
542CONFIG_MII=y
543# CONFIG_HAPPYMEAL is not set
544# CONFIG_SUNGEM is not set
545# CONFIG_CASSINI is not set
546# CONFIG_NET_VENDOR_3COM is not set
547# CONFIG_NET_TULIP is not set
548# CONFIG_HP100 is not set
549# CONFIG_IBM_NEW_EMAC_ZMII is not set
550# CONFIG_IBM_NEW_EMAC_RGMII is not set
551# CONFIG_IBM_NEW_EMAC_TAH is not set
552# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
553# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
554# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
555# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
556# CONFIG_NET_PCI is not set
557# CONFIG_B44 is not set
558# CONFIG_ATL2 is not set
559CONFIG_NETDEV_1000=y
560# CONFIG_ACENIC is not set
561# CONFIG_DL2K is not set
562# CONFIG_E1000 is not set
563# CONFIG_E1000E is not set
564# CONFIG_IP1000 is not set
565# CONFIG_IGB is not set
566# CONFIG_NS83820 is not set
567# CONFIG_HAMACHI is not set
568# CONFIG_YELLOWFIN is not set
569# CONFIG_R8169 is not set
570# CONFIG_SIS190 is not set
571# CONFIG_SKGE is not set
572# CONFIG_SKY2 is not set
573# CONFIG_VIA_VELOCITY is not set
574# CONFIG_TIGON3 is not set
575# CONFIG_BNX2 is not set
576CONFIG_GIANFAR=y
577# CONFIG_UCC_GETH is not set
578# CONFIG_QLA3XXX is not set
579# CONFIG_ATL1 is not set
580# CONFIG_ATL1E is not set
581# CONFIG_JME is not set
582CONFIG_NETDEV_10000=y
583# CONFIG_CHELSIO_T1 is not set
584CONFIG_CHELSIO_T3_DEPENDS=y
585# CONFIG_CHELSIO_T3 is not set
586# CONFIG_ENIC is not set
587# CONFIG_IXGBE is not set
588# CONFIG_IXGB is not set
589# CONFIG_S2IO is not set
590# CONFIG_MYRI10GE is not set
591# CONFIG_NETXEN_NIC is not set
592# CONFIG_NIU is not set
593# CONFIG_MLX4_EN is not set
594# CONFIG_MLX4_CORE is not set
595# CONFIG_TEHUTI is not set
596# CONFIG_BNX2X is not set
597# CONFIG_QLGE is not set
598# CONFIG_SFC is not set
599# CONFIG_TR is not set
600
601#
602# Wireless LAN
603#
604# CONFIG_WLAN_PRE80211 is not set
605# CONFIG_WLAN_80211 is not set
606# CONFIG_IWLWIFI_LEDS is not set
607
608#
609# Enable WiMAX (Networking options) to see the WiMAX drivers
610#
611# CONFIG_WAN is not set
612# CONFIG_FDDI is not set
613# CONFIG_HIPPI is not set
614# CONFIG_PPP is not set
615# CONFIG_SLIP is not set
616# CONFIG_NET_FC is not set
617# CONFIG_NETCONSOLE is not set
618# CONFIG_NETPOLL is not set
619# CONFIG_NET_POLL_CONTROLLER is not set
620# CONFIG_ISDN is not set
621# CONFIG_PHONE is not set
622
623#
624# Input device support
625#
626CONFIG_INPUT=y
627# CONFIG_INPUT_FF_MEMLESS is not set
628# CONFIG_INPUT_POLLDEV is not set
629
630#
631# Userland interfaces
632#
633# CONFIG_INPUT_MOUSEDEV is not set
634# CONFIG_INPUT_JOYDEV is not set
635# CONFIG_INPUT_EVDEV is not set
636# CONFIG_INPUT_EVBUG is not set
637
638#
639# Input Device Drivers
640#
641# CONFIG_INPUT_KEYBOARD is not set
642# CONFIG_INPUT_MOUSE is not set
643# CONFIG_INPUT_JOYSTICK is not set
644# CONFIG_INPUT_TABLET is not set
645# CONFIG_INPUT_TOUCHSCREEN is not set
646# CONFIG_INPUT_MISC is not set
647
648#
649# Hardware I/O ports
650#
651# CONFIG_SERIO is not set
652# CONFIG_GAMEPORT is not set
653
654#
655# Character devices
656#
657# CONFIG_VT is not set
658CONFIG_DEVKMEM=y
659# CONFIG_SERIAL_NONSTANDARD is not set
660# CONFIG_NOZOMI is not set
661
662#
663# Serial drivers
664#
665CONFIG_SERIAL_8250=y
666CONFIG_SERIAL_8250_CONSOLE=y
667CONFIG_SERIAL_8250_PCI=y
668CONFIG_SERIAL_8250_NR_UARTS=4
669CONFIG_SERIAL_8250_RUNTIME_UARTS=4
670# CONFIG_SERIAL_8250_EXTENDED is not set
671CONFIG_SERIAL_8250_SHARE_IRQ=y
672
673#
674# Non-8250 serial port support
675#
676# CONFIG_SERIAL_UARTLITE is not set
677CONFIG_SERIAL_CORE=y
678CONFIG_SERIAL_CORE_CONSOLE=y
679# CONFIG_SERIAL_JSM is not set
680# CONFIG_SERIAL_OF_PLATFORM is not set
681# CONFIG_SERIAL_QE is not set
682CONFIG_UNIX98_PTYS=y
683# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
684CONFIG_LEGACY_PTYS=y
685CONFIG_LEGACY_PTY_COUNT=256
686# CONFIG_HVC_UDBG is not set
687# CONFIG_IPMI_HANDLER is not set
688CONFIG_HW_RANDOM=y
689# CONFIG_NVRAM is not set
690# CONFIG_R3964 is not set
691# CONFIG_APPLICOM is not set
692# CONFIG_RAW_DRIVER is not set
693# CONFIG_TCG_TPM is not set
694CONFIG_DEVPORT=y
695CONFIG_I2C=y
696CONFIG_I2C_BOARDINFO=y
697CONFIG_I2C_CHARDEV=y
698CONFIG_I2C_HELPER_AUTO=y
699
700#
701# I2C Hardware Bus support
702#
703
704#
705# PC SMBus host controller drivers
706#
707# CONFIG_I2C_ALI1535 is not set
708# CONFIG_I2C_ALI1563 is not set
709# CONFIG_I2C_ALI15X3 is not set
710# CONFIG_I2C_AMD756 is not set
711# CONFIG_I2C_AMD8111 is not set
712# CONFIG_I2C_I801 is not set
713# CONFIG_I2C_ISCH is not set
714# CONFIG_I2C_PIIX4 is not set
715# CONFIG_I2C_NFORCE2 is not set
716# CONFIG_I2C_SIS5595 is not set
717# CONFIG_I2C_SIS630 is not set
718# CONFIG_I2C_SIS96X is not set
719# CONFIG_I2C_VIA is not set
720# CONFIG_I2C_VIAPRO is not set
721
722#
723# I2C system bus drivers (mostly embedded / system-on-chip)
724#
725CONFIG_I2C_MPC=y
726# CONFIG_I2C_OCORES is not set
727# CONFIG_I2C_SIMTEC is not set
728
729#
730# External I2C/SMBus adapter drivers
731#
732# CONFIG_I2C_PARPORT_LIGHT is not set
733# CONFIG_I2C_TAOS_EVM is not set
734
735#
736# Graphics adapter I2C/DDC channel drivers
737#
738# CONFIG_I2C_VOODOO3 is not set
739
740#
741# Other I2C/SMBus bus drivers
742#
743# CONFIG_I2C_PCA_PLATFORM is not set
744# CONFIG_I2C_STUB is not set
745
746#
747# Miscellaneous I2C Chip support
748#
749# CONFIG_DS1682 is not set
750# CONFIG_EEPROM_AT24 is not set
751# CONFIG_EEPROM_LEGACY is not set
752# CONFIG_SENSORS_PCF8574 is not set
753# CONFIG_PCF8575 is not set
754# CONFIG_SENSORS_PCA9539 is not set
755# CONFIG_SENSORS_PCF8591 is not set
756# CONFIG_SENSORS_MAX6875 is not set
757# CONFIG_SENSORS_TSL2550 is not set
758# CONFIG_I2C_DEBUG_CORE is not set
759# CONFIG_I2C_DEBUG_ALGO is not set
760# CONFIG_I2C_DEBUG_BUS is not set
761# CONFIG_I2C_DEBUG_CHIP is not set
762# CONFIG_SPI is not set
763CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
764# CONFIG_GPIOLIB is not set
765# CONFIG_W1 is not set
766# CONFIG_POWER_SUPPLY is not set
767CONFIG_HWMON=y
768# CONFIG_HWMON_VID is not set
769# CONFIG_SENSORS_AD7414 is not set
770# CONFIG_SENSORS_AD7418 is not set
771# CONFIG_SENSORS_ADM1021 is not set
772# CONFIG_SENSORS_ADM1025 is not set
773# CONFIG_SENSORS_ADM1026 is not set
774# CONFIG_SENSORS_ADM1029 is not set
775# CONFIG_SENSORS_ADM1031 is not set
776# CONFIG_SENSORS_ADM9240 is not set
777# CONFIG_SENSORS_ADT7462 is not set
778# CONFIG_SENSORS_ADT7470 is not set
779# CONFIG_SENSORS_ADT7473 is not set
780# CONFIG_SENSORS_ADT7475 is not set
781# CONFIG_SENSORS_ATXP1 is not set
782# CONFIG_SENSORS_DS1621 is not set
783# CONFIG_SENSORS_I5K_AMB is not set
784# CONFIG_SENSORS_F71805F is not set
785# CONFIG_SENSORS_F71882FG is not set
786# CONFIG_SENSORS_F75375S is not set
787# CONFIG_SENSORS_GL518SM is not set
788# CONFIG_SENSORS_GL520SM is not set
789# CONFIG_SENSORS_IT87 is not set
790# CONFIG_SENSORS_LM63 is not set
791# CONFIG_SENSORS_LM75 is not set
792# CONFIG_SENSORS_LM77 is not set
793# CONFIG_SENSORS_LM78 is not set
794# CONFIG_SENSORS_LM80 is not set
795# CONFIG_SENSORS_LM83 is not set
796# CONFIG_SENSORS_LM85 is not set
797# CONFIG_SENSORS_LM87 is not set
798# CONFIG_SENSORS_LM90 is not set
799# CONFIG_SENSORS_LM92 is not set
800# CONFIG_SENSORS_LM93 is not set
801# CONFIG_SENSORS_LTC4245 is not set
802# CONFIG_SENSORS_MAX1619 is not set
803# CONFIG_SENSORS_MAX6650 is not set
804# CONFIG_SENSORS_PC87360 is not set
805# CONFIG_SENSORS_PC87427 is not set
806# CONFIG_SENSORS_SIS5595 is not set
807# CONFIG_SENSORS_DME1737 is not set
808# CONFIG_SENSORS_SMSC47M1 is not set
809# CONFIG_SENSORS_SMSC47M192 is not set
810# CONFIG_SENSORS_SMSC47B397 is not set
811# CONFIG_SENSORS_ADS7828 is not set
812# CONFIG_SENSORS_THMC50 is not set
813# CONFIG_SENSORS_VIA686A is not set
814# CONFIG_SENSORS_VT1211 is not set
815# CONFIG_SENSORS_VT8231 is not set
816# CONFIG_SENSORS_W83781D is not set
817# CONFIG_SENSORS_W83791D is not set
818# CONFIG_SENSORS_W83792D is not set
819# CONFIG_SENSORS_W83793 is not set
820# CONFIG_SENSORS_W83L785TS is not set
821# CONFIG_SENSORS_W83L786NG is not set
822# CONFIG_SENSORS_W83627HF is not set
823# CONFIG_SENSORS_W83627EHF is not set
824# CONFIG_HWMON_DEBUG_CHIP is not set
825# CONFIG_THERMAL is not set
826# CONFIG_THERMAL_HWMON is not set
827CONFIG_WATCHDOG=y
828# CONFIG_WATCHDOG_NOWAYOUT is not set
829
830#
831# Watchdog Device Drivers
832#
833# CONFIG_SOFT_WATCHDOG is not set
834# CONFIG_ALIM7101_WDT is not set
835# CONFIG_BOOKE_WDT is not set
836
837#
838# PCI-based Watchdog Cards
839#
840# CONFIG_PCIPCWATCHDOG is not set
841# CONFIG_WDTPCI is not set
842CONFIG_SSB_POSSIBLE=y
843
844#
845# Sonics Silicon Backplane
846#
847# CONFIG_SSB is not set
848
849#
850# Multifunction device drivers
851#
852# CONFIG_MFD_CORE is not set
853# CONFIG_MFD_SM501 is not set
854# CONFIG_HTC_PASIC3 is not set
855# CONFIG_TWL4030_CORE is not set
856# CONFIG_MFD_TMIO is not set
857# CONFIG_PMIC_DA903X is not set
858# CONFIG_MFD_WM8400 is not set
859# CONFIG_MFD_WM8350_I2C is not set
860# CONFIG_MFD_PCF50633 is not set
861# CONFIG_REGULATOR is not set
862
863#
864# Multimedia devices
865#
866
867#
868# Multimedia core support
869#
870# CONFIG_VIDEO_DEV is not set
871# CONFIG_DVB_CORE is not set
872# CONFIG_VIDEO_MEDIA is not set
873
874#
875# Multimedia drivers
876#
877CONFIG_DAB=y
878
879#
880# Graphics support
881#
882# CONFIG_AGP is not set
883# CONFIG_DRM is not set
884# CONFIG_VGASTATE is not set
885CONFIG_VIDEO_OUTPUT_CONTROL=m
886# CONFIG_FB is not set
887# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
888
889#
890# Display device support
891#
892# CONFIG_DISPLAY_SUPPORT is not set
893# CONFIG_SOUND is not set
894CONFIG_HID_SUPPORT=y
895CONFIG_HID=y
896# CONFIG_HID_DEBUG is not set
897# CONFIG_HIDRAW is not set
898# CONFIG_HID_PID is not set
899
900#
901# Special HID drivers
902#
903CONFIG_HID_COMPAT=y
904CONFIG_USB_SUPPORT=y
905CONFIG_USB_ARCH_HAS_HCD=y
906CONFIG_USB_ARCH_HAS_OHCI=y
907CONFIG_USB_ARCH_HAS_EHCI=y
908# CONFIG_USB is not set
909# CONFIG_USB_OTG_WHITELIST is not set
910# CONFIG_USB_OTG_BLACKLIST_HUB is not set
911
912#
913# Enable Host or Gadget support to see Inventra options
914#
915
916#
917# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
918#
919# CONFIG_USB_GADGET is not set
920
921#
922# OTG and related infrastructure
923#
924# CONFIG_UWB is not set
925# CONFIG_MMC is not set
926# CONFIG_MEMSTICK is not set
927# CONFIG_NEW_LEDS is not set
928# CONFIG_ACCESSIBILITY is not set
929# CONFIG_INFINIBAND is not set
930# CONFIG_EDAC is not set
931CONFIG_RTC_LIB=y
932CONFIG_RTC_CLASS=y
933CONFIG_RTC_HCTOSYS=y
934CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
935# CONFIG_RTC_DEBUG is not set
936
937#
938# RTC interfaces
939#
940CONFIG_RTC_INTF_SYSFS=y
941CONFIG_RTC_INTF_PROC=y
942CONFIG_RTC_INTF_DEV=y
943# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
944# CONFIG_RTC_DRV_TEST is not set
945
946#
947# I2C RTC drivers
948#
949# CONFIG_RTC_DRV_DS1307 is not set
950CONFIG_RTC_DRV_DS1374=y
951# CONFIG_RTC_DRV_DS1672 is not set
952# CONFIG_RTC_DRV_MAX6900 is not set
953# CONFIG_RTC_DRV_RS5C372 is not set
954# CONFIG_RTC_DRV_ISL1208 is not set
955# CONFIG_RTC_DRV_X1205 is not set
956# CONFIG_RTC_DRV_PCF8563 is not set
957# CONFIG_RTC_DRV_PCF8583 is not set
958# CONFIG_RTC_DRV_M41T80 is not set
959# CONFIG_RTC_DRV_S35390A is not set
960# CONFIG_RTC_DRV_FM3130 is not set
961# CONFIG_RTC_DRV_RX8581 is not set
962
963#
964# SPI RTC drivers
965#
966
967#
968# Platform RTC drivers
969#
970# CONFIG_RTC_DRV_CMOS is not set
971# CONFIG_RTC_DRV_DS1286 is not set
972# CONFIG_RTC_DRV_DS1511 is not set
973# CONFIG_RTC_DRV_DS1553 is not set
974# CONFIG_RTC_DRV_DS1742 is not set
975# CONFIG_RTC_DRV_STK17TA8 is not set
976# CONFIG_RTC_DRV_M48T86 is not set
977# CONFIG_RTC_DRV_M48T35 is not set
978# CONFIG_RTC_DRV_M48T59 is not set
979# CONFIG_RTC_DRV_BQ4802 is not set
980# CONFIG_RTC_DRV_V3020 is not set
981
982#
983# on-CPU RTC drivers
984#
985# CONFIG_RTC_DRV_PPC is not set
986# CONFIG_DMADEVICES is not set
987# CONFIG_UIO is not set
988# CONFIG_STAGING is not set
989
990#
991# File systems
992#
993CONFIG_EXT2_FS=y
994# CONFIG_EXT2_FS_XATTR is not set
995# CONFIG_EXT2_FS_XIP is not set
996CONFIG_EXT3_FS=y
997CONFIG_EXT3_FS_XATTR=y
998# CONFIG_EXT3_FS_POSIX_ACL is not set
999# CONFIG_EXT3_FS_SECURITY is not set
1000# CONFIG_EXT4_FS is not set
1001CONFIG_JBD=y
1002CONFIG_FS_MBCACHE=y
1003# CONFIG_REISERFS_FS is not set
1004# CONFIG_JFS_FS is not set
1005# CONFIG_FS_POSIX_ACL is not set
1006CONFIG_FILE_LOCKING=y
1007# CONFIG_XFS_FS is not set
1008# CONFIG_OCFS2_FS is not set
1009# CONFIG_BTRFS_FS is not set
1010CONFIG_DNOTIFY=y
1011CONFIG_INOTIFY=y
1012CONFIG_INOTIFY_USER=y
1013# CONFIG_QUOTA is not set
1014# CONFIG_AUTOFS_FS is not set
1015# CONFIG_AUTOFS4_FS is not set
1016# CONFIG_FUSE_FS is not set
1017
1018#
1019# CD-ROM/DVD Filesystems
1020#
1021# CONFIG_ISO9660_FS is not set
1022# CONFIG_UDF_FS is not set
1023
1024#
1025# DOS/FAT/NT Filesystems
1026#
1027# CONFIG_MSDOS_FS is not set
1028# CONFIG_VFAT_FS is not set
1029# CONFIG_NTFS_FS is not set
1030
1031#
1032# Pseudo filesystems
1033#
1034CONFIG_PROC_FS=y
1035CONFIG_PROC_KCORE=y
1036CONFIG_PROC_SYSCTL=y
1037CONFIG_PROC_PAGE_MONITOR=y
1038CONFIG_SYSFS=y
1039CONFIG_TMPFS=y
1040# CONFIG_TMPFS_POSIX_ACL is not set
1041# CONFIG_HUGETLB_PAGE is not set
1042# CONFIG_CONFIGFS_FS is not set
1043CONFIG_MISC_FILESYSTEMS=y
1044# CONFIG_ADFS_FS is not set
1045# CONFIG_AFFS_FS is not set
1046# CONFIG_HFS_FS is not set
1047# CONFIG_HFSPLUS_FS is not set
1048# CONFIG_BEFS_FS is not set
1049# CONFIG_BFS_FS is not set
1050# CONFIG_EFS_FS is not set
1051# CONFIG_CRAMFS is not set
1052# CONFIG_SQUASHFS is not set
1053# CONFIG_VXFS_FS is not set
1054# CONFIG_MINIX_FS is not set
1055# CONFIG_OMFS_FS is not set
1056# CONFIG_HPFS_FS is not set
1057# CONFIG_QNX4FS_FS is not set
1058# CONFIG_ROMFS_FS is not set
1059# CONFIG_SYSV_FS is not set
1060# CONFIG_UFS_FS is not set
1061CONFIG_NETWORK_FILESYSTEMS=y
1062CONFIG_NFS_FS=y
1063CONFIG_NFS_V3=y
1064# CONFIG_NFS_V3_ACL is not set
1065CONFIG_NFS_V4=y
1066CONFIG_ROOT_NFS=y
1067# CONFIG_NFSD is not set
1068CONFIG_LOCKD=y
1069CONFIG_LOCKD_V4=y
1070CONFIG_NFS_COMMON=y
1071CONFIG_SUNRPC=y
1072CONFIG_SUNRPC_GSS=y
1073# CONFIG_SUNRPC_REGISTER_V4 is not set
1074CONFIG_RPCSEC_GSS_KRB5=y
1075# CONFIG_RPCSEC_GSS_SPKM3 is not set
1076# CONFIG_SMB_FS is not set
1077# CONFIG_CIFS is not set
1078# CONFIG_NCP_FS is not set
1079# CONFIG_CODA_FS is not set
1080# CONFIG_AFS_FS is not set
1081
1082#
1083# Partition Types
1084#
1085CONFIG_PARTITION_ADVANCED=y
1086# CONFIG_ACORN_PARTITION is not set
1087# CONFIG_OSF_PARTITION is not set
1088# CONFIG_AMIGA_PARTITION is not set
1089# CONFIG_ATARI_PARTITION is not set
1090# CONFIG_MAC_PARTITION is not set
1091# CONFIG_MSDOS_PARTITION is not set
1092# CONFIG_LDM_PARTITION is not set
1093# CONFIG_SGI_PARTITION is not set
1094# CONFIG_ULTRIX_PARTITION is not set
1095# CONFIG_SUN_PARTITION is not set
1096# CONFIG_KARMA_PARTITION is not set
1097# CONFIG_EFI_PARTITION is not set
1098# CONFIG_SYSV68_PARTITION is not set
1099# CONFIG_NLS is not set
1100# CONFIG_DLM is not set
1101
1102#
1103# Library routines
1104#
1105CONFIG_BITREVERSE=y
1106CONFIG_GENERIC_FIND_LAST_BIT=y
1107# CONFIG_CRC_CCITT is not set
1108# CONFIG_CRC16 is not set
1109# CONFIG_CRC_T10DIF is not set
1110# CONFIG_CRC_ITU_T is not set
1111CONFIG_CRC32=y
1112# CONFIG_CRC7 is not set
1113# CONFIG_LIBCRC32C is not set
1114CONFIG_PLIST=y
1115CONFIG_HAS_IOMEM=y
1116CONFIG_HAS_IOPORT=y
1117CONFIG_HAS_DMA=y
1118CONFIG_HAVE_LMB=y
1119
1120#
1121# Kernel hacking
1122#
1123# CONFIG_PRINTK_TIME is not set
1124CONFIG_ENABLE_WARN_DEPRECATED=y
1125CONFIG_ENABLE_MUST_CHECK=y
1126CONFIG_FRAME_WARN=1024
1127# CONFIG_MAGIC_SYSRQ is not set
1128# CONFIG_UNUSED_SYMBOLS is not set
1129# CONFIG_DEBUG_FS is not set
1130# CONFIG_HEADERS_CHECK is not set
1131CONFIG_DEBUG_KERNEL=y
1132# CONFIG_DEBUG_SHIRQ is not set
1133CONFIG_DETECT_SOFTLOCKUP=y
1134# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
1135CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
1136CONFIG_SCHED_DEBUG=y
1137# CONFIG_SCHEDSTATS is not set
1138# CONFIG_TIMER_STATS is not set
1139# CONFIG_DEBUG_OBJECTS is not set
1140# CONFIG_SLUB_DEBUG_ON is not set
1141# CONFIG_SLUB_STATS is not set
1142# CONFIG_DEBUG_RT_MUTEXES is not set
1143# CONFIG_RT_MUTEX_TESTER is not set
1144# CONFIG_DEBUG_SPINLOCK is not set
1145# CONFIG_DEBUG_MUTEXES is not set
1146# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1147# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1148# CONFIG_DEBUG_KOBJECT is not set
1149# CONFIG_DEBUG_BUGVERBOSE is not set
1150# CONFIG_DEBUG_INFO is not set
1151# CONFIG_DEBUG_VM is not set
1152# CONFIG_DEBUG_WRITECOUNT is not set
1153# CONFIG_DEBUG_MEMORY_INIT is not set
1154# CONFIG_DEBUG_LIST is not set
1155# CONFIG_DEBUG_SG is not set
1156# CONFIG_DEBUG_NOTIFIERS is not set
1157# CONFIG_BOOT_PRINTK_DELAY is not set
1158# CONFIG_RCU_TORTURE_TEST is not set
1159# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1160# CONFIG_BACKTRACE_SELF_TEST is not set
1161# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1162# CONFIG_FAULT_INJECTION is not set
1163# CONFIG_LATENCYTOP is not set
1164CONFIG_SYSCTL_SYSCALL_CHECK=y
1165CONFIG_HAVE_FUNCTION_TRACER=y
1166CONFIG_HAVE_DYNAMIC_FTRACE=y
1167CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1168
1169#
1170# Tracers
1171#
1172# CONFIG_FUNCTION_TRACER is not set
1173# CONFIG_SCHED_TRACER is not set
1174# CONFIG_CONTEXT_SWITCH_TRACER is not set
1175# CONFIG_BOOT_TRACER is not set
1176# CONFIG_TRACE_BRANCH_PROFILING is not set
1177# CONFIG_STACK_TRACER is not set
1178# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1179# CONFIG_SAMPLES is not set
1180CONFIG_HAVE_ARCH_KGDB=y
1181# CONFIG_KGDB is not set
1182CONFIG_PRINT_STACK_DEPTH=64
1183# CONFIG_DEBUG_STACKOVERFLOW is not set
1184# CONFIG_DEBUG_STACK_USAGE is not set
1185# CONFIG_DEBUG_PAGEALLOC is not set
1186# CONFIG_CODE_PATCHING_SELFTEST is not set
1187# CONFIG_FTR_FIXUP_SELFTEST is not set
1188# CONFIG_MSI_BITMAP_SELFTEST is not set
1189# CONFIG_XMON is not set
1190# CONFIG_IRQSTACKS is not set
1191# CONFIG_BDI_SWITCH is not set
1192CONFIG_PPC_EARLY_DEBUG=y
1193# CONFIG_PPC_EARLY_DEBUG_LPAR is not set
1194# CONFIG_PPC_EARLY_DEBUG_G5 is not set
1195# CONFIG_PPC_EARLY_DEBUG_RTAS_PANEL is not set
1196# CONFIG_PPC_EARLY_DEBUG_RTAS_CONSOLE is not set
1197# CONFIG_PPC_EARLY_DEBUG_MAPLE is not set
1198# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set
1199# CONFIG_PPC_EARLY_DEBUG_PAS_REALMODE is not set
1200# CONFIG_PPC_EARLY_DEBUG_BEAT is not set
1201# CONFIG_PPC_EARLY_DEBUG_44x is not set
1202# CONFIG_PPC_EARLY_DEBUG_40x is not set
1203# CONFIG_PPC_EARLY_DEBUG_CPM is not set
1204
1205#
1206# Security options
1207#
1208# CONFIG_KEYS is not set
1209# CONFIG_SECURITY is not set
1210# CONFIG_SECURITYFS is not set
1211# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1212CONFIG_CRYPTO=y
1213
1214#
1215# Crypto core or helper
1216#
1217# CONFIG_CRYPTO_FIPS is not set
1218CONFIG_CRYPTO_ALGAPI=y
1219CONFIG_CRYPTO_ALGAPI2=y
1220CONFIG_CRYPTO_AEAD2=y
1221CONFIG_CRYPTO_BLKCIPHER=y
1222CONFIG_CRYPTO_BLKCIPHER2=y
1223CONFIG_CRYPTO_HASH=y
1224CONFIG_CRYPTO_HASH2=y
1225CONFIG_CRYPTO_RNG2=y
1226CONFIG_CRYPTO_MANAGER=y
1227CONFIG_CRYPTO_MANAGER2=y
1228# CONFIG_CRYPTO_GF128MUL is not set
1229# CONFIG_CRYPTO_NULL is not set
1230# CONFIG_CRYPTO_CRYPTD is not set
1231# CONFIG_CRYPTO_AUTHENC is not set
1232# CONFIG_CRYPTO_TEST is not set
1233
1234#
1235# Authenticated Encryption with Associated Data
1236#
1237# CONFIG_CRYPTO_CCM is not set
1238# CONFIG_CRYPTO_GCM is not set
1239# CONFIG_CRYPTO_SEQIV is not set
1240
1241#
1242# Block modes
1243#
1244CONFIG_CRYPTO_CBC=y
1245# CONFIG_CRYPTO_CTR is not set
1246# CONFIG_CRYPTO_CTS is not set
1247CONFIG_CRYPTO_ECB=m
1248# CONFIG_CRYPTO_LRW is not set
1249CONFIG_CRYPTO_PCBC=m
1250# CONFIG_CRYPTO_XTS is not set
1251
1252#
1253# Hash modes
1254#
1255# CONFIG_CRYPTO_HMAC is not set
1256# CONFIG_CRYPTO_XCBC is not set
1257
1258#
1259# Digest
1260#
1261# CONFIG_CRYPTO_CRC32C is not set
1262# CONFIG_CRYPTO_MD4 is not set
1263CONFIG_CRYPTO_MD5=y
1264# CONFIG_CRYPTO_MICHAEL_MIC is not set
1265# CONFIG_CRYPTO_RMD128 is not set
1266# CONFIG_CRYPTO_RMD160 is not set
1267# CONFIG_CRYPTO_RMD256 is not set
1268# CONFIG_CRYPTO_RMD320 is not set
1269# CONFIG_CRYPTO_SHA1 is not set
1270# CONFIG_CRYPTO_SHA256 is not set
1271# CONFIG_CRYPTO_SHA512 is not set
1272# CONFIG_CRYPTO_TGR192 is not set
1273# CONFIG_CRYPTO_WP512 is not set
1274
1275#
1276# Ciphers
1277#
1278# CONFIG_CRYPTO_AES is not set
1279# CONFIG_CRYPTO_ANUBIS is not set
1280# CONFIG_CRYPTO_ARC4 is not set
1281# CONFIG_CRYPTO_BLOWFISH is not set
1282# CONFIG_CRYPTO_CAMELLIA is not set
1283# CONFIG_CRYPTO_CAST5 is not set
1284# CONFIG_CRYPTO_CAST6 is not set
1285CONFIG_CRYPTO_DES=y
1286# CONFIG_CRYPTO_FCRYPT is not set
1287# CONFIG_CRYPTO_KHAZAD is not set
1288# CONFIG_CRYPTO_SALSA20 is not set
1289# CONFIG_CRYPTO_SEED is not set
1290# CONFIG_CRYPTO_SERPENT is not set
1291# CONFIG_CRYPTO_TEA is not set
1292# CONFIG_CRYPTO_TWOFISH is not set
1293
1294#
1295# Compression
1296#
1297# CONFIG_CRYPTO_DEFLATE is not set
1298# CONFIG_CRYPTO_LZO is not set
1299
1300#
1301# Random Number Generation
1302#
1303# CONFIG_CRYPTO_ANSI_CPRNG is not set
1304CONFIG_CRYPTO_HW=y
1305# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1306# CONFIG_CRYPTO_DEV_TALITOS is not set
1307# CONFIG_PPC_CLOCK is not set
1308CONFIG_PPC_LIB_RHEAP=y
1309# CONFIG_VIRTUALIZATION is not set
diff --git a/arch/powerpc/configs/mpc5200_defconfig b/arch/powerpc/configs/mpc5200_defconfig
index af0cd55605d0..aaa4416660e9 100644
--- a/arch/powerpc/configs/mpc5200_defconfig
+++ b/arch/powerpc/configs/mpc5200_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.29-rc3 3# Linux kernel version: 2.6.30-rc2
4# Fri Feb 6 09:48:53 2009 4# Mon Apr 20 11:06:25 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -14,6 +14,7 @@ CONFIG_6xx=y
14# CONFIG_40x is not set 14# CONFIG_40x is not set
15# CONFIG_44x is not set 15# CONFIG_44x is not set
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_PPC_BOOK3S=y
17CONFIG_PPC_FPU=y 18CONFIG_PPC_FPU=y
18# CONFIG_ALTIVEC is not set 19# CONFIG_ALTIVEC is not set
19CONFIG_PPC_STD_MMU=y 20CONFIG_PPC_STD_MMU=y
@@ -39,6 +40,7 @@ CONFIG_ARCH_HAS_ILOG2_U32=y
39CONFIG_GENERIC_HWEIGHT=y 40CONFIG_GENERIC_HWEIGHT=y
40CONFIG_GENERIC_CALIBRATE_DELAY=y 41CONFIG_GENERIC_CALIBRATE_DELAY=y
41CONFIG_GENERIC_FIND_NEXT_BIT=y 42CONFIG_GENERIC_FIND_NEXT_BIT=y
43CONFIG_GENERIC_GPIO=y
42# CONFIG_ARCH_NO_VIRT_TO_BUS is not set 44# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
43CONFIG_PPC=y 45CONFIG_PPC=y
44CONFIG_EARLY_PRINTK=y 46CONFIG_EARLY_PRINTK=y
@@ -55,6 +57,7 @@ CONFIG_DEFAULT_UIMAGE=y
55CONFIG_ARCH_SUSPEND_POSSIBLE=y 57CONFIG_ARCH_SUSPEND_POSSIBLE=y
56# CONFIG_PPC_DCR_NATIVE is not set 58# CONFIG_PPC_DCR_NATIVE is not set
57# CONFIG_PPC_DCR_MMIO is not set 59# CONFIG_PPC_DCR_MMIO is not set
60CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
58CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 61CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
59 62
60# 63#
@@ -91,19 +94,22 @@ CONFIG_SYSFS_DEPRECATED_V2=y
91# CONFIG_NAMESPACES is not set 94# CONFIG_NAMESPACES is not set
92CONFIG_BLK_DEV_INITRD=y 95CONFIG_BLK_DEV_INITRD=y
93CONFIG_INITRAMFS_SOURCE="" 96CONFIG_INITRAMFS_SOURCE=""
97CONFIG_RD_GZIP=y
98# CONFIG_RD_BZIP2 is not set
99# CONFIG_RD_LZMA is not set
94# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 100# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
95CONFIG_SYSCTL=y 101CONFIG_SYSCTL=y
102CONFIG_ANON_INODES=y
96CONFIG_EMBEDDED=y 103CONFIG_EMBEDDED=y
97# CONFIG_SYSCTL_SYSCALL is not set 104# CONFIG_SYSCTL_SYSCALL is not set
98# CONFIG_KALLSYMS is not set 105# CONFIG_KALLSYMS is not set
106# CONFIG_STRIP_ASM_SYMS is not set
99CONFIG_HOTPLUG=y 107CONFIG_HOTPLUG=y
100CONFIG_PRINTK=y 108CONFIG_PRINTK=y
101CONFIG_BUG=y 109CONFIG_BUG=y
102CONFIG_ELF_CORE=y 110CONFIG_ELF_CORE=y
103CONFIG_COMPAT_BRK=y
104CONFIG_BASE_FULL=y 111CONFIG_BASE_FULL=y
105CONFIG_FUTEX=y 112CONFIG_FUTEX=y
106CONFIG_ANON_INODES=y
107# CONFIG_EPOLL is not set 113# CONFIG_EPOLL is not set
108CONFIG_SIGNALFD=y 114CONFIG_SIGNALFD=y
109CONFIG_TIMERFD=y 115CONFIG_TIMERFD=y
@@ -113,10 +119,12 @@ CONFIG_AIO=y
113CONFIG_VM_EVENT_COUNTERS=y 119CONFIG_VM_EVENT_COUNTERS=y
114CONFIG_PCI_QUIRKS=y 120CONFIG_PCI_QUIRKS=y
115CONFIG_SLUB_DEBUG=y 121CONFIG_SLUB_DEBUG=y
122CONFIG_COMPAT_BRK=y
116# CONFIG_SLAB is not set 123# CONFIG_SLAB is not set
117CONFIG_SLUB=y 124CONFIG_SLUB=y
118# CONFIG_SLOB is not set 125# CONFIG_SLOB is not set
119# CONFIG_PROFILING is not set 126# CONFIG_PROFILING is not set
127# CONFIG_MARKERS is not set
120CONFIG_HAVE_OPROFILE=y 128CONFIG_HAVE_OPROFILE=y
121CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 129CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
122CONFIG_HAVE_IOREMAP_PROT=y 130CONFIG_HAVE_IOREMAP_PROT=y
@@ -124,6 +132,7 @@ CONFIG_HAVE_KPROBES=y
124CONFIG_HAVE_KRETPROBES=y 132CONFIG_HAVE_KRETPROBES=y
125CONFIG_HAVE_ARCH_TRACEHOOK=y 133CONFIG_HAVE_ARCH_TRACEHOOK=y
126CONFIG_HAVE_CLK=y 134CONFIG_HAVE_CLK=y
135# CONFIG_SLOW_WORK is not set
127# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 136# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
128CONFIG_SLABINFO=y 137CONFIG_SLABINFO=y
129CONFIG_RT_MUTEXES=y 138CONFIG_RT_MUTEXES=y
@@ -136,7 +145,6 @@ CONFIG_MODULE_UNLOAD=y
136# CONFIG_MODULE_SRCVERSION_ALL is not set 145# CONFIG_MODULE_SRCVERSION_ALL is not set
137CONFIG_BLOCK=y 146CONFIG_BLOCK=y
138# CONFIG_LBD is not set 147# CONFIG_LBD is not set
139# CONFIG_BLK_DEV_IO_TRACE is not set
140# CONFIG_BLK_DEV_BSG is not set 148# CONFIG_BLK_DEV_BSG is not set
141# CONFIG_BLK_DEV_INTEGRITY is not set 149# CONFIG_BLK_DEV_INTEGRITY is not set
142 150
@@ -157,8 +165,6 @@ CONFIG_FREEZER=y
157# 165#
158# Platform support 166# Platform support
159# 167#
160CONFIG_PPC_MULTIPLATFORM=y
161CONFIG_CLASSIC32=y
162# CONFIG_PPC_CHRP is not set 168# CONFIG_PPC_CHRP is not set
163# CONFIG_MPC5121_ADS is not set 169# CONFIG_MPC5121_ADS is not set
164# CONFIG_MPC5121_GENERIC is not set 170# CONFIG_MPC5121_GENERIC is not set
@@ -166,8 +172,9 @@ CONFIG_PPC_MPC52xx=y
166CONFIG_PPC_MPC5200_SIMPLE=y 172CONFIG_PPC_MPC5200_SIMPLE=y
167CONFIG_PPC_EFIKA=y 173CONFIG_PPC_EFIKA=y
168CONFIG_PPC_LITE5200=y 174CONFIG_PPC_LITE5200=y
175CONFIG_PPC_MEDIA5200=y
169CONFIG_PPC_MPC5200_BUGFIX=y 176CONFIG_PPC_MPC5200_BUGFIX=y
170# CONFIG_PPC_MPC5200_GPIO is not set 177CONFIG_PPC_MPC5200_GPIO=y
171# CONFIG_PPC_PMAC is not set 178# CONFIG_PPC_PMAC is not set
172# CONFIG_PPC_CELL is not set 179# CONFIG_PPC_CELL is not set
173# CONFIG_PPC_CELL_NATIVE is not set 180# CONFIG_PPC_CELL_NATIVE is not set
@@ -176,7 +183,9 @@ CONFIG_PPC_MPC5200_BUGFIX=y
176# CONFIG_PPC_83xx is not set 183# CONFIG_PPC_83xx is not set
177# CONFIG_PPC_86xx is not set 184# CONFIG_PPC_86xx is not set
178# CONFIG_EMBEDDED6xx is not set 185# CONFIG_EMBEDDED6xx is not set
186# CONFIG_AMIGAONE is not set
179CONFIG_PPC_NATIVE=y 187CONFIG_PPC_NATIVE=y
188CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
180# CONFIG_UDBG_RTAS_CONSOLE is not set 189# CONFIG_UDBG_RTAS_CONSOLE is not set
181# CONFIG_IPIC is not set 190# CONFIG_IPIC is not set
182# CONFIG_MPIC is not set 191# CONFIG_MPIC is not set
@@ -241,9 +250,12 @@ CONFIG_ZONE_DMA_FLAG=1
241CONFIG_BOUNCE=y 250CONFIG_BOUNCE=y
242CONFIG_VIRT_TO_BUS=y 251CONFIG_VIRT_TO_BUS=y
243CONFIG_UNEVICTABLE_LRU=y 252CONFIG_UNEVICTABLE_LRU=y
253CONFIG_HAVE_MLOCK=y
254CONFIG_HAVE_MLOCKED_PAGE_BIT=y
244CONFIG_PPC_4K_PAGES=y 255CONFIG_PPC_4K_PAGES=y
245# CONFIG_PPC_16K_PAGES is not set 256# CONFIG_PPC_16K_PAGES is not set
246# CONFIG_PPC_64K_PAGES is not set 257# CONFIG_PPC_64K_PAGES is not set
258# CONFIG_PPC_256K_PAGES is not set
247CONFIG_FORCE_MAX_ZONEORDER=11 259CONFIG_FORCE_MAX_ZONEORDER=11
248CONFIG_PROC_DEVICETREE=y 260CONFIG_PROC_DEVICETREE=y
249# CONFIG_CMDLINE_BOOL is not set 261# CONFIG_CMDLINE_BOOL is not set
@@ -272,6 +284,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
272CONFIG_PCI_LEGACY=y 284CONFIG_PCI_LEGACY=y
273# CONFIG_PCI_DEBUG is not set 285# CONFIG_PCI_DEBUG is not set
274# CONFIG_PCI_STUB is not set 286# CONFIG_PCI_STUB is not set
287# CONFIG_PCI_IOV is not set
275# CONFIG_PCCARD is not set 288# CONFIG_PCCARD is not set
276# CONFIG_HOTPLUG_PCI is not set 289# CONFIG_HOTPLUG_PCI is not set
277# CONFIG_HAS_RAPIDIO is not set 290# CONFIG_HAS_RAPIDIO is not set
@@ -294,7 +307,6 @@ CONFIG_NET=y
294# 307#
295# Networking options 308# Networking options
296# 309#
297CONFIG_COMPAT_NET_DEV_OPS=y
298CONFIG_PACKET=y 310CONFIG_PACKET=y
299# CONFIG_PACKET_MMAP is not set 311# CONFIG_PACKET_MMAP is not set
300CONFIG_UNIX=y 312CONFIG_UNIX=y
@@ -350,6 +362,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
350# CONFIG_LAPB is not set 362# CONFIG_LAPB is not set
351# CONFIG_ECONET is not set 363# CONFIG_ECONET is not set
352# CONFIG_WAN_ROUTER is not set 364# CONFIG_WAN_ROUTER is not set
365# CONFIG_PHONET is not set
353# CONFIG_NET_SCHED is not set 366# CONFIG_NET_SCHED is not set
354# CONFIG_DCB is not set 367# CONFIG_DCB is not set
355 368
@@ -362,7 +375,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
362# CONFIG_IRDA is not set 375# CONFIG_IRDA is not set
363# CONFIG_BT is not set 376# CONFIG_BT is not set
364# CONFIG_AF_RXRPC is not set 377# CONFIG_AF_RXRPC is not set
365# CONFIG_PHONET is not set
366# CONFIG_WIRELESS is not set 378# CONFIG_WIRELESS is not set
367# CONFIG_WIMAX is not set 379# CONFIG_WIMAX is not set
368# CONFIG_RFKILL is not set 380# CONFIG_RFKILL is not set
@@ -388,12 +400,9 @@ CONFIG_MTD=y
388CONFIG_MTD_CONCAT=y 400CONFIG_MTD_CONCAT=y
389CONFIG_MTD_PARTITIONS=y 401CONFIG_MTD_PARTITIONS=y
390# CONFIG_MTD_TESTS is not set 402# CONFIG_MTD_TESTS is not set
391CONFIG_MTD_REDBOOT_PARTS=y 403# CONFIG_MTD_REDBOOT_PARTS is not set
392CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
393# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
394# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
395CONFIG_MTD_CMDLINE_PARTS=y 404CONFIG_MTD_CMDLINE_PARTS=y
396# CONFIG_MTD_OF_PARTS is not set 405CONFIG_MTD_OF_PARTS=y
397# CONFIG_MTD_AR7_PARTS is not set 406# CONFIG_MTD_AR7_PARTS is not set
398 407
399# 408#
@@ -447,6 +456,8 @@ CONFIG_MTD_PHYSMAP_OF=y
447# Self-contained MTD device drivers 456# Self-contained MTD device drivers
448# 457#
449# CONFIG_MTD_PMC551 is not set 458# CONFIG_MTD_PMC551 is not set
459# CONFIG_MTD_DATAFLASH is not set
460# CONFIG_MTD_M25P80 is not set
450# CONFIG_MTD_SLRAM is not set 461# CONFIG_MTD_SLRAM is not set
451# CONFIG_MTD_PHRAM is not set 462# CONFIG_MTD_PHRAM is not set
452# CONFIG_MTD_MTDRAM is not set 463# CONFIG_MTD_MTDRAM is not set
@@ -465,14 +476,23 @@ CONFIG_MTD_PHYSMAP_OF=y
465# LPDDR flash memory drivers 476# LPDDR flash memory drivers
466# 477#
467# CONFIG_MTD_LPDDR is not set 478# CONFIG_MTD_LPDDR is not set
468# CONFIG_MTD_QINFO_PROBE is not set
469 479
470# 480#
471# UBI - Unsorted block images 481# UBI - Unsorted block images
472# 482#
473# CONFIG_MTD_UBI is not set 483CONFIG_MTD_UBI=m
484CONFIG_MTD_UBI_WL_THRESHOLD=4096
485CONFIG_MTD_UBI_BEB_RESERVE=1
486# CONFIG_MTD_UBI_GLUEBI is not set
487
488#
489# UBI debugging options
490#
491# CONFIG_MTD_UBI_DEBUG is not set
474CONFIG_OF_DEVICE=y 492CONFIG_OF_DEVICE=y
493CONFIG_OF_GPIO=y
475CONFIG_OF_I2C=y 494CONFIG_OF_I2C=y
495CONFIG_OF_SPI=y
476# CONFIG_PARPORT is not set 496# CONFIG_PARPORT is not set
477CONFIG_BLK_DEV=y 497CONFIG_BLK_DEV=y
478# CONFIG_BLK_DEV_FD is not set 498# CONFIG_BLK_DEV_FD is not set
@@ -500,12 +520,14 @@ CONFIG_MISC_DEVICES=y
500# CONFIG_ICS932S401 is not set 520# CONFIG_ICS932S401 is not set
501# CONFIG_ENCLOSURE_SERVICES is not set 521# CONFIG_ENCLOSURE_SERVICES is not set
502# CONFIG_HP_ILO is not set 522# CONFIG_HP_ILO is not set
523# CONFIG_ISL29003 is not set
503# CONFIG_C2PORT is not set 524# CONFIG_C2PORT is not set
504 525
505# 526#
506# EEPROM support 527# EEPROM support
507# 528#
508CONFIG_EEPROM_AT24=y 529CONFIG_EEPROM_AT24=y
530# CONFIG_EEPROM_AT25 is not set
509# CONFIG_EEPROM_LEGACY is not set 531# CONFIG_EEPROM_LEGACY is not set
510# CONFIG_EEPROM_93CX6 is not set 532# CONFIG_EEPROM_93CX6 is not set
511CONFIG_HAVE_IDE=y 533CONFIG_HAVE_IDE=y
@@ -564,9 +586,11 @@ CONFIG_SCSI_LOWLEVEL=y
564# CONFIG_MEGARAID_NEWGEN is not set 586# CONFIG_MEGARAID_NEWGEN is not set
565# CONFIG_MEGARAID_LEGACY is not set 587# CONFIG_MEGARAID_LEGACY is not set
566# CONFIG_MEGARAID_SAS is not set 588# CONFIG_MEGARAID_SAS is not set
589# CONFIG_SCSI_MPT2SAS is not set
567# CONFIG_SCSI_HPTIOP is not set 590# CONFIG_SCSI_HPTIOP is not set
568# CONFIG_SCSI_BUSLOGIC is not set 591# CONFIG_SCSI_BUSLOGIC is not set
569# CONFIG_LIBFC is not set 592# CONFIG_LIBFC is not set
593# CONFIG_LIBFCOE is not set
570# CONFIG_FCOE is not set 594# CONFIG_FCOE is not set
571# CONFIG_SCSI_DMX3191D is not set 595# CONFIG_SCSI_DMX3191D is not set
572# CONFIG_SCSI_EATA is not set 596# CONFIG_SCSI_EATA is not set
@@ -589,6 +613,7 @@ CONFIG_SCSI_LOWLEVEL=y
589# CONFIG_SCSI_DEBUG is not set 613# CONFIG_SCSI_DEBUG is not set
590# CONFIG_SCSI_SRP is not set 614# CONFIG_SCSI_SRP is not set
591# CONFIG_SCSI_DH is not set 615# CONFIG_SCSI_DH is not set
616# CONFIG_SCSI_OSD_INITIATOR is not set
592CONFIG_ATA=y 617CONFIG_ATA=y
593# CONFIG_ATA_NONSTANDARD is not set 618# CONFIG_ATA_NONSTANDARD is not set
594CONFIG_SATA_PMP=y 619CONFIG_SATA_PMP=y
@@ -666,6 +691,7 @@ CONFIG_PATA_PLATFORM=y
666# CONFIG_I2O is not set 691# CONFIG_I2O is not set
667# CONFIG_MACINTOSH_DRIVERS is not set 692# CONFIG_MACINTOSH_DRIVERS is not set
668CONFIG_NETDEVICES=y 693CONFIG_NETDEVICES=y
694CONFIG_COMPAT_NET_DEV_OPS=y
669# CONFIG_DUMMY is not set 695# CONFIG_DUMMY is not set
670# CONFIG_BONDING is not set 696# CONFIG_BONDING is not set
671# CONFIG_MACVLAN is not set 697# CONFIG_MACVLAN is not set
@@ -699,6 +725,9 @@ CONFIG_NET_ETHERNET=y
699# CONFIG_SUNGEM is not set 725# CONFIG_SUNGEM is not set
700# CONFIG_CASSINI is not set 726# CONFIG_CASSINI is not set
701# CONFIG_NET_VENDOR_3COM is not set 727# CONFIG_NET_VENDOR_3COM is not set
728# CONFIG_ENC28J60 is not set
729# CONFIG_ETHOC is not set
730# CONFIG_DNET is not set
702# CONFIG_NET_TULIP is not set 731# CONFIG_NET_TULIP is not set
703# CONFIG_HP100 is not set 732# CONFIG_HP100 is not set
704# CONFIG_IBM_NEW_EMAC_ZMII is not set 733# CONFIG_IBM_NEW_EMAC_ZMII is not set
@@ -722,7 +751,6 @@ CONFIG_FEC_MPC52xx_MDIO=y
722# 751#
723# CONFIG_WLAN_PRE80211 is not set 752# CONFIG_WLAN_PRE80211 is not set
724# CONFIG_WLAN_80211 is not set 753# CONFIG_WLAN_80211 is not set
725# CONFIG_IWLWIFI_LEDS is not set
726 754
727# 755#
728# Enable WiMAX (Networking options) to see the WiMAX drivers 756# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -802,6 +830,7 @@ CONFIG_DEVKMEM=y
802# 830#
803# Non-8250 serial port support 831# Non-8250 serial port support
804# 832#
833# CONFIG_SERIAL_MAX3100 is not set
805# CONFIG_SERIAL_UARTLITE is not set 834# CONFIG_SERIAL_UARTLITE is not set
806CONFIG_SERIAL_CORE=y 835CONFIG_SERIAL_CORE=y
807CONFIG_SERIAL_CORE_CONSOLE=y 836CONFIG_SERIAL_CORE_CONSOLE=y
@@ -854,6 +883,7 @@ CONFIG_I2C_ALGOBIT=y
854# 883#
855# I2C system bus drivers (mostly embedded / system-on-chip) 884# I2C system bus drivers (mostly embedded / system-on-chip)
856# 885#
886# CONFIG_I2C_GPIO is not set
857CONFIG_I2C_MPC=y 887CONFIG_I2C_MPC=y
858# CONFIG_I2C_OCORES is not set 888# CONFIG_I2C_OCORES is not set
859# CONFIG_I2C_SIMTEC is not set 889# CONFIG_I2C_SIMTEC is not set
@@ -883,22 +913,63 @@ CONFIG_I2C_MPC=y
883# CONFIG_SENSORS_PCF8574 is not set 913# CONFIG_SENSORS_PCF8574 is not set
884# CONFIG_PCF8575 is not set 914# CONFIG_PCF8575 is not set
885# CONFIG_SENSORS_PCA9539 is not set 915# CONFIG_SENSORS_PCA9539 is not set
886# CONFIG_SENSORS_PCF8591 is not set
887# CONFIG_SENSORS_MAX6875 is not set 916# CONFIG_SENSORS_MAX6875 is not set
888# CONFIG_SENSORS_TSL2550 is not set 917# CONFIG_SENSORS_TSL2550 is not set
889# CONFIG_I2C_DEBUG_CORE is not set 918# CONFIG_I2C_DEBUG_CORE is not set
890# CONFIG_I2C_DEBUG_ALGO is not set 919# CONFIG_I2C_DEBUG_ALGO is not set
891# CONFIG_I2C_DEBUG_BUS is not set 920# CONFIG_I2C_DEBUG_BUS is not set
892# CONFIG_I2C_DEBUG_CHIP is not set 921# CONFIG_I2C_DEBUG_CHIP is not set
893# CONFIG_SPI is not set 922CONFIG_SPI=y
923# CONFIG_SPI_DEBUG is not set
924CONFIG_SPI_MASTER=y
925
926#
927# SPI Master Controller Drivers
928#
929# CONFIG_SPI_BITBANG is not set
930# CONFIG_SPI_GPIO is not set
931CONFIG_SPI_MPC52xx_PSC=m
932
933#
934# SPI Protocol Masters
935#
936CONFIG_SPI_SPIDEV=m
937# CONFIG_SPI_TLE62X0 is not set
894CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y 938CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
895# CONFIG_GPIOLIB is not set 939CONFIG_ARCH_REQUIRE_GPIOLIB=y
940CONFIG_GPIOLIB=y
941# CONFIG_DEBUG_GPIO is not set
942# CONFIG_GPIO_SYSFS is not set
943
944#
945# Memory mapped GPIO expanders:
946#
947# CONFIG_GPIO_XILINX is not set
948
949#
950# I2C GPIO expanders:
951#
952# CONFIG_GPIO_MAX732X is not set
953# CONFIG_GPIO_PCA953X is not set
954# CONFIG_GPIO_PCF857X is not set
955
956#
957# PCI GPIO expanders:
958#
959# CONFIG_GPIO_BT8XX is not set
960
961#
962# SPI GPIO expanders:
963#
964# CONFIG_GPIO_MAX7301 is not set
965# CONFIG_GPIO_MCP23S08 is not set
896# CONFIG_W1 is not set 966# CONFIG_W1 is not set
897# CONFIG_POWER_SUPPLY is not set 967# CONFIG_POWER_SUPPLY is not set
898CONFIG_HWMON=y 968CONFIG_HWMON=y
899# CONFIG_HWMON_VID is not set 969# CONFIG_HWMON_VID is not set
900# CONFIG_SENSORS_AD7414 is not set 970# CONFIG_SENSORS_AD7414 is not set
901# CONFIG_SENSORS_AD7418 is not set 971# CONFIG_SENSORS_AD7418 is not set
972# CONFIG_SENSORS_ADCXX is not set
902# CONFIG_SENSORS_ADM1021 is not set 973# CONFIG_SENSORS_ADM1021 is not set
903# CONFIG_SENSORS_ADM1025 is not set 974# CONFIG_SENSORS_ADM1025 is not set
904# CONFIG_SENSORS_ADM1026 is not set 975# CONFIG_SENSORS_ADM1026 is not set
@@ -915,10 +986,12 @@ CONFIG_HWMON=y
915# CONFIG_SENSORS_F71805F is not set 986# CONFIG_SENSORS_F71805F is not set
916# CONFIG_SENSORS_F71882FG is not set 987# CONFIG_SENSORS_F71882FG is not set
917# CONFIG_SENSORS_F75375S is not set 988# CONFIG_SENSORS_F75375S is not set
989# CONFIG_SENSORS_G760A is not set
918# CONFIG_SENSORS_GL518SM is not set 990# CONFIG_SENSORS_GL518SM is not set
919# CONFIG_SENSORS_GL520SM is not set 991# CONFIG_SENSORS_GL520SM is not set
920# CONFIG_SENSORS_IT87 is not set 992# CONFIG_SENSORS_IT87 is not set
921# CONFIG_SENSORS_LM63 is not set 993# CONFIG_SENSORS_LM63 is not set
994# CONFIG_SENSORS_LM70 is not set
922# CONFIG_SENSORS_LM75 is not set 995# CONFIG_SENSORS_LM75 is not set
923# CONFIG_SENSORS_LM77 is not set 996# CONFIG_SENSORS_LM77 is not set
924# CONFIG_SENSORS_LM78 is not set 997# CONFIG_SENSORS_LM78 is not set
@@ -929,11 +1002,16 @@ CONFIG_HWMON=y
929# CONFIG_SENSORS_LM90 is not set 1002# CONFIG_SENSORS_LM90 is not set
930# CONFIG_SENSORS_LM92 is not set 1003# CONFIG_SENSORS_LM92 is not set
931# CONFIG_SENSORS_LM93 is not set 1004# CONFIG_SENSORS_LM93 is not set
1005# CONFIG_SENSORS_LTC4215 is not set
932# CONFIG_SENSORS_LTC4245 is not set 1006# CONFIG_SENSORS_LTC4245 is not set
1007# CONFIG_SENSORS_LM95241 is not set
1008# CONFIG_SENSORS_MAX1111 is not set
933# CONFIG_SENSORS_MAX1619 is not set 1009# CONFIG_SENSORS_MAX1619 is not set
934# CONFIG_SENSORS_MAX6650 is not set 1010# CONFIG_SENSORS_MAX6650 is not set
935# CONFIG_SENSORS_PC87360 is not set 1011# CONFIG_SENSORS_PC87360 is not set
936# CONFIG_SENSORS_PC87427 is not set 1012# CONFIG_SENSORS_PC87427 is not set
1013# CONFIG_SENSORS_PCF8591 is not set
1014# CONFIG_SENSORS_SHT15 is not set
937# CONFIG_SENSORS_SIS5595 is not set 1015# CONFIG_SENSORS_SIS5595 is not set
938# CONFIG_SENSORS_DME1737 is not set 1016# CONFIG_SENSORS_DME1737 is not set
939# CONFIG_SENSORS_SMSC47M1 is not set 1017# CONFIG_SENSORS_SMSC47M1 is not set
@@ -952,6 +1030,7 @@ CONFIG_HWMON=y
952# CONFIG_SENSORS_W83L786NG is not set 1030# CONFIG_SENSORS_W83L786NG is not set
953# CONFIG_SENSORS_W83627HF is not set 1031# CONFIG_SENSORS_W83627HF is not set
954# CONFIG_SENSORS_W83627EHF is not set 1032# CONFIG_SENSORS_W83627EHF is not set
1033# CONFIG_SENSORS_LIS3_SPI is not set
955# CONFIG_HWMON_DEBUG_CHIP is not set 1034# CONFIG_HWMON_DEBUG_CHIP is not set
956# CONFIG_THERMAL is not set 1035# CONFIG_THERMAL is not set
957# CONFIG_THERMAL_HWMON is not set 1036# CONFIG_THERMAL_HWMON is not set
@@ -989,6 +1068,7 @@ CONFIG_SSB_POSSIBLE=y
989# CONFIG_MFD_CORE is not set 1068# CONFIG_MFD_CORE is not set
990# CONFIG_MFD_SM501 is not set 1069# CONFIG_MFD_SM501 is not set
991# CONFIG_HTC_PASIC3 is not set 1070# CONFIG_HTC_PASIC3 is not set
1071# CONFIG_TPS65010 is not set
992# CONFIG_TWL4030_CORE is not set 1072# CONFIG_TWL4030_CORE is not set
993# CONFIG_MFD_TMIO is not set 1073# CONFIG_MFD_TMIO is not set
994# CONFIG_PMIC_DA903X is not set 1074# CONFIG_PMIC_DA903X is not set
@@ -1084,9 +1164,13 @@ CONFIG_FB_RADEON_BACKLIGHT=y
1084# CONFIG_FB_VIRTUAL is not set 1164# CONFIG_FB_VIRTUAL is not set
1085# CONFIG_FB_METRONOME is not set 1165# CONFIG_FB_METRONOME is not set
1086# CONFIG_FB_MB862XX is not set 1166# CONFIG_FB_MB862XX is not set
1167# CONFIG_FB_BROADSHEET is not set
1087CONFIG_BACKLIGHT_LCD_SUPPORT=y 1168CONFIG_BACKLIGHT_LCD_SUPPORT=y
1088CONFIG_LCD_CLASS_DEVICE=m 1169CONFIG_LCD_CLASS_DEVICE=m
1170# CONFIG_LCD_LTV350QV is not set
1089# CONFIG_LCD_ILI9320 is not set 1171# CONFIG_LCD_ILI9320 is not set
1172# CONFIG_LCD_TDO24M is not set
1173# CONFIG_LCD_VGG2432A4 is not set
1090# CONFIG_LCD_PLATFORM is not set 1174# CONFIG_LCD_PLATFORM is not set
1091CONFIG_BACKLIGHT_CLASS_DEVICE=y 1175CONFIG_BACKLIGHT_CLASS_DEVICE=y
1092CONFIG_BACKLIGHT_GENERIC=y 1176CONFIG_BACKLIGHT_GENERIC=y
@@ -1127,15 +1211,17 @@ CONFIG_USB_HID=y
1127# 1211#
1128# Special HID drivers 1212# Special HID drivers
1129# 1213#
1130CONFIG_HID_COMPAT=y
1131CONFIG_HID_A4TECH=y 1214CONFIG_HID_A4TECH=y
1132# CONFIG_HID_APPLE is not set 1215# CONFIG_HID_APPLE is not set
1133CONFIG_HID_BELKIN=y 1216CONFIG_HID_BELKIN=y
1134CONFIG_HID_CHERRY=y 1217CONFIG_HID_CHERRY=y
1135# CONFIG_HID_CHICONY is not set 1218# CONFIG_HID_CHICONY is not set
1136CONFIG_HID_CYPRESS=y 1219CONFIG_HID_CYPRESS=y
1220# CONFIG_DRAGONRISE_FF is not set
1137CONFIG_HID_EZKEY=y 1221CONFIG_HID_EZKEY=y
1222# CONFIG_HID_KYE is not set
1138# CONFIG_HID_GYRATION is not set 1223# CONFIG_HID_GYRATION is not set
1224# CONFIG_HID_KENSINGTON is not set
1139# CONFIG_HID_LOGITECH is not set 1225# CONFIG_HID_LOGITECH is not set
1140# CONFIG_HID_MICROSOFT is not set 1226# CONFIG_HID_MICROSOFT is not set
1141# CONFIG_HID_MONTEREY is not set 1227# CONFIG_HID_MONTEREY is not set
@@ -1204,11 +1290,11 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1204# CONFIG_USB_TMC is not set 1290# CONFIG_USB_TMC is not set
1205 1291
1206# 1292#
1207# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; 1293# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
1208# 1294#
1209 1295
1210# 1296#
1211# see USB_STORAGE Help for more information 1297# also be needed; see USB_STORAGE Help for more info
1212# 1298#
1213CONFIG_USB_STORAGE=y 1299CONFIG_USB_STORAGE=y
1214# CONFIG_USB_STORAGE_DEBUG is not set 1300# CONFIG_USB_STORAGE_DEBUG is not set
@@ -1250,7 +1336,6 @@ CONFIG_USB_STORAGE=y
1250# CONFIG_USB_LED is not set 1336# CONFIG_USB_LED is not set
1251# CONFIG_USB_CYPRESS_CY7C63 is not set 1337# CONFIG_USB_CYPRESS_CY7C63 is not set
1252# CONFIG_USB_CYTHERM is not set 1338# CONFIG_USB_CYTHERM is not set
1253# CONFIG_USB_PHIDGET is not set
1254# CONFIG_USB_IDMOUSE is not set 1339# CONFIG_USB_IDMOUSE is not set
1255# CONFIG_USB_FTDI_ELAN is not set 1340# CONFIG_USB_FTDI_ELAN is not set
1256# CONFIG_USB_APPLEDISPLAY is not set 1341# CONFIG_USB_APPLEDISPLAY is not set
@@ -1265,6 +1350,8 @@ CONFIG_USB_STORAGE=y
1265# 1350#
1266# OTG and related infrastructure 1351# OTG and related infrastructure
1267# 1352#
1353# CONFIG_USB_GPIO_VBUS is not set
1354# CONFIG_NOP_USB_XCEIV is not set
1268# CONFIG_UWB is not set 1355# CONFIG_UWB is not set
1269# CONFIG_MMC is not set 1356# CONFIG_MMC is not set
1270# CONFIG_MEMSTICK is not set 1357# CONFIG_MEMSTICK is not set
@@ -1317,6 +1404,13 @@ CONFIG_RTC_DRV_DS1307=y
1317# 1404#
1318# SPI RTC drivers 1405# SPI RTC drivers
1319# 1406#
1407# CONFIG_RTC_DRV_M41T94 is not set
1408# CONFIG_RTC_DRV_DS1305 is not set
1409# CONFIG_RTC_DRV_DS1390 is not set
1410# CONFIG_RTC_DRV_MAX6902 is not set
1411# CONFIG_RTC_DRV_R9701 is not set
1412# CONFIG_RTC_DRV_RS5C348 is not set
1413# CONFIG_RTC_DRV_DS3234 is not set
1320 1414
1321# 1415#
1322# Platform RTC drivers 1416# Platform RTC drivers
@@ -1336,8 +1430,9 @@ CONFIG_RTC_DRV_DS1307=y
1336# 1430#
1337# on-CPU RTC drivers 1431# on-CPU RTC drivers
1338# 1432#
1339# CONFIG_RTC_DRV_PPC is not set 1433# CONFIG_RTC_DRV_GENERIC is not set
1340# CONFIG_DMADEVICES is not set 1434# CONFIG_DMADEVICES is not set
1435# CONFIG_AUXDISPLAY is not set
1341# CONFIG_UIO is not set 1436# CONFIG_UIO is not set
1342# CONFIG_STAGING is not set 1437# CONFIG_STAGING is not set
1343 1438
@@ -1348,6 +1443,7 @@ CONFIG_EXT2_FS=y
1348# CONFIG_EXT2_FS_XATTR is not set 1443# CONFIG_EXT2_FS_XATTR is not set
1349# CONFIG_EXT2_FS_XIP is not set 1444# CONFIG_EXT2_FS_XIP is not set
1350CONFIG_EXT3_FS=y 1445CONFIG_EXT3_FS=y
1446# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
1351CONFIG_EXT3_FS_XATTR=y 1447CONFIG_EXT3_FS_XATTR=y
1352# CONFIG_EXT3_FS_POSIX_ACL is not set 1448# CONFIG_EXT3_FS_POSIX_ACL is not set
1353# CONFIG_EXT3_FS_SECURITY is not set 1449# CONFIG_EXT3_FS_SECURITY is not set
@@ -1370,6 +1466,11 @@ CONFIG_INOTIFY_USER=y
1370# CONFIG_FUSE_FS is not set 1466# CONFIG_FUSE_FS is not set
1371 1467
1372# 1468#
1469# Caches
1470#
1471# CONFIG_FSCACHE is not set
1472
1473#
1373# CD-ROM/DVD Filesystems 1474# CD-ROM/DVD Filesystems
1374# 1475#
1375# CONFIG_ISO9660_FS is not set 1476# CONFIG_ISO9660_FS is not set
@@ -1416,6 +1517,12 @@ CONFIG_JFFS2_ZLIB=y
1416# CONFIG_JFFS2_LZO is not set 1517# CONFIG_JFFS2_LZO is not set
1417CONFIG_JFFS2_RTIME=y 1518CONFIG_JFFS2_RTIME=y
1418# CONFIG_JFFS2_RUBIN is not set 1519# CONFIG_JFFS2_RUBIN is not set
1520CONFIG_UBIFS_FS=m
1521# CONFIG_UBIFS_FS_XATTR is not set
1522# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
1523CONFIG_UBIFS_FS_LZO=y
1524CONFIG_UBIFS_FS_ZLIB=y
1525# CONFIG_UBIFS_FS_DEBUG is not set
1419CONFIG_CRAMFS=y 1526CONFIG_CRAMFS=y
1420# CONFIG_SQUASHFS is not set 1527# CONFIG_SQUASHFS is not set
1421# CONFIG_VXFS_FS is not set 1528# CONFIG_VXFS_FS is not set
@@ -1426,6 +1533,7 @@ CONFIG_CRAMFS=y
1426# CONFIG_ROMFS_FS is not set 1533# CONFIG_ROMFS_FS is not set
1427# CONFIG_SYSV_FS is not set 1534# CONFIG_SYSV_FS is not set
1428# CONFIG_UFS_FS is not set 1535# CONFIG_UFS_FS is not set
1536# CONFIG_NILFS2_FS is not set
1429CONFIG_NETWORK_FILESYSTEMS=y 1537CONFIG_NETWORK_FILESYSTEMS=y
1430CONFIG_NFS_FS=y 1538CONFIG_NFS_FS=y
1431CONFIG_NFS_V3=y 1539CONFIG_NFS_V3=y
@@ -1438,7 +1546,6 @@ CONFIG_LOCKD_V4=y
1438CONFIG_NFS_COMMON=y 1546CONFIG_NFS_COMMON=y
1439CONFIG_SUNRPC=y 1547CONFIG_SUNRPC=y
1440CONFIG_SUNRPC_GSS=y 1548CONFIG_SUNRPC_GSS=y
1441# CONFIG_SUNRPC_REGISTER_V4 is not set
1442CONFIG_RPCSEC_GSS_KRB5=y 1549CONFIG_RPCSEC_GSS_KRB5=y
1443# CONFIG_RPCSEC_GSS_SPKM3 is not set 1550# CONFIG_RPCSEC_GSS_SPKM3 is not set
1444# CONFIG_SMB_FS is not set 1551# CONFIG_SMB_FS is not set
@@ -1493,6 +1600,7 @@ CONFIG_NLS_ISO8859_1=y
1493# CONFIG_NLS_KOI8_U is not set 1600# CONFIG_NLS_KOI8_U is not set
1494# CONFIG_NLS_UTF8 is not set 1601# CONFIG_NLS_UTF8 is not set
1495# CONFIG_DLM is not set 1602# CONFIG_DLM is not set
1603# CONFIG_BINARY_PRINTF is not set
1496 1604
1497# 1605#
1498# Library routines 1606# Library routines
@@ -1500,7 +1608,7 @@ CONFIG_NLS_ISO8859_1=y
1500CONFIG_BITREVERSE=y 1608CONFIG_BITREVERSE=y
1501CONFIG_GENERIC_FIND_LAST_BIT=y 1609CONFIG_GENERIC_FIND_LAST_BIT=y
1502# CONFIG_CRC_CCITT is not set 1610# CONFIG_CRC_CCITT is not set
1503# CONFIG_CRC16 is not set 1611CONFIG_CRC16=m
1504# CONFIG_CRC_T10DIF is not set 1612# CONFIG_CRC_T10DIF is not set
1505# CONFIG_CRC_ITU_T is not set 1613# CONFIG_CRC_ITU_T is not set
1506CONFIG_CRC32=y 1614CONFIG_CRC32=y
@@ -1508,11 +1616,14 @@ CONFIG_CRC32=y
1508# CONFIG_LIBCRC32C is not set 1616# CONFIG_LIBCRC32C is not set
1509CONFIG_ZLIB_INFLATE=y 1617CONFIG_ZLIB_INFLATE=y
1510CONFIG_ZLIB_DEFLATE=y 1618CONFIG_ZLIB_DEFLATE=y
1511CONFIG_PLIST=y 1619CONFIG_LZO_COMPRESS=m
1620CONFIG_LZO_DECOMPRESS=m
1621CONFIG_DECOMPRESS_GZIP=y
1512CONFIG_HAS_IOMEM=y 1622CONFIG_HAS_IOMEM=y
1513CONFIG_HAS_IOPORT=y 1623CONFIG_HAS_IOPORT=y
1514CONFIG_HAS_DMA=y 1624CONFIG_HAS_DMA=y
1515CONFIG_HAVE_LMB=y 1625CONFIG_HAVE_LMB=y
1626CONFIG_NLATTR=y
1516 1627
1517# 1628#
1518# Kernel hacking 1629# Kernel hacking
@@ -1530,6 +1641,9 @@ CONFIG_DEBUG_KERNEL=y
1530CONFIG_DETECT_SOFTLOCKUP=y 1641CONFIG_DETECT_SOFTLOCKUP=y
1531# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set 1642# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
1532CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 1643CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
1644CONFIG_DETECT_HUNG_TASK=y
1645# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
1646CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
1533CONFIG_SCHED_DEBUG=y 1647CONFIG_SCHED_DEBUG=y
1534# CONFIG_SCHEDSTATS is not set 1648# CONFIG_SCHEDSTATS is not set
1535# CONFIG_TIMER_STATS is not set 1649# CONFIG_TIMER_STATS is not set
@@ -1558,9 +1672,12 @@ CONFIG_DEBUG_INFO=y
1558# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 1672# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1559# CONFIG_FAULT_INJECTION is not set 1673# CONFIG_FAULT_INJECTION is not set
1560# CONFIG_LATENCYTOP is not set 1674# CONFIG_LATENCYTOP is not set
1675# CONFIG_DEBUG_PAGEALLOC is not set
1561CONFIG_HAVE_FUNCTION_TRACER=y 1676CONFIG_HAVE_FUNCTION_TRACER=y
1677CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
1562CONFIG_HAVE_DYNAMIC_FTRACE=y 1678CONFIG_HAVE_DYNAMIC_FTRACE=y
1563CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1679CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1680CONFIG_TRACING_SUPPORT=y
1564 1681
1565# 1682#
1566# Tracers 1683# Tracers
@@ -1568,17 +1685,19 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1568# CONFIG_FUNCTION_TRACER is not set 1685# CONFIG_FUNCTION_TRACER is not set
1569# CONFIG_SCHED_TRACER is not set 1686# CONFIG_SCHED_TRACER is not set
1570# CONFIG_CONTEXT_SWITCH_TRACER is not set 1687# CONFIG_CONTEXT_SWITCH_TRACER is not set
1688# CONFIG_EVENT_TRACER is not set
1571# CONFIG_BOOT_TRACER is not set 1689# CONFIG_BOOT_TRACER is not set
1572# CONFIG_TRACE_BRANCH_PROFILING is not set 1690# CONFIG_TRACE_BRANCH_PROFILING is not set
1573# CONFIG_STACK_TRACER is not set 1691# CONFIG_STACK_TRACER is not set
1574# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1692# CONFIG_KMEMTRACE is not set
1693# CONFIG_WORKQUEUE_TRACER is not set
1694# CONFIG_BLK_DEV_IO_TRACE is not set
1575# CONFIG_SAMPLES is not set 1695# CONFIG_SAMPLES is not set
1576CONFIG_HAVE_ARCH_KGDB=y 1696CONFIG_HAVE_ARCH_KGDB=y
1577# CONFIG_KGDB is not set 1697# CONFIG_KGDB is not set
1578CONFIG_PRINT_STACK_DEPTH=64 1698CONFIG_PRINT_STACK_DEPTH=64
1579# CONFIG_DEBUG_STACKOVERFLOW is not set 1699# CONFIG_DEBUG_STACKOVERFLOW is not set
1580# CONFIG_DEBUG_STACK_USAGE is not set 1700# CONFIG_DEBUG_STACK_USAGE is not set
1581# CONFIG_DEBUG_PAGEALLOC is not set
1582# CONFIG_CODE_PATCHING_SELFTEST is not set 1701# CONFIG_CODE_PATCHING_SELFTEST is not set
1583# CONFIG_FTR_FIXUP_SELFTEST is not set 1702# CONFIG_FTR_FIXUP_SELFTEST is not set
1584# CONFIG_MSI_BITMAP_SELFTEST is not set 1703# CONFIG_MSI_BITMAP_SELFTEST is not set
@@ -1609,10 +1728,12 @@ CONFIG_CRYPTO_BLKCIPHER2=y
1609CONFIG_CRYPTO_HASH=y 1728CONFIG_CRYPTO_HASH=y
1610CONFIG_CRYPTO_HASH2=y 1729CONFIG_CRYPTO_HASH2=y
1611CONFIG_CRYPTO_RNG2=y 1730CONFIG_CRYPTO_RNG2=y
1731CONFIG_CRYPTO_PCOMP=y
1612CONFIG_CRYPTO_MANAGER=y 1732CONFIG_CRYPTO_MANAGER=y
1613CONFIG_CRYPTO_MANAGER2=y 1733CONFIG_CRYPTO_MANAGER2=y
1614# CONFIG_CRYPTO_GF128MUL is not set 1734# CONFIG_CRYPTO_GF128MUL is not set
1615# CONFIG_CRYPTO_NULL is not set 1735# CONFIG_CRYPTO_NULL is not set
1736CONFIG_CRYPTO_WORKQUEUE=y
1616# CONFIG_CRYPTO_CRYPTD is not set 1737# CONFIG_CRYPTO_CRYPTD is not set
1617# CONFIG_CRYPTO_AUTHENC is not set 1738# CONFIG_CRYPTO_AUTHENC is not set
1618# CONFIG_CRYPTO_TEST is not set 1739# CONFIG_CRYPTO_TEST is not set
@@ -1680,8 +1801,9 @@ CONFIG_CRYPTO_DES=y
1680# 1801#
1681# Compression 1802# Compression
1682# 1803#
1683# CONFIG_CRYPTO_DEFLATE is not set 1804CONFIG_CRYPTO_DEFLATE=m
1684# CONFIG_CRYPTO_LZO is not set 1805# CONFIG_CRYPTO_ZLIB is not set
1806CONFIG_CRYPTO_LZO=m
1685 1807
1686# 1808#
1687# Random Number Generation 1809# Random Number Generation
diff --git a/arch/powerpc/configs/mpc85xx_defconfig b/arch/powerpc/configs/mpc85xx_defconfig
index fb08819d7cc4..c162724fed4f 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.29-rc2 3# Linux kernel version: 2.6.30-rc2
4# Mon Jan 26 15:35:37 2009 4# Tue Apr 21 15:40:23 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_BOOK3E_MMU=y
25# CONFIG_PPC_MM_SLICES is not set 26# CONFIG_PPC_MM_SLICES is not set
26# CONFIG_SMP is not set 27# CONFIG_SMP is not set
27CONFIG_PPC32=y 28CONFIG_PPC32=y
@@ -59,6 +60,7 @@ CONFIG_GENERIC_BUG=y
59CONFIG_DEFAULT_UIMAGE=y 60CONFIG_DEFAULT_UIMAGE=y
60# CONFIG_PPC_DCR_NATIVE is not set 61# CONFIG_PPC_DCR_NATIVE is not set
61# CONFIG_PPC_DCR_MMIO is not set 62# CONFIG_PPC_DCR_MMIO is not set
63CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
62CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 64CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
63 65
64# 66#
@@ -73,11 +75,21 @@ CONFIG_SWAP=y
73CONFIG_SYSVIPC=y 75CONFIG_SYSVIPC=y
74CONFIG_SYSVIPC_SYSCTL=y 76CONFIG_SYSVIPC_SYSCTL=y
75CONFIG_POSIX_MQUEUE=y 77CONFIG_POSIX_MQUEUE=y
78CONFIG_POSIX_MQUEUE_SYSCTL=y
76CONFIG_BSD_PROCESS_ACCT=y 79CONFIG_BSD_PROCESS_ACCT=y
77# CONFIG_BSD_PROCESS_ACCT_V3 is not set 80# CONFIG_BSD_PROCESS_ACCT_V3 is not set
78# CONFIG_TASKSTATS is not set 81# CONFIG_TASKSTATS is not set
79CONFIG_AUDIT=y 82CONFIG_AUDIT=y
80# CONFIG_AUDITSYSCALL is not set 83# CONFIG_AUDITSYSCALL is not set
84
85#
86# RCU Subsystem
87#
88CONFIG_CLASSIC_RCU=y
89# CONFIG_TREE_RCU is not set
90# CONFIG_PREEMPT_RCU is not set
91# CONFIG_TREE_RCU_TRACE is not set
92# CONFIG_PREEMPT_RCU_TRACE is not set
81CONFIG_IKCONFIG=y 93CONFIG_IKCONFIG=y
82CONFIG_IKCONFIG_PROC=y 94CONFIG_IKCONFIG_PROC=y
83CONFIG_LOG_BUF_SHIFT=14 95CONFIG_LOG_BUF_SHIFT=14
@@ -93,22 +105,24 @@ CONFIG_SYSFS_DEPRECATED_V2=y
93# CONFIG_NAMESPACES is not set 105# CONFIG_NAMESPACES is not set
94CONFIG_BLK_DEV_INITRD=y 106CONFIG_BLK_DEV_INITRD=y
95CONFIG_INITRAMFS_SOURCE="" 107CONFIG_INITRAMFS_SOURCE=""
108CONFIG_RD_GZIP=y
109# CONFIG_RD_BZIP2 is not set
110# CONFIG_RD_LZMA is not set
96# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 111# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
97CONFIG_SYSCTL=y 112CONFIG_SYSCTL=y
113CONFIG_ANON_INODES=y
98CONFIG_EMBEDDED=y 114CONFIG_EMBEDDED=y
99CONFIG_SYSCTL_SYSCALL=y 115CONFIG_SYSCTL_SYSCALL=y
100CONFIG_KALLSYMS=y 116CONFIG_KALLSYMS=y
101CONFIG_KALLSYMS_ALL=y 117CONFIG_KALLSYMS_ALL=y
102CONFIG_KALLSYMS_STRIP_GENERATED=y
103CONFIG_KALLSYMS_EXTRA_PASS=y 118CONFIG_KALLSYMS_EXTRA_PASS=y
119# CONFIG_STRIP_ASM_SYMS is not set
104CONFIG_HOTPLUG=y 120CONFIG_HOTPLUG=y
105CONFIG_PRINTK=y 121CONFIG_PRINTK=y
106CONFIG_BUG=y 122CONFIG_BUG=y
107CONFIG_ELF_CORE=y 123CONFIG_ELF_CORE=y
108CONFIG_COMPAT_BRK=y
109CONFIG_BASE_FULL=y 124CONFIG_BASE_FULL=y
110CONFIG_FUTEX=y 125CONFIG_FUTEX=y
111CONFIG_ANON_INODES=y
112CONFIG_EPOLL=y 126CONFIG_EPOLL=y
113CONFIG_SIGNALFD=y 127CONFIG_SIGNALFD=y
114CONFIG_TIMERFD=y 128CONFIG_TIMERFD=y
@@ -118,10 +132,12 @@ CONFIG_AIO=y
118CONFIG_VM_EVENT_COUNTERS=y 132CONFIG_VM_EVENT_COUNTERS=y
119CONFIG_PCI_QUIRKS=y 133CONFIG_PCI_QUIRKS=y
120CONFIG_SLUB_DEBUG=y 134CONFIG_SLUB_DEBUG=y
135CONFIG_COMPAT_BRK=y
121# CONFIG_SLAB is not set 136# CONFIG_SLAB is not set
122CONFIG_SLUB=y 137CONFIG_SLUB=y
123# CONFIG_SLOB is not set 138# CONFIG_SLOB is not set
124# CONFIG_PROFILING is not set 139# CONFIG_PROFILING is not set
140# CONFIG_MARKERS is not set
125CONFIG_HAVE_OPROFILE=y 141CONFIG_HAVE_OPROFILE=y
126# CONFIG_KPROBES is not set 142# CONFIG_KPROBES is not set
127CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 143CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -130,6 +146,7 @@ CONFIG_HAVE_KPROBES=y
130CONFIG_HAVE_KRETPROBES=y 146CONFIG_HAVE_KRETPROBES=y
131CONFIG_HAVE_ARCH_TRACEHOOK=y 147CONFIG_HAVE_ARCH_TRACEHOOK=y
132CONFIG_HAVE_CLK=y 148CONFIG_HAVE_CLK=y
149# CONFIG_SLOW_WORK is not set
133# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 150# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
134CONFIG_SLABINFO=y 151CONFIG_SLABINFO=y
135CONFIG_RT_MUTEXES=y 152CONFIG_RT_MUTEXES=y
@@ -142,7 +159,6 @@ CONFIG_MODVERSIONS=y
142# CONFIG_MODULE_SRCVERSION_ALL is not set 159# CONFIG_MODULE_SRCVERSION_ALL is not set
143CONFIG_BLOCK=y 160CONFIG_BLOCK=y
144CONFIG_LBD=y 161CONFIG_LBD=y
145# CONFIG_BLK_DEV_IO_TRACE is not set
146# CONFIG_BLK_DEV_BSG is not set 162# CONFIG_BLK_DEV_BSG is not set
147# CONFIG_BLK_DEV_INTEGRITY is not set 163# CONFIG_BLK_DEV_INTEGRITY is not set
148 164
@@ -158,11 +174,6 @@ CONFIG_IOSCHED_CFQ=y
158CONFIG_DEFAULT_CFQ=y 174CONFIG_DEFAULT_CFQ=y
159# CONFIG_DEFAULT_NOOP is not set 175# CONFIG_DEFAULT_NOOP is not set
160CONFIG_DEFAULT_IOSCHED="cfq" 176CONFIG_DEFAULT_IOSCHED="cfq"
161CONFIG_CLASSIC_RCU=y
162# CONFIG_TREE_RCU is not set
163# CONFIG_PREEMPT_RCU is not set
164# CONFIG_TREE_RCU_TRACE is not set
165# CONFIG_PREEMPT_RCU_TRACE is not set
166# CONFIG_FREEZER is not set 177# CONFIG_FREEZER is not set
167 178
168# 179#
@@ -178,8 +189,9 @@ CONFIG_MPC85xx_CDS=y
178CONFIG_MPC85xx_MDS=y 189CONFIG_MPC85xx_MDS=y
179CONFIG_MPC8536_DS=y 190CONFIG_MPC8536_DS=y
180CONFIG_MPC85xx_DS=y 191CONFIG_MPC85xx_DS=y
192CONFIG_SOCRATES=y
181CONFIG_KSI8560=y 193CONFIG_KSI8560=y
182# CONFIG_STX_GP3 is not set 194CONFIG_STX_GP3=y
183CONFIG_TQM8540=y 195CONFIG_TQM8540=y
184CONFIG_TQM8541=y 196CONFIG_TQM8541=y
185CONFIG_TQM8548=y 197CONFIG_TQM8548=y
@@ -200,11 +212,11 @@ CONFIG_PPC_I8259=y
200# CONFIG_GENERIC_IOMAP is not set 212# CONFIG_GENERIC_IOMAP is not set
201# CONFIG_CPU_FREQ is not set 213# CONFIG_CPU_FREQ is not set
202CONFIG_QUICC_ENGINE=y 214CONFIG_QUICC_ENGINE=y
203# CONFIG_QE_GPIO is not set 215CONFIG_QE_GPIO=y
204CONFIG_CPM2=y 216CONFIG_CPM2=y
205CONFIG_FSL_ULI1575=y 217CONFIG_FSL_ULI1575=y
206CONFIG_CPM=y 218CONFIG_CPM=y
207# CONFIG_MPC8xxx_GPIO is not set 219CONFIG_MPC8xxx_GPIO=y
208# CONFIG_SIMPLE_GPIO is not set 220# CONFIG_SIMPLE_GPIO is not set
209 221
210# 222#
@@ -249,9 +261,12 @@ CONFIG_ZONE_DMA_FLAG=1
249CONFIG_BOUNCE=y 261CONFIG_BOUNCE=y
250CONFIG_VIRT_TO_BUS=y 262CONFIG_VIRT_TO_BUS=y
251CONFIG_UNEVICTABLE_LRU=y 263CONFIG_UNEVICTABLE_LRU=y
264CONFIG_HAVE_MLOCK=y
265CONFIG_HAVE_MLOCKED_PAGE_BIT=y
252CONFIG_PPC_4K_PAGES=y 266CONFIG_PPC_4K_PAGES=y
253# CONFIG_PPC_16K_PAGES is not set 267# CONFIG_PPC_16K_PAGES is not set
254# CONFIG_PPC_64K_PAGES is not set 268# CONFIG_PPC_64K_PAGES is not set
269# CONFIG_PPC_256K_PAGES is not set
255CONFIG_FORCE_MAX_ZONEORDER=11 270CONFIG_FORCE_MAX_ZONEORDER=11
256CONFIG_PROC_DEVICETREE=y 271CONFIG_PROC_DEVICETREE=y
257# CONFIG_CMDLINE_BOOL is not set 272# CONFIG_CMDLINE_BOOL is not set
@@ -278,6 +293,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
278# CONFIG_PCI_LEGACY is not set 293# CONFIG_PCI_LEGACY is not set
279# CONFIG_PCI_DEBUG is not set 294# CONFIG_PCI_DEBUG is not set
280# CONFIG_PCI_STUB is not set 295# CONFIG_PCI_STUB is not set
296# CONFIG_PCI_IOV is not set
281# CONFIG_PCCARD is not set 297# CONFIG_PCCARD is not set
282# CONFIG_HOTPLUG_PCI is not set 298# CONFIG_HOTPLUG_PCI is not set
283# CONFIG_HAS_RAPIDIO is not set 299# CONFIG_HAS_RAPIDIO is not set
@@ -291,17 +307,17 @@ CONFIG_ARCH_SUPPORTS_MSI=y
291# Default settings for advanced configuration options are used 307# Default settings for advanced configuration options are used
292# 308#
293CONFIG_LOWMEM_SIZE=0x30000000 309CONFIG_LOWMEM_SIZE=0x30000000
310CONFIG_LOWMEM_CAM_NUM=3
294CONFIG_PAGE_OFFSET=0xc0000000 311CONFIG_PAGE_OFFSET=0xc0000000
295CONFIG_KERNEL_START=0xc0000000 312CONFIG_KERNEL_START=0xc0000000
296CONFIG_PHYSICAL_START=0x00000000 313CONFIG_PHYSICAL_START=0x00000000
297CONFIG_PHYSICAL_ALIGN=0x10000000 314CONFIG_PHYSICAL_ALIGN=0x04000000
298CONFIG_TASK_SIZE=0xc0000000 315CONFIG_TASK_SIZE=0xc0000000
299CONFIG_NET=y 316CONFIG_NET=y
300 317
301# 318#
302# Networking options 319# Networking options
303# 320#
304CONFIG_COMPAT_NET_DEV_OPS=y
305CONFIG_PACKET=y 321CONFIG_PACKET=y
306# CONFIG_PACKET_MMAP is not set 322# CONFIG_PACKET_MMAP is not set
307CONFIG_UNIX=y 323CONFIG_UNIX=y
@@ -389,6 +405,7 @@ CONFIG_SCTP_HMAC_MD5=y
389# CONFIG_LAPB is not set 405# CONFIG_LAPB is not set
390# CONFIG_ECONET is not set 406# CONFIG_ECONET is not set
391# CONFIG_WAN_ROUTER is not set 407# CONFIG_WAN_ROUTER is not set
408# CONFIG_PHONET is not set
392# CONFIG_NET_SCHED is not set 409# CONFIG_NET_SCHED is not set
393# CONFIG_DCB is not set 410# CONFIG_DCB is not set
394 411
@@ -401,7 +418,6 @@ CONFIG_SCTP_HMAC_MD5=y
401# CONFIG_IRDA is not set 418# CONFIG_IRDA is not set
402# CONFIG_BT is not set 419# CONFIG_BT is not set
403# CONFIG_AF_RXRPC is not set 420# CONFIG_AF_RXRPC is not set
404# CONFIG_PHONET is not set
405CONFIG_FIB_RULES=y 421CONFIG_FIB_RULES=y
406CONFIG_WIRELESS=y 422CONFIG_WIRELESS=y
407# CONFIG_CFG80211 is not set 423# CONFIG_CFG80211 is not set
@@ -456,13 +472,20 @@ CONFIG_BLK_DEV_RAM_SIZE=131072
456# CONFIG_BLK_DEV_HD is not set 472# CONFIG_BLK_DEV_HD is not set
457CONFIG_MISC_DEVICES=y 473CONFIG_MISC_DEVICES=y
458# CONFIG_PHANTOM is not set 474# CONFIG_PHANTOM is not set
459# CONFIG_EEPROM_93CX6 is not set
460# CONFIG_SGI_IOC4 is not set 475# CONFIG_SGI_IOC4 is not set
461# CONFIG_TIFM_CORE is not set 476# CONFIG_TIFM_CORE is not set
462# CONFIG_ICS932S401 is not set 477# CONFIG_ICS932S401 is not set
463# CONFIG_ENCLOSURE_SERVICES is not set 478# CONFIG_ENCLOSURE_SERVICES is not set
464# CONFIG_HP_ILO is not set 479# CONFIG_HP_ILO is not set
480# CONFIG_ISL29003 is not set
465# CONFIG_C2PORT is not set 481# CONFIG_C2PORT is not set
482
483#
484# EEPROM support
485#
486# CONFIG_EEPROM_AT24 is not set
487CONFIG_EEPROM_LEGACY=y
488# CONFIG_EEPROM_93CX6 is not set
466CONFIG_HAVE_IDE=y 489CONFIG_HAVE_IDE=y
467# CONFIG_IDE is not set 490# CONFIG_IDE is not set
468 491
@@ -521,9 +544,11 @@ CONFIG_SCSI_LOWLEVEL=y
521# CONFIG_MEGARAID_NEWGEN is not set 544# CONFIG_MEGARAID_NEWGEN is not set
522# CONFIG_MEGARAID_LEGACY is not set 545# CONFIG_MEGARAID_LEGACY is not set
523# CONFIG_MEGARAID_SAS is not set 546# CONFIG_MEGARAID_SAS is not set
547# CONFIG_SCSI_MPT2SAS is not set
524# CONFIG_SCSI_HPTIOP is not set 548# CONFIG_SCSI_HPTIOP is not set
525# CONFIG_SCSI_BUSLOGIC is not set 549# CONFIG_SCSI_BUSLOGIC is not set
526# CONFIG_LIBFC is not set 550# CONFIG_LIBFC is not set
551# CONFIG_LIBFCOE is not set
527# CONFIG_FCOE is not set 552# CONFIG_FCOE is not set
528# CONFIG_SCSI_DMX3191D is not set 553# CONFIG_SCSI_DMX3191D is not set
529# CONFIG_SCSI_EATA is not set 554# CONFIG_SCSI_EATA is not set
@@ -546,6 +571,7 @@ CONFIG_SCSI_LOWLEVEL=y
546# CONFIG_SCSI_DEBUG is not set 571# CONFIG_SCSI_DEBUG is not set
547# CONFIG_SCSI_SRP is not set 572# CONFIG_SCSI_SRP is not set
548# CONFIG_SCSI_DH is not set 573# CONFIG_SCSI_DH is not set
574# CONFIG_SCSI_OSD_INITIATOR is not set
549CONFIG_ATA=y 575CONFIG_ATA=y
550# CONFIG_ATA_NONSTANDARD is not set 576# CONFIG_ATA_NONSTANDARD is not set
551CONFIG_SATA_PMP=y 577CONFIG_SATA_PMP=y
@@ -622,6 +648,7 @@ CONFIG_PATA_ALI=y
622# CONFIG_I2O is not set 648# CONFIG_I2O is not set
623# CONFIG_MACINTOSH_DRIVERS is not set 649# CONFIG_MACINTOSH_DRIVERS is not set
624CONFIG_NETDEVICES=y 650CONFIG_NETDEVICES=y
651CONFIG_COMPAT_NET_DEV_OPS=y
625CONFIG_DUMMY=y 652CONFIG_DUMMY=y
626# CONFIG_BONDING is not set 653# CONFIG_BONDING is not set
627# CONFIG_MACVLAN is not set 654# CONFIG_MACVLAN is not set
@@ -634,11 +661,11 @@ CONFIG_PHYLIB=y
634# 661#
635# MII PHY device drivers 662# MII PHY device drivers
636# 663#
637# CONFIG_MARVELL_PHY is not set 664CONFIG_MARVELL_PHY=y
638# CONFIG_DAVICOM_PHY is not set 665CONFIG_DAVICOM_PHY=y
639# CONFIG_QSEMI_PHY is not set 666# CONFIG_QSEMI_PHY is not set
640# CONFIG_LXT_PHY is not set 667# CONFIG_LXT_PHY is not set
641# CONFIG_CICADA_PHY is not set 668CONFIG_CICADA_PHY=y
642CONFIG_VITESSE_PHY=y 669CONFIG_VITESSE_PHY=y
643# CONFIG_SMSC_PHY is not set 670# CONFIG_SMSC_PHY is not set
644# CONFIG_BROADCOM_PHY is not set 671# CONFIG_BROADCOM_PHY is not set
@@ -647,7 +674,7 @@ CONFIG_VITESSE_PHY=y
647# CONFIG_NATIONAL_PHY is not set 674# CONFIG_NATIONAL_PHY is not set
648# CONFIG_STE10XP is not set 675# CONFIG_STE10XP is not set
649# CONFIG_LSI_ET1011C_PHY is not set 676# CONFIG_LSI_ET1011C_PHY is not set
650# CONFIG_FIXED_PHY is not set 677CONFIG_FIXED_PHY=y
651# CONFIG_MDIO_BITBANG is not set 678# CONFIG_MDIO_BITBANG is not set
652CONFIG_NET_ETHERNET=y 679CONFIG_NET_ETHERNET=y
653CONFIG_MII=y 680CONFIG_MII=y
@@ -655,6 +682,8 @@ CONFIG_MII=y
655# CONFIG_SUNGEM is not set 682# CONFIG_SUNGEM is not set
656# CONFIG_CASSINI is not set 683# CONFIG_CASSINI is not set
657# CONFIG_NET_VENDOR_3COM is not set 684# CONFIG_NET_VENDOR_3COM is not set
685# CONFIG_ETHOC is not set
686# CONFIG_DNET is not set
658# CONFIG_NET_TULIP is not set 687# CONFIG_NET_TULIP is not set
659# CONFIG_HP100 is not set 688# CONFIG_HP100 is not set
660# CONFIG_IBM_NEW_EMAC_ZMII is not set 689# CONFIG_IBM_NEW_EMAC_ZMII is not set
@@ -667,7 +696,10 @@ CONFIG_MII=y
667# CONFIG_NET_PCI is not set 696# CONFIG_NET_PCI is not set
668# CONFIG_B44 is not set 697# CONFIG_B44 is not set
669# CONFIG_ATL2 is not set 698# CONFIG_ATL2 is not set
670# CONFIG_FS_ENET is not set 699CONFIG_FS_ENET=y
700CONFIG_FS_ENET_HAS_SCC=y
701CONFIG_FS_ENET_HAS_FCC=y
702# CONFIG_FS_ENET_MDIO_FCC is not set
671CONFIG_NETDEV_1000=y 703CONFIG_NETDEV_1000=y
672# CONFIG_ACENIC is not set 704# CONFIG_ACENIC is not set
673# CONFIG_DL2K is not set 705# CONFIG_DL2K is not set
@@ -675,6 +707,7 @@ CONFIG_NETDEV_1000=y
675# CONFIG_E1000E is not set 707# CONFIG_E1000E is not set
676# CONFIG_IP1000 is not set 708# CONFIG_IP1000 is not set
677# CONFIG_IGB is not set 709# CONFIG_IGB is not set
710# CONFIG_IGBVF is not set
678# CONFIG_NS83820 is not set 711# CONFIG_NS83820 is not set
679# CONFIG_HAMACHI is not set 712# CONFIG_HAMACHI is not set
680# CONFIG_YELLOWFIN is not set 713# CONFIG_YELLOWFIN is not set
@@ -685,11 +718,15 @@ CONFIG_NETDEV_1000=y
685# CONFIG_VIA_VELOCITY is not set 718# CONFIG_VIA_VELOCITY is not set
686# CONFIG_TIGON3 is not set 719# CONFIG_TIGON3 is not set
687# CONFIG_BNX2 is not set 720# CONFIG_BNX2 is not set
721CONFIG_FSL_PQ_MDIO=y
688CONFIG_GIANFAR=y 722CONFIG_GIANFAR=y
689# CONFIG_UCC_GETH is not set 723CONFIG_UCC_GETH=y
724# CONFIG_UGETH_MAGIC_PACKET is not set
725# CONFIG_UGETH_TX_ON_DEMAND is not set
690# CONFIG_QLA3XXX is not set 726# CONFIG_QLA3XXX is not set
691# CONFIG_ATL1 is not set 727# CONFIG_ATL1 is not set
692# CONFIG_ATL1E is not set 728# CONFIG_ATL1E is not set
729# CONFIG_ATL1C is not set
693# CONFIG_JME is not set 730# CONFIG_JME is not set
694CONFIG_NETDEV_10000=y 731CONFIG_NETDEV_10000=y
695# CONFIG_CHELSIO_T1 is not set 732# CONFIG_CHELSIO_T1 is not set
@@ -699,6 +736,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
699# CONFIG_IXGBE is not set 736# CONFIG_IXGBE is not set
700# CONFIG_IXGB is not set 737# CONFIG_IXGB is not set
701# CONFIG_S2IO is not set 738# CONFIG_S2IO is not set
739# CONFIG_VXGE is not set
702# CONFIG_MYRI10GE is not set 740# CONFIG_MYRI10GE is not set
703# CONFIG_NETXEN_NIC is not set 741# CONFIG_NETXEN_NIC is not set
704# CONFIG_NIU is not set 742# CONFIG_NIU is not set
@@ -708,6 +746,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
708# CONFIG_BNX2X is not set 746# CONFIG_BNX2X is not set
709# CONFIG_QLGE is not set 747# CONFIG_QLGE is not set
710# CONFIG_SFC is not set 748# CONFIG_SFC is not set
749# CONFIG_BE2NET is not set
711# CONFIG_TR is not set 750# CONFIG_TR is not set
712 751
713# 752#
@@ -715,7 +754,6 @@ CONFIG_CHELSIO_T3_DEPENDS=y
715# 754#
716# CONFIG_WLAN_PRE80211 is not set 755# CONFIG_WLAN_PRE80211 is not set
717# CONFIG_WLAN_80211 is not set 756# CONFIG_WLAN_80211 is not set
718# CONFIG_IWLWIFI_LEDS is not set
719 757
720# 758#
721# Enable WiMAX (Networking options) to see the WiMAX drivers 759# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -813,14 +851,15 @@ CONFIG_SERIAL_CORE_CONSOLE=y
813# CONFIG_SERIAL_CPM is not set 851# CONFIG_SERIAL_CPM is not set
814# CONFIG_SERIAL_JSM is not set 852# CONFIG_SERIAL_JSM is not set
815# CONFIG_SERIAL_OF_PLATFORM is not set 853# CONFIG_SERIAL_OF_PLATFORM is not set
816# CONFIG_SERIAL_QE is not set 854CONFIG_SERIAL_QE=m
817CONFIG_UNIX98_PTYS=y 855CONFIG_UNIX98_PTYS=y
818# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 856# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
819CONFIG_LEGACY_PTYS=y 857CONFIG_LEGACY_PTYS=y
820CONFIG_LEGACY_PTY_COUNT=256 858CONFIG_LEGACY_PTY_COUNT=256
821# CONFIG_HVC_UDBG is not set 859# CONFIG_HVC_UDBG is not set
822# CONFIG_IPMI_HANDLER is not set 860# CONFIG_IPMI_HANDLER is not set
823# CONFIG_HW_RANDOM is not set 861CONFIG_HW_RANDOM=y
862# CONFIG_HW_RANDOM_TIMERIOMEM is not set
824CONFIG_NVRAM=y 863CONFIG_NVRAM=y
825# CONFIG_R3964 is not set 864# CONFIG_R3964 is not set
826# CONFIG_APPLICOM is not set 865# CONFIG_APPLICOM is not set
@@ -857,7 +896,7 @@ CONFIG_I2C_HELPER_AUTO=y
857# 896#
858# I2C system bus drivers (mostly embedded / system-on-chip) 897# I2C system bus drivers (mostly embedded / system-on-chip)
859# 898#
860# CONFIG_I2C_CPM is not set 899CONFIG_I2C_CPM=m
861# CONFIG_I2C_GPIO is not set 900# CONFIG_I2C_GPIO is not set
862CONFIG_I2C_MPC=y 901CONFIG_I2C_MPC=y
863# CONFIG_I2C_OCORES is not set 902# CONFIG_I2C_OCORES is not set
@@ -885,12 +924,9 @@ CONFIG_I2C_MPC=y
885# Miscellaneous I2C Chip support 924# Miscellaneous I2C Chip support
886# 925#
887# CONFIG_DS1682 is not set 926# CONFIG_DS1682 is not set
888# CONFIG_EEPROM_AT24 is not set
889CONFIG_EEPROM_LEGACY=y
890# CONFIG_SENSORS_PCF8574 is not set 927# CONFIG_SENSORS_PCF8574 is not set
891# CONFIG_PCF8575 is not set 928# CONFIG_PCF8575 is not set
892# CONFIG_SENSORS_PCA9539 is not set 929# CONFIG_SENSORS_PCA9539 is not set
893# CONFIG_SENSORS_PCF8591 is not set
894# CONFIG_SENSORS_MAX6875 is not set 930# CONFIG_SENSORS_MAX6875 is not set
895# CONFIG_SENSORS_TSL2550 is not set 931# CONFIG_SENSORS_TSL2550 is not set
896# CONFIG_I2C_DEBUG_CORE is not set 932# CONFIG_I2C_DEBUG_CORE is not set
@@ -969,7 +1005,7 @@ CONFIG_VIDEO_MEDIA=m
969# 1005#
970# CONFIG_MEDIA_ATTACH is not set 1006# CONFIG_MEDIA_ATTACH is not set
971CONFIG_MEDIA_TUNER=m 1007CONFIG_MEDIA_TUNER=m
972# CONFIG_MEDIA_TUNER_CUSTOMIZE is not set 1008# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
973CONFIG_MEDIA_TUNER_SIMPLE=m 1009CONFIG_MEDIA_TUNER_SIMPLE=m
974CONFIG_MEDIA_TUNER_TDA8290=m 1010CONFIG_MEDIA_TUNER_TDA8290=m
975CONFIG_MEDIA_TUNER_TDA9887=m 1011CONFIG_MEDIA_TUNER_TDA9887=m
@@ -978,6 +1014,7 @@ CONFIG_MEDIA_TUNER_TEA5767=m
978CONFIG_MEDIA_TUNER_MT20XX=m 1014CONFIG_MEDIA_TUNER_MT20XX=m
979CONFIG_MEDIA_TUNER_XC2028=m 1015CONFIG_MEDIA_TUNER_XC2028=m
980CONFIG_MEDIA_TUNER_XC5000=m 1016CONFIG_MEDIA_TUNER_XC5000=m
1017CONFIG_MEDIA_TUNER_MC44S803=m
981# CONFIG_DVB_DYNAMIC_MINORS is not set 1018# CONFIG_DVB_DYNAMIC_MINORS is not set
982CONFIG_DVB_CAPTURE_DRIVERS=y 1019CONFIG_DVB_CAPTURE_DRIVERS=y
983 1020
@@ -1017,103 +1054,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
1017# 1054#
1018# Supported DVB Frontends 1055# Supported DVB Frontends
1019# 1056#
1020
1021#
1022# Customise DVB Frontends
1023#
1024# CONFIG_DVB_FE_CUSTOMISE is not set 1057# CONFIG_DVB_FE_CUSTOMISE is not set
1025
1026#
1027# Multistandard (satellite) frontends
1028#
1029# CONFIG_DVB_STB0899 is not set
1030# CONFIG_DVB_STB6100 is not set
1031
1032#
1033# DVB-S (satellite) frontends
1034#
1035# CONFIG_DVB_CX24110 is not set
1036# CONFIG_DVB_CX24123 is not set
1037# CONFIG_DVB_MT312 is not set
1038# CONFIG_DVB_S5H1420 is not set
1039# CONFIG_DVB_STV0288 is not set
1040# CONFIG_DVB_STB6000 is not set
1041# CONFIG_DVB_STV0299 is not set
1042# CONFIG_DVB_TDA8083 is not set
1043# CONFIG_DVB_TDA10086 is not set
1044# CONFIG_DVB_TDA8261 is not set
1045# CONFIG_DVB_VES1X93 is not set
1046# CONFIG_DVB_TUNER_ITD1000 is not set
1047# CONFIG_DVB_TUNER_CX24113 is not set
1048# CONFIG_DVB_TDA826X is not set
1049# CONFIG_DVB_TUA6100 is not set
1050# CONFIG_DVB_CX24116 is not set
1051# CONFIG_DVB_SI21XX is not set
1052
1053#
1054# DVB-T (terrestrial) frontends
1055#
1056# CONFIG_DVB_SP8870 is not set
1057# CONFIG_DVB_SP887X is not set
1058# CONFIG_DVB_CX22700 is not set
1059# CONFIG_DVB_CX22702 is not set
1060# CONFIG_DVB_DRX397XD is not set
1061# CONFIG_DVB_L64781 is not set
1062# CONFIG_DVB_TDA1004X is not set
1063# CONFIG_DVB_NXT6000 is not set
1064# CONFIG_DVB_MT352 is not set
1065# CONFIG_DVB_ZL10353 is not set
1066# CONFIG_DVB_DIB3000MB is not set
1067# CONFIG_DVB_DIB3000MC is not set
1068# CONFIG_DVB_DIB7000M is not set
1069# CONFIG_DVB_DIB7000P is not set
1070# CONFIG_DVB_TDA10048 is not set
1071
1072#
1073# DVB-C (cable) frontends
1074#
1075# CONFIG_DVB_VES1820 is not set
1076# CONFIG_DVB_TDA10021 is not set
1077# CONFIG_DVB_TDA10023 is not set
1078# CONFIG_DVB_STV0297 is not set
1079
1080#
1081# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
1082#
1083# CONFIG_DVB_NXT200X is not set
1084# CONFIG_DVB_OR51211 is not set
1085# CONFIG_DVB_OR51132 is not set
1086# CONFIG_DVB_BCM3510 is not set
1087# CONFIG_DVB_LGDT330X is not set
1088# CONFIG_DVB_LGDT3304 is not set
1089# CONFIG_DVB_S5H1409 is not set
1090# CONFIG_DVB_AU8522 is not set
1091# CONFIG_DVB_S5H1411 is not set
1092
1093#
1094# ISDB-T (terrestrial) frontends
1095#
1096# CONFIG_DVB_S921 is not set
1097
1098#
1099# Digital terrestrial only tuners/PLL
1100#
1101# CONFIG_DVB_PLL is not set
1102# CONFIG_DVB_TUNER_DIB0070 is not set
1103
1104#
1105# SEC control devices for DVB-S
1106#
1107# CONFIG_DVB_LNBP21 is not set
1108# CONFIG_DVB_ISL6405 is not set
1109# CONFIG_DVB_ISL6421 is not set
1110# CONFIG_DVB_LGS8GL5 is not set
1111
1112#
1113# Tools to develop new frontends
1114#
1115# CONFIG_DVB_DUMMY_FE is not set
1116# CONFIG_DVB_AF9013 is not set
1117CONFIG_DAB=y 1058CONFIG_DAB=y
1118# CONFIG_USB_DABUSB is not set 1059# CONFIG_USB_DABUSB is not set
1119 1060
@@ -1193,6 +1134,8 @@ CONFIG_SND_PCI=y
1193# CONFIG_SND_INDIGO is not set 1134# CONFIG_SND_INDIGO is not set
1194# CONFIG_SND_INDIGOIO is not set 1135# CONFIG_SND_INDIGOIO is not set
1195# CONFIG_SND_INDIGODJ is not set 1136# CONFIG_SND_INDIGODJ is not set
1137# CONFIG_SND_INDIGOIOX is not set
1138# CONFIG_SND_INDIGODJX is not set
1196# CONFIG_SND_EMU10K1 is not set 1139# CONFIG_SND_EMU10K1 is not set
1197# CONFIG_SND_EMU10K1X is not set 1140# CONFIG_SND_EMU10K1X is not set
1198# CONFIG_SND_ENS1370 is not set 1141# CONFIG_SND_ENS1370 is not set
@@ -1247,15 +1190,17 @@ CONFIG_USB_HID=y
1247# 1190#
1248# Special HID drivers 1191# Special HID drivers
1249# 1192#
1250CONFIG_HID_COMPAT=y
1251CONFIG_HID_A4TECH=y 1193CONFIG_HID_A4TECH=y
1252CONFIG_HID_APPLE=y 1194CONFIG_HID_APPLE=y
1253CONFIG_HID_BELKIN=y 1195CONFIG_HID_BELKIN=y
1254CONFIG_HID_CHERRY=y 1196CONFIG_HID_CHERRY=y
1255CONFIG_HID_CHICONY=y 1197CONFIG_HID_CHICONY=y
1256CONFIG_HID_CYPRESS=y 1198CONFIG_HID_CYPRESS=y
1199# CONFIG_DRAGONRISE_FF is not set
1257CONFIG_HID_EZKEY=y 1200CONFIG_HID_EZKEY=y
1201# CONFIG_HID_KYE is not set
1258CONFIG_HID_GYRATION=y 1202CONFIG_HID_GYRATION=y
1203# CONFIG_HID_KENSINGTON is not set
1259CONFIG_HID_LOGITECH=y 1204CONFIG_HID_LOGITECH=y
1260# CONFIG_LOGITECH_FF is not set 1205# CONFIG_LOGITECH_FF is not set
1261# CONFIG_LOGIRUMBLEPAD2_FF is not set 1206# CONFIG_LOGIRUMBLEPAD2_FF is not set
@@ -1314,6 +1259,7 @@ CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
1314CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y 1259CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
1315CONFIG_USB_OHCI_LITTLE_ENDIAN=y 1260CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1316# CONFIG_USB_UHCI_HCD is not set 1261# CONFIG_USB_UHCI_HCD is not set
1262# CONFIG_USB_FHCI_HCD is not set
1317# CONFIG_USB_SL811_HCD is not set 1263# CONFIG_USB_SL811_HCD is not set
1318# CONFIG_USB_R8A66597_HCD is not set 1264# CONFIG_USB_R8A66597_HCD is not set
1319# CONFIG_USB_WHCI_HCD is not set 1265# CONFIG_USB_WHCI_HCD is not set
@@ -1329,11 +1275,11 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1329# CONFIG_USB_TMC is not set 1275# CONFIG_USB_TMC is not set
1330 1276
1331# 1277#
1332# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; 1278# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
1333# 1279#
1334 1280
1335# 1281#
1336# see USB_STORAGE Help for more information 1282# also be needed; see USB_STORAGE Help for more info
1337# 1283#
1338CONFIG_USB_STORAGE=y 1284CONFIG_USB_STORAGE=y
1339# CONFIG_USB_STORAGE_DEBUG is not set 1285# CONFIG_USB_STORAGE_DEBUG is not set
@@ -1375,7 +1321,6 @@ CONFIG_USB_STORAGE=y
1375# CONFIG_USB_LED is not set 1321# CONFIG_USB_LED is not set
1376# CONFIG_USB_CYPRESS_CY7C63 is not set 1322# CONFIG_USB_CYPRESS_CY7C63 is not set
1377# CONFIG_USB_CYTHERM is not set 1323# CONFIG_USB_CYTHERM is not set
1378# CONFIG_USB_PHIDGET is not set
1379# CONFIG_USB_IDMOUSE is not set 1324# CONFIG_USB_IDMOUSE is not set
1380# CONFIG_USB_FTDI_ELAN is not set 1325# CONFIG_USB_FTDI_ELAN is not set
1381# CONFIG_USB_APPLEDISPLAY is not set 1326# CONFIG_USB_APPLEDISPLAY is not set
@@ -1392,6 +1337,7 @@ CONFIG_USB_STORAGE=y
1392# OTG and related infrastructure 1337# OTG and related infrastructure
1393# 1338#
1394# CONFIG_USB_GPIO_VBUS is not set 1339# CONFIG_USB_GPIO_VBUS is not set
1340# CONFIG_NOP_USB_XCEIV is not set
1395# CONFIG_UWB is not set 1341# CONFIG_UWB is not set
1396# CONFIG_MMC is not set 1342# CONFIG_MMC is not set
1397# CONFIG_MEMSTICK is not set 1343# CONFIG_MEMSTICK is not set
@@ -1406,6 +1352,8 @@ CONFIG_EDAC=y
1406# CONFIG_EDAC_DEBUG is not set 1352# CONFIG_EDAC_DEBUG is not set
1407CONFIG_EDAC_MM_EDAC=y 1353CONFIG_EDAC_MM_EDAC=y
1408CONFIG_EDAC_MPC85XX=y 1354CONFIG_EDAC_MPC85XX=y
1355# CONFIG_EDAC_AMD8131 is not set
1356# CONFIG_EDAC_AMD8111 is not set
1409CONFIG_RTC_LIB=y 1357CONFIG_RTC_LIB=y
1410CONFIG_RTC_CLASS=y 1358CONFIG_RTC_CLASS=y
1411CONFIG_RTC_HCTOSYS=y 1359CONFIG_RTC_HCTOSYS=y
@@ -1460,7 +1408,7 @@ CONFIG_RTC_DRV_CMOS=y
1460# 1408#
1461# on-CPU RTC drivers 1409# on-CPU RTC drivers
1462# 1410#
1463# CONFIG_RTC_DRV_PPC is not set 1411# CONFIG_RTC_DRV_GENERIC is not set
1464CONFIG_DMADEVICES=y 1412CONFIG_DMADEVICES=y
1465 1413
1466# 1414#
@@ -1473,7 +1421,9 @@ CONFIG_DMA_ENGINE=y
1473# DMA Clients 1421# DMA Clients
1474# 1422#
1475# CONFIG_NET_DMA is not set 1423# CONFIG_NET_DMA is not set
1424# CONFIG_ASYNC_TX_DMA is not set
1476# CONFIG_DMATEST is not set 1425# CONFIG_DMATEST is not set
1426# CONFIG_AUXDISPLAY is not set
1477# CONFIG_UIO is not set 1427# CONFIG_UIO is not set
1478# CONFIG_STAGING is not set 1428# CONFIG_STAGING is not set
1479 1429
@@ -1484,6 +1434,7 @@ CONFIG_EXT2_FS=y
1484# CONFIG_EXT2_FS_XATTR is not set 1434# CONFIG_EXT2_FS_XATTR is not set
1485# CONFIG_EXT2_FS_XIP is not set 1435# CONFIG_EXT2_FS_XIP is not set
1486CONFIG_EXT3_FS=y 1436CONFIG_EXT3_FS=y
1437# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
1487CONFIG_EXT3_FS_XATTR=y 1438CONFIG_EXT3_FS_XATTR=y
1488# CONFIG_EXT3_FS_POSIX_ACL is not set 1439# CONFIG_EXT3_FS_POSIX_ACL is not set
1489# CONFIG_EXT3_FS_SECURITY is not set 1440# CONFIG_EXT3_FS_SECURITY is not set
@@ -1508,6 +1459,11 @@ CONFIG_INOTIFY_USER=y
1508# CONFIG_FUSE_FS is not set 1459# CONFIG_FUSE_FS is not set
1509 1460
1510# 1461#
1462# Caches
1463#
1464# CONFIG_FSCACHE is not set
1465
1466#
1511# CD-ROM/DVD Filesystems 1467# CD-ROM/DVD Filesystems
1512# 1468#
1513CONFIG_ISO9660_FS=m 1469CONFIG_ISO9660_FS=m
@@ -1562,6 +1518,7 @@ CONFIG_SYSV_FS=m
1562CONFIG_UFS_FS=m 1518CONFIG_UFS_FS=m
1563# CONFIG_UFS_FS_WRITE is not set 1519# CONFIG_UFS_FS_WRITE is not set
1564# CONFIG_UFS_DEBUG is not set 1520# CONFIG_UFS_DEBUG is not set
1521# CONFIG_NILFS2_FS is not set
1565CONFIG_NETWORK_FILESYSTEMS=y 1522CONFIG_NETWORK_FILESYSTEMS=y
1566CONFIG_NFS_FS=y 1523CONFIG_NFS_FS=y
1567CONFIG_NFS_V3=y 1524CONFIG_NFS_V3=y
@@ -1577,7 +1534,6 @@ CONFIG_EXPORTFS=y
1577CONFIG_NFS_COMMON=y 1534CONFIG_NFS_COMMON=y
1578CONFIG_SUNRPC=y 1535CONFIG_SUNRPC=y
1579CONFIG_SUNRPC_GSS=y 1536CONFIG_SUNRPC_GSS=y
1580# CONFIG_SUNRPC_REGISTER_V4 is not set
1581CONFIG_RPCSEC_GSS_KRB5=y 1537CONFIG_RPCSEC_GSS_KRB5=y
1582# CONFIG_RPCSEC_GSS_SPKM3 is not set 1538# CONFIG_RPCSEC_GSS_SPKM3 is not set
1583# CONFIG_SMB_FS is not set 1539# CONFIG_SMB_FS is not set
@@ -1648,6 +1604,10 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1648# CONFIG_NLS_KOI8_U is not set 1604# CONFIG_NLS_KOI8_U is not set
1649CONFIG_NLS_UTF8=m 1605CONFIG_NLS_UTF8=m
1650# CONFIG_DLM is not set 1606# CONFIG_DLM is not set
1607CONFIG_UCC_SLOW=y
1608CONFIG_UCC_FAST=y
1609CONFIG_UCC=y
1610# CONFIG_BINARY_PRINTF is not set
1651 1611
1652# 1612#
1653# Library routines 1613# Library routines
@@ -1662,11 +1622,12 @@ CONFIG_CRC32=y
1662# CONFIG_CRC7 is not set 1622# CONFIG_CRC7 is not set
1663CONFIG_LIBCRC32C=m 1623CONFIG_LIBCRC32C=m
1664CONFIG_ZLIB_INFLATE=y 1624CONFIG_ZLIB_INFLATE=y
1665CONFIG_PLIST=y 1625CONFIG_DECOMPRESS_GZIP=y
1666CONFIG_HAS_IOMEM=y 1626CONFIG_HAS_IOMEM=y
1667CONFIG_HAS_IOPORT=y 1627CONFIG_HAS_IOPORT=y
1668CONFIG_HAS_DMA=y 1628CONFIG_HAS_DMA=y
1669CONFIG_HAVE_LMB=y 1629CONFIG_HAVE_LMB=y
1630CONFIG_NLATTR=y
1670 1631
1671# 1632#
1672# Kernel hacking 1633# Kernel hacking
@@ -1684,6 +1645,9 @@ CONFIG_DEBUG_KERNEL=y
1684CONFIG_DETECT_SOFTLOCKUP=y 1645CONFIG_DETECT_SOFTLOCKUP=y
1685# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set 1646# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
1686CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 1647CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
1648CONFIG_DETECT_HUNG_TASK=y
1649# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
1650CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
1687CONFIG_SCHED_DEBUG=y 1651CONFIG_SCHED_DEBUG=y
1688# CONFIG_SCHEDSTATS is not set 1652# CONFIG_SCHEDSTATS is not set
1689# CONFIG_TIMER_STATS is not set 1653# CONFIG_TIMER_STATS is not set
@@ -1714,9 +1678,12 @@ CONFIG_DEBUG_INFO=y
1714# CONFIG_FAULT_INJECTION is not set 1678# CONFIG_FAULT_INJECTION is not set
1715# CONFIG_LATENCYTOP is not set 1679# CONFIG_LATENCYTOP is not set
1716CONFIG_SYSCTL_SYSCALL_CHECK=y 1680CONFIG_SYSCTL_SYSCALL_CHECK=y
1681# CONFIG_DEBUG_PAGEALLOC is not set
1717CONFIG_HAVE_FUNCTION_TRACER=y 1682CONFIG_HAVE_FUNCTION_TRACER=y
1683CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
1718CONFIG_HAVE_DYNAMIC_FTRACE=y 1684CONFIG_HAVE_DYNAMIC_FTRACE=y
1719CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1685CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1686CONFIG_TRACING_SUPPORT=y
1720 1687
1721# 1688#
1722# Tracers 1689# Tracers
@@ -1724,17 +1691,20 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1724# CONFIG_FUNCTION_TRACER is not set 1691# CONFIG_FUNCTION_TRACER is not set
1725# CONFIG_SCHED_TRACER is not set 1692# CONFIG_SCHED_TRACER is not set
1726# CONFIG_CONTEXT_SWITCH_TRACER is not set 1693# CONFIG_CONTEXT_SWITCH_TRACER is not set
1694# CONFIG_EVENT_TRACER is not set
1727# CONFIG_BOOT_TRACER is not set 1695# CONFIG_BOOT_TRACER is not set
1728# CONFIG_TRACE_BRANCH_PROFILING is not set 1696# CONFIG_TRACE_BRANCH_PROFILING is not set
1729# CONFIG_STACK_TRACER is not set 1697# CONFIG_STACK_TRACER is not set
1730# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1698# CONFIG_KMEMTRACE is not set
1699# CONFIG_WORKQUEUE_TRACER is not set
1700# CONFIG_BLK_DEV_IO_TRACE is not set
1701# CONFIG_DYNAMIC_DEBUG is not set
1731# CONFIG_SAMPLES is not set 1702# CONFIG_SAMPLES is not set
1732CONFIG_HAVE_ARCH_KGDB=y 1703CONFIG_HAVE_ARCH_KGDB=y
1733# CONFIG_KGDB is not set 1704# CONFIG_KGDB is not set
1734CONFIG_PRINT_STACK_DEPTH=64 1705CONFIG_PRINT_STACK_DEPTH=64
1735# CONFIG_DEBUG_STACKOVERFLOW is not set 1706# CONFIG_DEBUG_STACKOVERFLOW is not set
1736# CONFIG_DEBUG_STACK_USAGE is not set 1707# CONFIG_DEBUG_STACK_USAGE is not set
1737# CONFIG_DEBUG_PAGEALLOC is not set
1738# CONFIG_CODE_PATCHING_SELFTEST is not set 1708# CONFIG_CODE_PATCHING_SELFTEST is not set
1739# CONFIG_FTR_FIXUP_SELFTEST is not set 1709# CONFIG_FTR_FIXUP_SELFTEST is not set
1740# CONFIG_MSI_BITMAP_SELFTEST is not set 1710# CONFIG_MSI_BITMAP_SELFTEST is not set
@@ -1759,18 +1729,21 @@ CONFIG_CRYPTO=y
1759# CONFIG_CRYPTO_FIPS is not set 1729# CONFIG_CRYPTO_FIPS is not set
1760CONFIG_CRYPTO_ALGAPI=y 1730CONFIG_CRYPTO_ALGAPI=y
1761CONFIG_CRYPTO_ALGAPI2=y 1731CONFIG_CRYPTO_ALGAPI2=y
1732CONFIG_CRYPTO_AEAD=y
1762CONFIG_CRYPTO_AEAD2=y 1733CONFIG_CRYPTO_AEAD2=y
1763CONFIG_CRYPTO_BLKCIPHER=y 1734CONFIG_CRYPTO_BLKCIPHER=y
1764CONFIG_CRYPTO_BLKCIPHER2=y 1735CONFIG_CRYPTO_BLKCIPHER2=y
1765CONFIG_CRYPTO_HASH=y 1736CONFIG_CRYPTO_HASH=y
1766CONFIG_CRYPTO_HASH2=y 1737CONFIG_CRYPTO_HASH2=y
1767CONFIG_CRYPTO_RNG2=y 1738CONFIG_CRYPTO_RNG2=y
1739CONFIG_CRYPTO_PCOMP=y
1768CONFIG_CRYPTO_MANAGER=y 1740CONFIG_CRYPTO_MANAGER=y
1769CONFIG_CRYPTO_MANAGER2=y 1741CONFIG_CRYPTO_MANAGER2=y
1770# CONFIG_CRYPTO_GF128MUL is not set 1742# CONFIG_CRYPTO_GF128MUL is not set
1771# CONFIG_CRYPTO_NULL is not set 1743# CONFIG_CRYPTO_NULL is not set
1744CONFIG_CRYPTO_WORKQUEUE=y
1772# CONFIG_CRYPTO_CRYPTD is not set 1745# CONFIG_CRYPTO_CRYPTD is not set
1773# CONFIG_CRYPTO_AUTHENC is not set 1746CONFIG_CRYPTO_AUTHENC=y
1774# CONFIG_CRYPTO_TEST is not set 1747# CONFIG_CRYPTO_TEST is not set
1775 1748
1776# 1749#
@@ -1837,6 +1810,7 @@ CONFIG_CRYPTO_DES=y
1837# Compression 1810# Compression
1838# 1811#
1839# CONFIG_CRYPTO_DEFLATE is not set 1812# CONFIG_CRYPTO_DEFLATE is not set
1813# CONFIG_CRYPTO_ZLIB is not set
1840# CONFIG_CRYPTO_LZO is not set 1814# CONFIG_CRYPTO_LZO is not set
1841 1815
1842# 1816#
@@ -1845,7 +1819,7 @@ CONFIG_CRYPTO_DES=y
1845# CONFIG_CRYPTO_ANSI_CPRNG is not set 1819# CONFIG_CRYPTO_ANSI_CPRNG is not set
1846CONFIG_CRYPTO_HW=y 1820CONFIG_CRYPTO_HW=y
1847# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1821# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1848# CONFIG_CRYPTO_DEV_TALITOS is not set 1822CONFIG_CRYPTO_DEV_TALITOS=y
1849CONFIG_PPC_CLOCK=y 1823CONFIG_PPC_CLOCK=y
1850CONFIG_PPC_LIB_RHEAP=y 1824CONFIG_PPC_LIB_RHEAP=y
1851# CONFIG_VIRTUALIZATION is not set 1825# CONFIG_VIRTUALIZATION is not set
diff --git a/arch/powerpc/configs/85xx/mpc8572_ds_defconfig b/arch/powerpc/configs/mpc85xx_smp_defconfig
index 813223ae174d..1aa1c508d600 100644
--- a/arch/powerpc/configs/85xx/mpc8572_ds_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.29-rc2 3# Linux kernel version: 2.6.30-rc2
4# Mon Jan 26 15:36:12 2009 4# Tue Apr 21 15:41:18 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -22,9 +22,10 @@ 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_BOOK3E_MMU=y
25# CONFIG_PPC_MM_SLICES is not set 26# CONFIG_PPC_MM_SLICES is not set
26CONFIG_SMP=y 27CONFIG_SMP=y
27CONFIG_NR_CPUS=2 28CONFIG_NR_CPUS=8
28CONFIG_PPC32=y 29CONFIG_PPC32=y
29CONFIG_WORD_SIZE=32 30CONFIG_WORD_SIZE=32
30# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set 31# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
@@ -44,6 +45,7 @@ CONFIG_ARCH_HAS_ILOG2_U32=y
44CONFIG_GENERIC_HWEIGHT=y 45CONFIG_GENERIC_HWEIGHT=y
45CONFIG_GENERIC_CALIBRATE_DELAY=y 46CONFIG_GENERIC_CALIBRATE_DELAY=y
46CONFIG_GENERIC_FIND_NEXT_BIT=y 47CONFIG_GENERIC_FIND_NEXT_BIT=y
48CONFIG_GENERIC_GPIO=y
47# CONFIG_ARCH_NO_VIRT_TO_BUS is not set 49# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
48CONFIG_PPC=y 50CONFIG_PPC=y
49CONFIG_EARLY_PRINTK=y 51CONFIG_EARLY_PRINTK=y
@@ -59,6 +61,7 @@ CONFIG_GENERIC_BUG=y
59CONFIG_DEFAULT_UIMAGE=y 61CONFIG_DEFAULT_UIMAGE=y
60# CONFIG_PPC_DCR_NATIVE is not set 62# CONFIG_PPC_DCR_NATIVE is not set
61# CONFIG_PPC_DCR_MMIO is not set 63# CONFIG_PPC_DCR_MMIO is not set
64CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
62CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 65CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
63 66
64# 67#
@@ -73,11 +76,21 @@ CONFIG_SWAP=y
73CONFIG_SYSVIPC=y 76CONFIG_SYSVIPC=y
74CONFIG_SYSVIPC_SYSCTL=y 77CONFIG_SYSVIPC_SYSCTL=y
75CONFIG_POSIX_MQUEUE=y 78CONFIG_POSIX_MQUEUE=y
79CONFIG_POSIX_MQUEUE_SYSCTL=y
76CONFIG_BSD_PROCESS_ACCT=y 80CONFIG_BSD_PROCESS_ACCT=y
77# CONFIG_BSD_PROCESS_ACCT_V3 is not set 81# CONFIG_BSD_PROCESS_ACCT_V3 is not set
78# CONFIG_TASKSTATS is not set 82# CONFIG_TASKSTATS is not set
79CONFIG_AUDIT=y 83CONFIG_AUDIT=y
80# CONFIG_AUDITSYSCALL is not set 84# CONFIG_AUDITSYSCALL is not set
85
86#
87# RCU Subsystem
88#
89CONFIG_CLASSIC_RCU=y
90# CONFIG_TREE_RCU is not set
91# CONFIG_PREEMPT_RCU is not set
92# CONFIG_TREE_RCU_TRACE is not set
93# CONFIG_PREEMPT_RCU_TRACE is not set
81CONFIG_IKCONFIG=y 94CONFIG_IKCONFIG=y
82CONFIG_IKCONFIG_PROC=y 95CONFIG_IKCONFIG_PROC=y
83CONFIG_LOG_BUF_SHIFT=14 96CONFIG_LOG_BUF_SHIFT=14
@@ -93,22 +106,24 @@ CONFIG_SYSFS_DEPRECATED_V2=y
93# CONFIG_NAMESPACES is not set 106# CONFIG_NAMESPACES is not set
94CONFIG_BLK_DEV_INITRD=y 107CONFIG_BLK_DEV_INITRD=y
95CONFIG_INITRAMFS_SOURCE="" 108CONFIG_INITRAMFS_SOURCE=""
109CONFIG_RD_GZIP=y
110# CONFIG_RD_BZIP2 is not set
111# CONFIG_RD_LZMA is not set
96# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 112# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
97CONFIG_SYSCTL=y 113CONFIG_SYSCTL=y
114CONFIG_ANON_INODES=y
98CONFIG_EMBEDDED=y 115CONFIG_EMBEDDED=y
99CONFIG_SYSCTL_SYSCALL=y 116CONFIG_SYSCTL_SYSCALL=y
100CONFIG_KALLSYMS=y 117CONFIG_KALLSYMS=y
101CONFIG_KALLSYMS_ALL=y 118CONFIG_KALLSYMS_ALL=y
102CONFIG_KALLSYMS_STRIP_GENERATED=y
103CONFIG_KALLSYMS_EXTRA_PASS=y 119CONFIG_KALLSYMS_EXTRA_PASS=y
120# CONFIG_STRIP_ASM_SYMS is not set
104CONFIG_HOTPLUG=y 121CONFIG_HOTPLUG=y
105CONFIG_PRINTK=y 122CONFIG_PRINTK=y
106CONFIG_BUG=y 123CONFIG_BUG=y
107CONFIG_ELF_CORE=y 124CONFIG_ELF_CORE=y
108CONFIG_COMPAT_BRK=y
109CONFIG_BASE_FULL=y 125CONFIG_BASE_FULL=y
110CONFIG_FUTEX=y 126CONFIG_FUTEX=y
111CONFIG_ANON_INODES=y
112CONFIG_EPOLL=y 127CONFIG_EPOLL=y
113CONFIG_SIGNALFD=y 128CONFIG_SIGNALFD=y
114CONFIG_TIMERFD=y 129CONFIG_TIMERFD=y
@@ -118,10 +133,12 @@ CONFIG_AIO=y
118CONFIG_VM_EVENT_COUNTERS=y 133CONFIG_VM_EVENT_COUNTERS=y
119CONFIG_PCI_QUIRKS=y 134CONFIG_PCI_QUIRKS=y
120CONFIG_SLUB_DEBUG=y 135CONFIG_SLUB_DEBUG=y
136CONFIG_COMPAT_BRK=y
121# CONFIG_SLAB is not set 137# CONFIG_SLAB is not set
122CONFIG_SLUB=y 138CONFIG_SLUB=y
123# CONFIG_SLOB is not set 139# CONFIG_SLOB is not set
124# CONFIG_PROFILING is not set 140# CONFIG_PROFILING is not set
141# CONFIG_MARKERS is not set
125CONFIG_HAVE_OPROFILE=y 142CONFIG_HAVE_OPROFILE=y
126# CONFIG_KPROBES is not set 143# CONFIG_KPROBES is not set
127CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 144CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -130,6 +147,8 @@ CONFIG_HAVE_KPROBES=y
130CONFIG_HAVE_KRETPROBES=y 147CONFIG_HAVE_KRETPROBES=y
131CONFIG_HAVE_ARCH_TRACEHOOK=y 148CONFIG_HAVE_ARCH_TRACEHOOK=y
132CONFIG_USE_GENERIC_SMP_HELPERS=y 149CONFIG_USE_GENERIC_SMP_HELPERS=y
150CONFIG_HAVE_CLK=y
151# CONFIG_SLOW_WORK is not set
133# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 152# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
134CONFIG_SLABINFO=y 153CONFIG_SLABINFO=y
135CONFIG_RT_MUTEXES=y 154CONFIG_RT_MUTEXES=y
@@ -143,7 +162,6 @@ CONFIG_MODVERSIONS=y
143CONFIG_STOP_MACHINE=y 162CONFIG_STOP_MACHINE=y
144CONFIG_BLOCK=y 163CONFIG_BLOCK=y
145CONFIG_LBD=y 164CONFIG_LBD=y
146# CONFIG_BLK_DEV_IO_TRACE is not set
147# CONFIG_BLK_DEV_BSG is not set 165# CONFIG_BLK_DEV_BSG is not set
148# CONFIG_BLK_DEV_INTEGRITY is not set 166# CONFIG_BLK_DEV_INTEGRITY is not set
149 167
@@ -159,11 +177,6 @@ CONFIG_IOSCHED_CFQ=y
159CONFIG_DEFAULT_CFQ=y 177CONFIG_DEFAULT_CFQ=y
160# CONFIG_DEFAULT_NOOP is not set 178# CONFIG_DEFAULT_NOOP is not set
161CONFIG_DEFAULT_IOSCHED="cfq" 179CONFIG_DEFAULT_IOSCHED="cfq"
162CONFIG_CLASSIC_RCU=y
163# CONFIG_TREE_RCU is not set
164# CONFIG_PREEMPT_RCU is not set
165# CONFIG_TREE_RCU_TRACE is not set
166# CONFIG_PREEMPT_RCU_TRACE is not set
167# CONFIG_FREEZER is not set 180# CONFIG_FREEZER is not set
168 181
169# 182#
@@ -173,21 +186,23 @@ CONFIG_CLASSIC_RCU=y
173# CONFIG_PPC_CELL_NATIVE is not set 186# CONFIG_PPC_CELL_NATIVE is not set
174# CONFIG_PQ2ADS is not set 187# CONFIG_PQ2ADS is not set
175CONFIG_MPC85xx=y 188CONFIG_MPC85xx=y
176# CONFIG_MPC8540_ADS is not set 189CONFIG_MPC8540_ADS=y
177# CONFIG_MPC8560_ADS is not set 190CONFIG_MPC8560_ADS=y
178# CONFIG_MPC85xx_CDS is not set 191CONFIG_MPC85xx_CDS=y
179# CONFIG_MPC85xx_MDS is not set 192CONFIG_MPC85xx_MDS=y
180# CONFIG_MPC8536_DS is not set 193CONFIG_MPC8536_DS=y
181CONFIG_MPC85xx_DS=y 194CONFIG_MPC85xx_DS=y
182# CONFIG_KSI8560 is not set 195CONFIG_SOCRATES=y
183# CONFIG_STX_GP3 is not set 196CONFIG_KSI8560=y
184# CONFIG_TQM8540 is not set 197CONFIG_STX_GP3=y
185# CONFIG_TQM8541 is not set 198CONFIG_TQM8540=y
186# CONFIG_TQM8548 is not set 199CONFIG_TQM8541=y
187# CONFIG_TQM8555 is not set 200CONFIG_TQM8548=y
188# CONFIG_TQM8560 is not set 201CONFIG_TQM8555=y
189# CONFIG_SBC8548 is not set 202CONFIG_TQM8560=y
203CONFIG_SBC8548=y
190# CONFIG_SBC8560 is not set 204# CONFIG_SBC8560 is not set
205CONFIG_TQM85xx=y
191# CONFIG_IPIC is not set 206# CONFIG_IPIC is not set
192CONFIG_MPIC=y 207CONFIG_MPIC=y
193# CONFIG_MPIC_WEIRD is not set 208# CONFIG_MPIC_WEIRD is not set
@@ -199,10 +214,12 @@ CONFIG_PPC_I8259=y
199# CONFIG_PPC_INDIRECT_IO is not set 214# CONFIG_PPC_INDIRECT_IO is not set
200# CONFIG_GENERIC_IOMAP is not set 215# CONFIG_GENERIC_IOMAP is not set
201# CONFIG_CPU_FREQ is not set 216# CONFIG_CPU_FREQ is not set
202# CONFIG_QUICC_ENGINE is not set 217CONFIG_QUICC_ENGINE=y
203# CONFIG_CPM2 is not set 218CONFIG_QE_GPIO=y
219CONFIG_CPM2=y
204CONFIG_FSL_ULI1575=y 220CONFIG_FSL_ULI1575=y
205# CONFIG_MPC8xxx_GPIO is not set 221CONFIG_CPM=y
222CONFIG_MPC8xxx_GPIO=y
206# CONFIG_SIMPLE_GPIO is not set 223# CONFIG_SIMPLE_GPIO is not set
207 224
208# 225#
@@ -248,9 +265,12 @@ CONFIG_ZONE_DMA_FLAG=1
248CONFIG_BOUNCE=y 265CONFIG_BOUNCE=y
249CONFIG_VIRT_TO_BUS=y 266CONFIG_VIRT_TO_BUS=y
250CONFIG_UNEVICTABLE_LRU=y 267CONFIG_UNEVICTABLE_LRU=y
268CONFIG_HAVE_MLOCK=y
269CONFIG_HAVE_MLOCKED_PAGE_BIT=y
251CONFIG_PPC_4K_PAGES=y 270CONFIG_PPC_4K_PAGES=y
252# CONFIG_PPC_16K_PAGES is not set 271# CONFIG_PPC_16K_PAGES is not set
253# CONFIG_PPC_64K_PAGES is not set 272# CONFIG_PPC_64K_PAGES is not set
273# CONFIG_PPC_256K_PAGES is not set
254CONFIG_FORCE_MAX_ZONEORDER=11 274CONFIG_FORCE_MAX_ZONEORDER=11
255CONFIG_PROC_DEVICETREE=y 275CONFIG_PROC_DEVICETREE=y
256# CONFIG_CMDLINE_BOOL is not set 276# CONFIG_CMDLINE_BOOL is not set
@@ -277,6 +297,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
277# CONFIG_PCI_LEGACY is not set 297# CONFIG_PCI_LEGACY is not set
278# CONFIG_PCI_DEBUG is not set 298# CONFIG_PCI_DEBUG is not set
279# CONFIG_PCI_STUB is not set 299# CONFIG_PCI_STUB is not set
300# CONFIG_PCI_IOV is not set
280# CONFIG_PCCARD is not set 301# CONFIG_PCCARD is not set
281# CONFIG_HOTPLUG_PCI is not set 302# CONFIG_HOTPLUG_PCI is not set
282# CONFIG_HAS_RAPIDIO is not set 303# CONFIG_HAS_RAPIDIO is not set
@@ -290,17 +311,17 @@ CONFIG_ARCH_SUPPORTS_MSI=y
290# Default settings for advanced configuration options are used 311# Default settings for advanced configuration options are used
291# 312#
292CONFIG_LOWMEM_SIZE=0x30000000 313CONFIG_LOWMEM_SIZE=0x30000000
314CONFIG_LOWMEM_CAM_NUM=3
293CONFIG_PAGE_OFFSET=0xc0000000 315CONFIG_PAGE_OFFSET=0xc0000000
294CONFIG_KERNEL_START=0xc0000000 316CONFIG_KERNEL_START=0xc0000000
295CONFIG_PHYSICAL_START=0x00000000 317CONFIG_PHYSICAL_START=0x00000000
296CONFIG_PHYSICAL_ALIGN=0x10000000 318CONFIG_PHYSICAL_ALIGN=0x04000000
297CONFIG_TASK_SIZE=0xc0000000 319CONFIG_TASK_SIZE=0xc0000000
298CONFIG_NET=y 320CONFIG_NET=y
299 321
300# 322#
301# Networking options 323# Networking options
302# 324#
303CONFIG_COMPAT_NET_DEV_OPS=y
304CONFIG_PACKET=y 325CONFIG_PACKET=y
305# CONFIG_PACKET_MMAP is not set 326# CONFIG_PACKET_MMAP is not set
306CONFIG_UNIX=y 327CONFIG_UNIX=y
@@ -388,6 +409,7 @@ CONFIG_SCTP_HMAC_MD5=y
388# CONFIG_LAPB is not set 409# CONFIG_LAPB is not set
389# CONFIG_ECONET is not set 410# CONFIG_ECONET is not set
390# CONFIG_WAN_ROUTER is not set 411# CONFIG_WAN_ROUTER is not set
412# CONFIG_PHONET is not set
391# CONFIG_NET_SCHED is not set 413# CONFIG_NET_SCHED is not set
392# CONFIG_DCB is not set 414# CONFIG_DCB is not set
393 415
@@ -400,7 +422,6 @@ CONFIG_SCTP_HMAC_MD5=y
400# CONFIG_IRDA is not set 422# CONFIG_IRDA is not set
401# CONFIG_BT is not set 423# CONFIG_BT is not set
402# CONFIG_AF_RXRPC is not set 424# CONFIG_AF_RXRPC is not set
403# CONFIG_PHONET is not set
404CONFIG_FIB_RULES=y 425CONFIG_FIB_RULES=y
405CONFIG_WIRELESS=y 426CONFIG_WIRELESS=y
406# CONFIG_CFG80211 is not set 427# CONFIG_CFG80211 is not set
@@ -431,6 +452,7 @@ CONFIG_EXTRA_FIRMWARE=""
431# CONFIG_CONNECTOR is not set 452# CONFIG_CONNECTOR is not set
432# CONFIG_MTD is not set 453# CONFIG_MTD is not set
433CONFIG_OF_DEVICE=y 454CONFIG_OF_DEVICE=y
455CONFIG_OF_GPIO=y
434CONFIG_OF_I2C=y 456CONFIG_OF_I2C=y
435# CONFIG_PARPORT is not set 457# CONFIG_PARPORT is not set
436CONFIG_BLK_DEV=y 458CONFIG_BLK_DEV=y
@@ -454,13 +476,20 @@ CONFIG_BLK_DEV_RAM_SIZE=131072
454# CONFIG_BLK_DEV_HD is not set 476# CONFIG_BLK_DEV_HD is not set
455CONFIG_MISC_DEVICES=y 477CONFIG_MISC_DEVICES=y
456# CONFIG_PHANTOM is not set 478# CONFIG_PHANTOM is not set
457# CONFIG_EEPROM_93CX6 is not set
458# CONFIG_SGI_IOC4 is not set 479# CONFIG_SGI_IOC4 is not set
459# CONFIG_TIFM_CORE is not set 480# CONFIG_TIFM_CORE is not set
460# CONFIG_ICS932S401 is not set 481# CONFIG_ICS932S401 is not set
461# CONFIG_ENCLOSURE_SERVICES is not set 482# CONFIG_ENCLOSURE_SERVICES is not set
462# CONFIG_HP_ILO is not set 483# CONFIG_HP_ILO is not set
484# CONFIG_ISL29003 is not set
463# CONFIG_C2PORT is not set 485# CONFIG_C2PORT is not set
486
487#
488# EEPROM support
489#
490# CONFIG_EEPROM_AT24 is not set
491CONFIG_EEPROM_LEGACY=y
492# CONFIG_EEPROM_93CX6 is not set
464CONFIG_HAVE_IDE=y 493CONFIG_HAVE_IDE=y
465# CONFIG_IDE is not set 494# CONFIG_IDE is not set
466 495
@@ -519,9 +548,11 @@ CONFIG_SCSI_LOWLEVEL=y
519# CONFIG_MEGARAID_NEWGEN is not set 548# CONFIG_MEGARAID_NEWGEN is not set
520# CONFIG_MEGARAID_LEGACY is not set 549# CONFIG_MEGARAID_LEGACY is not set
521# CONFIG_MEGARAID_SAS is not set 550# CONFIG_MEGARAID_SAS is not set
551# CONFIG_SCSI_MPT2SAS is not set
522# CONFIG_SCSI_HPTIOP is not set 552# CONFIG_SCSI_HPTIOP is not set
523# CONFIG_SCSI_BUSLOGIC is not set 553# CONFIG_SCSI_BUSLOGIC is not set
524# CONFIG_LIBFC is not set 554# CONFIG_LIBFC is not set
555# CONFIG_LIBFCOE is not set
525# CONFIG_FCOE is not set 556# CONFIG_FCOE is not set
526# CONFIG_SCSI_DMX3191D is not set 557# CONFIG_SCSI_DMX3191D is not set
527# CONFIG_SCSI_EATA is not set 558# CONFIG_SCSI_EATA is not set
@@ -544,12 +575,13 @@ CONFIG_SCSI_LOWLEVEL=y
544# CONFIG_SCSI_DEBUG is not set 575# CONFIG_SCSI_DEBUG is not set
545# CONFIG_SCSI_SRP is not set 576# CONFIG_SCSI_SRP is not set
546# CONFIG_SCSI_DH is not set 577# CONFIG_SCSI_DH is not set
578# CONFIG_SCSI_OSD_INITIATOR is not set
547CONFIG_ATA=y 579CONFIG_ATA=y
548# CONFIG_ATA_NONSTANDARD is not set 580# CONFIG_ATA_NONSTANDARD is not set
549CONFIG_SATA_PMP=y 581CONFIG_SATA_PMP=y
550CONFIG_SATA_AHCI=y 582CONFIG_SATA_AHCI=y
551# CONFIG_SATA_SIL24 is not set 583# CONFIG_SATA_SIL24 is not set
552# CONFIG_SATA_FSL is not set 584CONFIG_SATA_FSL=y
553CONFIG_ATA_SFF=y 585CONFIG_ATA_SFF=y
554# CONFIG_SATA_SVW is not set 586# CONFIG_SATA_SVW is not set
555# CONFIG_ATA_PIIX is not set 587# CONFIG_ATA_PIIX is not set
@@ -620,6 +652,7 @@ CONFIG_PATA_ALI=y
620# CONFIG_I2O is not set 652# CONFIG_I2O is not set
621# CONFIG_MACINTOSH_DRIVERS is not set 653# CONFIG_MACINTOSH_DRIVERS is not set
622CONFIG_NETDEVICES=y 654CONFIG_NETDEVICES=y
655CONFIG_COMPAT_NET_DEV_OPS=y
623CONFIG_DUMMY=y 656CONFIG_DUMMY=y
624# CONFIG_BONDING is not set 657# CONFIG_BONDING is not set
625# CONFIG_MACVLAN is not set 658# CONFIG_MACVLAN is not set
@@ -632,11 +665,11 @@ CONFIG_PHYLIB=y
632# 665#
633# MII PHY device drivers 666# MII PHY device drivers
634# 667#
635# CONFIG_MARVELL_PHY is not set 668CONFIG_MARVELL_PHY=y
636# CONFIG_DAVICOM_PHY is not set 669CONFIG_DAVICOM_PHY=y
637# CONFIG_QSEMI_PHY is not set 670# CONFIG_QSEMI_PHY is not set
638# CONFIG_LXT_PHY is not set 671# CONFIG_LXT_PHY is not set
639# CONFIG_CICADA_PHY is not set 672CONFIG_CICADA_PHY=y
640CONFIG_VITESSE_PHY=y 673CONFIG_VITESSE_PHY=y
641# CONFIG_SMSC_PHY is not set 674# CONFIG_SMSC_PHY is not set
642# CONFIG_BROADCOM_PHY is not set 675# CONFIG_BROADCOM_PHY is not set
@@ -645,7 +678,7 @@ CONFIG_VITESSE_PHY=y
645# CONFIG_NATIONAL_PHY is not set 678# CONFIG_NATIONAL_PHY is not set
646# CONFIG_STE10XP is not set 679# CONFIG_STE10XP is not set
647# CONFIG_LSI_ET1011C_PHY is not set 680# CONFIG_LSI_ET1011C_PHY is not set
648# CONFIG_FIXED_PHY is not set 681CONFIG_FIXED_PHY=y
649# CONFIG_MDIO_BITBANG is not set 682# CONFIG_MDIO_BITBANG is not set
650CONFIG_NET_ETHERNET=y 683CONFIG_NET_ETHERNET=y
651CONFIG_MII=y 684CONFIG_MII=y
@@ -653,6 +686,8 @@ CONFIG_MII=y
653# CONFIG_SUNGEM is not set 686# CONFIG_SUNGEM is not set
654# CONFIG_CASSINI is not set 687# CONFIG_CASSINI is not set
655# CONFIG_NET_VENDOR_3COM is not set 688# CONFIG_NET_VENDOR_3COM is not set
689# CONFIG_ETHOC is not set
690# CONFIG_DNET is not set
656# CONFIG_NET_TULIP is not set 691# CONFIG_NET_TULIP is not set
657# CONFIG_HP100 is not set 692# CONFIG_HP100 is not set
658# CONFIG_IBM_NEW_EMAC_ZMII is not set 693# CONFIG_IBM_NEW_EMAC_ZMII is not set
@@ -665,6 +700,10 @@ CONFIG_MII=y
665# CONFIG_NET_PCI is not set 700# CONFIG_NET_PCI is not set
666# CONFIG_B44 is not set 701# CONFIG_B44 is not set
667# CONFIG_ATL2 is not set 702# CONFIG_ATL2 is not set
703CONFIG_FS_ENET=y
704CONFIG_FS_ENET_HAS_SCC=y
705CONFIG_FS_ENET_HAS_FCC=y
706# CONFIG_FS_ENET_MDIO_FCC is not set
668CONFIG_NETDEV_1000=y 707CONFIG_NETDEV_1000=y
669# CONFIG_ACENIC is not set 708# CONFIG_ACENIC is not set
670# CONFIG_DL2K is not set 709# CONFIG_DL2K is not set
@@ -672,6 +711,7 @@ CONFIG_NETDEV_1000=y
672# CONFIG_E1000E is not set 711# CONFIG_E1000E is not set
673# CONFIG_IP1000 is not set 712# CONFIG_IP1000 is not set
674# CONFIG_IGB is not set 713# CONFIG_IGB is not set
714# CONFIG_IGBVF is not set
675# CONFIG_NS83820 is not set 715# CONFIG_NS83820 is not set
676# CONFIG_HAMACHI is not set 716# CONFIG_HAMACHI is not set
677# CONFIG_YELLOWFIN is not set 717# CONFIG_YELLOWFIN is not set
@@ -682,10 +722,15 @@ CONFIG_NETDEV_1000=y
682# CONFIG_VIA_VELOCITY is not set 722# CONFIG_VIA_VELOCITY is not set
683# CONFIG_TIGON3 is not set 723# CONFIG_TIGON3 is not set
684# CONFIG_BNX2 is not set 724# CONFIG_BNX2 is not set
725CONFIG_FSL_PQ_MDIO=y
685CONFIG_GIANFAR=y 726CONFIG_GIANFAR=y
727CONFIG_UCC_GETH=y
728# CONFIG_UGETH_MAGIC_PACKET is not set
729# CONFIG_UGETH_TX_ON_DEMAND is not set
686# CONFIG_QLA3XXX is not set 730# CONFIG_QLA3XXX is not set
687# CONFIG_ATL1 is not set 731# CONFIG_ATL1 is not set
688# CONFIG_ATL1E is not set 732# CONFIG_ATL1E is not set
733# CONFIG_ATL1C is not set
689# CONFIG_JME is not set 734# CONFIG_JME is not set
690CONFIG_NETDEV_10000=y 735CONFIG_NETDEV_10000=y
691# CONFIG_CHELSIO_T1 is not set 736# CONFIG_CHELSIO_T1 is not set
@@ -695,6 +740,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
695# CONFIG_IXGBE is not set 740# CONFIG_IXGBE is not set
696# CONFIG_IXGB is not set 741# CONFIG_IXGB is not set
697# CONFIG_S2IO is not set 742# CONFIG_S2IO is not set
743# CONFIG_VXGE is not set
698# CONFIG_MYRI10GE is not set 744# CONFIG_MYRI10GE is not set
699# CONFIG_NETXEN_NIC is not set 745# CONFIG_NETXEN_NIC is not set
700# CONFIG_NIU is not set 746# CONFIG_NIU is not set
@@ -704,6 +750,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
704# CONFIG_BNX2X is not set 750# CONFIG_BNX2X is not set
705# CONFIG_QLGE is not set 751# CONFIG_QLGE is not set
706# CONFIG_SFC is not set 752# CONFIG_SFC is not set
753# CONFIG_BE2NET is not set
707# CONFIG_TR is not set 754# CONFIG_TR is not set
708 755
709# 756#
@@ -711,7 +758,6 @@ CONFIG_CHELSIO_T3_DEPENDS=y
711# 758#
712# CONFIG_WLAN_PRE80211 is not set 759# CONFIG_WLAN_PRE80211 is not set
713# CONFIG_WLAN_80211 is not set 760# CONFIG_WLAN_80211 is not set
714# CONFIG_IWLWIFI_LEDS is not set
715 761
716# 762#
717# Enable WiMAX (Networking options) to see the WiMAX drivers 763# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -806,8 +852,10 @@ CONFIG_SERIAL_8250_RSA=y
806# CONFIG_SERIAL_UARTLITE is not set 852# CONFIG_SERIAL_UARTLITE is not set
807CONFIG_SERIAL_CORE=y 853CONFIG_SERIAL_CORE=y
808CONFIG_SERIAL_CORE_CONSOLE=y 854CONFIG_SERIAL_CORE_CONSOLE=y
855# CONFIG_SERIAL_CPM is not set
809# CONFIG_SERIAL_JSM is not set 856# CONFIG_SERIAL_JSM is not set
810# CONFIG_SERIAL_OF_PLATFORM is not set 857# CONFIG_SERIAL_OF_PLATFORM is not set
858CONFIG_SERIAL_QE=m
811CONFIG_UNIX98_PTYS=y 859CONFIG_UNIX98_PTYS=y
812# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 860# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
813CONFIG_LEGACY_PTYS=y 861CONFIG_LEGACY_PTYS=y
@@ -815,6 +863,7 @@ CONFIG_LEGACY_PTY_COUNT=256
815# CONFIG_HVC_UDBG is not set 863# CONFIG_HVC_UDBG is not set
816# CONFIG_IPMI_HANDLER is not set 864# CONFIG_IPMI_HANDLER is not set
817CONFIG_HW_RANDOM=y 865CONFIG_HW_RANDOM=y
866# CONFIG_HW_RANDOM_TIMERIOMEM is not set
818CONFIG_NVRAM=y 867CONFIG_NVRAM=y
819# CONFIG_R3964 is not set 868# CONFIG_R3964 is not set
820# CONFIG_APPLICOM is not set 869# CONFIG_APPLICOM is not set
@@ -851,6 +900,8 @@ CONFIG_I2C_HELPER_AUTO=y
851# 900#
852# I2C system bus drivers (mostly embedded / system-on-chip) 901# I2C system bus drivers (mostly embedded / system-on-chip)
853# 902#
903CONFIG_I2C_CPM=m
904# CONFIG_I2C_GPIO is not set
854CONFIG_I2C_MPC=y 905CONFIG_I2C_MPC=y
855# CONFIG_I2C_OCORES is not set 906# CONFIG_I2C_OCORES is not set
856# CONFIG_I2C_SIMTEC is not set 907# CONFIG_I2C_SIMTEC is not set
@@ -877,12 +928,9 @@ CONFIG_I2C_MPC=y
877# Miscellaneous I2C Chip support 928# Miscellaneous I2C Chip support
878# 929#
879# CONFIG_DS1682 is not set 930# CONFIG_DS1682 is not set
880# CONFIG_EEPROM_AT24 is not set
881CONFIG_EEPROM_LEGACY=y
882# CONFIG_SENSORS_PCF8574 is not set 931# CONFIG_SENSORS_PCF8574 is not set
883# CONFIG_PCF8575 is not set 932# CONFIG_PCF8575 is not set
884# CONFIG_SENSORS_PCA9539 is not set 933# CONFIG_SENSORS_PCA9539 is not set
885# CONFIG_SENSORS_PCF8591 is not set
886# CONFIG_SENSORS_MAX6875 is not set 934# CONFIG_SENSORS_MAX6875 is not set
887# CONFIG_SENSORS_TSL2550 is not set 935# CONFIG_SENSORS_TSL2550 is not set
888# CONFIG_I2C_DEBUG_CORE is not set 936# CONFIG_I2C_DEBUG_CORE is not set
@@ -891,7 +939,31 @@ CONFIG_EEPROM_LEGACY=y
891# CONFIG_I2C_DEBUG_CHIP is not set 939# CONFIG_I2C_DEBUG_CHIP is not set
892# CONFIG_SPI is not set 940# CONFIG_SPI is not set
893CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y 941CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
894# CONFIG_GPIOLIB is not set 942CONFIG_ARCH_REQUIRE_GPIOLIB=y
943CONFIG_GPIOLIB=y
944# CONFIG_DEBUG_GPIO is not set
945# CONFIG_GPIO_SYSFS is not set
946
947#
948# Memory mapped GPIO expanders:
949#
950# CONFIG_GPIO_XILINX is not set
951
952#
953# I2C GPIO expanders:
954#
955# CONFIG_GPIO_MAX732X is not set
956# CONFIG_GPIO_PCA953X is not set
957# CONFIG_GPIO_PCF857X is not set
958
959#
960# PCI GPIO expanders:
961#
962# CONFIG_GPIO_BT8XX is not set
963
964#
965# SPI GPIO expanders:
966#
895# CONFIG_W1 is not set 967# CONFIG_W1 is not set
896# CONFIG_POWER_SUPPLY is not set 968# CONFIG_POWER_SUPPLY is not set
897# CONFIG_HWMON is not set 969# CONFIG_HWMON is not set
@@ -911,6 +983,8 @@ CONFIG_SSB_POSSIBLE=y
911# CONFIG_MFD_CORE is not set 983# CONFIG_MFD_CORE is not set
912# CONFIG_MFD_SM501 is not set 984# CONFIG_MFD_SM501 is not set
913# CONFIG_HTC_PASIC3 is not set 985# CONFIG_HTC_PASIC3 is not set
986# CONFIG_UCB1400_CORE is not set
987# CONFIG_TPS65010 is not set
914# CONFIG_TWL4030_CORE is not set 988# CONFIG_TWL4030_CORE is not set
915# CONFIG_MFD_TMIO is not set 989# CONFIG_MFD_TMIO is not set
916# CONFIG_PMIC_DA903X is not set 990# CONFIG_PMIC_DA903X is not set
@@ -935,7 +1009,7 @@ CONFIG_VIDEO_MEDIA=m
935# 1009#
936# CONFIG_MEDIA_ATTACH is not set 1010# CONFIG_MEDIA_ATTACH is not set
937CONFIG_MEDIA_TUNER=m 1011CONFIG_MEDIA_TUNER=m
938# CONFIG_MEDIA_TUNER_CUSTOMIZE is not set 1012# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
939CONFIG_MEDIA_TUNER_SIMPLE=m 1013CONFIG_MEDIA_TUNER_SIMPLE=m
940CONFIG_MEDIA_TUNER_TDA8290=m 1014CONFIG_MEDIA_TUNER_TDA8290=m
941CONFIG_MEDIA_TUNER_TDA9887=m 1015CONFIG_MEDIA_TUNER_TDA9887=m
@@ -944,6 +1018,7 @@ CONFIG_MEDIA_TUNER_TEA5767=m
944CONFIG_MEDIA_TUNER_MT20XX=m 1018CONFIG_MEDIA_TUNER_MT20XX=m
945CONFIG_MEDIA_TUNER_XC2028=m 1019CONFIG_MEDIA_TUNER_XC2028=m
946CONFIG_MEDIA_TUNER_XC5000=m 1020CONFIG_MEDIA_TUNER_XC5000=m
1021CONFIG_MEDIA_TUNER_MC44S803=m
947# CONFIG_DVB_DYNAMIC_MINORS is not set 1022# CONFIG_DVB_DYNAMIC_MINORS is not set
948CONFIG_DVB_CAPTURE_DRIVERS=y 1023CONFIG_DVB_CAPTURE_DRIVERS=y
949 1024
@@ -983,103 +1058,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
983# 1058#
984# Supported DVB Frontends 1059# Supported DVB Frontends
985# 1060#
986
987#
988# Customise DVB Frontends
989#
990# CONFIG_DVB_FE_CUSTOMISE is not set 1061# CONFIG_DVB_FE_CUSTOMISE is not set
991
992#
993# Multistandard (satellite) frontends
994#
995# CONFIG_DVB_STB0899 is not set
996# CONFIG_DVB_STB6100 is not set
997
998#
999# DVB-S (satellite) frontends
1000#
1001# CONFIG_DVB_CX24110 is not set
1002# CONFIG_DVB_CX24123 is not set
1003# CONFIG_DVB_MT312 is not set
1004# CONFIG_DVB_S5H1420 is not set
1005# CONFIG_DVB_STV0288 is not set
1006# CONFIG_DVB_STB6000 is not set
1007# CONFIG_DVB_STV0299 is not set
1008# CONFIG_DVB_TDA8083 is not set
1009# CONFIG_DVB_TDA10086 is not set
1010# CONFIG_DVB_TDA8261 is not set
1011# CONFIG_DVB_VES1X93 is not set
1012# CONFIG_DVB_TUNER_ITD1000 is not set
1013# CONFIG_DVB_TUNER_CX24113 is not set
1014# CONFIG_DVB_TDA826X is not set
1015# CONFIG_DVB_TUA6100 is not set
1016# CONFIG_DVB_CX24116 is not set
1017# CONFIG_DVB_SI21XX is not set
1018
1019#
1020# DVB-T (terrestrial) frontends
1021#
1022# CONFIG_DVB_SP8870 is not set
1023# CONFIG_DVB_SP887X is not set
1024# CONFIG_DVB_CX22700 is not set
1025# CONFIG_DVB_CX22702 is not set
1026# CONFIG_DVB_DRX397XD is not set
1027# CONFIG_DVB_L64781 is not set
1028# CONFIG_DVB_TDA1004X is not set
1029# CONFIG_DVB_NXT6000 is not set
1030# CONFIG_DVB_MT352 is not set
1031# CONFIG_DVB_ZL10353 is not set
1032# CONFIG_DVB_DIB3000MB is not set
1033# CONFIG_DVB_DIB3000MC is not set
1034# CONFIG_DVB_DIB7000M is not set
1035# CONFIG_DVB_DIB7000P is not set
1036# CONFIG_DVB_TDA10048 is not set
1037
1038#
1039# DVB-C (cable) frontends
1040#
1041# CONFIG_DVB_VES1820 is not set
1042# CONFIG_DVB_TDA10021 is not set
1043# CONFIG_DVB_TDA10023 is not set
1044# CONFIG_DVB_STV0297 is not set
1045
1046#
1047# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
1048#
1049# CONFIG_DVB_NXT200X is not set
1050# CONFIG_DVB_OR51211 is not set
1051# CONFIG_DVB_OR51132 is not set
1052# CONFIG_DVB_BCM3510 is not set
1053# CONFIG_DVB_LGDT330X is not set
1054# CONFIG_DVB_LGDT3304 is not set
1055# CONFIG_DVB_S5H1409 is not set
1056# CONFIG_DVB_AU8522 is not set
1057# CONFIG_DVB_S5H1411 is not set
1058
1059#
1060# ISDB-T (terrestrial) frontends
1061#
1062# CONFIG_DVB_S921 is not set
1063
1064#
1065# Digital terrestrial only tuners/PLL
1066#
1067# CONFIG_DVB_PLL is not set
1068# CONFIG_DVB_TUNER_DIB0070 is not set
1069
1070#
1071# SEC control devices for DVB-S
1072#
1073# CONFIG_DVB_LNBP21 is not set
1074# CONFIG_DVB_ISL6405 is not set
1075# CONFIG_DVB_ISL6421 is not set
1076# CONFIG_DVB_LGS8GL5 is not set
1077
1078#
1079# Tools to develop new frontends
1080#
1081# CONFIG_DVB_DUMMY_FE is not set
1082# CONFIG_DVB_AF9013 is not set
1083CONFIG_DAB=y 1062CONFIG_DAB=y
1084# CONFIG_USB_DABUSB is not set 1063# CONFIG_USB_DABUSB is not set
1085 1064
@@ -1159,6 +1138,8 @@ CONFIG_SND_PCI=y
1159# CONFIG_SND_INDIGO is not set 1138# CONFIG_SND_INDIGO is not set
1160# CONFIG_SND_INDIGOIO is not set 1139# CONFIG_SND_INDIGOIO is not set
1161# CONFIG_SND_INDIGODJ is not set 1140# CONFIG_SND_INDIGODJ is not set
1141# CONFIG_SND_INDIGOIOX is not set
1142# CONFIG_SND_INDIGODJX is not set
1162# CONFIG_SND_EMU10K1 is not set 1143# CONFIG_SND_EMU10K1 is not set
1163# CONFIG_SND_EMU10K1X is not set 1144# CONFIG_SND_EMU10K1X is not set
1164# CONFIG_SND_ENS1370 is not set 1145# CONFIG_SND_ENS1370 is not set
@@ -1213,15 +1194,17 @@ CONFIG_USB_HID=y
1213# 1194#
1214# Special HID drivers 1195# Special HID drivers
1215# 1196#
1216CONFIG_HID_COMPAT=y
1217CONFIG_HID_A4TECH=y 1197CONFIG_HID_A4TECH=y
1218CONFIG_HID_APPLE=y 1198CONFIG_HID_APPLE=y
1219CONFIG_HID_BELKIN=y 1199CONFIG_HID_BELKIN=y
1220CONFIG_HID_CHERRY=y 1200CONFIG_HID_CHERRY=y
1221CONFIG_HID_CHICONY=y 1201CONFIG_HID_CHICONY=y
1222CONFIG_HID_CYPRESS=y 1202CONFIG_HID_CYPRESS=y
1203# CONFIG_DRAGONRISE_FF is not set
1223CONFIG_HID_EZKEY=y 1204CONFIG_HID_EZKEY=y
1205# CONFIG_HID_KYE is not set
1224CONFIG_HID_GYRATION=y 1206CONFIG_HID_GYRATION=y
1207# CONFIG_HID_KENSINGTON is not set
1225CONFIG_HID_LOGITECH=y 1208CONFIG_HID_LOGITECH=y
1226# CONFIG_LOGITECH_FF is not set 1209# CONFIG_LOGITECH_FF is not set
1227# CONFIG_LOGIRUMBLEPAD2_FF is not set 1210# CONFIG_LOGIRUMBLEPAD2_FF is not set
@@ -1264,9 +1247,9 @@ CONFIG_USB_MON=y
1264# 1247#
1265# CONFIG_USB_C67X00_HCD is not set 1248# CONFIG_USB_C67X00_HCD is not set
1266CONFIG_USB_EHCI_HCD=y 1249CONFIG_USB_EHCI_HCD=y
1267# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1250CONFIG_USB_EHCI_ROOT_HUB_TT=y
1268# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1251# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1269# CONFIG_USB_EHCI_FSL is not set 1252CONFIG_USB_EHCI_FSL=y
1270CONFIG_USB_EHCI_HCD_PPC_OF=y 1253CONFIG_USB_EHCI_HCD_PPC_OF=y
1271# CONFIG_USB_OXU210HP_HCD is not set 1254# CONFIG_USB_OXU210HP_HCD is not set
1272# CONFIG_USB_ISP116X_HCD is not set 1255# CONFIG_USB_ISP116X_HCD is not set
@@ -1280,10 +1263,12 @@ CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
1280CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y 1263CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
1281CONFIG_USB_OHCI_LITTLE_ENDIAN=y 1264CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1282# CONFIG_USB_UHCI_HCD is not set 1265# CONFIG_USB_UHCI_HCD is not set
1266# CONFIG_USB_FHCI_HCD is not set
1283# CONFIG_USB_SL811_HCD is not set 1267# CONFIG_USB_SL811_HCD is not set
1284# CONFIG_USB_R8A66597_HCD is not set 1268# CONFIG_USB_R8A66597_HCD is not set
1285# CONFIG_USB_WHCI_HCD is not set 1269# CONFIG_USB_WHCI_HCD is not set
1286# CONFIG_USB_HWA_HCD is not set 1270# CONFIG_USB_HWA_HCD is not set
1271# CONFIG_USB_MUSB_HDRC is not set
1287 1272
1288# 1273#
1289# USB Device Class drivers 1274# USB Device Class drivers
@@ -1294,11 +1279,11 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1294# CONFIG_USB_TMC is not set 1279# CONFIG_USB_TMC is not set
1295 1280
1296# 1281#
1297# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; 1282# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
1298# 1283#
1299 1284
1300# 1285#
1301# see USB_STORAGE Help for more information 1286# also be needed; see USB_STORAGE Help for more info
1302# 1287#
1303CONFIG_USB_STORAGE=y 1288CONFIG_USB_STORAGE=y
1304# CONFIG_USB_STORAGE_DEBUG is not set 1289# CONFIG_USB_STORAGE_DEBUG is not set
@@ -1340,7 +1325,6 @@ CONFIG_USB_STORAGE=y
1340# CONFIG_USB_LED is not set 1325# CONFIG_USB_LED is not set
1341# CONFIG_USB_CYPRESS_CY7C63 is not set 1326# CONFIG_USB_CYPRESS_CY7C63 is not set
1342# CONFIG_USB_CYTHERM is not set 1327# CONFIG_USB_CYTHERM is not set
1343# CONFIG_USB_PHIDGET is not set
1344# CONFIG_USB_IDMOUSE is not set 1328# CONFIG_USB_IDMOUSE is not set
1345# CONFIG_USB_FTDI_ELAN is not set 1329# CONFIG_USB_FTDI_ELAN is not set
1346# CONFIG_USB_APPLEDISPLAY is not set 1330# CONFIG_USB_APPLEDISPLAY is not set
@@ -1356,13 +1340,24 @@ CONFIG_USB_STORAGE=y
1356# 1340#
1357# OTG and related infrastructure 1341# OTG and related infrastructure
1358# 1342#
1343# CONFIG_USB_GPIO_VBUS is not set
1344# CONFIG_NOP_USB_XCEIV is not set
1359# CONFIG_UWB is not set 1345# CONFIG_UWB is not set
1360# CONFIG_MMC is not set 1346# CONFIG_MMC is not set
1361# CONFIG_MEMSTICK is not set 1347# CONFIG_MEMSTICK is not set
1362# CONFIG_NEW_LEDS is not set 1348# CONFIG_NEW_LEDS is not set
1363# CONFIG_ACCESSIBILITY is not set 1349# CONFIG_ACCESSIBILITY is not set
1364# CONFIG_INFINIBAND is not set 1350# CONFIG_INFINIBAND is not set
1365# CONFIG_EDAC is not set 1351CONFIG_EDAC=y
1352
1353#
1354# Reporting subsystems
1355#
1356# CONFIG_EDAC_DEBUG is not set
1357CONFIG_EDAC_MM_EDAC=y
1358CONFIG_EDAC_MPC85XX=y
1359# CONFIG_EDAC_AMD8131 is not set
1360# CONFIG_EDAC_AMD8111 is not set
1366CONFIG_RTC_LIB=y 1361CONFIG_RTC_LIB=y
1367CONFIG_RTC_CLASS=y 1362CONFIG_RTC_CLASS=y
1368CONFIG_RTC_HCTOSYS=y 1363CONFIG_RTC_HCTOSYS=y
@@ -1417,8 +1412,22 @@ CONFIG_RTC_DRV_CMOS=y
1417# 1412#
1418# on-CPU RTC drivers 1413# on-CPU RTC drivers
1419# 1414#
1420# CONFIG_RTC_DRV_PPC is not set 1415# CONFIG_RTC_DRV_GENERIC is not set
1421# CONFIG_DMADEVICES is not set 1416CONFIG_DMADEVICES=y
1417
1418#
1419# DMA Devices
1420#
1421CONFIG_FSL_DMA=y
1422CONFIG_DMA_ENGINE=y
1423
1424#
1425# DMA Clients
1426#
1427# CONFIG_NET_DMA is not set
1428# CONFIG_ASYNC_TX_DMA is not set
1429# CONFIG_DMATEST is not set
1430# CONFIG_AUXDISPLAY is not set
1422# CONFIG_UIO is not set 1431# CONFIG_UIO is not set
1423# CONFIG_STAGING is not set 1432# CONFIG_STAGING is not set
1424 1433
@@ -1429,11 +1438,13 @@ CONFIG_EXT2_FS=y
1429# CONFIG_EXT2_FS_XATTR is not set 1438# CONFIG_EXT2_FS_XATTR is not set
1430# CONFIG_EXT2_FS_XIP is not set 1439# CONFIG_EXT2_FS_XIP is not set
1431CONFIG_EXT3_FS=y 1440CONFIG_EXT3_FS=y
1441# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
1432CONFIG_EXT3_FS_XATTR=y 1442CONFIG_EXT3_FS_XATTR=y
1433# CONFIG_EXT3_FS_POSIX_ACL is not set 1443# CONFIG_EXT3_FS_POSIX_ACL is not set
1434# CONFIG_EXT3_FS_SECURITY is not set 1444# CONFIG_EXT3_FS_SECURITY is not set
1435# CONFIG_EXT4_FS is not set 1445# CONFIG_EXT4_FS is not set
1436CONFIG_JBD=y 1446CONFIG_JBD=y
1447# CONFIG_JBD_DEBUG is not set
1437CONFIG_FS_MBCACHE=y 1448CONFIG_FS_MBCACHE=y
1438# CONFIG_REISERFS_FS is not set 1449# CONFIG_REISERFS_FS is not set
1439# CONFIG_JFS_FS is not set 1450# CONFIG_JFS_FS is not set
@@ -1452,6 +1463,11 @@ CONFIG_INOTIFY_USER=y
1452# CONFIG_FUSE_FS is not set 1463# CONFIG_FUSE_FS is not set
1453 1464
1454# 1465#
1466# Caches
1467#
1468# CONFIG_FSCACHE is not set
1469
1470#
1455# CD-ROM/DVD Filesystems 1471# CD-ROM/DVD Filesystems
1456# 1472#
1457CONFIG_ISO9660_FS=m 1473CONFIG_ISO9660_FS=m
@@ -1506,6 +1522,7 @@ CONFIG_SYSV_FS=m
1506CONFIG_UFS_FS=m 1522CONFIG_UFS_FS=m
1507# CONFIG_UFS_FS_WRITE is not set 1523# CONFIG_UFS_FS_WRITE is not set
1508# CONFIG_UFS_DEBUG is not set 1524# CONFIG_UFS_DEBUG is not set
1525# CONFIG_NILFS2_FS is not set
1509CONFIG_NETWORK_FILESYSTEMS=y 1526CONFIG_NETWORK_FILESYSTEMS=y
1510CONFIG_NFS_FS=y 1527CONFIG_NFS_FS=y
1511CONFIG_NFS_V3=y 1528CONFIG_NFS_V3=y
@@ -1521,7 +1538,6 @@ CONFIG_EXPORTFS=y
1521CONFIG_NFS_COMMON=y 1538CONFIG_NFS_COMMON=y
1522CONFIG_SUNRPC=y 1539CONFIG_SUNRPC=y
1523CONFIG_SUNRPC_GSS=y 1540CONFIG_SUNRPC_GSS=y
1524# CONFIG_SUNRPC_REGISTER_V4 is not set
1525CONFIG_RPCSEC_GSS_KRB5=y 1541CONFIG_RPCSEC_GSS_KRB5=y
1526# CONFIG_RPCSEC_GSS_SPKM3 is not set 1542# CONFIG_RPCSEC_GSS_SPKM3 is not set
1527# CONFIG_SMB_FS is not set 1543# CONFIG_SMB_FS is not set
@@ -1592,6 +1608,10 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1592# CONFIG_NLS_KOI8_U is not set 1608# CONFIG_NLS_KOI8_U is not set
1593CONFIG_NLS_UTF8=m 1609CONFIG_NLS_UTF8=m
1594# CONFIG_DLM is not set 1610# CONFIG_DLM is not set
1611CONFIG_UCC_SLOW=y
1612CONFIG_UCC_FAST=y
1613CONFIG_UCC=y
1614# CONFIG_BINARY_PRINTF is not set
1595 1615
1596# 1616#
1597# Library routines 1617# Library routines
@@ -1606,11 +1626,12 @@ CONFIG_CRC32=y
1606# CONFIG_CRC7 is not set 1626# CONFIG_CRC7 is not set
1607CONFIG_LIBCRC32C=m 1627CONFIG_LIBCRC32C=m
1608CONFIG_ZLIB_INFLATE=y 1628CONFIG_ZLIB_INFLATE=y
1609CONFIG_PLIST=y 1629CONFIG_DECOMPRESS_GZIP=y
1610CONFIG_HAS_IOMEM=y 1630CONFIG_HAS_IOMEM=y
1611CONFIG_HAS_IOPORT=y 1631CONFIG_HAS_IOPORT=y
1612CONFIG_HAS_DMA=y 1632CONFIG_HAS_DMA=y
1613CONFIG_HAVE_LMB=y 1633CONFIG_HAVE_LMB=y
1634CONFIG_NLATTR=y
1614 1635
1615# 1636#
1616# Kernel hacking 1637# Kernel hacking
@@ -1621,13 +1642,16 @@ CONFIG_ENABLE_MUST_CHECK=y
1621CONFIG_FRAME_WARN=1024 1642CONFIG_FRAME_WARN=1024
1622# CONFIG_MAGIC_SYSRQ is not set 1643# CONFIG_MAGIC_SYSRQ is not set
1623# CONFIG_UNUSED_SYMBOLS is not set 1644# CONFIG_UNUSED_SYMBOLS is not set
1624# CONFIG_DEBUG_FS is not set 1645CONFIG_DEBUG_FS=y
1625# CONFIG_HEADERS_CHECK is not set 1646# CONFIG_HEADERS_CHECK is not set
1626CONFIG_DEBUG_KERNEL=y 1647CONFIG_DEBUG_KERNEL=y
1627# CONFIG_DEBUG_SHIRQ is not set 1648# CONFIG_DEBUG_SHIRQ is not set
1628CONFIG_DETECT_SOFTLOCKUP=y 1649CONFIG_DETECT_SOFTLOCKUP=y
1629# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set 1650# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
1630CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 1651CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
1652CONFIG_DETECT_HUNG_TASK=y
1653# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
1654CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
1631CONFIG_SCHED_DEBUG=y 1655CONFIG_SCHED_DEBUG=y
1632# CONFIG_SCHEDSTATS is not set 1656# CONFIG_SCHEDSTATS is not set
1633# CONFIG_TIMER_STATS is not set 1657# CONFIG_TIMER_STATS is not set
@@ -1658,9 +1682,12 @@ CONFIG_DEBUG_INFO=y
1658# CONFIG_FAULT_INJECTION is not set 1682# CONFIG_FAULT_INJECTION is not set
1659# CONFIG_LATENCYTOP is not set 1683# CONFIG_LATENCYTOP is not set
1660CONFIG_SYSCTL_SYSCALL_CHECK=y 1684CONFIG_SYSCTL_SYSCALL_CHECK=y
1685# CONFIG_DEBUG_PAGEALLOC is not set
1661CONFIG_HAVE_FUNCTION_TRACER=y 1686CONFIG_HAVE_FUNCTION_TRACER=y
1687CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
1662CONFIG_HAVE_DYNAMIC_FTRACE=y 1688CONFIG_HAVE_DYNAMIC_FTRACE=y
1663CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1689CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1690CONFIG_TRACING_SUPPORT=y
1664 1691
1665# 1692#
1666# Tracers 1693# Tracers
@@ -1668,22 +1695,26 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1668# CONFIG_FUNCTION_TRACER is not set 1695# CONFIG_FUNCTION_TRACER is not set
1669# CONFIG_SCHED_TRACER is not set 1696# CONFIG_SCHED_TRACER is not set
1670# CONFIG_CONTEXT_SWITCH_TRACER is not set 1697# CONFIG_CONTEXT_SWITCH_TRACER is not set
1698# CONFIG_EVENT_TRACER is not set
1671# CONFIG_BOOT_TRACER is not set 1699# CONFIG_BOOT_TRACER is not set
1672# CONFIG_TRACE_BRANCH_PROFILING is not set 1700# CONFIG_TRACE_BRANCH_PROFILING is not set
1673# CONFIG_STACK_TRACER is not set 1701# CONFIG_STACK_TRACER is not set
1674# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1702# CONFIG_KMEMTRACE is not set
1703# CONFIG_WORKQUEUE_TRACER is not set
1704# CONFIG_BLK_DEV_IO_TRACE is not set
1705# CONFIG_DYNAMIC_DEBUG is not set
1675# CONFIG_SAMPLES is not set 1706# CONFIG_SAMPLES is not set
1676CONFIG_HAVE_ARCH_KGDB=y 1707CONFIG_HAVE_ARCH_KGDB=y
1677# CONFIG_KGDB is not set 1708# CONFIG_KGDB is not set
1678CONFIG_PRINT_STACK_DEPTH=64 1709CONFIG_PRINT_STACK_DEPTH=64
1679# CONFIG_DEBUG_STACKOVERFLOW is not set 1710# CONFIG_DEBUG_STACKOVERFLOW is not set
1680# CONFIG_DEBUG_STACK_USAGE is not set 1711# CONFIG_DEBUG_STACK_USAGE is not set
1681# CONFIG_DEBUG_PAGEALLOC is not set
1682# CONFIG_CODE_PATCHING_SELFTEST is not set 1712# CONFIG_CODE_PATCHING_SELFTEST is not set
1683# CONFIG_FTR_FIXUP_SELFTEST is not set 1713# CONFIG_FTR_FIXUP_SELFTEST is not set
1684# CONFIG_MSI_BITMAP_SELFTEST is not set 1714# CONFIG_MSI_BITMAP_SELFTEST is not set
1685# CONFIG_XMON is not set 1715# CONFIG_XMON is not set
1686# CONFIG_IRQSTACKS is not set 1716# CONFIG_IRQSTACKS is not set
1717CONFIG_VIRQ_DEBUG=y
1687# CONFIG_BDI_SWITCH is not set 1718# CONFIG_BDI_SWITCH is not set
1688# CONFIG_PPC_EARLY_DEBUG is not set 1719# CONFIG_PPC_EARLY_DEBUG is not set
1689 1720
@@ -1709,10 +1740,12 @@ CONFIG_CRYPTO_BLKCIPHER2=y
1709CONFIG_CRYPTO_HASH=y 1740CONFIG_CRYPTO_HASH=y
1710CONFIG_CRYPTO_HASH2=y 1741CONFIG_CRYPTO_HASH2=y
1711CONFIG_CRYPTO_RNG2=y 1742CONFIG_CRYPTO_RNG2=y
1743CONFIG_CRYPTO_PCOMP=y
1712CONFIG_CRYPTO_MANAGER=y 1744CONFIG_CRYPTO_MANAGER=y
1713CONFIG_CRYPTO_MANAGER2=y 1745CONFIG_CRYPTO_MANAGER2=y
1714# CONFIG_CRYPTO_GF128MUL is not set 1746# CONFIG_CRYPTO_GF128MUL is not set
1715# CONFIG_CRYPTO_NULL is not set 1747# CONFIG_CRYPTO_NULL is not set
1748CONFIG_CRYPTO_WORKQUEUE=y
1716# CONFIG_CRYPTO_CRYPTD is not set 1749# CONFIG_CRYPTO_CRYPTD is not set
1717CONFIG_CRYPTO_AUTHENC=y 1750CONFIG_CRYPTO_AUTHENC=y
1718# CONFIG_CRYPTO_TEST is not set 1751# CONFIG_CRYPTO_TEST is not set
@@ -1781,6 +1814,7 @@ CONFIG_CRYPTO_DES=y
1781# Compression 1814# Compression
1782# 1815#
1783# CONFIG_CRYPTO_DEFLATE is not set 1816# CONFIG_CRYPTO_DEFLATE is not set
1817# CONFIG_CRYPTO_ZLIB is not set
1784# CONFIG_CRYPTO_LZO is not set 1818# CONFIG_CRYPTO_LZO is not set
1785 1819
1786# 1820#
@@ -1790,5 +1824,6 @@ CONFIG_CRYPTO_DES=y
1790CONFIG_CRYPTO_HW=y 1824CONFIG_CRYPTO_HW=y
1791# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1825# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1792CONFIG_CRYPTO_DEV_TALITOS=y 1826CONFIG_CRYPTO_DEV_TALITOS=y
1793# CONFIG_PPC_CLOCK is not set 1827CONFIG_PPC_CLOCK=y
1828CONFIG_PPC_LIB_RHEAP=y
1794# CONFIG_VIRTUALIZATION is not set 1829# CONFIG_VIRTUALIZATION is not set
diff --git a/arch/powerpc/include/asm/elf.h b/arch/powerpc/include/asm/elf.h
index 1a856b15226e..087c22f1d368 100644
--- a/arch/powerpc/include/asm/elf.h
+++ b/arch/powerpc/include/asm/elf.h
@@ -258,7 +258,8 @@ do { \
258# define elf_read_implies_exec(ex, exec_stk) (test_thread_flag(TIF_32BIT) ? \ 258# define elf_read_implies_exec(ex, exec_stk) (test_thread_flag(TIF_32BIT) ? \
259 (exec_stk != EXSTACK_DISABLE_X) : 0) 259 (exec_stk != EXSTACK_DISABLE_X) : 0)
260#else 260#else
261# define SET_PERSONALITY(ex) set_personality(PER_LINUX) 261# define SET_PERSONALITY(ex) \
262 set_personality(PER_LINUX | (current->personality & (~PER_MASK)))
262#endif /* __powerpc64__ */ 263#endif /* __powerpc64__ */
263 264
264extern int dcache_bsize; 265extern int dcache_bsize;
diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S
index 54e68c11ae15..c01467f952d3 100644
--- a/arch/powerpc/kernel/head_32.S
+++ b/arch/powerpc/kernel/head_32.S
@@ -21,6 +21,7 @@
21 * 21 *
22 */ 22 */
23 23
24#include <linux/init.h>
24#include <asm/reg.h> 25#include <asm/reg.h>
25#include <asm/page.h> 26#include <asm/page.h>
26#include <asm/mmu.h> 27#include <asm/mmu.h>
@@ -50,7 +51,7 @@
50 mtspr SPRN_DBAT##n##L,RB; \ 51 mtspr SPRN_DBAT##n##L,RB; \
511: 521:
52 53
53 .section .text.head, "ax" 54 __HEAD
54 .stabs "arch/powerpc/kernel/",N_SO,0,0,0f 55 .stabs "arch/powerpc/kernel/",N_SO,0,0,0f
55 .stabs "head_32.S",N_SO,0,0,0f 56 .stabs "head_32.S",N_SO,0,0,0f
560: 570:
diff --git a/arch/powerpc/kernel/head_40x.S b/arch/powerpc/kernel/head_40x.S
index 56d8e5d90c5b..0c96911d4299 100644
--- a/arch/powerpc/kernel/head_40x.S
+++ b/arch/powerpc/kernel/head_40x.S
@@ -31,6 +31,7 @@
31 * 31 *
32 */ 32 */
33 33
34#include <linux/init.h>
34#include <asm/processor.h> 35#include <asm/processor.h>
35#include <asm/page.h> 36#include <asm/page.h>
36#include <asm/mmu.h> 37#include <asm/mmu.h>
@@ -52,7 +53,7 @@
52 * 53 *
53 * This is all going to change RSN when we add bi_recs....... -- Dan 54 * This is all going to change RSN when we add bi_recs....... -- Dan
54 */ 55 */
55 .section .text.head, "ax" 56 __HEAD
56_ENTRY(_stext); 57_ENTRY(_stext);
57_ENTRY(_start); 58_ENTRY(_start);
58 59
diff --git a/arch/powerpc/kernel/head_44x.S b/arch/powerpc/kernel/head_44x.S
index b56fecc93a16..18d8a1677c4d 100644
--- a/arch/powerpc/kernel/head_44x.S
+++ b/arch/powerpc/kernel/head_44x.S
@@ -28,6 +28,7 @@
28 * option) any later version. 28 * option) any later version.
29 */ 29 */
30 30
31#include <linux/init.h>
31#include <asm/processor.h> 32#include <asm/processor.h>
32#include <asm/page.h> 33#include <asm/page.h>
33#include <asm/mmu.h> 34#include <asm/mmu.h>
@@ -50,7 +51,7 @@
50 * r7 - End of kernel command line string 51 * r7 - End of kernel command line string
51 * 52 *
52 */ 53 */
53 .section .text.head, "ax" 54 __HEAD
54_ENTRY(_stext); 55_ENTRY(_stext);
55_ENTRY(_start); 56_ENTRY(_start);
56 /* 57 /*
diff --git a/arch/powerpc/kernel/head_8xx.S b/arch/powerpc/kernel/head_8xx.S
index 3c9452d4308b..52ff8c53b93c 100644
--- a/arch/powerpc/kernel/head_8xx.S
+++ b/arch/powerpc/kernel/head_8xx.S
@@ -19,6 +19,7 @@
19 * 19 *
20 */ 20 */
21 21
22#include <linux/init.h>
22#include <asm/processor.h> 23#include <asm/processor.h>
23#include <asm/page.h> 24#include <asm/page.h>
24#include <asm/mmu.h> 25#include <asm/mmu.h>
@@ -38,7 +39,7 @@
38#else 39#else
39#define DO_8xx_CPU6(val, reg) 40#define DO_8xx_CPU6(val, reg)
40#endif 41#endif
41 .section .text.head, "ax" 42 __HEAD
42_ENTRY(_stext); 43_ENTRY(_stext);
43_ENTRY(_start); 44_ENTRY(_start);
44 45
diff --git a/arch/powerpc/kernel/head_fsl_booke.S b/arch/powerpc/kernel/head_fsl_booke.S
index 4c22620d009b..5bdcc06d294c 100644
--- a/arch/powerpc/kernel/head_fsl_booke.S
+++ b/arch/powerpc/kernel/head_fsl_booke.S
@@ -30,6 +30,7 @@
30 * option) any later version. 30 * option) any later version.
31 */ 31 */
32 32
33#include <linux/init.h>
33#include <linux/threads.h> 34#include <linux/threads.h>
34#include <asm/processor.h> 35#include <asm/processor.h>
35#include <asm/page.h> 36#include <asm/page.h>
@@ -53,7 +54,7 @@
53 * r7 - End of kernel command line string 54 * r7 - End of kernel command line string
54 * 55 *
55 */ 56 */
56 .section .text.head, "ax" 57 __HEAD
57_ENTRY(_stext); 58_ENTRY(_stext);
58_ENTRY(_start); 59_ENTRY(_start);
59 /* 60 /*
diff --git a/arch/powerpc/kernel/prom_parse.c b/arch/powerpc/kernel/prom_parse.c
index 8f0856f312da..8362620c9e6f 100644
--- a/arch/powerpc/kernel/prom_parse.c
+++ b/arch/powerpc/kernel/prom_parse.c
@@ -971,7 +971,7 @@ int of_irq_map_one(struct device_node *device, int index, struct of_irq *out_irq
971 struct device_node *p; 971 struct device_node *p;
972 const u32 *intspec, *tmp, *addr; 972 const u32 *intspec, *tmp, *addr;
973 u32 intsize, intlen; 973 u32 intsize, intlen;
974 int res; 974 int res = -EINVAL;
975 975
976 DBG("of_irq_map_one: dev=%s, index=%d\n", device->full_name, index); 976 DBG("of_irq_map_one: dev=%s, index=%d\n", device->full_name, index);
977 977
@@ -995,21 +995,20 @@ int of_irq_map_one(struct device_node *device, int index, struct of_irq *out_irq
995 995
996 /* Get size of interrupt specifier */ 996 /* Get size of interrupt specifier */
997 tmp = of_get_property(p, "#interrupt-cells", NULL); 997 tmp = of_get_property(p, "#interrupt-cells", NULL);
998 if (tmp == NULL) { 998 if (tmp == NULL)
999 of_node_put(p); 999 goto out;
1000 return -EINVAL;
1001 }
1002 intsize = *tmp; 1000 intsize = *tmp;
1003 1001
1004 DBG(" intsize=%d intlen=%d\n", intsize, intlen); 1002 DBG(" intsize=%d intlen=%d\n", intsize, intlen);
1005 1003
1006 /* Check index */ 1004 /* Check index */
1007 if ((index + 1) * intsize > intlen) 1005 if ((index + 1) * intsize > intlen)
1008 return -EINVAL; 1006 goto out;
1009 1007
1010 /* Get new specifier and map it */ 1008 /* Get new specifier and map it */
1011 res = of_irq_map_raw(p, intspec + index * intsize, intsize, 1009 res = of_irq_map_raw(p, intspec + index * intsize, intsize,
1012 addr, out_irq); 1010 addr, out_irq);
1011out:
1013 of_node_put(p); 1012 of_node_put(p);
1014 return res; 1013 return res;
1015} 1014}
diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S
index b9ef1644a722..d7425fffbc1c 100644
--- a/arch/powerpc/kernel/vmlinux.lds.S
+++ b/arch/powerpc/kernel/vmlinux.lds.S
@@ -52,7 +52,7 @@ SECTIONS
52 /* Text and gots */ 52 /* Text and gots */
53 .text : AT(ADDR(.text) - LOAD_OFFSET) { 53 .text : AT(ADDR(.text) - LOAD_OFFSET) {
54 ALIGN_FUNCTION(); 54 ALIGN_FUNCTION();
55 *(.text.head) 55 HEAD_TEXT
56 _text = .; 56 _text = .;
57 *(.text .fixup .text.init.refok .exit.text.refok __ftr_alt_*) 57 *(.text .fixup .text.init.refok .exit.text.refok __ftr_alt_*)
58 SCHED_TEXT 58 SCHED_TEXT
diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c
index db556d25c3a7..1ade7eb6ae00 100644
--- a/arch/powerpc/mm/hash_utils_64.c
+++ b/arch/powerpc/mm/hash_utils_64.c
@@ -753,7 +753,7 @@ void __init early_init_mmu(void)
753} 753}
754 754
755#ifdef CONFIG_SMP 755#ifdef CONFIG_SMP
756void __init early_init_mmu_secondary(void) 756void __cpuinit early_init_mmu_secondary(void)
757{ 757{
758 /* Initialize hash table for that CPU */ 758 /* Initialize hash table for that CPU */
759 if (!firmware_has_feature(FW_FEATURE_LPAR)) 759 if (!firmware_has_feature(FW_FEATURE_LPAR))
diff --git a/arch/powerpc/platforms/fsl_uli1575.c b/arch/powerpc/platforms/fsl_uli1575.c
index 1db6b9e037fc..65a35f38e062 100644
--- a/arch/powerpc/platforms/fsl_uli1575.c
+++ b/arch/powerpc/platforms/fsl_uli1575.c
@@ -275,11 +275,6 @@ static void __devinit hpcd_quirk_uli5288(struct pci_dev *dev)
275 if (!machine_is(mpc86xx_hpcd)) 275 if (!machine_is(mpc86xx_hpcd))
276 return; 276 return;
277 277
278 /* Interrupt Disable, Needed when SATA disabled */
279 pci_read_config_word(dev, PCI_COMMAND, &temp);
280 temp |= 1<<10;
281 pci_write_config_word(dev, PCI_COMMAND, temp);
282
283 pci_read_config_byte(dev, 0x83, &c); 278 pci_read_config_byte(dev, 0x83, &c);
284 c |= 0x80; 279 c |= 0x80;
285 pci_write_config_byte(dev, 0x83, c); 280 pci_write_config_byte(dev, 0x83, c);
diff --git a/arch/powerpc/platforms/pasemi/setup.c b/arch/powerpc/platforms/pasemi/setup.c
index c64fb5bfb37e..153051eb6d93 100644
--- a/arch/powerpc/platforms/pasemi/setup.c
+++ b/arch/powerpc/platforms/pasemi/setup.c
@@ -44,10 +44,6 @@
44 44
45#include "pasemi.h" 45#include "pasemi.h"
46 46
47#if !defined(CONFIG_SMP)
48static void smp_send_stop(void) {}
49#endif
50
51/* SDC reset register, must be pre-mapped at reset time */ 47/* SDC reset register, must be pre-mapped at reset time */
52static void __iomem *reset_reg; 48static void __iomem *reset_reg;
53 49
diff --git a/arch/powerpc/platforms/ps3/os-area.c b/arch/powerpc/platforms/ps3/os-area.c
index 86e392b1b049..cf1cd0f8c18f 100644
--- a/arch/powerpc/platforms/ps3/os-area.c
+++ b/arch/powerpc/platforms/ps3/os-area.c
@@ -578,7 +578,7 @@ static void os_area_db_init(struct os_area_db *db)
578 * 578 *
579 */ 579 */
580 580
581static void update_flash_db(void) 581static void __maybe_unused update_flash_db(void)
582{ 582{
583 int result; 583 int result;
584 int file; 584 int file;
diff --git a/arch/powerpc/sysdev/fsl_rio.c b/arch/powerpc/sysdev/fsl_rio.c
index a0fa4ebb39c6..abdb124e1e2f 100644
--- a/arch/powerpc/sysdev/fsl_rio.c
+++ b/arch/powerpc/sysdev/fsl_rio.c
@@ -18,6 +18,7 @@
18#include <linux/types.h> 18#include <linux/types.h>
19#include <linux/dma-mapping.h> 19#include <linux/dma-mapping.h>
20#include <linux/interrupt.h> 20#include <linux/interrupt.h>
21#include <linux/device.h>
21#include <linux/rio.h> 22#include <linux/rio.h>
22#include <linux/rio_drv.h> 23#include <linux/rio_drv.h>
23#include <linux/of_platform.h> 24#include <linux/of_platform.h>
@@ -159,6 +160,7 @@ struct rio_msg_rx_ring {
159}; 160};
160 161
161struct rio_priv { 162struct rio_priv {
163 struct device *dev;
162 void __iomem *regs_win; 164 void __iomem *regs_win;
163 struct rio_atmu_regs __iomem *atmu_regs; 165 struct rio_atmu_regs __iomem *atmu_regs;
164 struct rio_atmu_regs __iomem *maint_atmu_regs; 166 struct rio_atmu_regs __iomem *maint_atmu_regs;
@@ -484,13 +486,13 @@ int rio_open_outb_mbox(struct rio_mport *mport, void *dev_id, int mbox, int entr
484 486
485 for (i = 0; i < priv->msg_tx_ring.size; i++) { 487 for (i = 0; i < priv->msg_tx_ring.size; i++) {
486 priv->msg_tx_ring.virt_buffer[i] = 488 priv->msg_tx_ring.virt_buffer[i] =
487 dma_alloc_coherent(NULL, RIO_MSG_BUFFER_SIZE, 489 dma_alloc_coherent(priv->dev, RIO_MSG_BUFFER_SIZE,
488 &priv->msg_tx_ring.phys_buffer[i], GFP_KERNEL); 490 &priv->msg_tx_ring.phys_buffer[i], GFP_KERNEL);
489 if (!priv->msg_tx_ring.virt_buffer[i]) { 491 if (!priv->msg_tx_ring.virt_buffer[i]) {
490 rc = -ENOMEM; 492 rc = -ENOMEM;
491 for (j = 0; j < priv->msg_tx_ring.size; j++) 493 for (j = 0; j < priv->msg_tx_ring.size; j++)
492 if (priv->msg_tx_ring.virt_buffer[j]) 494 if (priv->msg_tx_ring.virt_buffer[j])
493 dma_free_coherent(NULL, 495 dma_free_coherent(priv->dev,
494 RIO_MSG_BUFFER_SIZE, 496 RIO_MSG_BUFFER_SIZE,
495 priv->msg_tx_ring. 497 priv->msg_tx_ring.
496 virt_buffer[j], 498 virt_buffer[j],
@@ -501,7 +503,7 @@ int rio_open_outb_mbox(struct rio_mport *mport, void *dev_id, int mbox, int entr
501 } 503 }
502 504
503 /* Initialize outbound message descriptor ring */ 505 /* Initialize outbound message descriptor ring */
504 priv->msg_tx_ring.virt = dma_alloc_coherent(NULL, 506 priv->msg_tx_ring.virt = dma_alloc_coherent(priv->dev,
505 priv->msg_tx_ring.size * RIO_MSG_DESC_SIZE, 507 priv->msg_tx_ring.size * RIO_MSG_DESC_SIZE,
506 &priv->msg_tx_ring.phys, GFP_KERNEL); 508 &priv->msg_tx_ring.phys, GFP_KERNEL);
507 if (!priv->msg_tx_ring.virt) { 509 if (!priv->msg_tx_ring.virt) {
@@ -549,12 +551,13 @@ int rio_open_outb_mbox(struct rio_mport *mport, void *dev_id, int mbox, int entr
549 return rc; 551 return rc;
550 552
551 out_irq: 553 out_irq:
552 dma_free_coherent(NULL, priv->msg_tx_ring.size * RIO_MSG_DESC_SIZE, 554 dma_free_coherent(priv->dev,
555 priv->msg_tx_ring.size * RIO_MSG_DESC_SIZE,
553 priv->msg_tx_ring.virt, priv->msg_tx_ring.phys); 556 priv->msg_tx_ring.virt, priv->msg_tx_ring.phys);
554 557
555 out_dma: 558 out_dma:
556 for (i = 0; i < priv->msg_tx_ring.size; i++) 559 for (i = 0; i < priv->msg_tx_ring.size; i++)
557 dma_free_coherent(NULL, RIO_MSG_BUFFER_SIZE, 560 dma_free_coherent(priv->dev, RIO_MSG_BUFFER_SIZE,
558 priv->msg_tx_ring.virt_buffer[i], 561 priv->msg_tx_ring.virt_buffer[i],
559 priv->msg_tx_ring.phys_buffer[i]); 562 priv->msg_tx_ring.phys_buffer[i]);
560 563
@@ -576,7 +579,8 @@ void rio_close_outb_mbox(struct rio_mport *mport, int mbox)
576 out_be32(&priv->msg_regs->omr, 0); 579 out_be32(&priv->msg_regs->omr, 0);
577 580
578 /* Free ring */ 581 /* Free ring */
579 dma_free_coherent(NULL, priv->msg_tx_ring.size * RIO_MSG_DESC_SIZE, 582 dma_free_coherent(priv->dev,
583 priv->msg_tx_ring.size * RIO_MSG_DESC_SIZE,
580 priv->msg_tx_ring.virt, priv->msg_tx_ring.phys); 584 priv->msg_tx_ring.virt, priv->msg_tx_ring.phys);
581 585
582 /* Free interrupt */ 586 /* Free interrupt */
@@ -654,7 +658,7 @@ int rio_open_inb_mbox(struct rio_mport *mport, void *dev_id, int mbox, int entri
654 priv->msg_rx_ring.virt_buffer[i] = NULL; 658 priv->msg_rx_ring.virt_buffer[i] = NULL;
655 659
656 /* Initialize inbound message ring */ 660 /* Initialize inbound message ring */
657 priv->msg_rx_ring.virt = dma_alloc_coherent(NULL, 661 priv->msg_rx_ring.virt = dma_alloc_coherent(priv->dev,
658 priv->msg_rx_ring.size * RIO_MAX_MSG_SIZE, 662 priv->msg_rx_ring.size * RIO_MAX_MSG_SIZE,
659 &priv->msg_rx_ring.phys, GFP_KERNEL); 663 &priv->msg_rx_ring.phys, GFP_KERNEL);
660 if (!priv->msg_rx_ring.virt) { 664 if (!priv->msg_rx_ring.virt) {
@@ -673,7 +677,7 @@ int rio_open_inb_mbox(struct rio_mport *mport, void *dev_id, int mbox, int entri
673 rc = request_irq(IRQ_RIO_RX(mport), fsl_rio_rx_handler, 0, 677 rc = request_irq(IRQ_RIO_RX(mport), fsl_rio_rx_handler, 0,
674 "msg_rx", (void *)mport); 678 "msg_rx", (void *)mport);
675 if (rc < 0) { 679 if (rc < 0) {
676 dma_free_coherent(NULL, RIO_MSG_BUFFER_SIZE, 680 dma_free_coherent(priv->dev, RIO_MSG_BUFFER_SIZE,
677 priv->msg_tx_ring.virt_buffer[i], 681 priv->msg_tx_ring.virt_buffer[i],
678 priv->msg_tx_ring.phys_buffer[i]); 682 priv->msg_tx_ring.phys_buffer[i]);
679 goto out; 683 goto out;
@@ -713,7 +717,7 @@ void rio_close_inb_mbox(struct rio_mport *mport, int mbox)
713 out_be32(&priv->msg_regs->imr, 0); 717 out_be32(&priv->msg_regs->imr, 0);
714 718
715 /* Free ring */ 719 /* Free ring */
716 dma_free_coherent(NULL, priv->msg_rx_ring.size * RIO_MAX_MSG_SIZE, 720 dma_free_coherent(priv->dev, priv->msg_rx_ring.size * RIO_MAX_MSG_SIZE,
717 priv->msg_rx_ring.virt, priv->msg_rx_ring.phys); 721 priv->msg_rx_ring.virt, priv->msg_rx_ring.phys);
718 722
719 /* Free interrupt */ 723 /* Free interrupt */
@@ -890,7 +894,7 @@ static int fsl_rio_doorbell_init(struct rio_mport *mport)
890 } 894 }
891 895
892 /* Initialize inbound doorbells */ 896 /* Initialize inbound doorbells */
893 priv->dbell_ring.virt = dma_alloc_coherent(NULL, 512 * 897 priv->dbell_ring.virt = dma_alloc_coherent(priv->dev, 512 *
894 DOORBELL_MESSAGE_SIZE, &priv->dbell_ring.phys, GFP_KERNEL); 898 DOORBELL_MESSAGE_SIZE, &priv->dbell_ring.phys, GFP_KERNEL);
895 if (!priv->dbell_ring.virt) { 899 if (!priv->dbell_ring.virt) {
896 printk(KERN_ERR "RIO: unable allocate inbound doorbell ring\n"); 900 printk(KERN_ERR "RIO: unable allocate inbound doorbell ring\n");
@@ -911,7 +915,7 @@ static int fsl_rio_doorbell_init(struct rio_mport *mport)
911 "dbell_rx", (void *)mport); 915 "dbell_rx", (void *)mport);
912 if (rc < 0) { 916 if (rc < 0) {
913 iounmap(priv->dbell_win); 917 iounmap(priv->dbell_win);
914 dma_free_coherent(NULL, 512 * DOORBELL_MESSAGE_SIZE, 918 dma_free_coherent(priv->dev, 512 * DOORBELL_MESSAGE_SIZE,
915 priv->dbell_ring.virt, priv->dbell_ring.phys); 919 priv->dbell_ring.virt, priv->dbell_ring.phys);
916 printk(KERN_ERR 920 printk(KERN_ERR
917 "MPC85xx RIO: unable to request inbound doorbell irq"); 921 "MPC85xx RIO: unable to request inbound doorbell irq");
@@ -1087,6 +1091,8 @@ int fsl_rio_setup(struct of_device *dev)
1087 rio_init_mbox_res(&port->riores[RIO_OUTB_MBOX_RESOURCE], 0, 0); 1091 rio_init_mbox_res(&port->riores[RIO_OUTB_MBOX_RESOURCE], 0, 0);
1088 strcpy(port->name, "RIO0 mport"); 1092 strcpy(port->name, "RIO0 mport");
1089 1093
1094 priv->dev = &dev->dev;
1095
1090 port->ops = ops; 1096 port->ops = ops;
1091 port->host_deviceid = fsl_rio_get_hdid(port->id); 1097 port->host_deviceid = fsl_rio_get_hdid(port->id);
1092 1098
diff --git a/arch/s390/appldata/appldata_base.c b/arch/s390/appldata/appldata_base.c
index aeb3cff95f63..1dfc7100c7ee 100644
--- a/arch/s390/appldata/appldata_base.c
+++ b/arch/s390/appldata/appldata_base.c
@@ -98,7 +98,7 @@ static DECLARE_WORK(appldata_work, appldata_work_fn);
98/* 98/*
99 * Ops list 99 * Ops list
100 */ 100 */
101static DEFINE_SPINLOCK(appldata_ops_lock); 101static DEFINE_MUTEX(appldata_ops_mutex);
102static LIST_HEAD(appldata_ops_list); 102static LIST_HEAD(appldata_ops_list);
103 103
104 104
@@ -129,14 +129,14 @@ static void appldata_work_fn(struct work_struct *work)
129 129
130 i = 0; 130 i = 0;
131 get_online_cpus(); 131 get_online_cpus();
132 spin_lock(&appldata_ops_lock); 132 mutex_lock(&appldata_ops_mutex);
133 list_for_each(lh, &appldata_ops_list) { 133 list_for_each(lh, &appldata_ops_list) {
134 ops = list_entry(lh, struct appldata_ops, list); 134 ops = list_entry(lh, struct appldata_ops, list);
135 if (ops->active == 1) { 135 if (ops->active == 1) {
136 ops->callback(ops->data); 136 ops->callback(ops->data);
137 } 137 }
138 } 138 }
139 spin_unlock(&appldata_ops_lock); 139 mutex_unlock(&appldata_ops_mutex);
140 put_online_cpus(); 140 put_online_cpus();
141} 141}
142 142
@@ -338,7 +338,7 @@ appldata_generic_handler(ctl_table *ctl, int write, struct file *filp,
338 struct list_head *lh; 338 struct list_head *lh;
339 339
340 found = 0; 340 found = 0;
341 spin_lock(&appldata_ops_lock); 341 mutex_lock(&appldata_ops_mutex);
342 list_for_each(lh, &appldata_ops_list) { 342 list_for_each(lh, &appldata_ops_list) {
343 tmp_ops = list_entry(lh, struct appldata_ops, list); 343 tmp_ops = list_entry(lh, struct appldata_ops, list);
344 if (&tmp_ops->ctl_table[2] == ctl) { 344 if (&tmp_ops->ctl_table[2] == ctl) {
@@ -346,15 +346,15 @@ appldata_generic_handler(ctl_table *ctl, int write, struct file *filp,
346 } 346 }
347 } 347 }
348 if (!found) { 348 if (!found) {
349 spin_unlock(&appldata_ops_lock); 349 mutex_unlock(&appldata_ops_mutex);
350 return -ENODEV; 350 return -ENODEV;
351 } 351 }
352 ops = ctl->data; 352 ops = ctl->data;
353 if (!try_module_get(ops->owner)) { // protect this function 353 if (!try_module_get(ops->owner)) { // protect this function
354 spin_unlock(&appldata_ops_lock); 354 mutex_unlock(&appldata_ops_mutex);
355 return -ENODEV; 355 return -ENODEV;
356 } 356 }
357 spin_unlock(&appldata_ops_lock); 357 mutex_unlock(&appldata_ops_mutex);
358 358
359 if (!*lenp || *ppos) { 359 if (!*lenp || *ppos) {
360 *lenp = 0; 360 *lenp = 0;
@@ -378,11 +378,11 @@ appldata_generic_handler(ctl_table *ctl, int write, struct file *filp,
378 return -EFAULT; 378 return -EFAULT;
379 } 379 }
380 380
381 spin_lock(&appldata_ops_lock); 381 mutex_lock(&appldata_ops_mutex);
382 if ((buf[0] == '1') && (ops->active == 0)) { 382 if ((buf[0] == '1') && (ops->active == 0)) {
383 // protect work queue callback 383 // protect work queue callback
384 if (!try_module_get(ops->owner)) { 384 if (!try_module_get(ops->owner)) {
385 spin_unlock(&appldata_ops_lock); 385 mutex_unlock(&appldata_ops_mutex);
386 module_put(ops->owner); 386 module_put(ops->owner);
387 return -ENODEV; 387 return -ENODEV;
388 } 388 }
@@ -407,7 +407,7 @@ appldata_generic_handler(ctl_table *ctl, int write, struct file *filp,
407 "failed with rc=%d\n", ops->name, rc); 407 "failed with rc=%d\n", ops->name, rc);
408 module_put(ops->owner); 408 module_put(ops->owner);
409 } 409 }
410 spin_unlock(&appldata_ops_lock); 410 mutex_unlock(&appldata_ops_mutex);
411out: 411out:
412 *lenp = len; 412 *lenp = len;
413 *ppos += len; 413 *ppos += len;
@@ -433,9 +433,9 @@ int appldata_register_ops(struct appldata_ops *ops)
433 if (!ops->ctl_table) 433 if (!ops->ctl_table)
434 return -ENOMEM; 434 return -ENOMEM;
435 435
436 spin_lock(&appldata_ops_lock); 436 mutex_lock(&appldata_ops_mutex);
437 list_add(&ops->list, &appldata_ops_list); 437 list_add(&ops->list, &appldata_ops_list);
438 spin_unlock(&appldata_ops_lock); 438 mutex_unlock(&appldata_ops_mutex);
439 439
440 ops->ctl_table[0].procname = appldata_proc_name; 440 ops->ctl_table[0].procname = appldata_proc_name;
441 ops->ctl_table[0].maxlen = 0; 441 ops->ctl_table[0].maxlen = 0;
@@ -452,9 +452,9 @@ int appldata_register_ops(struct appldata_ops *ops)
452 goto out; 452 goto out;
453 return 0; 453 return 0;
454out: 454out:
455 spin_lock(&appldata_ops_lock); 455 mutex_lock(&appldata_ops_mutex);
456 list_del(&ops->list); 456 list_del(&ops->list);
457 spin_unlock(&appldata_ops_lock); 457 mutex_unlock(&appldata_ops_mutex);
458 kfree(ops->ctl_table); 458 kfree(ops->ctl_table);
459 return -ENOMEM; 459 return -ENOMEM;
460} 460}
@@ -466,9 +466,9 @@ out:
466 */ 466 */
467void appldata_unregister_ops(struct appldata_ops *ops) 467void appldata_unregister_ops(struct appldata_ops *ops)
468{ 468{
469 spin_lock(&appldata_ops_lock); 469 mutex_lock(&appldata_ops_mutex);
470 list_del(&ops->list); 470 list_del(&ops->list);
471 spin_unlock(&appldata_ops_lock); 471 mutex_unlock(&appldata_ops_mutex);
472 unregister_sysctl_table(ops->sysctl_header); 472 unregister_sysctl_table(ops->sysctl_header);
473 kfree(ops->ctl_table); 473 kfree(ops->ctl_table);
474} 474}
diff --git a/arch/s390/appldata/appldata_mem.c b/arch/s390/appldata/appldata_mem.c
index 3ed56b7d1b2f..4188cbe63a54 100644
--- a/arch/s390/appldata/appldata_mem.c
+++ b/arch/s390/appldata/appldata_mem.c
@@ -78,7 +78,7 @@ static void appldata_get_mem_data(void *data)
78{ 78{
79 /* 79 /*
80 * don't put large structures on the stack, we are 80 * don't put large structures on the stack, we are
81 * serialized through the appldata_ops_lock and can use static 81 * serialized through the appldata_ops_mutex and can use static
82 */ 82 */
83 static struct sysinfo val; 83 static struct sysinfo val;
84 unsigned long ev[NR_VM_EVENT_ITEMS]; 84 unsigned long ev[NR_VM_EVENT_ITEMS];
diff --git a/arch/s390/defconfig b/arch/s390/defconfig
index 31e809c77790..d401d56c255f 100644
--- a/arch/s390/defconfig
+++ b/arch/s390/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.29-rc4 3# Linux kernel version: 2.6.30-rc3
4# Wed Feb 11 10:07:16 2009 4# Thu Apr 23 09:29:52 2009
5# 5#
6CONFIG_SCHED_MC=y 6CONFIG_SCHED_MC=y
7CONFIG_MMU=y 7CONFIG_MMU=y
@@ -22,6 +22,7 @@ CONFIG_NO_DMA=y
22CONFIG_GENERIC_LOCKBREAK=y 22CONFIG_GENERIC_LOCKBREAK=y
23CONFIG_PGSTE=y 23CONFIG_PGSTE=y
24CONFIG_VIRT_CPU_ACCOUNTING=y 24CONFIG_VIRT_CPU_ACCOUNTING=y
25CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
25CONFIG_S390=y 26CONFIG_S390=y
26CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 27CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
27 28
@@ -37,6 +38,7 @@ CONFIG_SWAP=y
37CONFIG_SYSVIPC=y 38CONFIG_SYSVIPC=y
38CONFIG_SYSVIPC_SYSCTL=y 39CONFIG_SYSVIPC_SYSCTL=y
39CONFIG_POSIX_MQUEUE=y 40CONFIG_POSIX_MQUEUE=y
41CONFIG_POSIX_MQUEUE_SYSCTL=y
40# CONFIG_BSD_PROCESS_ACCT is not set 42# CONFIG_BSD_PROCESS_ACCT is not set
41# CONFIG_TASKSTATS is not set 43# CONFIG_TASKSTATS is not set
42CONFIG_AUDIT=y 44CONFIG_AUDIT=y
@@ -77,21 +79,24 @@ CONFIG_IPC_NS=y
77# CONFIG_NET_NS is not set 79# CONFIG_NET_NS is not set
78CONFIG_BLK_DEV_INITRD=y 80CONFIG_BLK_DEV_INITRD=y
79CONFIG_INITRAMFS_SOURCE="" 81CONFIG_INITRAMFS_SOURCE=""
82CONFIG_RD_GZIP=y
83CONFIG_RD_BZIP2=y
84CONFIG_RD_LZMA=y
80# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 85# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
81CONFIG_SYSCTL=y 86CONFIG_SYSCTL=y
87CONFIG_ANON_INODES=y
82# CONFIG_EMBEDDED is not set 88# CONFIG_EMBEDDED is not set
83CONFIG_SYSCTL_SYSCALL=y 89CONFIG_SYSCTL_SYSCALL=y
84CONFIG_KALLSYMS=y 90CONFIG_KALLSYMS=y
85# CONFIG_KALLSYMS_ALL is not set 91# CONFIG_KALLSYMS_ALL is not set
86# CONFIG_KALLSYMS_EXTRA_PASS is not set 92# CONFIG_KALLSYMS_EXTRA_PASS is not set
93# CONFIG_STRIP_ASM_SYMS is not set
87CONFIG_HOTPLUG=y 94CONFIG_HOTPLUG=y
88CONFIG_PRINTK=y 95CONFIG_PRINTK=y
89CONFIG_BUG=y 96CONFIG_BUG=y
90CONFIG_ELF_CORE=y 97CONFIG_ELF_CORE=y
91# CONFIG_COMPAT_BRK is not set
92CONFIG_BASE_FULL=y 98CONFIG_BASE_FULL=y
93CONFIG_FUTEX=y 99CONFIG_FUTEX=y
94CONFIG_ANON_INODES=y
95CONFIG_EPOLL=y 100CONFIG_EPOLL=y
96CONFIG_SIGNALFD=y 101CONFIG_SIGNALFD=y
97CONFIG_TIMERFD=y 102CONFIG_TIMERFD=y
@@ -99,10 +104,12 @@ CONFIG_EVENTFD=y
99CONFIG_SHMEM=y 104CONFIG_SHMEM=y
100CONFIG_AIO=y 105CONFIG_AIO=y
101CONFIG_VM_EVENT_COUNTERS=y 106CONFIG_VM_EVENT_COUNTERS=y
107# CONFIG_COMPAT_BRK is not set
102CONFIG_SLAB=y 108CONFIG_SLAB=y
103# CONFIG_SLUB is not set 109# CONFIG_SLUB is not set
104# CONFIG_SLOB is not set 110# CONFIG_SLOB is not set
105# CONFIG_PROFILING is not set 111# CONFIG_PROFILING is not set
112# CONFIG_MARKERS is not set
106CONFIG_HAVE_OPROFILE=y 113CONFIG_HAVE_OPROFILE=y
107CONFIG_KPROBES=y 114CONFIG_KPROBES=y
108CONFIG_HAVE_SYSCALL_WRAPPERS=y 115CONFIG_HAVE_SYSCALL_WRAPPERS=y
@@ -111,6 +118,8 @@ CONFIG_HAVE_KPROBES=y
111CONFIG_HAVE_KRETPROBES=y 118CONFIG_HAVE_KRETPROBES=y
112CONFIG_HAVE_ARCH_TRACEHOOK=y 119CONFIG_HAVE_ARCH_TRACEHOOK=y
113CONFIG_USE_GENERIC_SMP_HELPERS=y 120CONFIG_USE_GENERIC_SMP_HELPERS=y
121CONFIG_HAVE_DEFAULT_NO_SPIN_MUTEXES=y
122# CONFIG_SLOW_WORK is not set
114# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 123# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
115CONFIG_SLABINFO=y 124CONFIG_SLABINFO=y
116CONFIG_RT_MUTEXES=y 125CONFIG_RT_MUTEXES=y
@@ -124,7 +133,6 @@ CONFIG_MODVERSIONS=y
124CONFIG_INIT_ALL_POSSIBLE=y 133CONFIG_INIT_ALL_POSSIBLE=y
125CONFIG_STOP_MACHINE=y 134CONFIG_STOP_MACHINE=y
126CONFIG_BLOCK=y 135CONFIG_BLOCK=y
127# CONFIG_BLK_DEV_IO_TRACE is not set
128CONFIG_BLK_DEV_BSG=y 136CONFIG_BLK_DEV_BSG=y
129# CONFIG_BLK_DEV_INTEGRITY is not set 137# CONFIG_BLK_DEV_INTEGRITY is not set
130CONFIG_BLOCK_COMPAT=y 138CONFIG_BLOCK_COMPAT=y
@@ -211,11 +219,12 @@ CONFIG_ZONE_DMA_FLAG=1
211CONFIG_BOUNCE=y 219CONFIG_BOUNCE=y
212CONFIG_VIRT_TO_BUS=y 220CONFIG_VIRT_TO_BUS=y
213CONFIG_UNEVICTABLE_LRU=y 221CONFIG_UNEVICTABLE_LRU=y
222CONFIG_HAVE_MLOCK=y
223CONFIG_HAVE_MLOCKED_PAGE_BIT=y
214 224
215# 225#
216# I/O subsystem configuration 226# I/O subsystem configuration
217# 227#
218CONFIG_MACHCHK_WARNING=y
219CONFIG_QDIO=y 228CONFIG_QDIO=y
220CONFIG_CHSC_SCH=m 229CONFIG_CHSC_SCH=m
221 230
@@ -247,12 +256,12 @@ CONFIG_S390_HYPFS_FS=y
247CONFIG_KEXEC=y 256CONFIG_KEXEC=y
248# CONFIG_ZFCPDUMP is not set 257# CONFIG_ZFCPDUMP is not set
249CONFIG_S390_GUEST=y 258CONFIG_S390_GUEST=y
259CONFIG_SECCOMP=y
250CONFIG_NET=y 260CONFIG_NET=y
251 261
252# 262#
253# Networking options 263# Networking options
254# 264#
255CONFIG_COMPAT_NET_DEV_OPS=y
256CONFIG_PACKET=y 265CONFIG_PACKET=y
257# CONFIG_PACKET_MMAP is not set 266# CONFIG_PACKET_MMAP is not set
258CONFIG_UNIX=y 267CONFIG_UNIX=y
@@ -374,6 +383,7 @@ CONFIG_SCTP_HMAC_MD5=y
374# CONFIG_LAPB is not set 383# CONFIG_LAPB is not set
375# CONFIG_ECONET is not set 384# CONFIG_ECONET is not set
376# CONFIG_WAN_ROUTER is not set 385# CONFIG_WAN_ROUTER is not set
386# CONFIG_PHONET is not set
377CONFIG_NET_SCHED=y 387CONFIG_NET_SCHED=y
378 388
379# 389#
@@ -438,7 +448,6 @@ CONFIG_CAN_BCM=m
438CONFIG_CAN_VCAN=m 448CONFIG_CAN_VCAN=m
439# CONFIG_CAN_DEBUG_DEVICES is not set 449# CONFIG_CAN_DEBUG_DEVICES is not set
440# CONFIG_AF_RXRPC is not set 450# CONFIG_AF_RXRPC is not set
441# CONFIG_PHONET is not set
442# CONFIG_WIMAX is not set 451# CONFIG_WIMAX is not set
443# CONFIG_RFKILL is not set 452# CONFIG_RFKILL is not set
444# CONFIG_NET_9P is not set 453# CONFIG_NET_9P is not set
@@ -537,6 +546,7 @@ CONFIG_SCSI_FC_ATTRS=y
537CONFIG_SCSI_LOWLEVEL=y 546CONFIG_SCSI_LOWLEVEL=y
538# CONFIG_ISCSI_TCP is not set 547# CONFIG_ISCSI_TCP is not set
539# CONFIG_LIBFC is not set 548# CONFIG_LIBFC is not set
549# CONFIG_LIBFCOE is not set
540# CONFIG_SCSI_DEBUG is not set 550# CONFIG_SCSI_DEBUG is not set
541CONFIG_ZFCP=y 551CONFIG_ZFCP=y
542CONFIG_SCSI_DH=m 552CONFIG_SCSI_DH=m
@@ -544,6 +554,10 @@ CONFIG_SCSI_DH_RDAC=m
544CONFIG_SCSI_DH_HP_SW=m 554CONFIG_SCSI_DH_HP_SW=m
545CONFIG_SCSI_DH_EMC=m 555CONFIG_SCSI_DH_EMC=m
546CONFIG_SCSI_DH_ALUA=m 556CONFIG_SCSI_DH_ALUA=m
557CONFIG_SCSI_OSD_INITIATOR=m
558CONFIG_SCSI_OSD_ULD=m
559CONFIG_SCSI_OSD_DPRINT_SENSE=1
560# CONFIG_SCSI_OSD_DEBUG is not set
547CONFIG_MD=y 561CONFIG_MD=y
548CONFIG_BLK_DEV_MD=y 562CONFIG_BLK_DEV_MD=y
549CONFIG_MD_AUTODETECT=y 563CONFIG_MD_AUTODETECT=y
@@ -564,6 +578,7 @@ CONFIG_DM_MULTIPATH=m
564# CONFIG_DM_DELAY is not set 578# CONFIG_DM_DELAY is not set
565# CONFIG_DM_UEVENT is not set 579# CONFIG_DM_UEVENT is not set
566CONFIG_NETDEVICES=y 580CONFIG_NETDEVICES=y
581CONFIG_COMPAT_NET_DEV_OPS=y
567# CONFIG_IFB is not set 582# CONFIG_IFB is not set
568CONFIG_DUMMY=m 583CONFIG_DUMMY=m
569CONFIG_BONDING=m 584CONFIG_BONDING=m
@@ -667,6 +682,7 @@ CONFIG_S390_VMUR=m
667# CONFIG_MEMSTICK is not set 682# CONFIG_MEMSTICK is not set
668# CONFIG_NEW_LEDS is not set 683# CONFIG_NEW_LEDS is not set
669CONFIG_ACCESSIBILITY=y 684CONFIG_ACCESSIBILITY=y
685# CONFIG_AUXDISPLAY is not set
670# CONFIG_STAGING is not set 686# CONFIG_STAGING is not set
671 687
672# 688#
@@ -676,6 +692,7 @@ CONFIG_EXT2_FS=y
676# CONFIG_EXT2_FS_XATTR is not set 692# CONFIG_EXT2_FS_XATTR is not set
677# CONFIG_EXT2_FS_XIP is not set 693# CONFIG_EXT2_FS_XIP is not set
678CONFIG_EXT3_FS=y 694CONFIG_EXT3_FS=y
695# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
679CONFIG_EXT3_FS_XATTR=y 696CONFIG_EXT3_FS_XATTR=y
680# CONFIG_EXT3_FS_POSIX_ACL is not set 697# CONFIG_EXT3_FS_POSIX_ACL is not set
681# CONFIG_EXT3_FS_SECURITY is not set 698# CONFIG_EXT3_FS_SECURITY is not set
@@ -701,6 +718,11 @@ CONFIG_INOTIFY_USER=y
701CONFIG_GENERIC_ACL=y 718CONFIG_GENERIC_ACL=y
702 719
703# 720#
721# Caches
722#
723# CONFIG_FSCACHE is not set
724
725#
704# CD-ROM/DVD Filesystems 726# CD-ROM/DVD Filesystems
705# 727#
706# CONFIG_ISO9660_FS is not set 728# CONFIG_ISO9660_FS is not set
@@ -744,6 +766,8 @@ CONFIG_MISC_FILESYSTEMS=y
744# CONFIG_ROMFS_FS is not set 766# CONFIG_ROMFS_FS is not set
745# CONFIG_SYSV_FS is not set 767# CONFIG_SYSV_FS is not set
746# CONFIG_UFS_FS is not set 768# CONFIG_UFS_FS is not set
769# CONFIG_EXOFS_FS is not set
770# CONFIG_NILFS2_FS is not set
747CONFIG_NETWORK_FILESYSTEMS=y 771CONFIG_NETWORK_FILESYSTEMS=y
748CONFIG_NFS_FS=y 772CONFIG_NFS_FS=y
749CONFIG_NFS_V3=y 773CONFIG_NFS_V3=y
@@ -758,7 +782,6 @@ CONFIG_LOCKD_V4=y
758CONFIG_EXPORTFS=y 782CONFIG_EXPORTFS=y
759CONFIG_NFS_COMMON=y 783CONFIG_NFS_COMMON=y
760CONFIG_SUNRPC=y 784CONFIG_SUNRPC=y
761# CONFIG_SUNRPC_REGISTER_V4 is not set
762# CONFIG_RPCSEC_GSS_KRB5 is not set 785# CONFIG_RPCSEC_GSS_KRB5 is not set
763# CONFIG_RPCSEC_GSS_SPKM3 is not set 786# CONFIG_RPCSEC_GSS_SPKM3 is not set
764# CONFIG_SMB_FS is not set 787# CONFIG_SMB_FS is not set
@@ -806,6 +829,7 @@ CONFIG_MAGIC_SYSRQ=y
806CONFIG_DEBUG_FS=y 829CONFIG_DEBUG_FS=y
807# CONFIG_HEADERS_CHECK is not set 830# CONFIG_HEADERS_CHECK is not set
808CONFIG_DEBUG_KERNEL=y 831CONFIG_DEBUG_KERNEL=y
832# CONFIG_DETECT_HUNG_TASK is not set
809# CONFIG_SCHED_DEBUG is not set 833# CONFIG_SCHED_DEBUG is not set
810# CONFIG_SCHEDSTATS is not set 834# CONFIG_SCHEDSTATS is not set
811# CONFIG_TIMER_STATS is not set 835# CONFIG_TIMER_STATS is not set
@@ -830,7 +854,6 @@ CONFIG_DEBUG_MEMORY_INIT=y
830# CONFIG_DEBUG_LIST is not set 854# CONFIG_DEBUG_LIST is not set
831# CONFIG_DEBUG_SG is not set 855# CONFIG_DEBUG_SG is not set
832# CONFIG_DEBUG_NOTIFIERS is not set 856# CONFIG_DEBUG_NOTIFIERS is not set
833# CONFIG_FRAME_POINTER is not set
834# CONFIG_RCU_TORTURE_TEST is not set 857# CONFIG_RCU_TORTURE_TEST is not set
835# CONFIG_RCU_CPU_STALL_DETECTOR is not set 858# CONFIG_RCU_CPU_STALL_DETECTOR is not set
836# CONFIG_KPROBES_SANITY_TEST is not set 859# CONFIG_KPROBES_SANITY_TEST is not set
@@ -840,7 +863,9 @@ CONFIG_DEBUG_MEMORY_INIT=y
840# CONFIG_FAULT_INJECTION is not set 863# CONFIG_FAULT_INJECTION is not set
841# CONFIG_LATENCYTOP is not set 864# CONFIG_LATENCYTOP is not set
842CONFIG_SYSCTL_SYSCALL_CHECK=y 865CONFIG_SYSCTL_SYSCALL_CHECK=y
866# CONFIG_DEBUG_PAGEALLOC is not set
843CONFIG_HAVE_FUNCTION_TRACER=y 867CONFIG_HAVE_FUNCTION_TRACER=y
868CONFIG_TRACING_SUPPORT=y
844 869
845# 870#
846# Tracers 871# Tracers
@@ -850,14 +875,17 @@ CONFIG_HAVE_FUNCTION_TRACER=y
850# CONFIG_PREEMPT_TRACER is not set 875# CONFIG_PREEMPT_TRACER is not set
851# CONFIG_SCHED_TRACER is not set 876# CONFIG_SCHED_TRACER is not set
852# CONFIG_CONTEXT_SWITCH_TRACER is not set 877# CONFIG_CONTEXT_SWITCH_TRACER is not set
878# CONFIG_EVENT_TRACER is not set
853# CONFIG_BOOT_TRACER is not set 879# CONFIG_BOOT_TRACER is not set
854# CONFIG_TRACE_BRANCH_PROFILING is not set 880# CONFIG_TRACE_BRANCH_PROFILING is not set
855# CONFIG_STACK_TRACER is not set 881# CONFIG_STACK_TRACER is not set
856# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 882# CONFIG_KMEMTRACE is not set
883# CONFIG_WORKQUEUE_TRACER is not set
884# CONFIG_BLK_DEV_IO_TRACE is not set
885# CONFIG_DYNAMIC_DEBUG is not set
857CONFIG_SAMPLES=y 886CONFIG_SAMPLES=y
858# CONFIG_SAMPLE_KOBJECT is not set 887# CONFIG_SAMPLE_KOBJECT is not set
859# CONFIG_SAMPLE_KPROBES is not set 888# CONFIG_SAMPLE_KPROBES is not set
860# CONFIG_DEBUG_PAGEALLOC is not set
861 889
862# 890#
863# Security options 891# Security options
@@ -882,10 +910,12 @@ CONFIG_CRYPTO_HASH=m
882CONFIG_CRYPTO_HASH2=y 910CONFIG_CRYPTO_HASH2=y
883CONFIG_CRYPTO_RNG=m 911CONFIG_CRYPTO_RNG=m
884CONFIG_CRYPTO_RNG2=y 912CONFIG_CRYPTO_RNG2=y
913CONFIG_CRYPTO_PCOMP=y
885CONFIG_CRYPTO_MANAGER=y 914CONFIG_CRYPTO_MANAGER=y
886CONFIG_CRYPTO_MANAGER2=y 915CONFIG_CRYPTO_MANAGER2=y
887CONFIG_CRYPTO_GF128MUL=m 916CONFIG_CRYPTO_GF128MUL=m
888# CONFIG_CRYPTO_NULL is not set 917# CONFIG_CRYPTO_NULL is not set
918CONFIG_CRYPTO_WORKQUEUE=y
889# CONFIG_CRYPTO_CRYPTD is not set 919# CONFIG_CRYPTO_CRYPTD is not set
890CONFIG_CRYPTO_AUTHENC=m 920CONFIG_CRYPTO_AUTHENC=m
891# CONFIG_CRYPTO_TEST is not set 921# CONFIG_CRYPTO_TEST is not set
@@ -954,6 +984,7 @@ CONFIG_CRYPTO_SEED=m
954# Compression 984# Compression
955# 985#
956# CONFIG_CRYPTO_DEFLATE is not set 986# CONFIG_CRYPTO_DEFLATE is not set
987CONFIG_CRYPTO_ZLIB=m
957CONFIG_CRYPTO_LZO=m 988CONFIG_CRYPTO_LZO=m
958 989
959# 990#
@@ -969,6 +1000,7 @@ CONFIG_CRYPTO_SHA512_S390=m
969# CONFIG_CRYPTO_DES_S390 is not set 1000# CONFIG_CRYPTO_DES_S390 is not set
970# CONFIG_CRYPTO_AES_S390 is not set 1001# CONFIG_CRYPTO_AES_S390 is not set
971CONFIG_S390_PRNG=m 1002CONFIG_S390_PRNG=m
1003# CONFIG_BINARY_PRINTF is not set
972 1004
973# 1005#
974# Library routines 1006# Library routines
@@ -982,9 +1014,14 @@ CONFIG_CRC_T10DIF=y
982CONFIG_CRC32=m 1014CONFIG_CRC32=m
983CONFIG_CRC7=m 1015CONFIG_CRC7=m
984CONFIG_LIBCRC32C=m 1016CONFIG_LIBCRC32C=m
1017CONFIG_ZLIB_INFLATE=y
1018CONFIG_ZLIB_DEFLATE=m
985CONFIG_LZO_COMPRESS=m 1019CONFIG_LZO_COMPRESS=m
986CONFIG_LZO_DECOMPRESS=m 1020CONFIG_LZO_DECOMPRESS=m
987CONFIG_PLIST=y 1021CONFIG_DECOMPRESS_GZIP=y
1022CONFIG_DECOMPRESS_BZIP2=y
1023CONFIG_DECOMPRESS_LZMA=y
1024CONFIG_NLATTR=y
988CONFIG_HAVE_KVM=y 1025CONFIG_HAVE_KVM=y
989CONFIG_VIRTUALIZATION=y 1026CONFIG_VIRTUALIZATION=y
990CONFIG_KVM=m 1027CONFIG_KVM=m
diff --git a/arch/s390/include/asm/cputime.h b/arch/s390/include/asm/cputime.h
index 95b0f7db3c69..941384fbd39c 100644
--- a/arch/s390/include/asm/cputime.h
+++ b/arch/s390/include/asm/cputime.h
@@ -174,4 +174,8 @@ cputime64_to_clock_t(cputime64_t cputime)
174 return __div(cputime, 4096000000ULL / USER_HZ); 174 return __div(cputime, 4096000000ULL / USER_HZ);
175} 175}
176 176
177cputime64_t s390_get_idle_time(int cpu);
178
179#define arch_idle_time(cpu) s390_get_idle_time(cpu)
180
177#endif /* _S390_CPUTIME_H */ 181#endif /* _S390_CPUTIME_H */
diff --git a/arch/s390/kernel/head.S b/arch/s390/kernel/head.S
index bba14494ee00..22596d70fc2e 100644
--- a/arch/s390/kernel/head.S
+++ b/arch/s390/kernel/head.S
@@ -23,6 +23,7 @@
23 * 23 *
24 */ 24 */
25 25
26#include <linux/init.h>
26#include <asm/setup.h> 27#include <asm/setup.h>
27#include <asm/lowcore.h> 28#include <asm/lowcore.h>
28#include <asm/asm-offsets.h> 29#include <asm/asm-offsets.h>
@@ -35,7 +36,7 @@
35#define ARCH_OFFSET 0 36#define ARCH_OFFSET 0
36#endif 37#endif
37 38
38.section ".text.head","ax" 39__HEAD
39#ifndef CONFIG_IPL 40#ifndef CONFIG_IPL
40 .org 0 41 .org 0
41 .long 0x00080000,0x80000000+startup # Just a restart PSW 42 .long 0x00080000,0x80000000+startup # Just a restart PSW
diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c
index 6f3711a0eaaa..b8bf4b140065 100644
--- a/arch/s390/kernel/ipl.c
+++ b/arch/s390/kernel/ipl.c
@@ -23,6 +23,7 @@
23#include <asm/ebcdic.h> 23#include <asm/ebcdic.h>
24#include <asm/reset.h> 24#include <asm/reset.h>
25#include <asm/sclp.h> 25#include <asm/sclp.h>
26#include <asm/sigp.h>
26#include <asm/checksum.h> 27#include <asm/checksum.h>
27 28
28#define IPL_PARM_BLOCK_VERSION 0 29#define IPL_PARM_BLOCK_VERSION 0
diff --git a/arch/s390/kernel/vmlinux.lds.S b/arch/s390/kernel/vmlinux.lds.S
index 7a2063eb88f0..89399b8756c2 100644
--- a/arch/s390/kernel/vmlinux.lds.S
+++ b/arch/s390/kernel/vmlinux.lds.S
@@ -29,8 +29,8 @@ SECTIONS
29 . = 0x00000000; 29 . = 0x00000000;
30 .text : { 30 .text : {
31 _text = .; /* Text and read-only data */ 31 _text = .; /* Text and read-only data */
32 *(.text.head) 32 HEAD_TEXT
33 TEXT_TEXT 33 TEXT_TEXT
34 SCHED_TEXT 34 SCHED_TEXT
35 LOCK_TEXT 35 LOCK_TEXT
36 KPROBES_TEXT 36 KPROBES_TEXT
diff --git a/arch/s390/kernel/vtime.c b/arch/s390/kernel/vtime.c
index 38ea92ff04f9..c87f59bd8246 100644
--- a/arch/s390/kernel/vtime.c
+++ b/arch/s390/kernel/vtime.c
@@ -240,6 +240,22 @@ void vtime_stop_cpu(void)
240 } 240 }
241} 241}
242 242
243cputime64_t s390_get_idle_time(int cpu)
244{
245 struct s390_idle_data *idle;
246 unsigned long long now, idle_time, idle_enter;
247
248 idle = &per_cpu(s390_idle, cpu);
249 spin_lock(&idle->lock);
250 now = get_clock();
251 idle_time = 0;
252 idle_enter = idle->idle_enter;
253 if (idle_enter != 0ULL && idle_enter < now)
254 idle_time = now - idle_enter;
255 spin_unlock(&idle->lock);
256 return idle_time;
257}
258
243/* 259/*
244 * Sorted add to a list. List is linear searched until first bigger 260 * Sorted add to a list. List is linear searched until first bigger
245 * element is found. 261 * element is found.
diff --git a/arch/sh/boards/mach-dreamcast/setup.c b/arch/sh/boards/mach-dreamcast/setup.c
index d1bee4884cd6..ebe99227d4e6 100644
--- a/arch/sh/boards/mach-dreamcast/setup.c
+++ b/arch/sh/boards/mach-dreamcast/setup.c
@@ -30,7 +30,6 @@
30 30
31extern struct irq_chip systemasic_int; 31extern struct irq_chip systemasic_int;
32extern void aica_time_init(void); 32extern void aica_time_init(void);
33extern int gapspci_init(void);
34extern int systemasic_irq_demux(int); 33extern int systemasic_irq_demux(int);
35 34
36static void __init dreamcast_setup(char **cmdline_p) 35static void __init dreamcast_setup(char **cmdline_p)
@@ -51,11 +50,6 @@ static void __init dreamcast_setup(char **cmdline_p)
51 handle_level_irq); 50 handle_level_irq);
52 51
53 board_time_init = aica_time_init; 52 board_time_init = aica_time_init;
54
55#ifdef CONFIG_PCI
56 if (gapspci_init() < 0)
57 printk(KERN_WARNING "GAPSPCI was not detected.\n");
58#endif
59} 53}
60 54
61static struct sh_machine_vector mv_dreamcast __initmv = { 55static struct sh_machine_vector mv_dreamcast __initmv = {
diff --git a/arch/sh/boards/mach-se/7751/Makefile b/arch/sh/boards/mach-se/7751/Makefile
index dbc29f3a9de5..e6f4341bfe6e 100644
--- a/arch/sh/boards/mach-se/7751/Makefile
+++ b/arch/sh/boards/mach-se/7751/Makefile
@@ -3,5 +3,3 @@
3# 3#
4 4
5obj-y := setup.o io.o irq.o 5obj-y := setup.o io.o irq.o
6
7obj-$(CONFIG_PCI) += pci.o
diff --git a/arch/sh/boards/mach-se/7751/io.c b/arch/sh/boards/mach-se/7751/io.c
index 6287ae570319..6e75bd4459e5 100644
--- a/arch/sh/boards/mach-se/7751/io.c
+++ b/arch/sh/boards/mach-se/7751/io.c
@@ -34,8 +34,6 @@ unsigned char sh7751se_inb(unsigned long port)
34{ 34{
35 if (PXSEG(port)) 35 if (PXSEG(port))
36 return *(volatile unsigned char *)port; 36 return *(volatile unsigned char *)port;
37 else if (is_pci_ioaddr(port))
38 return *(volatile unsigned char *)pci_ioaddr(port);
39 else 37 else
40 return (*port2adr(port)) & 0xff; 38 return (*port2adr(port)) & 0xff;
41} 39}
@@ -46,8 +44,6 @@ unsigned char sh7751se_inb_p(unsigned long port)
46 44
47 if (PXSEG(port)) 45 if (PXSEG(port))
48 v = *(volatile unsigned char *)port; 46 v = *(volatile unsigned char *)port;
49 else if (is_pci_ioaddr(port))
50 v = *(volatile unsigned char *)pci_ioaddr(port);
51 else 47 else
52 v = (*port2adr(port)) & 0xff; 48 v = (*port2adr(port)) & 0xff;
53 ctrl_delay(); 49 ctrl_delay();
@@ -58,8 +54,6 @@ unsigned short sh7751se_inw(unsigned long port)
58{ 54{
59 if (PXSEG(port)) 55 if (PXSEG(port))
60 return *(volatile unsigned short *)port; 56 return *(volatile unsigned short *)port;
61 else if (is_pci_ioaddr(port))
62 return *(volatile unsigned short *)pci_ioaddr(port);
63 else if (port >= 0x2000) 57 else if (port >= 0x2000)
64 return *port2adr(port); 58 return *port2adr(port);
65 else 59 else
@@ -71,8 +65,6 @@ unsigned int sh7751se_inl(unsigned long port)
71{ 65{
72 if (PXSEG(port)) 66 if (PXSEG(port))
73 return *(volatile unsigned long *)port; 67 return *(volatile unsigned long *)port;
74 else if (is_pci_ioaddr(port))
75 return *(volatile unsigned int *)pci_ioaddr(port);
76 else if (port >= 0x2000) 68 else if (port >= 0x2000)
77 return *port2adr(port); 69 return *port2adr(port);
78 else 70 else
@@ -85,8 +77,6 @@ void sh7751se_outb(unsigned char value, unsigned long port)
85 77
86 if (PXSEG(port)) 78 if (PXSEG(port))
87 *(volatile unsigned char *)port = value; 79 *(volatile unsigned char *)port = value;
88 else if (is_pci_ioaddr(port))
89 *((unsigned char*)pci_ioaddr(port)) = value;
90 else 80 else
91 *(port2adr(port)) = value; 81 *(port2adr(port)) = value;
92} 82}
@@ -95,8 +85,6 @@ void sh7751se_outb_p(unsigned char value, unsigned long port)
95{ 85{
96 if (PXSEG(port)) 86 if (PXSEG(port))
97 *(volatile unsigned char *)port = value; 87 *(volatile unsigned char *)port = value;
98 else if (is_pci_ioaddr(port))
99 *((unsigned char*)pci_ioaddr(port)) = value;
100 else 88 else
101 *(port2adr(port)) = value; 89 *(port2adr(port)) = value;
102 ctrl_delay(); 90 ctrl_delay();
@@ -106,8 +94,6 @@ void sh7751se_outw(unsigned short value, unsigned long port)
106{ 94{
107 if (PXSEG(port)) 95 if (PXSEG(port))
108 *(volatile unsigned short *)port = value; 96 *(volatile unsigned short *)port = value;
109 else if (is_pci_ioaddr(port))
110 *((unsigned short *)pci_ioaddr(port)) = value;
111 else if (port >= 0x2000) 97 else if (port >= 0x2000)
112 *port2adr(port) = value; 98 *port2adr(port) = value;
113 else 99 else
@@ -118,8 +104,6 @@ void sh7751se_outl(unsigned int value, unsigned long port)
118{ 104{
119 if (PXSEG(port)) 105 if (PXSEG(port))
120 *(volatile unsigned long *)port = value; 106 *(volatile unsigned long *)port = value;
121 else if (is_pci_ioaddr(port))
122 *((unsigned long*)pci_ioaddr(port)) = value;
123 else 107 else
124 maybebadio(port); 108 maybebadio(port);
125} 109}
diff --git a/arch/sh/boards/mach-se/7751/pci.c b/arch/sh/boards/mach-se/7751/pci.c
deleted file mode 100644
index 203b2923fe7f..000000000000
--- a/arch/sh/boards/mach-se/7751/pci.c
+++ /dev/null
@@ -1,147 +0,0 @@
1/*
2 * linux/arch/sh/boards/se/7751/pci.c
3 *
4 * Author: Ian DaSilva (idasilva@mvista.com)
5 *
6 * Highly leveraged from pci-bigsur.c, written by Dustin McIntire.
7 *
8 * May be copied or modified under the terms of the GNU General Public
9 * License. See linux/COPYING for more information.
10 *
11 * PCI initialization for the Hitachi SH7751 Solution Engine board (MS7751SE01)
12 */
13
14#include <linux/kernel.h>
15#include <linux/types.h>
16#include <linux/init.h>
17#include <linux/delay.h>
18#include <linux/pci.h>
19
20#include <asm/io.h>
21#include "../../../drivers/pci/pci-sh7751.h"
22
23#define PCIMCR_MRSET_OFF 0xBFFFFFFF
24#define PCIMCR_RFSH_OFF 0xFFFFFFFB
25
26/*
27 * Only long word accesses of the PCIC's internal local registers and the
28 * configuration registers from the CPU is supported.
29 */
30#define PCIC_WRITE(x,v) writel((v), PCI_REG(x))
31#define PCIC_READ(x) readl(PCI_REG(x))
32
33/*
34 * Description: This function sets up and initializes the pcic, sets
35 * up the BARS, maps the DRAM into the address space etc, etc.
36 */
37int __init pcibios_init_platform(void)
38{
39 unsigned long bcr1, wcr1, wcr2, wcr3, mcr;
40 unsigned short bcr2;
41
42 /*
43 * Initialize the slave bus controller on the pcic. The values used
44 * here should not be hardcoded, but they should be taken from the bsc
45 * on the processor, to make this function as generic as possible.
46 * (i.e. Another sbc may usr different SDRAM timing settings -- in order
47 * for the pcic to work, its settings need to be exactly the same.)
48 */
49 bcr1 = (*(volatile unsigned long*)(SH7751_BCR1));
50 bcr2 = (*(volatile unsigned short*)(SH7751_BCR2));
51 wcr1 = (*(volatile unsigned long*)(SH7751_WCR1));
52 wcr2 = (*(volatile unsigned long*)(SH7751_WCR2));
53 wcr3 = (*(volatile unsigned long*)(SH7751_WCR3));
54 mcr = (*(volatile unsigned long*)(SH7751_MCR));
55
56 bcr1 = bcr1 | 0x00080000; /* Enable Bit 19, BREQEN */
57 (*(volatile unsigned long*)(SH7751_BCR1)) = bcr1;
58
59 bcr1 = bcr1 | 0x40080000; /* Enable Bit 19 BREQEN, set PCIC to slave */
60 PCIC_WRITE(SH7751_PCIBCR1, bcr1); /* PCIC BCR1 */
61 PCIC_WRITE(SH7751_PCIBCR2, bcr2); /* PCIC BCR2 */
62 PCIC_WRITE(SH7751_PCIWCR1, wcr1); /* PCIC WCR1 */
63 PCIC_WRITE(SH7751_PCIWCR2, wcr2); /* PCIC WCR2 */
64 PCIC_WRITE(SH7751_PCIWCR3, wcr3); /* PCIC WCR3 */
65 mcr = (mcr & PCIMCR_MRSET_OFF) & PCIMCR_RFSH_OFF;
66 PCIC_WRITE(SH7751_PCIMCR, mcr); /* PCIC MCR */
67
68
69 /* Enable all interrupts, so we know what to fix */
70 PCIC_WRITE(SH7751_PCIINTM, 0x0000c3ff);
71 PCIC_WRITE(SH7751_PCIAINTM, 0x0000380f);
72
73 /* Set up standard PCI config registers */
74 PCIC_WRITE(SH7751_PCICONF1, 0xF39000C7); /* Bus Master, Mem & I/O access */
75 PCIC_WRITE(SH7751_PCICONF2, 0x00000000); /* PCI Class code & Revision ID */
76 PCIC_WRITE(SH7751_PCICONF4, 0xab000001); /* PCI I/O address (local regs) */
77 PCIC_WRITE(SH7751_PCICONF5, 0x0c000000); /* PCI MEM address (local RAM) */
78 PCIC_WRITE(SH7751_PCICONF6, 0xd0000000); /* PCI MEM address (unused) */
79 PCIC_WRITE(SH7751_PCICONF11, 0x35051054); /* PCI Subsystem ID & Vendor ID */
80 PCIC_WRITE(SH7751_PCILSR0, 0x03f00000); /* MEM (full 64M exposed) */
81 PCIC_WRITE(SH7751_PCILSR1, 0x00000000); /* MEM (unused) */
82 PCIC_WRITE(SH7751_PCILAR0, 0x0c000000); /* MEM (direct map from PCI) */
83 PCIC_WRITE(SH7751_PCILAR1, 0x00000000); /* MEM (unused) */
84
85 /* Now turn it on... */
86 PCIC_WRITE(SH7751_PCICR, 0xa5000001);
87
88 /*
89 * Set PCIMBR and PCIIOBR here, assuming a single window
90 * (16M MEM, 256K IO) is enough. If a larger space is
91 * needed, the readx/writex and inx/outx functions will
92 * have to do more (e.g. setting registers for each call).
93 */
94
95 /*
96 * Set the MBR so PCI address is one-to-one with window,
97 * meaning all calls go straight through... use BUG_ON to
98 * catch erroneous assumption.
99 */
100 BUG_ON(PCIBIOS_MIN_MEM != SH7751_PCI_MEMORY_BASE);
101
102 PCIC_WRITE(SH7751_PCIMBR, PCIBIOS_MIN_MEM);
103
104 /* Set IOBR for window containing area specified in pci.h */
105 PCIC_WRITE(SH7751_PCIIOBR, (PCIBIOS_MIN_IO & SH7751_PCIIOBR_MASK));
106
107 /* All done, may as well say so... */
108 printk("SH7751 PCI: Finished initialization of the PCI controller\n");
109
110 return 1;
111}
112
113int __init pcibios_map_platform_irq(u8 slot, u8 pin)
114{
115 switch (slot) {
116 case 0: return 13;
117 case 1: return 13; /* AMD Ethernet controller */
118 case 2: return -1;
119 case 3: return -1;
120 case 4: return -1;
121 default:
122 printk("PCI: Bad IRQ mapping request for slot %d\n", slot);
123 return -1;
124 }
125}
126
127static struct resource sh7751_io_resource = {
128 .name = "SH7751 IO",
129 .start = SH7751_PCI_IO_BASE,
130 .end = SH7751_PCI_IO_BASE + SH7751_PCI_IO_SIZE - 1,
131 .flags = IORESOURCE_IO
132};
133
134static struct resource sh7751_mem_resource = {
135 .name = "SH7751 mem",
136 .start = SH7751_PCI_MEMORY_BASE,
137 .end = SH7751_PCI_MEMORY_BASE + SH7751_PCI_MEM_SIZE - 1,
138 .flags = IORESOURCE_MEM
139};
140
141extern struct pci_ops sh7751_pci_ops;
142
143struct pci_channel board_pci_channels[] = {
144 { &sh7751_pci_ops, &sh7751_io_resource, &sh7751_mem_resource, 0, 0xff },
145 { NULL, NULL, NULL, 0, 0 },
146};
147
diff --git a/arch/sh/boards/mach-se/7780/irq.c b/arch/sh/boards/mach-se/7780/irq.c
index 66ad292c9fc3..b8d43b638fcf 100644
--- a/arch/sh/boards/mach-se/7780/irq.c
+++ b/arch/sh/boards/mach-se/7780/irq.c
@@ -12,10 +12,13 @@
12#include <linux/init.h> 12#include <linux/init.h>
13#include <linux/irq.h> 13#include <linux/irq.h>
14#include <linux/interrupt.h> 14#include <linux/interrupt.h>
15#include <asm/irq.h> 15#include <linux/irq.h>
16#include <asm/io.h> 16#include <linux/io.h>
17#include <mach-se/mach/se7780.h> 17#include <mach-se/mach/se7780.h>
18 18
19#define INTC_BASE 0xffd00000
20#define INTC_ICR1 (INTC_BASE+0x1c)
21
19/* 22/*
20 * Initialize IRQ setting 23 * Initialize IRQ setting
21 */ 24 */
@@ -43,4 +46,24 @@ void __init init_se7780_IRQ(void)
43 ctrl_outw((IRQPIN_PCCPW << IRQPOS_PCCPW), FPGA_INTSEL3); 46 ctrl_outw((IRQPIN_PCCPW << IRQPOS_PCCPW), FPGA_INTSEL3);
44 47
45 plat_irq_setup_pins(IRQ_MODE_IRQ); /* install handlers for IRQ0-7 */ 48 plat_irq_setup_pins(IRQ_MODE_IRQ); /* install handlers for IRQ0-7 */
49
50 /* ICR1: detect low level(for 2ndcut) */
51 ctrl_outl(0xAAAA0000, INTC_ICR1);
52
53 /*
54 * FPGA PCISEL register initialize
55 *
56 * CPU || SLOT1 | SLOT2 | S-ATA | USB
57 * -------------------------------------
58 * INTA || INTA | INTD | -- | INTB
59 * -------------------------------------
60 * INTB || INTB | INTA | -- | INTC
61 * -------------------------------------
62 * INTC || INTC | INTB | INTA | --
63 * -------------------------------------
64 * INTD || INTD | INTC | -- | INTA
65 * -------------------------------------
66 */
67 ctrl_outw(0x0013, FPGA_PCI_INTSEL1);
68 ctrl_outw(0xE402, FPGA_PCI_INTSEL2);
46} 69}
diff --git a/arch/sh/boards/mach-snapgear/io.c b/arch/sh/boards/mach-snapgear/io.c
index 0f4824264557..476650e42dbc 100644
--- a/arch/sh/boards/mach-snapgear/io.c
+++ b/arch/sh/boards/mach-snapgear/io.c
@@ -36,8 +36,6 @@ unsigned char snapgear_inb(unsigned long port)
36{ 36{
37 if (PXSEG(port)) 37 if (PXSEG(port))
38 return *(volatile unsigned char *)port; 38 return *(volatile unsigned char *)port;
39 else if (is_pci_ioaddr(port))
40 return *(volatile unsigned char *)pci_ioaddr(port);
41 else 39 else
42 return (*port2adr(port)) & 0xff; 40 return (*port2adr(port)) & 0xff;
43} 41}
@@ -48,8 +46,6 @@ unsigned char snapgear_inb_p(unsigned long port)
48 46
49 if (PXSEG(port)) 47 if (PXSEG(port))
50 v = *(volatile unsigned char *)port; 48 v = *(volatile unsigned char *)port;
51 else if (is_pci_ioaddr(port))
52 v = *(volatile unsigned char *)pci_ioaddr(port);
53 else 49 else
54 v = (*port2adr(port))&0xff; 50 v = (*port2adr(port))&0xff;
55 ctrl_delay(); 51 ctrl_delay();
@@ -60,8 +56,6 @@ unsigned short snapgear_inw(unsigned long port)
60{ 56{
61 if (PXSEG(port)) 57 if (PXSEG(port))
62 return *(volatile unsigned short *)port; 58 return *(volatile unsigned short *)port;
63 else if (is_pci_ioaddr(port))
64 return *(volatile unsigned short *)pci_ioaddr(port);
65 else if (port >= 0x2000) 59 else if (port >= 0x2000)
66 return *port2adr(port); 60 return *port2adr(port);
67 else 61 else
@@ -73,8 +67,6 @@ unsigned int snapgear_inl(unsigned long port)
73{ 67{
74 if (PXSEG(port)) 68 if (PXSEG(port))
75 return *(volatile unsigned long *)port; 69 return *(volatile unsigned long *)port;
76 else if (is_pci_ioaddr(port))
77 return *(volatile unsigned int *)pci_ioaddr(port);
78 else if (port >= 0x2000) 70 else if (port >= 0x2000)
79 return *port2adr(port); 71 return *port2adr(port);
80 else 72 else
@@ -87,8 +79,6 @@ void snapgear_outb(unsigned char value, unsigned long port)
87 79
88 if (PXSEG(port)) 80 if (PXSEG(port))
89 *(volatile unsigned char *)port = value; 81 *(volatile unsigned char *)port = value;
90 else if (is_pci_ioaddr(port))
91 *((unsigned char*)pci_ioaddr(port)) = value;
92 else 82 else
93 *(port2adr(port)) = value; 83 *(port2adr(port)) = value;
94} 84}
@@ -97,8 +87,6 @@ void snapgear_outb_p(unsigned char value, unsigned long port)
97{ 87{
98 if (PXSEG(port)) 88 if (PXSEG(port))
99 *(volatile unsigned char *)port = value; 89 *(volatile unsigned char *)port = value;
100 else if (is_pci_ioaddr(port))
101 *((unsigned char*)pci_ioaddr(port)) = value;
102 else 90 else
103 *(port2adr(port)) = value; 91 *(port2adr(port)) = value;
104 ctrl_delay(); 92 ctrl_delay();
@@ -108,8 +96,6 @@ void snapgear_outw(unsigned short value, unsigned long port)
108{ 96{
109 if (PXSEG(port)) 97 if (PXSEG(port))
110 *(volatile unsigned short *)port = value; 98 *(volatile unsigned short *)port = value;
111 else if (is_pci_ioaddr(port))
112 *((unsigned short *)pci_ioaddr(port)) = value;
113 else if (port >= 0x2000) 99 else if (port >= 0x2000)
114 *port2adr(port) = value; 100 *port2adr(port) = value;
115 else 101 else
@@ -120,8 +106,6 @@ void snapgear_outl(unsigned int value, unsigned long port)
120{ 106{
121 if (PXSEG(port)) 107 if (PXSEG(port))
122 *(volatile unsigned long *)port = value; 108 *(volatile unsigned long *)port = value;
123 else if (is_pci_ioaddr(port))
124 *((unsigned long*)pci_ioaddr(port)) = value;
125 else 109 else
126 maybebadio(port); 110 maybebadio(port);
127} 111}
diff --git a/arch/sh/boards/mach-systemh/io.c b/arch/sh/boards/mach-systemh/io.c
index dec3db0ee933..15577ff1f715 100644
--- a/arch/sh/boards/mach-systemh/io.c
+++ b/arch/sh/boards/mach-systemh/io.c
@@ -35,8 +35,6 @@ unsigned char sh7751systemh_inb(unsigned long port)
35{ 35{
36 if (PXSEG(port)) 36 if (PXSEG(port))
37 return *(volatile unsigned char *)port; 37 return *(volatile unsigned char *)port;
38 else if (is_pci_ioaddr(port))
39 return *(volatile unsigned char *)pci_ioaddr(port);
40 else if (port <= 0x3F1) 38 else if (port <= 0x3F1)
41 return *(volatile unsigned char *)ETHER_IOMAP(port); 39 return *(volatile unsigned char *)ETHER_IOMAP(port);
42 else 40 else
@@ -49,8 +47,6 @@ unsigned char sh7751systemh_inb_p(unsigned long port)
49 47
50 if (PXSEG(port)) 48 if (PXSEG(port))
51 v = *(volatile unsigned char *)port; 49 v = *(volatile unsigned char *)port;
52 else if (is_pci_ioaddr(port))
53 v = *(volatile unsigned char *)pci_ioaddr(port);
54 else if (port <= 0x3F1) 50 else if (port <= 0x3F1)
55 v = *(volatile unsigned char *)ETHER_IOMAP(port); 51 v = *(volatile unsigned char *)ETHER_IOMAP(port);
56 else 52 else
@@ -63,8 +59,6 @@ unsigned short sh7751systemh_inw(unsigned long port)
63{ 59{
64 if (PXSEG(port)) 60 if (PXSEG(port))
65 return *(volatile unsigned short *)port; 61 return *(volatile unsigned short *)port;
66 else if (is_pci_ioaddr(port))
67 return *(volatile unsigned short *)pci_ioaddr(port);
68 else if (port >= 0x2000) 62 else if (port >= 0x2000)
69 return *port2adr(port); 63 return *port2adr(port);
70 else if (port <= 0x3F1) 64 else if (port <= 0x3F1)
@@ -78,8 +72,6 @@ unsigned int sh7751systemh_inl(unsigned long port)
78{ 72{
79 if (PXSEG(port)) 73 if (PXSEG(port))
80 return *(volatile unsigned long *)port; 74 return *(volatile unsigned long *)port;
81 else if (is_pci_ioaddr(port))
82 return *(volatile unsigned int *)pci_ioaddr(port);
83 else if (port >= 0x2000) 75 else if (port >= 0x2000)
84 return *port2adr(port); 76 return *port2adr(port);
85 else if (port <= 0x3F1) 77 else if (port <= 0x3F1)
@@ -94,8 +86,6 @@ void sh7751systemh_outb(unsigned char value, unsigned long port)
94 86
95 if (PXSEG(port)) 87 if (PXSEG(port))
96 *(volatile unsigned char *)port = value; 88 *(volatile unsigned char *)port = value;
97 else if (is_pci_ioaddr(port))
98 *((unsigned char*)pci_ioaddr(port)) = value;
99 else if (port <= 0x3F1) 89 else if (port <= 0x3F1)
100 *(volatile unsigned char *)ETHER_IOMAP(port) = value; 90 *(volatile unsigned char *)ETHER_IOMAP(port) = value;
101 else 91 else
@@ -106,8 +96,6 @@ void sh7751systemh_outb_p(unsigned char value, unsigned long port)
106{ 96{
107 if (PXSEG(port)) 97 if (PXSEG(port))
108 *(volatile unsigned char *)port = value; 98 *(volatile unsigned char *)port = value;
109 else if (is_pci_ioaddr(port))
110 *((unsigned char*)pci_ioaddr(port)) = value;
111 else if (port <= 0x3F1) 99 else if (port <= 0x3F1)
112 *(volatile unsigned char *)ETHER_IOMAP(port) = value; 100 *(volatile unsigned char *)ETHER_IOMAP(port) = value;
113 else 101 else
@@ -119,8 +107,6 @@ void sh7751systemh_outw(unsigned short value, unsigned long port)
119{ 107{
120 if (PXSEG(port)) 108 if (PXSEG(port))
121 *(volatile unsigned short *)port = value; 109 *(volatile unsigned short *)port = value;
122 else if (is_pci_ioaddr(port))
123 *((unsigned short *)pci_ioaddr(port)) = value;
124 else if (port >= 0x2000) 110 else if (port >= 0x2000)
125 *port2adr(port) = value; 111 *port2adr(port) = value;
126 else if (port <= 0x3F1) 112 else if (port <= 0x3F1)
@@ -133,8 +119,6 @@ void sh7751systemh_outl(unsigned int value, unsigned long port)
133{ 119{
134 if (PXSEG(port)) 120 if (PXSEG(port))
135 *(volatile unsigned long *)port = value; 121 *(volatile unsigned long *)port = value;
136 else if (is_pci_ioaddr(port))
137 *((unsigned long*)pci_ioaddr(port)) = value;
138 else 122 else
139 maybebadio(port); 123 maybebadio(port);
140} 124}
diff --git a/arch/sh/boards/mach-titan/io.c b/arch/sh/boards/mach-titan/io.c
index 4badad4c6f30..0130e9826aca 100644
--- a/arch/sh/boards/mach-titan/io.c
+++ b/arch/sh/boards/mach-titan/io.c
@@ -17,8 +17,6 @@ u8 titan_inb(unsigned long port)
17{ 17{
18 if (PXSEG(port)) 18 if (PXSEG(port))
19 return ctrl_inb(port); 19 return ctrl_inb(port);
20 else if (is_pci_ioaddr(port))
21 return ctrl_inb(pci_ioaddr(port));
22 return ctrl_inw(port2adr(port)) & 0xff; 20 return ctrl_inw(port2adr(port)) & 0xff;
23} 21}
24 22
@@ -28,8 +26,6 @@ u8 titan_inb_p(unsigned long port)
28 26
29 if (PXSEG(port)) 27 if (PXSEG(port))
30 v = ctrl_inb(port); 28 v = ctrl_inb(port);
31 else if (is_pci_ioaddr(port))
32 v = ctrl_inb(pci_ioaddr(port));
33 else 29 else
34 v = ctrl_inw(port2adr(port)) & 0xff; 30 v = ctrl_inw(port2adr(port)) & 0xff;
35 ctrl_delay(); 31 ctrl_delay();
@@ -40,8 +36,6 @@ u16 titan_inw(unsigned long port)
40{ 36{
41 if (PXSEG(port)) 37 if (PXSEG(port))
42 return ctrl_inw(port); 38 return ctrl_inw(port);
43 else if (is_pci_ioaddr(port))
44 return ctrl_inw(pci_ioaddr(port));
45 else if (port >= 0x2000) 39 else if (port >= 0x2000)
46 return ctrl_inw(port2adr(port)); 40 return ctrl_inw(port2adr(port));
47 else 41 else
@@ -53,8 +47,6 @@ u32 titan_inl(unsigned long port)
53{ 47{
54 if (PXSEG(port)) 48 if (PXSEG(port))
55 return ctrl_inl(port); 49 return ctrl_inl(port);
56 else if (is_pci_ioaddr(port))
57 return ctrl_inl(pci_ioaddr(port));
58 else if (port >= 0x2000) 50 else if (port >= 0x2000)
59 return ctrl_inw(port2adr(port)); 51 return ctrl_inw(port2adr(port));
60 else 52 else
@@ -66,8 +58,6 @@ void titan_outb(u8 value, unsigned long port)
66{ 58{
67 if (PXSEG(port)) 59 if (PXSEG(port))
68 ctrl_outb(value, port); 60 ctrl_outb(value, port);
69 else if (is_pci_ioaddr(port))
70 ctrl_outb(value, pci_ioaddr(port));
71 else 61 else
72 ctrl_outw(value, port2adr(port)); 62 ctrl_outw(value, port2adr(port));
73} 63}
@@ -76,8 +66,6 @@ void titan_outb_p(u8 value, unsigned long port)
76{ 66{
77 if (PXSEG(port)) 67 if (PXSEG(port))
78 ctrl_outb(value, port); 68 ctrl_outb(value, port);
79 else if (is_pci_ioaddr(port))
80 ctrl_outb(value, pci_ioaddr(port));
81 else 69 else
82 ctrl_outw(value, port2adr(port)); 70 ctrl_outw(value, port2adr(port));
83 ctrl_delay(); 71 ctrl_delay();
@@ -87,8 +75,6 @@ void titan_outw(u16 value, unsigned long port)
87{ 75{
88 if (PXSEG(port)) 76 if (PXSEG(port))
89 ctrl_outw(value, port); 77 ctrl_outw(value, port);
90 else if (is_pci_ioaddr(port))
91 ctrl_outw(value, pci_ioaddr(port));
92 else if (port >= 0x2000) 78 else if (port >= 0x2000)
93 ctrl_outw(value, port2adr(port)); 79 ctrl_outw(value, port2adr(port));
94 else 80 else
@@ -99,8 +85,6 @@ void titan_outl(u32 value, unsigned long port)
99{ 85{
100 if (PXSEG(port)) 86 if (PXSEG(port))
101 ctrl_outl(value, port); 87 ctrl_outl(value, port);
102 else if (is_pci_ioaddr(port))
103 ctrl_outl(value, pci_ioaddr(port));
104 else 88 else
105 maybebadio(port); 89 maybebadio(port);
106} 90}
@@ -117,10 +101,8 @@ void titan_outsl(unsigned long port, const void *src, unsigned long count)
117 101
118void __iomem *titan_ioport_map(unsigned long port, unsigned int size) 102void __iomem *titan_ioport_map(unsigned long port, unsigned int size)
119{ 103{
120 if (PXSEG(port) || is_pci_memaddr(port)) 104 if (PXSEG(port))
121 return (void __iomem *)port; 105 return (void __iomem *)port;
122 else if (is_pci_ioaddr(port))
123 return (void __iomem *)pci_ioaddr(port);
124 106
125 return (void __iomem *)port2adr(port); 107 return (void __iomem *)port2adr(port);
126} 108}
diff --git a/arch/sh/configs/sh7785lcr_defconfig b/arch/sh/configs/sh7785lcr_defconfig
index 8a42bbef1f50..e4fac2efc055 100644
--- a/arch/sh/configs/sh7785lcr_defconfig
+++ b/arch/sh/configs/sh7785lcr_defconfig
@@ -1,10 +1,11 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.29 3# Linux kernel version: 2.6.30-rc2
4# Thu Apr 2 19:15:58 2009 4# Wed Apr 22 19:17:56 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
8# CONFIG_SUPERH64 is not set
8CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig" 9CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig"
9CONFIG_RWSEM_GENERIC_SPINLOCK=y 10CONFIG_RWSEM_GENERIC_SPINLOCK=y
10CONFIG_GENERIC_BUG=y 11CONFIG_GENERIC_BUG=y
@@ -79,6 +80,7 @@ CONFIG_SYSCTL_SYSCALL=y
79CONFIG_KALLSYMS=y 80CONFIG_KALLSYMS=y
80# CONFIG_KALLSYMS_ALL is not set 81# CONFIG_KALLSYMS_ALL is not set
81# CONFIG_KALLSYMS_EXTRA_PASS is not set 82# CONFIG_KALLSYMS_EXTRA_PASS is not set
83# CONFIG_STRIP_ASM_SYMS is not set
82CONFIG_HOTPLUG=y 84CONFIG_HOTPLUG=y
83CONFIG_PRINTK=y 85CONFIG_PRINTK=y
84CONFIG_BUG=y 86CONFIG_BUG=y
@@ -98,6 +100,7 @@ CONFIG_SLAB=y
98# CONFIG_SLUB is not set 100# CONFIG_SLUB is not set
99# CONFIG_SLOB is not set 101# CONFIG_SLOB is not set
100CONFIG_PROFILING=y 102CONFIG_PROFILING=y
103# CONFIG_MARKERS is not set
101# CONFIG_OPROFILE is not set 104# CONFIG_OPROFILE is not set
102CONFIG_HAVE_OPROFILE=y 105CONFIG_HAVE_OPROFILE=y
103# CONFIG_KPROBES is not set 106# CONFIG_KPROBES is not set
@@ -106,6 +109,8 @@ CONFIG_HAVE_KPROBES=y
106CONFIG_HAVE_KRETPROBES=y 109CONFIG_HAVE_KRETPROBES=y
107CONFIG_HAVE_ARCH_TRACEHOOK=y 110CONFIG_HAVE_ARCH_TRACEHOOK=y
108CONFIG_HAVE_CLK=y 111CONFIG_HAVE_CLK=y
112CONFIG_HAVE_DMA_API_DEBUG=y
113# CONFIG_SLOW_WORK is not set
109CONFIG_HAVE_GENERIC_DMA_COHERENT=y 114CONFIG_HAVE_GENERIC_DMA_COHERENT=y
110CONFIG_SLABINFO=y 115CONFIG_SLABINFO=y
111CONFIG_RT_MUTEXES=y 116CONFIG_RT_MUTEXES=y
@@ -118,7 +123,6 @@ CONFIG_MODULE_UNLOAD=y
118# CONFIG_MODULE_SRCVERSION_ALL is not set 123# CONFIG_MODULE_SRCVERSION_ALL is not set
119CONFIG_BLOCK=y 124CONFIG_BLOCK=y
120# CONFIG_LBD is not set 125# CONFIG_LBD is not set
121# CONFIG_BLK_DEV_IO_TRACE is not set
122# CONFIG_BLK_DEV_BSG is not set 126# CONFIG_BLK_DEV_BSG is not set
123# CONFIG_BLK_DEV_INTEGRITY is not set 127# CONFIG_BLK_DEV_INTEGRITY is not set
124 128
@@ -166,6 +170,7 @@ CONFIG_CPU_SHX2=y
166# CONFIG_CPU_SUBTYPE_SH7760 is not set 170# CONFIG_CPU_SUBTYPE_SH7760 is not set
167# CONFIG_CPU_SUBTYPE_SH4_202 is not set 171# CONFIG_CPU_SUBTYPE_SH4_202 is not set
168# CONFIG_CPU_SUBTYPE_SH7723 is not set 172# CONFIG_CPU_SUBTYPE_SH7723 is not set
173# CONFIG_CPU_SUBTYPE_SH7724 is not set
169# CONFIG_CPU_SUBTYPE_SH7763 is not set 174# CONFIG_CPU_SUBTYPE_SH7763 is not set
170# CONFIG_CPU_SUBTYPE_SH7770 is not set 175# CONFIG_CPU_SUBTYPE_SH7770 is not set
171# CONFIG_CPU_SUBTYPE_SH7780 is not set 176# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -175,8 +180,6 @@ CONFIG_CPU_SUBTYPE_SH7785=y
175# CONFIG_CPU_SUBTYPE_SH7343 is not set 180# CONFIG_CPU_SUBTYPE_SH7343 is not set
176# CONFIG_CPU_SUBTYPE_SH7722 is not set 181# CONFIG_CPU_SUBTYPE_SH7722 is not set
177# CONFIG_CPU_SUBTYPE_SH7366 is not set 182# CONFIG_CPU_SUBTYPE_SH7366 is not set
178# CONFIG_CPU_SUBTYPE_SH5_101 is not set
179# CONFIG_CPU_SUBTYPE_SH5_103 is not set
180 183
181# 184#
182# Memory management options 185# Memory management options
@@ -186,38 +189,31 @@ CONFIG_MMU=y
186CONFIG_PAGE_OFFSET=0x80000000 189CONFIG_PAGE_OFFSET=0x80000000
187CONFIG_MEMORY_START=0x08000000 190CONFIG_MEMORY_START=0x08000000
188CONFIG_MEMORY_SIZE=0x08000000 191CONFIG_MEMORY_SIZE=0x08000000
189# CONFIG_29BIT is not set 192CONFIG_29BIT=y
190CONFIG_32BIT=y 193# CONFIG_PMB_ENABLE is not set
191CONFIG_PMB_ENABLE=y
192# CONFIG_PMB is not set
193CONFIG_PMB_FIXED=y
194# CONFIG_X2TLB is not set 194# CONFIG_X2TLB is not set
195CONFIG_VSYSCALL=y 195CONFIG_VSYSCALL=y
196# CONFIG_NUMA is not set 196# CONFIG_NUMA is not set
197CONFIG_ARCH_FLATMEM_ENABLE=y 197CONFIG_ARCH_FLATMEM_ENABLE=y
198CONFIG_ARCH_SPARSEMEM_ENABLE=y 198CONFIG_ARCH_SPARSEMEM_ENABLE=y
199CONFIG_ARCH_SPARSEMEM_DEFAULT=y 199CONFIG_ARCH_SPARSEMEM_DEFAULT=y
200CONFIG_MAX_ACTIVE_REGIONS=2 200CONFIG_MAX_ACTIVE_REGIONS=1
201CONFIG_ARCH_POPULATES_NODE_MAP=y 201CONFIG_ARCH_POPULATES_NODE_MAP=y
202CONFIG_ARCH_SELECT_MEMORY_MODEL=y 202CONFIG_ARCH_SELECT_MEMORY_MODEL=y
203CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
204CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
205CONFIG_PAGE_SIZE_4KB=y 203CONFIG_PAGE_SIZE_4KB=y
206# CONFIG_PAGE_SIZE_8KB is not set 204# CONFIG_PAGE_SIZE_8KB is not set
207# CONFIG_PAGE_SIZE_16KB is not set 205# CONFIG_PAGE_SIZE_16KB is not set
208# CONFIG_PAGE_SIZE_64KB is not set 206# CONFIG_PAGE_SIZE_64KB is not set
209CONFIG_ENTRY_OFFSET=0x00001000 207CONFIG_ENTRY_OFFSET=0x00001000
210CONFIG_SELECT_MEMORY_MODEL=y 208CONFIG_SELECT_MEMORY_MODEL=y
211# CONFIG_FLATMEM_MANUAL is not set 209CONFIG_FLATMEM_MANUAL=y
212# CONFIG_DISCONTIGMEM_MANUAL is not set 210# CONFIG_DISCONTIGMEM_MANUAL is not set
213CONFIG_SPARSEMEM_MANUAL=y 211# CONFIG_SPARSEMEM_MANUAL is not set
214CONFIG_SPARSEMEM=y 212CONFIG_FLATMEM=y
215CONFIG_HAVE_MEMORY_PRESENT=y 213CONFIG_FLAT_NODE_MEM_MAP=y
216CONFIG_SPARSEMEM_STATIC=y 214CONFIG_SPARSEMEM_STATIC=y
217# CONFIG_MEMORY_HOTPLUG is not set
218CONFIG_PAGEFLAGS_EXTENDED=y 215CONFIG_PAGEFLAGS_EXTENDED=y
219CONFIG_SPLIT_PTLOCK_CPUS=4 216CONFIG_SPLIT_PTLOCK_CPUS=4
220CONFIG_MIGRATION=y
221# CONFIG_PHYS_ADDR_T_64BIT is not set 217# CONFIG_PHYS_ADDR_T_64BIT is not set
222CONFIG_ZONE_DMA_FLAG=0 218CONFIG_ZONE_DMA_FLAG=0
223CONFIG_NR_QUICK=2 219CONFIG_NR_QUICK=2
@@ -249,6 +245,7 @@ CONFIG_CPU_HAS_FPU=y
249# 245#
250# CONFIG_SH_HIGHLANDER is not set 246# CONFIG_SH_HIGHLANDER is not set
251CONFIG_SH_SH7785LCR=y 247CONFIG_SH_SH7785LCR=y
248CONFIG_SH_SH7785LCR_29BIT_PHYSMAPS=y
252 249
253# 250#
254# Timer and clock configuration 251# Timer and clock configuration
@@ -672,6 +669,7 @@ CONFIG_NETDEV_1000=y
672# CONFIG_E1000E is not set 669# CONFIG_E1000E is not set
673# CONFIG_IP1000 is not set 670# CONFIG_IP1000 is not set
674# CONFIG_IGB is not set 671# CONFIG_IGB is not set
672# CONFIG_IGBVF is not set
675# CONFIG_NS83820 is not set 673# CONFIG_NS83820 is not set
676# CONFIG_HAMACHI is not set 674# CONFIG_HAMACHI is not set
677# CONFIG_YELLOWFIN is not set 675# CONFIG_YELLOWFIN is not set
@@ -1009,15 +1007,17 @@ CONFIG_USB_HID=y
1009# 1007#
1010# Special HID drivers 1008# Special HID drivers
1011# 1009#
1012CONFIG_HID_COMPAT=y
1013CONFIG_HID_A4TECH=y 1010CONFIG_HID_A4TECH=y
1014CONFIG_HID_APPLE=y 1011CONFIG_HID_APPLE=y
1015CONFIG_HID_BELKIN=y 1012CONFIG_HID_BELKIN=y
1016CONFIG_HID_CHERRY=y 1013CONFIG_HID_CHERRY=y
1017CONFIG_HID_CHICONY=y 1014CONFIG_HID_CHICONY=y
1018CONFIG_HID_CYPRESS=y 1015CONFIG_HID_CYPRESS=y
1016# CONFIG_DRAGONRISE_FF is not set
1019CONFIG_HID_EZKEY=y 1017CONFIG_HID_EZKEY=y
1018# CONFIG_HID_KYE is not set
1020CONFIG_HID_GYRATION=y 1019CONFIG_HID_GYRATION=y
1020# CONFIG_HID_KENSINGTON is not set
1021CONFIG_HID_LOGITECH=y 1021CONFIG_HID_LOGITECH=y
1022# CONFIG_LOGITECH_FF is not set 1022# CONFIG_LOGITECH_FF is not set
1023# CONFIG_LOGIRUMBLEPAD2_FF is not set 1023# CONFIG_LOGIRUMBLEPAD2_FF is not set
@@ -1218,6 +1218,7 @@ CONFIG_EXT2_FS=y
1218# CONFIG_EXT2_FS_XATTR is not set 1218# CONFIG_EXT2_FS_XATTR is not set
1219# CONFIG_EXT2_FS_XIP is not set 1219# CONFIG_EXT2_FS_XIP is not set
1220CONFIG_EXT3_FS=y 1220CONFIG_EXT3_FS=y
1221# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
1221CONFIG_EXT3_FS_XATTR=y 1222CONFIG_EXT3_FS_XATTR=y
1222# CONFIG_EXT3_FS_POSIX_ACL is not set 1223# CONFIG_EXT3_FS_POSIX_ACL is not set
1223# CONFIG_EXT3_FS_SECURITY is not set 1224# CONFIG_EXT3_FS_SECURITY is not set
@@ -1240,6 +1241,11 @@ CONFIG_INOTIFY_USER=y
1240# CONFIG_FUSE_FS is not set 1241# CONFIG_FUSE_FS is not set
1241 1242
1242# 1243#
1244# Caches
1245#
1246# CONFIG_FSCACHE is not set
1247
1248#
1243# CD-ROM/DVD Filesystems 1249# CD-ROM/DVD Filesystems
1244# 1250#
1245# CONFIG_ISO9660_FS is not set 1251# CONFIG_ISO9660_FS is not set
@@ -1289,6 +1295,7 @@ CONFIG_MINIX_FS=y
1289# CONFIG_ROMFS_FS is not set 1295# CONFIG_ROMFS_FS is not set
1290# CONFIG_SYSV_FS is not set 1296# CONFIG_SYSV_FS is not set
1291# CONFIG_UFS_FS is not set 1297# CONFIG_UFS_FS is not set
1298# CONFIG_NILFS2_FS is not set
1292CONFIG_NETWORK_FILESYSTEMS=y 1299CONFIG_NETWORK_FILESYSTEMS=y
1293CONFIG_NFS_FS=y 1300CONFIG_NFS_FS=y
1294CONFIG_NFS_V3=y 1301CONFIG_NFS_V3=y
@@ -1377,6 +1384,9 @@ CONFIG_DEBUG_KERNEL=y
1377CONFIG_DETECT_SOFTLOCKUP=y 1384CONFIG_DETECT_SOFTLOCKUP=y
1378# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set 1385# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
1379CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 1386CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
1387CONFIG_DETECT_HUNG_TASK=y
1388# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
1389CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
1380CONFIG_SCHED_DEBUG=y 1390CONFIG_SCHED_DEBUG=y
1381# CONFIG_SCHEDSTATS is not set 1391# CONFIG_SCHEDSTATS is not set
1382# CONFIG_TIMER_STATS is not set 1392# CONFIG_TIMER_STATS is not set
@@ -1413,6 +1423,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y
1413CONFIG_HAVE_FUNCTION_TRACER=y 1423CONFIG_HAVE_FUNCTION_TRACER=y
1414CONFIG_HAVE_DYNAMIC_FTRACE=y 1424CONFIG_HAVE_DYNAMIC_FTRACE=y
1415CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1425CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1426CONFIG_TRACING_SUPPORT=y
1416 1427
1417# 1428#
1418# Tracers 1429# Tracers
@@ -1422,9 +1433,14 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1422# CONFIG_PREEMPT_TRACER is not set 1433# CONFIG_PREEMPT_TRACER is not set
1423# CONFIG_SCHED_TRACER is not set 1434# CONFIG_SCHED_TRACER is not set
1424# CONFIG_CONTEXT_SWITCH_TRACER is not set 1435# CONFIG_CONTEXT_SWITCH_TRACER is not set
1436# CONFIG_EVENT_TRACER is not set
1425# CONFIG_BOOT_TRACER is not set 1437# CONFIG_BOOT_TRACER is not set
1426# CONFIG_TRACE_BRANCH_PROFILING is not set 1438# CONFIG_TRACE_BRANCH_PROFILING is not set
1427# CONFIG_STACK_TRACER is not set 1439# CONFIG_STACK_TRACER is not set
1440# CONFIG_KMEMTRACE is not set
1441# CONFIG_WORKQUEUE_TRACER is not set
1442# CONFIG_BLK_DEV_IO_TRACE is not set
1443# CONFIG_DMA_API_DEBUG is not set
1428# CONFIG_SAMPLES is not set 1444# CONFIG_SAMPLES is not set
1429CONFIG_HAVE_ARCH_KGDB=y 1445CONFIG_HAVE_ARCH_KGDB=y
1430# CONFIG_KGDB is not set 1446# CONFIG_KGDB is not set
@@ -1542,6 +1558,7 @@ CONFIG_CRYPTO_DES=y
1542# 1558#
1543# CONFIG_CRYPTO_ANSI_CPRNG is not set 1559# CONFIG_CRYPTO_ANSI_CPRNG is not set
1544# CONFIG_CRYPTO_HW is not set 1560# CONFIG_CRYPTO_HW is not set
1561# CONFIG_BINARY_PRINTF is not set
1545 1562
1546# 1563#
1547# Library routines 1564# Library routines
diff --git a/arch/sh/drivers/pci/Kconfig b/arch/sh/drivers/pci/Kconfig
index 7e816ededed7..e8db585a6638 100644
--- a/arch/sh/drivers/pci/Kconfig
+++ b/arch/sh/drivers/pci/Kconfig
@@ -17,21 +17,3 @@ config SH_PCIDMA_NONCOHERENT
17 code will not have to flush the CPU's caches. If you have a PCI host 17 code will not have to flush the CPU's caches. If you have a PCI host
18 bridge integrated with your SH CPU, refer carefully to the chip specs 18 bridge integrated with your SH CPU, refer carefully to the chip specs
19 to see if you can say 'N' here. Otherwise, leave it as 'Y'. 19 to see if you can say 'N' here. Otherwise, leave it as 'Y'.
20
21# This is also board-specific
22config PCI_AUTO
23 bool
24 depends on PCI
25 default y
26
27config PCI_AUTO_UPDATE_RESOURCES
28 bool
29 depends on PCI_AUTO
30 default y if !SH_DREAMCAST
31 help
32 Selecting this option will cause the PCI auto code to leave your
33 BAR values alone. Otherwise they will be updated automatically. If
34 for some reason, you have a board that simply refuses to work
35 with its resources updated beyond what they are when the device
36 is powered up, set this to N. Everyone else will want this as Y.
37
diff --git a/arch/sh/drivers/pci/Makefile b/arch/sh/drivers/pci/Makefile
index 847e90894d1b..d2ffc477549a 100644
--- a/arch/sh/drivers/pci/Makefile
+++ b/arch/sh/drivers/pci/Makefile
@@ -1,9 +1,7 @@
1# 1#
2# Makefile for the PCI specific kernel interface routines under Linux. 2# Makefile for the PCI specific kernel interface routines under Linux.
3# 3#
4
5obj-y += pci.o 4obj-y += pci.o
6obj-$(CONFIG_PCI_AUTO) += pci-auto.o
7 5
8obj-$(CONFIG_CPU_SUBTYPE_SH7751) += pci-sh7751.o ops-sh4.o 6obj-$(CONFIG_CPU_SUBTYPE_SH7751) += pci-sh7751.o ops-sh4.o
9obj-$(CONFIG_CPU_SUBTYPE_SH7751R) += pci-sh7751.o ops-sh4.o 7obj-$(CONFIG_CPU_SUBTYPE_SH7751R) += pci-sh7751.o ops-sh4.o
@@ -12,15 +10,17 @@ obj-$(CONFIG_CPU_SUBTYPE_SH7780) += pci-sh7780.o ops-sh4.o
12obj-$(CONFIG_CPU_SUBTYPE_SH7785) += pci-sh7780.o ops-sh4.o 10obj-$(CONFIG_CPU_SUBTYPE_SH7785) += pci-sh7780.o ops-sh4.o
13obj-$(CONFIG_CPU_SH5) += pci-sh5.o ops-sh5.o 11obj-$(CONFIG_CPU_SH5) += pci-sh5.o ops-sh5.o
14 12
15obj-$(CONFIG_SH_DREAMCAST) += ops-dreamcast.o fixups-dreamcast.o 13obj-$(CONFIG_SH_DREAMCAST) += ops-dreamcast.o fixups-dreamcast.o \
16obj-$(CONFIG_SH_SECUREEDGE5410) += ops-snapgear.o 14 pci-dreamcast.o
17obj-$(CONFIG_SH_RTS7751R2D) += ops-rts7751r2d.o fixups-rts7751r2d.o 15obj-$(CONFIG_SH_SECUREEDGE5410) += fixups-snapgear.o
18obj-$(CONFIG_SH_SH03) += ops-sh03.o fixups-sh03.o 16obj-$(CONFIG_SH_7751_SOLUTION_ENGINE) += fixups-se7751.o
19obj-$(CONFIG_SH_HIGHLANDER) += ops-r7780rp.o fixups-r7780rp.o 17obj-$(CONFIG_SH_RTS7751R2D) += fixups-rts7751r2d.o
20obj-$(CONFIG_SH_SDK7780) += ops-sdk7780.o fixups-sdk7780.o 18obj-$(CONFIG_SH_SH03) += fixups-sh03.o
21obj-$(CONFIG_SH_TITAN) += ops-titan.o 19obj-$(CONFIG_SH_HIGHLANDER) += fixups-r7780rp.o
22obj-$(CONFIG_SH_LANDISK) += ops-landisk.o 20obj-$(CONFIG_SH_SH7785LCR) += fixups-r7780rp.o
23obj-$(CONFIG_SH_LBOX_RE2) += ops-lboxre2.o fixups-lboxre2.o 21obj-$(CONFIG_SH_SDK7780) += fixups-sdk7780.o
24obj-$(CONFIG_SH_7780_SOLUTION_ENGINE) += ops-se7780.o fixups-se7780.o 22obj-$(CONFIG_SH_7780_SOLUTION_ENGINE) += fixups-sdk7780.o
25obj-$(CONFIG_SH_CAYMAN) += ops-cayman.o 23obj-$(CONFIG_SH_TITAN) += fixups-titan.o
26obj-$(CONFIG_SH_SH7785LCR) += ops-sh7785lcr.o fixups-sh7785lcr.o 24obj-$(CONFIG_SH_LANDISK) += fixups-landisk.o
25obj-$(CONFIG_SH_LBOX_RE2) += fixups-rts7751r2d.o
26obj-$(CONFIG_SH_CAYMAN) += fixups-cayman.o
diff --git a/arch/sh/drivers/pci/ops-cayman.c b/arch/sh/drivers/pci/fixups-cayman.c
index 38ef76207af6..b68b61d22c6c 100644
--- a/arch/sh/drivers/pci/ops-cayman.c
+++ b/arch/sh/drivers/pci/fixups-cayman.c
@@ -75,15 +75,3 @@ int __init pcibios_map_platform_irq(struct pci_dev *dev, u8 slot, u8 pin)
75 75
76 return result; 76 return result;
77} 77}
78
79struct pci_channel board_pci_channels[] = {
80 { &sh5_pci_ops, NULL, NULL, 0, 0xff },
81 { NULL, NULL, NULL, 0, 0 },
82};
83EXPORT_SYMBOL(board_pci_channels);
84
85int __init pcibios_init_platform(void)
86{
87 return sh5pci_init(__pa(memory_start),
88 __pa(memory_end) - __pa(memory_start));
89}
diff --git a/arch/sh/drivers/pci/fixups-dreamcast.c b/arch/sh/drivers/pci/fixups-dreamcast.c
index 2bf85cf091e1..ed7f489936f1 100644
--- a/arch/sh/drivers/pci/fixups-dreamcast.c
+++ b/arch/sh/drivers/pci/fixups-dreamcast.c
@@ -30,7 +30,7 @@
30 30
31static void __init gapspci_fixup_resources(struct pci_dev *dev) 31static void __init gapspci_fixup_resources(struct pci_dev *dev)
32{ 32{
33 struct pci_channel *p = board_pci_channels; 33 struct pci_channel *p = dev->sysdata;
34 34
35 printk(KERN_NOTICE "PCI: Fixing up device %s\n", pci_name(dev)); 35 printk(KERN_NOTICE "PCI: Fixing up device %s\n", pci_name(dev));
36 36
@@ -41,6 +41,13 @@ static void __init gapspci_fixup_resources(struct pci_dev *dev)
41 */ 41 */
42 dev->resource[1].start = p->io_resource->start + 0x100; 42 dev->resource[1].start = p->io_resource->start + 0x100;
43 dev->resource[1].end = dev->resource[1].start + 0x200 - 1; 43 dev->resource[1].end = dev->resource[1].start + 0x200 - 1;
44
45 /*
46 * This is not a normal BAR, prevent any attempts to move
47 * the BAR, as this will result in a bus lock.
48 */
49 dev->resource[1].flags |= IORESOURCE_PCI_FIXED;
50
44 /* 51 /*
45 * Redirect dma memory allocations to special memory window. 52 * Redirect dma memory allocations to special memory window.
46 */ 53 */
diff --git a/arch/sh/drivers/pci/ops-landisk.c b/arch/sh/drivers/pci/fixups-landisk.c
index bff09ecf3419..bb1a6bb5149e 100644
--- a/arch/sh/drivers/pci/ops-landisk.c
+++ b/arch/sh/drivers/pci/fixups-landisk.c
@@ -15,39 +15,6 @@
15#include <linux/pci.h> 15#include <linux/pci.h>
16#include "pci-sh4.h" 16#include "pci-sh4.h"
17 17
18static struct resource sh7751_io_resource = {
19 .name = "SH7751 IO",
20 .start = SH7751_PCI_IO_BASE,
21 .end = SH7751_PCI_IO_BASE + SH7751_PCI_IO_SIZE - 1,
22 .flags = IORESOURCE_IO
23};
24
25static struct resource sh7751_mem_resource = {
26 .name = "SH7751 mem",
27 .start = SH7751_PCI_MEMORY_BASE,
28 .end = SH7751_PCI_MEMORY_BASE + SH7751_PCI_MEM_SIZE - 1,
29 .flags = IORESOURCE_MEM
30};
31
32struct pci_channel board_pci_channels[] = {
33 {&sh4_pci_ops, &sh7751_io_resource, &sh7751_mem_resource, 0, 0x3ff},
34 {NULL, NULL, NULL, 0, 0},
35};
36
37static struct sh4_pci_address_map sh7751_pci_map = {
38 .window0 = {
39 .base = SH7751_CS3_BASE_ADDR,
40 .size = (64 << 20), /* 64MB */
41 },
42
43 .flags = SH4_PCIC_NO_RESET,
44};
45
46int __init pcibios_init_platform(void)
47{
48 return sh7751_pcic_init(&sh7751_pci_map);
49}
50
51int pcibios_map_platform_irq(struct pci_dev *pdev, u8 slot, u8 pin) 18int pcibios_map_platform_irq(struct pci_dev *pdev, u8 slot, u8 pin)
52{ 19{
53 /* 20 /*
diff --git a/arch/sh/drivers/pci/fixups-lboxre2.c b/arch/sh/drivers/pci/fixups-lboxre2.c
deleted file mode 100644
index 1c1d41255ec0..000000000000
--- a/arch/sh/drivers/pci/fixups-lboxre2.c
+++ /dev/null
@@ -1,41 +0,0 @@
1/*
2 * arch/sh/drivers/pci/fixups-lboxre2.c
3 *
4 * L-BOX RE2 PCI fixups
5 *
6 * Copyright (C) 2007 Nobuhiro Iwamatsu
7 *
8 * This file is subject to the terms and conditions of the GNU General Public
9 * License. See the file "COPYING" in the main directory of this archive
10 * for more details.
11 */
12#include "pci-sh4.h"
13
14#define PCIMCR_MRSET_OFF 0xBFFFFFFF
15#define PCIMCR_RFSH_OFF 0xFFFFFFFB
16
17int pci_fixup_pcic(void)
18{
19 unsigned long bcr1, mcr;
20
21 bcr1 = ctrl_inl(SH7751_BCR1);
22 bcr1 |= 0x40080000; /* Enable Bit 19 BREQEN, set PCIC to slave */
23 pci_write_reg(bcr1, SH4_PCIBCR1);
24
25 /* Enable all interrupts, so we known what to fix */
26 pci_write_reg(0x0000c3ff, SH4_PCIINTM);
27 pci_write_reg(0x0000380f, SH4_PCIAINTM);
28 pci_write_reg(0xfb900047, SH7751_PCICONF1);
29 pci_write_reg(0xab000001, SH7751_PCICONF4);
30
31 mcr = ctrl_inl(SH7751_MCR);
32 mcr = (mcr & PCIMCR_MRSET_OFF) & PCIMCR_RFSH_OFF;
33 pci_write_reg(mcr, SH4_PCIMCR);
34
35 pci_write_reg(0x0c000000, SH7751_PCICONF5);
36 pci_write_reg(0xd0000000, SH7751_PCICONF6);
37 pci_write_reg(0x0c000000, SH4_PCILAR0);
38 pci_write_reg(0x00000000, SH4_PCILAR1);
39
40 return 0;
41}
diff --git a/arch/sh/drivers/pci/fixups-r7780rp.c b/arch/sh/drivers/pci/fixups-r7780rp.c
index 3e321df65d22..15ca65cb667e 100644
--- a/arch/sh/drivers/pci/fixups-r7780rp.c
+++ b/arch/sh/drivers/pci/fixups-r7780rp.c
@@ -11,35 +11,26 @@
11 * for more details. 11 * for more details.
12 */ 12 */
13#include <linux/pci.h> 13#include <linux/pci.h>
14#include <linux/io.h>
14#include "pci-sh4.h" 15#include "pci-sh4.h"
15#include <asm/io.h>
16 16
17int pci_fixup_pcic(void) 17static char irq_tab[] __initdata = {
18{ 18 65, 66, 67, 68,
19 pci_write_reg(0x000043ff, SH4_PCIINTM); 19};
20 pci_write_reg(0x0000380f, SH4_PCIAINTM);
21
22 pci_write_reg(0xfbb00047, SH7780_PCICMD);
23 pci_write_reg(0x00000000, SH7780_PCIIBAR);
24
25 pci_write_reg(0x00011912, SH7780_PCISVID);
26 pci_write_reg(0x08000000, SH7780_PCICSCR0);
27 pci_write_reg(0x0000001b, SH7780_PCICSAR0);
28 pci_write_reg(0xfd000000, SH7780_PCICSCR1);
29 pci_write_reg(0x0000000f, SH7780_PCICSAR1);
30
31 pci_write_reg(0xfd000000, SH7780_PCIMBR0);
32 pci_write_reg(0x00fc0000, SH7780_PCIMBMR0);
33 20
34#ifdef CONFIG_32BIT 21int __init pcibios_map_platform_irq(struct pci_dev *pdev, u8 slot, u8 pin)
35 pci_write_reg(0xc0000000, SH7780_PCIMBR2); 22{
36 pci_write_reg(0x20000000 - SH7780_PCI_IO_SIZE, SH7780_PCIMBMR2); 23 return irq_tab[slot];
37#endif 24}
38 25
39 /* Set IOBR for windows containing area specified in pci.h */ 26int pci_fixup_pcic(struct pci_channel *chan)
40 pci_write_reg((PCIBIOS_MIN_IO & ~(SH7780_PCI_IO_SIZE - 1)), 27{
41 SH7780_PCIIOBR); 28 pci_write_reg(chan, 0x000043ff, SH4_PCIINTM);
42 pci_write_reg(((SH7780_PCI_IO_SIZE-1) & (7<<18)), SH7780_PCIIOBMR); 29 pci_write_reg(chan, 0x00000000, SH7780_PCIIBAR);
30 pci_write_reg(chan, 0x08000000, SH7780_PCICSCR0);
31 pci_write_reg(chan, 0x0000001b, SH7780_PCICSAR0);
32 pci_write_reg(chan, 0xfd000000, SH7780_PCICSCR1);
33 pci_write_reg(chan, 0x0000000f, SH7780_PCICSAR1);
43 34
44 return 0; 35 return 0;
45} 36}
diff --git a/arch/sh/drivers/pci/fixups-rts7751r2d.c b/arch/sh/drivers/pci/fixups-rts7751r2d.c
index 904bce8768d3..052b354236dc 100644
--- a/arch/sh/drivers/pci/fixups-rts7751r2d.c
+++ b/arch/sh/drivers/pci/fixups-rts7751r2d.c
@@ -1,43 +1,67 @@
1/* 1/*
2 * arch/sh/drivers/pci/fixups-rts7751r2d.c 2 * arch/sh/drivers/pci/fixups-rts7751r2d.c
3 * 3 *
4 * RTS7751R2D PCI fixups 4 * RTS7751R2D / LBOXRE2 PCI fixups
5 * 5 *
6 * Copyright (C) 2003 Lineo uSolutions, Inc. 6 * Copyright (C) 2003 Lineo uSolutions, Inc.
7 * Copyright (C) 2004 Paul Mundt 7 * Copyright (C) 2004 Paul Mundt
8 * Copyright (C) 2007 Nobuhiro Iwamatsu
8 * 9 *
9 * This file is subject to the terms and conditions of the GNU General Public 10 * This file is subject to the terms and conditions of the GNU General Public
10 * License. See the file "COPYING" in the main directory of this archive 11 * License. See the file "COPYING" in the main directory of this archive
11 * for more details. 12 * for more details.
12 */ 13 */
14#include <linux/pci.h>
15#include <mach/lboxre2.h>
16#include <mach/r2d.h>
13#include "pci-sh4.h" 17#include "pci-sh4.h"
18#include <asm/machtypes.h>
14 19
15#define PCIMCR_MRSET_OFF 0xBFFFFFFF 20#define PCIMCR_MRSET_OFF 0xBFFFFFFF
16#define PCIMCR_RFSH_OFF 0xFFFFFFFB 21#define PCIMCR_RFSH_OFF 0xFFFFFFFB
17 22
18int pci_fixup_pcic(void) 23static u8 rts7751r2d_irq_tab[] __initdata = {
24 IRQ_PCI_INTA,
25 IRQ_PCI_INTB,
26 IRQ_PCI_INTC,
27 IRQ_PCI_INTD,
28};
29
30static char lboxre2_irq_tab[] __initdata = {
31 IRQ_ETH0, IRQ_ETH1, IRQ_INTA, IRQ_INTD,
32};
33
34int __init pcibios_map_platform_irq(struct pci_dev *pdev, u8 slot, u8 pin)
35{
36 if (mach_is_lboxre2())
37 return lboxre2_irq_tab[slot];
38 else
39 return rts7751r2d_irq_tab[slot];
40}
41
42int pci_fixup_pcic(struct pci_channel *chan)
19{ 43{
20 unsigned long bcr1, mcr; 44 unsigned long bcr1, mcr;
21 45
22 bcr1 = ctrl_inl(SH7751_BCR1); 46 bcr1 = ctrl_inl(SH7751_BCR1);
23 bcr1 |= 0x40080000; /* Enable Bit 19 BREQEN, set PCIC to slave */ 47 bcr1 |= 0x40080000; /* Enable Bit 19 BREQEN, set PCIC to slave */
24 pci_write_reg(bcr1, SH4_PCIBCR1); 48 pci_write_reg(chan, bcr1, SH4_PCIBCR1);
25 49
26 /* Enable all interrupts, so we known what to fix */ 50 /* Enable all interrupts, so we known what to fix */
27 pci_write_reg(0x0000c3ff, SH4_PCIINTM); 51 pci_write_reg(chan, 0x0000c3ff, SH4_PCIINTM);
28 pci_write_reg(0x0000380f, SH4_PCIAINTM); 52 pci_write_reg(chan, 0x0000380f, SH4_PCIAINTM);
29 53
30 pci_write_reg(0xfb900047, SH7751_PCICONF1); 54 pci_write_reg(chan, 0xfb900047, SH7751_PCICONF1);
31 pci_write_reg(0xab000001, SH7751_PCICONF4); 55 pci_write_reg(chan, 0xab000001, SH7751_PCICONF4);
32 56
33 mcr = ctrl_inl(SH7751_MCR); 57 mcr = ctrl_inl(SH7751_MCR);
34 mcr = (mcr & PCIMCR_MRSET_OFF) & PCIMCR_RFSH_OFF; 58 mcr = (mcr & PCIMCR_MRSET_OFF) & PCIMCR_RFSH_OFF;
35 pci_write_reg(mcr, SH4_PCIMCR); 59 pci_write_reg(chan, mcr, SH4_PCIMCR);
36 60
37 pci_write_reg(0x0c000000, SH7751_PCICONF5); 61 pci_write_reg(chan, 0x0c000000, SH7751_PCICONF5);
38 pci_write_reg(0xd0000000, SH7751_PCICONF6); 62 pci_write_reg(chan, 0xd0000000, SH7751_PCICONF6);
39 pci_write_reg(0x0c000000, SH4_PCILAR0); 63 pci_write_reg(chan, 0x0c000000, SH4_PCILAR0);
40 pci_write_reg(0x00000000, SH4_PCILAR1); 64 pci_write_reg(chan, 0x00000000, SH4_PCILAR1);
41 65
42 return 0; 66 return 0;
43} 67}
diff --git a/arch/sh/drivers/pci/fixups-sdk7780.c b/arch/sh/drivers/pci/fixups-sdk7780.c
index 2f8863099dd1..250b0edd7365 100644
--- a/arch/sh/drivers/pci/fixups-sdk7780.c
+++ b/arch/sh/drivers/pci/fixups-sdk7780.c
@@ -5,55 +5,48 @@
5 * 5 *
6 * Copyright (C) 2003 Lineo uSolutions, Inc. 6 * Copyright (C) 2003 Lineo uSolutions, Inc.
7 * Copyright (C) 2004 - 2006 Paul Mundt 7 * Copyright (C) 2004 - 2006 Paul Mundt
8 * Copyright (C) 2006 Nobuhiro Iwamatsu
8 * 9 *
9 * This file is subject to the terms and conditions of the GNU General Public 10 * This file is subject to the terms and conditions of the GNU General Public
10 * License. See the file "COPYING" in the main directory of this archive 11 * License. See the file "COPYING" in the main directory of this archive
11 * for more details. 12 * for more details.
12 */ 13 */
13#include <linux/pci.h> 14#include <linux/pci.h>
15#include <linux/io.h>
14#include "pci-sh4.h" 16#include "pci-sh4.h"
15#include <asm/io.h>
16 17
17int pci_fixup_pcic(void) 18/* IDSEL [16][17][18][19][20][21][22][23][24][25][26][27][28][29][30][31] */
19static char sdk7780_irq_tab[4][16] __initdata = {
20 /* INTA */
21 { 65, 68, 67, 68, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
22 /* INTB */
23 { 66, 65, -1, 65, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
24 /* INTC */
25 { 67, 66, -1, 66, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
26 /* INTD */
27 { 68, 67, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
28};
29
30int __init pcibios_map_platform_irq(struct pci_dev *pdev, u8 slot, u8 pin)
31{
32 return sdk7780_irq_tab[pin-1][slot];
33}
34int pci_fixup_pcic(struct pci_channel *chan)
18{ 35{
19 ctrl_outl(0x00000001, SH7780_PCI_VCR2);
20
21 /* Enable all interrupts, so we know what to fix */ 36 /* Enable all interrupts, so we know what to fix */
22 pci_write_reg(0x0000C3FF, SH7780_PCIIMR); 37 pci_write_reg(chan, 0x0000C3FF, SH7780_PCIIMR);
23 pci_write_reg(0x0000380F, SH7780_PCIAINTM);
24 38
25 /* Set up standard PCI config registers */ 39 /* Set up standard PCI config registers */
26 pci_write_reg(0xFB00, SH7780_PCISTATUS); 40 pci_write_reg(chan, 0x08000000, SH7780_PCIMBAR0); /* PCI */
27 pci_write_reg(0x0047, SH7780_PCICMD); 41 pci_write_reg(chan, 0x08000000, SH4_PCILAR0); /* SHwy */
28 pci_write_reg(0x00, SH7780_PCIPIF); 42 pci_write_reg(chan, 0x07F00001, SH4_PCILSR0); /* size 128M w/ MBAR */
29 pci_write_reg(0x00, SH7780_PCISUB);
30 pci_write_reg(0x06, SH7780_PCIBCC);
31 pci_write_reg(0x1912, SH7780_PCISVID);
32 pci_write_reg(0x0001, SH7780_PCISID);
33
34 pci_write_reg(0x08000000, SH7780_PCIMBAR0); /* PCI */
35 pci_write_reg(0x08000000, SH7780_PCILAR0); /* SHwy */
36 pci_write_reg(0x07F00001, SH7780_PCILSR); /* size 128M w/ MBAR */
37
38 pci_write_reg(0x00000000, SH7780_PCIMBAR1);
39 pci_write_reg(0x00000000, SH7780_PCILAR1);
40 pci_write_reg(0x00000000, SH7780_PCILSR1);
41
42 pci_write_reg(0xAB000801, SH7780_PCIIBAR);
43
44 /*
45 * Set the MBR so PCI address is one-to-one with window,
46 * meaning all calls go straight through... use ifdef to
47 * catch erroneous assumption.
48 */
49 pci_write_reg(0xFD000000 , SH7780_PCIMBR0);
50 pci_write_reg(0x00FC0000 , SH7780_PCIMBMR0); /* 16M */
51 43
52 /* Set IOBR for window containing area specified in pci.h */ 44 pci_write_reg(chan, 0x00000000, SH7780_PCIMBAR1);
53 pci_write_reg(PCIBIOS_MIN_IO & ~(SH7780_PCI_IO_SIZE-1), SH7780_PCIIOBR); 45 pci_write_reg(chan, 0x00000000, SH4_PCILAR1);
54 pci_write_reg((SH7780_PCI_IO_SIZE-1) & (7 << 18), SH7780_PCIIOBMR); 46 pci_write_reg(chan, 0x00000000, SH4_PCILSR1);
55 47
56 pci_write_reg(0xA5000C01, SH7780_PCICR); 48 pci_write_reg(chan, 0xAB000801, SH7780_PCIIBAR);
49 pci_write_reg(chan, 0xA5000C01, SH4_PCICR);
57 50
58 return 0; 51 return 0;
59} 52}
diff --git a/arch/sh/drivers/pci/fixups-se7751.c b/arch/sh/drivers/pci/fixups-se7751.c
new file mode 100644
index 000000000000..475fa9f0fe2c
--- /dev/null
+++ b/arch/sh/drivers/pci/fixups-se7751.c
@@ -0,0 +1,111 @@
1#include <linux/kernel.h>
2#include <linux/types.h>
3#include <linux/init.h>
4#include <linux/delay.h>
5#include <linux/pci.h>
6#include <linux/io.h>
7#include "pci-sh4.h"
8
9int __init pcibios_map_platform_irq(u8 slot, u8 pin)
10{
11 switch (slot) {
12 case 0: return 13;
13 case 1: return 13; /* AMD Ethernet controller */
14 case 2: return -1;
15 case 3: return -1;
16 case 4: return -1;
17 default:
18 printk("PCI: Bad IRQ mapping request for slot %d\n", slot);
19 return -1;
20 }
21}
22
23#define PCIMCR_MRSET_OFF 0xBFFFFFFF
24#define PCIMCR_RFSH_OFF 0xFFFFFFFB
25
26/*
27 * Only long word accesses of the PCIC's internal local registers and the
28 * configuration registers from the CPU is supported.
29 */
30#define PCIC_WRITE(x,v) writel((v), PCI_REG(x))
31#define PCIC_READ(x) readl(PCI_REG(x))
32
33/*
34 * Description: This function sets up and initializes the pcic, sets
35 * up the BARS, maps the DRAM into the address space etc, etc.
36 */
37int pci_fixup_pcic(struct pci_channel *chan)
38{
39 unsigned long bcr1, wcr1, wcr2, wcr3, mcr;
40 unsigned short bcr2;
41
42 /*
43 * Initialize the slave bus controller on the pcic. The values used
44 * here should not be hardcoded, but they should be taken from the bsc
45 * on the processor, to make this function as generic as possible.
46 * (i.e. Another sbc may usr different SDRAM timing settings -- in order
47 * for the pcic to work, its settings need to be exactly the same.)
48 */
49 bcr1 = (*(volatile unsigned long*)(SH7751_BCR1));
50 bcr2 = (*(volatile unsigned short*)(SH7751_BCR2));
51 wcr1 = (*(volatile unsigned long*)(SH7751_WCR1));
52 wcr2 = (*(volatile unsigned long*)(SH7751_WCR2));
53 wcr3 = (*(volatile unsigned long*)(SH7751_WCR3));
54 mcr = (*(volatile unsigned long*)(SH7751_MCR));
55
56 bcr1 = bcr1 | 0x00080000; /* Enable Bit 19, BREQEN */
57 (*(volatile unsigned long*)(SH7751_BCR1)) = bcr1;
58
59 bcr1 = bcr1 | 0x40080000; /* Enable Bit 19 BREQEN, set PCIC to slave */
60 PCIC_WRITE(SH7751_PCIBCR1, bcr1); /* PCIC BCR1 */
61 PCIC_WRITE(SH7751_PCIBCR2, bcr2); /* PCIC BCR2 */
62 PCIC_WRITE(SH7751_PCIWCR1, wcr1); /* PCIC WCR1 */
63 PCIC_WRITE(SH7751_PCIWCR2, wcr2); /* PCIC WCR2 */
64 PCIC_WRITE(SH7751_PCIWCR3, wcr3); /* PCIC WCR3 */
65 mcr = (mcr & PCIMCR_MRSET_OFF) & PCIMCR_RFSH_OFF;
66 PCIC_WRITE(SH7751_PCIMCR, mcr); /* PCIC MCR */
67
68
69 /* Enable all interrupts, so we know what to fix */
70 PCIC_WRITE(SH7751_PCIINTM, 0x0000c3ff);
71 PCIC_WRITE(SH7751_PCIAINTM, 0x0000380f);
72
73 /* Set up standard PCI config registers */
74 PCIC_WRITE(SH7751_PCICONF1, 0xF39000C7); /* Bus Master, Mem & I/O access */
75 PCIC_WRITE(SH7751_PCICONF2, 0x00000000); /* PCI Class code & Revision ID */
76 PCIC_WRITE(SH7751_PCICONF4, 0xab000001); /* PCI I/O address (local regs) */
77 PCIC_WRITE(SH7751_PCICONF5, 0x0c000000); /* PCI MEM address (local RAM) */
78 PCIC_WRITE(SH7751_PCICONF6, 0xd0000000); /* PCI MEM address (unused) */
79 PCIC_WRITE(SH7751_PCICONF11, 0x35051054); /* PCI Subsystem ID & Vendor ID */
80 PCIC_WRITE(SH7751_PCILSR0, 0x03f00000); /* MEM (full 64M exposed) */
81 PCIC_WRITE(SH7751_PCILSR1, 0x00000000); /* MEM (unused) */
82 PCIC_WRITE(SH7751_PCILAR0, 0x0c000000); /* MEM (direct map from PCI) */
83 PCIC_WRITE(SH7751_PCILAR1, 0x00000000); /* MEM (unused) */
84
85 /* Now turn it on... */
86 PCIC_WRITE(SH7751_PCICR, 0xa5000001);
87
88 /*
89 * Set PCIMBR and PCIIOBR here, assuming a single window
90 * (16M MEM, 256K IO) is enough. If a larger space is
91 * needed, the readx/writex and inx/outx functions will
92 * have to do more (e.g. setting registers for each call).
93 */
94
95 /*
96 * Set the MBR so PCI address is one-to-one with window,
97 * meaning all calls go straight through... use BUG_ON to
98 * catch erroneous assumption.
99 */
100 BUG_ON(chan->mem_resource->start != SH7751_PCI_MEMORY_BASE);
101
102 PCIC_WRITE(SH7751_PCIMBR, chan->mem_resource->start);
103
104 /* Set IOBR for window containing area specified in pci.h */
105 PCIC_WRITE(SH7751_PCIIOBR, (chan->io_resource->start & SH7751_PCIIOBR_MASK));
106
107 /* All done, may as well say so... */
108 printk("SH7751 PCI: Finished initialization of the PCI controller\n");
109
110 return 1;
111}
diff --git a/arch/sh/drivers/pci/fixups-se7780.c b/arch/sh/drivers/pci/fixups-se7780.c
deleted file mode 100644
index 880cea1c0d89..000000000000
--- a/arch/sh/drivers/pci/fixups-se7780.c
+++ /dev/null
@@ -1,60 +0,0 @@
1/*
2 * arch/sh/drivers/pci/fixups-se7780.c
3 *
4 * HITACHI UL Solution Engine 7780 PCI fixups
5 *
6 * Copyright (C) 2003 Lineo uSolutions, Inc.
7 * Copyright (C) 2004 - 2006 Paul Mundt
8 * Copyright (C) 2006 Nobuhiro Iwamatsu
9 *
10 * This file is subject to the terms and conditions of the GNU General Public
11 * License. See the file "COPYING" in the main directory of this archive
12 * for more details.
13 */
14#include <linux/pci.h>
15#include "pci-sh4.h"
16#include <asm/io.h>
17
18int pci_fixup_pcic(void)
19{
20 ctrl_outl(0x00000001, SH7780_PCI_VCR2);
21
22 /* Enable all interrupts, so we know what to fix */
23 pci_write_reg(0x0000C3FF, SH7780_PCIIMR);
24 pci_write_reg(0x0000380F, SH7780_PCIAINTM);
25
26 /* Set up standard PCI config registers */
27 ctrl_outw(0xFB00, PCI_REG(SH7780_PCISTATUS));
28 ctrl_outw(0x0047, PCI_REG(SH7780_PCICMD));
29 ctrl_outb( 0x00, PCI_REG(SH7780_PCIPIF));
30 ctrl_outb( 0x00, PCI_REG(SH7780_PCISUB));
31 ctrl_outb( 0x06, PCI_REG(SH7780_PCIBCC));
32 ctrl_outw(0x1912, PCI_REG(SH7780_PCISVID));
33 ctrl_outw(0x0001, PCI_REG(SH7780_PCISID));
34
35 pci_write_reg(0x08000000, SH7780_PCIMBAR0); /* PCI */
36 pci_write_reg(0x08000000, SH7780_PCILAR0); /* SHwy */
37 pci_write_reg(0x07F00001, SH7780_PCILSR); /* size 128M w/ MBAR */
38
39 pci_write_reg(0x00000000, SH7780_PCIMBAR1);
40 pci_write_reg(0x00000000, SH7780_PCILAR1);
41 pci_write_reg(0x00000000, SH7780_PCILSR1);
42
43 pci_write_reg(0xAB000801, SH7780_PCIIBAR);
44
45 /*
46 * Set the MBR so PCI address is one-to-one with window,
47 * meaning all calls go straight through... use ifdef to
48 * catch erroneous assumption.
49 */
50 pci_write_reg(0xFD000000 , SH7780_PCIMBR0);
51 pci_write_reg(0x00FC0000 , SH7780_PCIMBMR0); /* 16M */
52
53 /* Set IOBR for window containing area specified in pci.h */
54 pci_write_reg(PCIBIOS_MIN_IO & ~(SH7780_PCI_IO_SIZE-1), SH7780_PCIIOBR);
55 pci_write_reg((SH7780_PCI_IO_SIZE-1) & (7 << 18), SH7780_PCIIOBMR);
56
57 pci_write_reg(0xA5000C01, SH7780_PCICR);
58
59 return 0;
60}
diff --git a/arch/sh/drivers/pci/fixups-sh7785lcr.c b/arch/sh/drivers/pci/fixups-sh7785lcr.c
deleted file mode 100644
index 4949e601387a..000000000000
--- a/arch/sh/drivers/pci/fixups-sh7785lcr.c
+++ /dev/null
@@ -1,46 +0,0 @@
1/*
2 * arch/sh/drivers/pci/fixups-sh7785lcr.c
3 *
4 * R0P7785LC0011RL PCI fixups
5 * Copyright (C) 2008 Yoshihiro Shimoda
6 *
7 * Based on arch/sh/drivers/pci/fixups-r7780rp.c
8 * Copyright (C) 2003 Lineo uSolutions, Inc.
9 * Copyright (C) 2004 - 2006 Paul Mundt
10 *
11 * This file is subject to the terms and conditions of the GNU General Public
12 * License. See the file "COPYING" in the main directory of this archive
13 * for more details.
14 */
15#include <linux/pci.h>
16#include "pci-sh4.h"
17
18int pci_fixup_pcic(void)
19{
20 pci_write_reg(0x000043ff, SH4_PCIINTM);
21 pci_write_reg(0x0000380f, SH4_PCIAINTM);
22
23 pci_write_reg(0xfbb00047, SH7780_PCICMD);
24 pci_write_reg(0x00000000, SH7780_PCIIBAR);
25
26 pci_write_reg(0x00011912, SH7780_PCISVID);
27 pci_write_reg(0x08000000, SH7780_PCICSCR0);
28 pci_write_reg(0x0000001b, SH7780_PCICSAR0);
29 pci_write_reg(0xfd000000, SH7780_PCICSCR1);
30 pci_write_reg(0x0000000f, SH7780_PCICSAR1);
31
32 pci_write_reg(0xfd000000, SH7780_PCIMBR0);
33 pci_write_reg(0x00fc0000, SH7780_PCIMBMR0);
34
35#ifdef CONFIG_32BIT
36 pci_write_reg(0xc0000000, SH7780_PCIMBR2);
37 pci_write_reg(0x20000000 - SH7780_PCI_IO_SIZE, SH7780_PCIMBMR2);
38#endif
39
40 /* Set IOBR for windows containing area specified in pci.h */
41 pci_write_reg((PCIBIOS_MIN_IO & ~(SH7780_PCI_IO_SIZE - 1)),
42 SH7780_PCIIOBR);
43 pci_write_reg(((SH7780_PCI_IO_SIZE - 1) & (7 << 18)), SH7780_PCIIOBMR);
44
45 return 0;
46}
diff --git a/arch/sh/drivers/pci/fixups-snapgear.c b/arch/sh/drivers/pci/fixups-snapgear.c
new file mode 100644
index 000000000000..5a39ecc1adb8
--- /dev/null
+++ b/arch/sh/drivers/pci/fixups-snapgear.c
@@ -0,0 +1,38 @@
1/*
2 * arch/sh/drivers/pci/ops-snapgear.c
3 *
4 * Author: David McCullough <davidm@snapgear.com>
5 *
6 * Ported to new API by Paul Mundt <lethal@linux-sh.org>
7 *
8 * Highly leveraged from pci-bigsur.c, written by Dustin McIntire.
9 *
10 * May be copied or modified under the terms of the GNU General Public
11 * License. See linux/COPYING for more information.
12 *
13 * PCI initialization for the SnapGear boards
14 */
15#include <linux/kernel.h>
16#include <linux/types.h>
17#include <linux/init.h>
18#include <linux/pci.h>
19#include "pci-sh4.h"
20
21int __init pcibios_map_platform_irq(struct pci_dev *pdev, u8 slot, u8 pin)
22{
23 int irq = -1;
24
25 switch (slot) {
26 case 8: /* the PCI bridge */ break;
27 case 11: irq = 8; break; /* USB */
28 case 12: irq = 11; break; /* PCMCIA */
29 case 13: irq = 5; break; /* eth0 */
30 case 14: irq = 8; break; /* eth1 */
31 case 15: irq = 11; break; /* safenet (unused) */
32 }
33
34 printk("PCI: Mapping SnapGear IRQ for slot %d, pin %c to irq %d\n",
35 slot, pin - 1 + 'A', irq);
36
37 return irq;
38}
diff --git a/arch/sh/drivers/pci/ops-titan.c b/arch/sh/drivers/pci/fixups-titan.c
index a8f7801a34af..3a79fa8254a6 100644
--- a/arch/sh/drivers/pci/ops-titan.c
+++ b/arch/sh/drivers/pci/fixups-titan.c
@@ -36,42 +36,3 @@ int __init pcibios_map_platform_irq(struct pci_dev *pdev, u8 slot, u8 pin)
36 36
37 return irq; 37 return irq;
38} 38}
39
40static struct resource sh7751_io_resource = {
41 .name = "SH7751_IO",
42 .start = SH7751_PCI_IO_BASE,
43 .end = SH7751_PCI_IO_BASE + SH7751_PCI_IO_SIZE - 1,
44 .flags = IORESOURCE_IO
45};
46
47static struct resource sh7751_mem_resource = {
48 .name = "SH7751_mem",
49 .start = SH7751_PCI_MEMORY_BASE,
50 .end = SH7751_PCI_MEMORY_BASE + SH7751_PCI_MEM_SIZE - 1,
51 .flags = IORESOURCE_MEM
52};
53
54struct pci_channel board_pci_channels[] = {
55 { &sh4_pci_ops, &sh7751_io_resource, &sh7751_mem_resource, 0, 0xff },
56 { NULL, NULL, NULL, 0, 0 },
57};
58EXPORT_SYMBOL(board_pci_channels);
59
60static struct sh4_pci_address_map sh7751_pci_map = {
61 .window0 = {
62 .base = SH7751_CS2_BASE_ADDR,
63 .size = SH7751_MEM_REGION_SIZE*2, /* cs2 and cs3 */
64 },
65
66 .window1 = {
67 .base = SH7751_CS2_BASE_ADDR,
68 .size = SH7751_MEM_REGION_SIZE*2,
69 },
70
71 .flags = SH4_PCIC_NO_RESET,
72};
73
74int __init pcibios_init_platform(void)
75{
76 return sh7751_pcic_init(&sh7751_pci_map);
77}
diff --git a/arch/sh/drivers/pci/ops-dreamcast.c b/arch/sh/drivers/pci/ops-dreamcast.c
index f5d2a2aa6f3f..e83d0d3aabe2 100644
--- a/arch/sh/drivers/pci/ops-dreamcast.c
+++ b/arch/sh/drivers/pci/ops-dreamcast.c
@@ -1,15 +1,9 @@
1/* 1/*
2 * arch/sh/drivers/pci/ops-dreamcast.c
3 *
4 * PCI operations for the Sega Dreamcast 2 * PCI operations for the Sega Dreamcast
5 * 3 *
6 * Copyright (C) 2001, 2002 M. R. Brown 4 * Copyright (C) 2001, 2002 M. R. Brown
7 * Copyright (C) 2002, 2003 Paul Mundt 5 * Copyright (C) 2002, 2003 Paul Mundt
8 * 6 *
9 * This file originally bore the message (with enclosed-$):
10 * Id: pci.c,v 1.3 2003/05/04 19:29:46 lethal Exp
11 * Dreamcast PCI: Supports SEGA Broadband Adaptor only.
12 *
13 * This file is subject to the terms and conditions of the GNU General Public 7 * This file is subject to the terms and conditions of the GNU General Public
14 * License. See the file "COPYING" in the main directory of this archive 8 * License. See the file "COPYING" in the main directory of this archive
15 * for more details. 9 * for more details.
@@ -23,34 +17,10 @@
23#include <linux/irq.h> 17#include <linux/irq.h>
24#include <linux/pci.h> 18#include <linux/pci.h>
25#include <linux/module.h> 19#include <linux/module.h>
26 20#include <linux/io.h>
27#include <asm/io.h> 21#include <linux/irq.h>
28#include <asm/irq.h>
29#include <mach/pci.h> 22#include <mach/pci.h>
30 23
31static struct resource gapspci_io_resource = {
32 .name = "GAPSPCI IO",
33 .start = GAPSPCI_BBA_CONFIG,
34 .end = GAPSPCI_BBA_CONFIG + GAPSPCI_BBA_CONFIG_SIZE - 1,
35 .flags = IORESOURCE_IO,
36};
37
38static struct resource gapspci_mem_resource = {
39 .name = "GAPSPCI mem",
40 .start = GAPSPCI_DMA_BASE,
41 .end = GAPSPCI_DMA_BASE + GAPSPCI_DMA_SIZE - 1,
42 .flags = IORESOURCE_MEM,
43};
44
45static struct pci_ops gapspci_pci_ops;
46
47struct pci_channel board_pci_channels[] = {
48 { &gapspci_pci_ops, &gapspci_io_resource,
49 &gapspci_mem_resource, 0, 1 },
50 { 0, }
51};
52EXPORT_SYMBOL(board_pci_channels);
53
54/* 24/*
55 * The !gapspci_config_access case really shouldn't happen, ever, unless 25 * The !gapspci_config_access case really shouldn't happen, ever, unless
56 * someone implicitly messes around with the last devfn value.. otherwise we 26 * someone implicitly messes around with the last devfn value.. otherwise we
@@ -85,10 +55,10 @@ static int gapspci_read(struct pci_bus *bus, unsigned int devfn, int where, int
85 return PCIBIOS_DEVICE_NOT_FOUND; 55 return PCIBIOS_DEVICE_NOT_FOUND;
86 56
87 switch (size) { 57 switch (size) {
88 case 1: *val = inb(GAPSPCI_BBA_CONFIG+where); break; 58 case 1: *val = inb(GAPSPCI_BBA_CONFIG+where); break;
89 case 2: *val = inw(GAPSPCI_BBA_CONFIG+where); break; 59 case 2: *val = inw(GAPSPCI_BBA_CONFIG+where); break;
90 case 4: *val = inl(GAPSPCI_BBA_CONFIG+where); break; 60 case 4: *val = inl(GAPSPCI_BBA_CONFIG+where); break;
91 } 61 }
92 62
93 return PCIBIOS_SUCCESSFUL; 63 return PCIBIOS_SUCCESSFUL;
94} 64}
@@ -99,72 +69,15 @@ static int gapspci_write(struct pci_bus *bus, unsigned int devfn, int where, int
99 return PCIBIOS_DEVICE_NOT_FOUND; 69 return PCIBIOS_DEVICE_NOT_FOUND;
100 70
101 switch (size) { 71 switch (size) {
102 case 1: outb(( u8)val, GAPSPCI_BBA_CONFIG+where); break; 72 case 1: outb(( u8)val, GAPSPCI_BBA_CONFIG+where); break;
103 case 2: outw((u16)val, GAPSPCI_BBA_CONFIG+where); break; 73 case 2: outw((u16)val, GAPSPCI_BBA_CONFIG+where); break;
104 case 4: outl((u32)val, GAPSPCI_BBA_CONFIG+where); break; 74 case 4: outl((u32)val, GAPSPCI_BBA_CONFIG+where); break;
105 } 75 }
106 76
107 return PCIBIOS_SUCCESSFUL; 77 return PCIBIOS_SUCCESSFUL;
108} 78}
109 79
110static struct pci_ops gapspci_pci_ops = { 80struct pci_ops gapspci_pci_ops = {
111 .read = gapspci_read, 81 .read = gapspci_read,
112 .write = gapspci_write, 82 .write = gapspci_write,
113}; 83};
114
115/*
116 * gapspci init
117 */
118
119int __init gapspci_init(void)
120{
121 char idbuf[16];
122 int i;
123
124 /*
125 * FIXME: All of this wants documenting to some degree,
126 * even some basic register definitions would be nice.
127 *
128 * I haven't seen anything this ugly since.. maple.
129 */
130
131 for (i=0; i<16; i++)
132 idbuf[i] = inb(GAPSPCI_REGS+i);
133
134 if (strncmp(idbuf, "GAPSPCI_BRIDGE_2", 16))
135 return -ENODEV;
136
137 outl(0x5a14a501, GAPSPCI_REGS+0x18);
138
139 for (i=0; i<1000000; i++)
140 ;
141
142 if (inl(GAPSPCI_REGS+0x18) != 1)
143 return -EINVAL;
144
145 outl(0x01000000, GAPSPCI_REGS+0x20);
146 outl(0x01000000, GAPSPCI_REGS+0x24);
147
148 outl(GAPSPCI_DMA_BASE, GAPSPCI_REGS+0x28);
149 outl(GAPSPCI_DMA_BASE+GAPSPCI_DMA_SIZE, GAPSPCI_REGS+0x2c);
150
151 outl(1, GAPSPCI_REGS+0x14);
152 outl(1, GAPSPCI_REGS+0x34);
153
154 /* Setting Broadband Adapter */
155 outw(0xf900, GAPSPCI_BBA_CONFIG+0x06);
156 outl(0x00000000, GAPSPCI_BBA_CONFIG+0x30);
157 outb(0x00, GAPSPCI_BBA_CONFIG+0x3c);
158 outb(0xf0, GAPSPCI_BBA_CONFIG+0x0d);
159 outw(0x0006, GAPSPCI_BBA_CONFIG+0x04);
160 outl(0x00002001, GAPSPCI_BBA_CONFIG+0x10);
161 outl(0x01000000, GAPSPCI_BBA_CONFIG+0x14);
162
163 return 0;
164}
165
166/* Haven't done anything here as yet */
167char * __devinit pcibios_setup(char *str)
168{
169 return str;
170}
diff --git a/arch/sh/drivers/pci/ops-lboxre2.c b/arch/sh/drivers/pci/ops-lboxre2.c
deleted file mode 100644
index 86c0b6fb7375..000000000000
--- a/arch/sh/drivers/pci/ops-lboxre2.c
+++ /dev/null
@@ -1,63 +0,0 @@
1/*
2 * linux/arch/sh/drivers/pci/ops-lboxre2.c
3 *
4 * Copyright (C) 2007 Nobuhiro Iwamatsu
5 *
6 * PCI initialization for the NTT COMWARE L-BOX RE2
7 */
8#include <linux/kernel.h>
9#include <linux/types.h>
10#include <linux/init.h>
11#include <linux/pci.h>
12#include <linux/io.h>
13#include <mach/lboxre2.h>
14#include "pci-sh4.h"
15
16static char lboxre2_irq_tab[] __initdata = {
17 IRQ_ETH0, IRQ_ETH1, IRQ_INTA, IRQ_INTD,
18};
19
20int __init pcibios_map_platform_irq(struct pci_dev *pdev, u8 slot, u8 pin)
21{
22 return lboxre2_irq_tab[slot];
23}
24
25static struct resource sh7751_io_resource = {
26 .name = "SH7751_IO",
27 .start = SH7751_PCI_IO_BASE ,
28 .end = SH7751_PCI_IO_BASE + SH7751_PCI_IO_SIZE - 1,
29 .flags = IORESOURCE_IO
30};
31
32static struct resource sh7751_mem_resource = {
33 .name = "SH7751_mem",
34 .start = SH7751_PCI_MEMORY_BASE,
35 .end = SH7751_PCI_MEMORY_BASE + SH7751_PCI_MEM_SIZE - 1,
36 .flags = IORESOURCE_MEM
37};
38
39extern struct pci_ops sh7751_pci_ops;
40
41struct pci_channel board_pci_channels[] = {
42 { &sh4_pci_ops, &sh7751_io_resource, &sh7751_mem_resource, 0, 0xff },
43 { NULL, NULL, NULL, 0, 0 },
44};
45
46EXPORT_SYMBOL(board_pci_channels);
47
48static struct sh4_pci_address_map sh7751_pci_map = {
49 .window0 = {
50 .base = SH7751_CS3_BASE_ADDR,
51 .size = 0x04000000,
52 },
53 .window1 = {
54 .base = 0x00000000, /* Unused */
55 .size = 0x00000000, /* Unused */
56 },
57 .flags = SH4_PCIC_NO_RESET,
58};
59
60int __init pcibios_init_platform(void)
61{
62 return sh7751_pcic_init(&sh7751_pci_map);
63}
diff --git a/arch/sh/drivers/pci/ops-r7780rp.c b/arch/sh/drivers/pci/ops-r7780rp.c
deleted file mode 100644
index 8555238e63eb..000000000000
--- a/arch/sh/drivers/pci/ops-r7780rp.c
+++ /dev/null
@@ -1,68 +0,0 @@
1/*
2 * Author: Ian DaSilva (idasilva@mvista.com)
3 *
4 * Highly leveraged from pci-bigsur.c, written by Dustin McIntire.
5 *
6 * May be copied or modified under the terms of the GNU General Public
7 * License. See linux/COPYING for more information.
8 *
9 * PCI initialization for the Renesas SH7780 Highlander R7780RP-1 board
10 */
11#include <linux/kernel.h>
12#include <linux/types.h>
13#include <linux/init.h>
14#include <linux/delay.h>
15#include <linux/pci.h>
16#include <mach/highlander.h>
17#include <asm/io.h>
18#include "pci-sh4.h"
19
20static char irq_tab[] __initdata = {
21 65, 66, 67, 68,
22};
23
24int __init pcibios_map_platform_irq(struct pci_dev *pdev, u8 slot, u8 pin)
25{
26 return irq_tab[slot];
27}
28
29static struct resource sh7780_io_resource = {
30 .name = "SH7780_IO",
31 .start = SH7780_PCI_IO_BASE,
32 .end = SH7780_PCI_IO_BASE + SH7780_PCI_IO_SIZE - 1,
33 .flags = IORESOURCE_IO
34};
35
36static struct resource sh7780_mem_resource = {
37 .name = "SH7780_mem",
38 .start = SH7780_PCI_MEMORY_BASE,
39 .end = SH7780_PCI_MEMORY_BASE + SH7780_PCI_MEM_SIZE - 1,
40 .flags = IORESOURCE_MEM
41};
42
43extern struct pci_ops sh7780_pci_ops;
44
45struct pci_channel board_pci_channels[] = {
46 { &sh4_pci_ops, &sh7780_io_resource, &sh7780_mem_resource, 0, 0xff },
47 { NULL, NULL, NULL, 0, 0 },
48};
49EXPORT_SYMBOL(board_pci_channels);
50
51static struct sh4_pci_address_map sh7780_pci_map = {
52 .window0 = {
53 .base = SH7780_CS2_BASE_ADDR,
54 .size = 0x04000000,
55 },
56
57 .window1 = {
58 .base = SH7780_CS3_BASE_ADDR,
59 .size = 0x04000000,
60 },
61
62 .flags = SH4_PCIC_NO_RESET,
63};
64
65int __init pcibios_init_platform(void)
66{
67 return sh7780_pcic_init(&sh7780_pci_map);
68}
diff --git a/arch/sh/drivers/pci/ops-rts7751r2d.c b/arch/sh/drivers/pci/ops-rts7751r2d.c
deleted file mode 100644
index d6ca74b25d5f..000000000000
--- a/arch/sh/drivers/pci/ops-rts7751r2d.c
+++ /dev/null
@@ -1,74 +0,0 @@
1/*
2 * linux/arch/sh/drivers/pci/ops-rts7751r2d.c
3 *
4 * Author: Ian DaSilva (idasilva@mvista.com)
5 *
6 * Highly leveraged from pci-bigsur.c, written by Dustin McIntire.
7 *
8 * May be copied or modified under the terms of the GNU General Public
9 * License. See linux/COPYING for more information.
10 *
11 * PCI initialization for the Renesas SH7751R RTS7751R2D board
12 */
13#include <linux/kernel.h>
14#include <linux/types.h>
15#include <linux/init.h>
16#include <linux/pci.h>
17#include <linux/io.h>
18#include <mach/r2d.h>
19#include "pci-sh4.h"
20
21static u8 rts7751r2d_irq_tab[] __initdata = {
22 IRQ_PCI_INTA,
23 IRQ_PCI_INTB,
24 IRQ_PCI_INTC,
25 IRQ_PCI_INTD,
26};
27
28int __init pcibios_map_platform_irq(struct pci_dev *pdev, u8 slot, u8 pin)
29{
30 return rts7751r2d_irq_tab[slot];
31}
32
33static struct resource sh7751_io_resource = {
34 .name = "SH7751_IO",
35 .start = 0x4000,
36 .end = SH7751_PCI_IO_SIZE - 1,
37 .flags = IORESOURCE_IO
38};
39
40static struct resource sh7751_mem_resource = {
41 .name = "SH7751_mem",
42 .start = SH7751_PCI_MEMORY_BASE,
43 .end = SH7751_PCI_MEMORY_BASE + SH7751_PCI_MEM_SIZE - 1,
44 .flags = IORESOURCE_MEM
45};
46
47extern struct pci_ops sh7751_pci_ops;
48
49struct pci_channel board_pci_channels[] = {
50 { &sh4_pci_ops, &sh7751_io_resource, &sh7751_mem_resource, 0, 0xff },
51 { NULL, NULL, NULL, 0, 0 },
52};
53EXPORT_SYMBOL(board_pci_channels);
54
55static struct sh4_pci_address_map sh7751_pci_map = {
56 .window0 = {
57 .base = SH7751_CS3_BASE_ADDR,
58 .size = 0x04000000,
59 },
60
61 .window1 = {
62 .base = 0x00000000, /* Unused */
63 .size = 0x00000000, /* Unused */
64 },
65
66 .flags = SH4_PCIC_NO_RESET,
67};
68
69int __init pcibios_init_platform(void)
70{
71 __set_io_port_base(SH7751_PCI_IO_BASE);
72 return sh7751_pcic_init(&sh7751_pci_map);
73}
74
diff --git a/arch/sh/drivers/pci/ops-sdk7780.c b/arch/sh/drivers/pci/ops-sdk7780.c
deleted file mode 100644
index 4dcc64184b23..000000000000
--- a/arch/sh/drivers/pci/ops-sdk7780.c
+++ /dev/null
@@ -1,73 +0,0 @@
1/*
2 * linux/arch/sh/drivers/pci/ops-sdk7780.c
3 *
4 * Copyright (C) 2006 Nobuhiro Iwamatsu
5 *
6 * PCI initialization for the SDK7780SE03
7 *
8 * May be copied or modified under the terms of the GNU General Public
9 * License. See linux/COPYING for more information.
10 */
11#include <linux/kernel.h>
12#include <linux/types.h>
13#include <linux/init.h>
14#include <linux/delay.h>
15#include <linux/pci.h>
16#include <mach/sdk7780.h>
17#include <asm/io.h>
18#include "pci-sh4.h"
19
20/* IDSEL [16][17][18][19][20][21][22][23][24][25][26][27][28][29][30][31] */
21static char sdk7780_irq_tab[4][16] __initdata = {
22 /* INTA */
23 { 65, 68, 67, 68, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
24 /* INTB */
25 { 66, 65, -1, 65, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
26 /* INTC */
27 { 67, 66, -1, 66, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
28 /* INTD */
29 { 68, 67, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
30};
31
32int __init pcibios_map_platform_irq(struct pci_dev *pdev, u8 slot, u8 pin)
33{
34 return sdk7780_irq_tab[pin-1][slot];
35}
36
37static struct resource sdk7780_io_resource = {
38 .name = "SH7780_IO",
39 .start = SH7780_PCI_IO_BASE,
40 .end = SH7780_PCI_IO_BASE + SH7780_PCI_IO_SIZE - 1,
41 .flags = IORESOURCE_IO
42};
43
44static struct resource sdk7780_mem_resource = {
45 .name = "SH7780_mem",
46 .start = SH7780_PCI_MEMORY_BASE,
47 .end = SH7780_PCI_MEMORY_BASE + SH7780_PCI_MEM_SIZE - 1,
48 .flags = IORESOURCE_MEM
49};
50
51struct pci_channel board_pci_channels[] = {
52 { &sh4_pci_ops, &sdk7780_io_resource, &sdk7780_mem_resource, 0, 0xff },
53 { NULL, NULL, NULL, 0, 0 },
54};
55EXPORT_SYMBOL(board_pci_channels);
56
57static struct sh4_pci_address_map sdk7780_pci_map = {
58 .window0 = {
59 .base = SH7780_CS2_BASE_ADDR,
60 .size = 0x04000000,
61 },
62 .window1 = {
63 .base = SH7780_CS3_BASE_ADDR,
64 .size = 0x04000000,
65 },
66 .flags = SH4_PCIC_NO_RESET,
67};
68
69int __init pcibios_init_platform(void)
70{
71 printk(KERN_INFO "SH7780 PCI: Finished initializing PCI controller\n");
72 return sh7780_pcic_init(&sdk7780_pci_map);
73}
diff --git a/arch/sh/drivers/pci/ops-se7780.c b/arch/sh/drivers/pci/ops-se7780.c
deleted file mode 100644
index 3145c62484d6..000000000000
--- a/arch/sh/drivers/pci/ops-se7780.c
+++ /dev/null
@@ -1,96 +0,0 @@
1/*
2 * linux/arch/sh/drivers/pci/ops-se7780.c
3 *
4 * Copyright (C) 2006 Nobuhiro Iwamatsu
5 *
6 * PCI initialization for the Hitachi UL Solution Engine 7780SE03
7 *
8 * May be copied or modified under the terms of the GNU General Public
9 * License. See linux/COPYING for more information.
10 */
11#include <linux/kernel.h>
12#include <linux/types.h>
13#include <linux/init.h>
14#include <linux/delay.h>
15#include <linux/pci.h>
16#include <mach-se/mach/se7780.h>
17#include <asm/io.h>
18#include "pci-sh4.h"
19
20/*
21 * IDSEL = AD16 PCI slot
22 * IDSEL = AD17 PCI slot
23 * IDSEL = AD18 Serial ATA Controller (Silicon Image SiL3512A)
24 * IDSEL = AD19 USB Host Controller (NEC uPD7210100A)
25 */
26
27/* IDSEL [16][17][18][19][20][21][22][23][24][25][26][27][28][29][30][31] */
28static char se7780_irq_tab[4][16] __initdata = {
29 /* INTA */
30 { 65, 68, 67, 68, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
31 /* INTB */
32 { 66, 65, -1, 65, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
33 /* INTC */
34 { 67, 66, -1, 66, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
35 /* INTD */
36 { 68, 67, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
37};
38
39int __init pcibios_map_platform_irq(struct pci_dev *pdev, u8 slot, u8 pin)
40{
41 return se7780_irq_tab[pin-1][slot];
42}
43
44static struct resource se7780_io_resource = {
45 .name = "SH7780_IO",
46 .start = SH7780_PCI_IO_BASE,
47 .end = SH7780_PCI_IO_BASE + SH7780_PCI_IO_SIZE - 1,
48 .flags = IORESOURCE_IO
49};
50
51static struct resource se7780_mem_resource = {
52 .name = "SH7780_mem",
53 .start = SH7780_PCI_MEMORY_BASE,
54 .end = SH7780_PCI_MEMORY_BASE + SH7780_PCI_MEM_SIZE - 1,
55 .flags = IORESOURCE_MEM
56};
57
58extern struct pci_ops se7780_pci_ops;
59
60struct pci_channel board_pci_channels[] = {
61 { &sh4_pci_ops, &se7780_io_resource, &se7780_mem_resource, 0, 0xff },
62 { NULL, NULL, NULL, 0, 0 },
63};
64EXPORT_SYMBOL(board_pci_channels);
65
66static struct sh4_pci_address_map se7780_pci_map = {
67 .window0 = {
68 .base = SH7780_CS2_BASE_ADDR,
69 .size = 0x04000000,
70 },
71 .flags = SH4_PCIC_NO_RESET,
72};
73
74int __init pcibios_init_platform(void)
75{
76 printk("SH7780 PCI: Finished initialization of the PCI controller\n");
77
78 /*
79 * FPGA PCISEL register initialize
80 *
81 * CPU || SLOT1 | SLOT2 | S-ATA | USB
82 * -------------------------------------
83 * INTA || INTA | INTD | -- | INTB
84 * -------------------------------------
85 * INTB || INTB | INTA | -- | INTC
86 * -------------------------------------
87 * INTC || INTC | INTB | INTA | --
88 * -------------------------------------
89 * INTD || INTD | INTC | -- | INTA
90 * -------------------------------------
91 */
92 ctrl_outw(0x0013, FPGA_PCI_INTSEL1);
93 ctrl_outw(0xE402, FPGA_PCI_INTSEL2);
94
95 return sh7780_pcic_init(&se7780_pci_map);
96}
diff --git a/arch/sh/drivers/pci/ops-sh03.c b/arch/sh/drivers/pci/ops-sh03.c
deleted file mode 100644
index e1703ff5a4d2..000000000000
--- a/arch/sh/drivers/pci/ops-sh03.c
+++ /dev/null
@@ -1,45 +0,0 @@
1/*
2 * linux/arch/sh/drivers/pci/ops-sh03.c
3 *
4 * PCI initialization for the Interface CTP/PCI-SH03 board
5 */
6
7#include <linux/kernel.h>
8#include <linux/types.h>
9#include <linux/init.h>
10#include <linux/delay.h>
11#include <linux/pci.h>
12#include <asm/io.h>
13#include "pci-sh7751.h"
14
15/*
16 * Description: This function sets up and initializes the pcic, sets
17 * up the BARS, maps the DRAM into the address space etc, etc.
18 */
19int __init pcibios_init_platform(void)
20{
21 __set_io_port_base(SH7751_PCI_IO_BASE);
22 return 1;
23}
24
25static struct resource sh7751_io_resource = {
26 .name = "SH03 IO",
27 .start = SH7751_PCI_IO_BASE,
28 .end = SH7751_PCI_IO_BASE + SH7751_PCI_IO_SIZE - 1,
29 .flags = IORESOURCE_IO
30};
31
32static struct resource sh7751_mem_resource = {
33 .name = "SH03 mem",
34 .start = SH7751_PCI_MEMORY_BASE,
35 .end = SH7751_PCI_MEMORY_BASE + SH7751_PCI_MEM_SIZE - 1,
36 .flags = IORESOURCE_MEM
37};
38
39extern struct pci_ops sh4_pci_ops;
40
41struct pci_channel board_pci_channels[] = {
42 { &sh4_pci_ops, &sh7751_io_resource, &sh7751_mem_resource, 0, 0xff },
43 { NULL, NULL, NULL, 0, 0 },
44};
45
diff --git a/arch/sh/drivers/pci/ops-sh4.c b/arch/sh/drivers/pci/ops-sh4.c
index 710a3b0306e5..78bebebdc99c 100644
--- a/arch/sh/drivers/pci/ops-sh4.c
+++ b/arch/sh/drivers/pci/ops-sh4.c
@@ -1,22 +1,22 @@
1/* 1/*
2 * Generic SH-4 / SH-4A PCIC operations (SH7751, SH7780). 2 * Generic SH-4 / SH-4A PCIC operations (SH7751, SH7780).
3 * 3 *
4 * Copyright (C) 2002 - 2006 Paul Mundt 4 * Copyright (C) 2002 - 2009 Paul Mundt
5 * 5 *
6 * This file is subject to the terms and conditions of the GNU General Public 6 * This file is subject to the terms and conditions of the GNU General Public
7 * License v2. See the file "COPYING" in the main directory of this archive 7 * License v2. See the file "COPYING" in the main directory of this archive
8 * for more details. 8 * for more details.
9 */ 9 */
10#include <linux/pci.h> 10#include <linux/pci.h>
11#include <linux/io.h>
11#include <asm/addrspace.h> 12#include <asm/addrspace.h>
12#include <asm/io.h>
13#include "pci-sh4.h" 13#include "pci-sh4.h"
14 14
15/* 15/*
16 * Direct access to PCI hardware... 16 * Direct access to PCI hardware...
17 */ 17 */
18#define CONFIG_CMD(bus, devfn, where) \ 18#define CONFIG_CMD(bus, devfn, where) \
19 P1SEGADDR((bus->number << 16) | (devfn << 8) | (where & ~3)) 19 (P1SEG | (bus->number << 16) | (devfn << 8) | (where & ~3))
20 20
21static DEFINE_SPINLOCK(sh4_pci_lock); 21static DEFINE_SPINLOCK(sh4_pci_lock);
22 22
@@ -26,6 +26,7 @@ static DEFINE_SPINLOCK(sh4_pci_lock);
26static int sh4_pci_read(struct pci_bus *bus, unsigned int devfn, 26static int sh4_pci_read(struct pci_bus *bus, unsigned int devfn,
27 int where, int size, u32 *val) 27 int where, int size, u32 *val)
28{ 28{
29 struct pci_channel *chan = bus->sysdata;
29 unsigned long flags; 30 unsigned long flags;
30 u32 data; 31 u32 data;
31 32
@@ -34,8 +35,8 @@ static int sh4_pci_read(struct pci_bus *bus, unsigned int devfn,
34 * so we must do byte alignment by hand 35 * so we must do byte alignment by hand
35 */ 36 */
36 spin_lock_irqsave(&sh4_pci_lock, flags); 37 spin_lock_irqsave(&sh4_pci_lock, flags);
37 pci_write_reg(CONFIG_CMD(bus, devfn, where), SH4_PCIPAR); 38 pci_write_reg(chan, CONFIG_CMD(bus, devfn, where), SH4_PCIPAR);
38 data = pci_read_reg(SH4_PCIPDR); 39 data = pci_read_reg(chan, SH4_PCIPDR);
39 spin_unlock_irqrestore(&sh4_pci_lock, flags); 40 spin_unlock_irqrestore(&sh4_pci_lock, flags);
40 41
41 switch (size) { 42 switch (size) {
@@ -63,13 +64,14 @@ static int sh4_pci_read(struct pci_bus *bus, unsigned int devfn,
63static int sh4_pci_write(struct pci_bus *bus, unsigned int devfn, 64static int sh4_pci_write(struct pci_bus *bus, unsigned int devfn,
64 int where, int size, u32 val) 65 int where, int size, u32 val)
65{ 66{
67 struct pci_channel *chan = bus->sysdata;
66 unsigned long flags; 68 unsigned long flags;
67 int shift; 69 int shift;
68 u32 data; 70 u32 data;
69 71
70 spin_lock_irqsave(&sh4_pci_lock, flags); 72 spin_lock_irqsave(&sh4_pci_lock, flags);
71 pci_write_reg(CONFIG_CMD(bus, devfn, where), SH4_PCIPAR); 73 pci_write_reg(chan, CONFIG_CMD(bus, devfn, where), SH4_PCIPAR);
72 data = pci_read_reg(SH4_PCIPDR); 74 data = pci_read_reg(chan, SH4_PCIPDR);
73 spin_unlock_irqrestore(&sh4_pci_lock, flags); 75 spin_unlock_irqrestore(&sh4_pci_lock, flags);
74 76
75 switch (size) { 77 switch (size) {
@@ -90,7 +92,7 @@ static int sh4_pci_write(struct pci_bus *bus, unsigned int devfn,
90 return PCIBIOS_FUNC_NOT_SUPPORTED; 92 return PCIBIOS_FUNC_NOT_SUPPORTED;
91 } 93 }
92 94
93 pci_write_reg(data, SH4_PCIPDR); 95 pci_write_reg(chan, data, SH4_PCIPDR);
94 96
95 return PCIBIOS_SUCCESSFUL; 97 return PCIBIOS_SUCCESSFUL;
96} 98}
@@ -104,66 +106,31 @@ struct pci_ops sh4_pci_ops = {
104 * Not really related to pci_ops, but it's common and not worth shoving 106 * Not really related to pci_ops, but it's common and not worth shoving
105 * somewhere else for now.. 107 * somewhere else for now..
106 */ 108 */
107static unsigned int pci_probe = PCI_PROBE_CONF1; 109int __init sh4_pci_check_direct(struct pci_channel *chan)
108
109int __init sh4_pci_check_direct(void)
110{ 110{
111 /* 111 /*
112 * Check if configuration works. 112 * Check if configuration works.
113 */ 113 */
114 if (pci_probe & PCI_PROBE_CONF1) { 114 unsigned int tmp = pci_read_reg(chan, SH4_PCIPAR);
115 unsigned int tmp = pci_read_reg(SH4_PCIPAR);
116
117 pci_write_reg(P1SEG, SH4_PCIPAR);
118 115
119 if (pci_read_reg(SH4_PCIPAR) == P1SEG) { 116 pci_write_reg(chan, P1SEG, SH4_PCIPAR);
120 pci_write_reg(tmp, SH4_PCIPAR);
121 printk(KERN_INFO "PCI: Using configuration type 1\n");
122 request_region(PCI_REG(SH4_PCIPAR), 8, "PCI conf1");
123 117
124 return 0; 118 if (pci_read_reg(chan, SH4_PCIPAR) == P1SEG) {
125 } 119 pci_write_reg(chan, tmp, SH4_PCIPAR);
126 120 printk(KERN_INFO "PCI: Using configuration type 1\n");
127 pci_write_reg(tmp, SH4_PCIPAR); 121 request_region(chan->reg_base + SH4_PCIPAR, 8,
122 "PCI conf1");
123 return 0;
128 } 124 }
129 125
130 pr_debug("PCI: pci_check_direct failed\n"); 126 pci_write_reg(chan, tmp, SH4_PCIPAR);
131 return -EINVAL;
132}
133 127
134/* Handle generic fixups */ 128 printk(KERN_ERR "PCI: %s failed\n", __func__);
135static void __init pci_fixup_ide_bases(struct pci_dev *d)
136{
137 int i;
138 129
139 /* 130 return -EINVAL;
140 * PCI IDE controllers use non-standard I/O port decoding, respect it.
141 */
142 if ((d->class >> 8) != PCI_CLASS_STORAGE_IDE)
143 return;
144 pr_debug("PCI: IDE base address fixup for %s\n", pci_name(d));
145 for(i = 0; i < 4; i++) {
146 struct resource *r = &d->resource[i];
147
148 if ((r->start & ~0x80) == 0x374) {
149 r->start |= 2;
150 r->end = r->start;
151 }
152 }
153}
154DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, pci_fixup_ide_bases);
155
156char * __devinit pcibios_setup(char *str)
157{
158 if (!strcmp(str, "off")) {
159 pci_probe = 0;
160 return NULL;
161 }
162
163 return str;
164} 131}
165 132
166int __attribute__((weak)) pci_fixup_pcic(void) 133int __attribute__((weak)) pci_fixup_pcic(struct pci_channel *chan)
167{ 134{
168 /* Nothing to do. */ 135 /* Nothing to do. */
169 return 0; 136 return 0;
diff --git a/arch/sh/drivers/pci/ops-sh5.c b/arch/sh/drivers/pci/ops-sh5.c
index 729e38a6fe07..4ce95a001b80 100644
--- a/arch/sh/drivers/pci/ops-sh5.c
+++ b/arch/sh/drivers/pci/ops-sh5.c
@@ -22,31 +22,6 @@
22#include <asm/io.h> 22#include <asm/io.h>
23#include "pci-sh5.h" 23#include "pci-sh5.h"
24 24
25static void __init pci_fixup_ide_bases(struct pci_dev *d)
26{
27 int i;
28
29 /*
30 * PCI IDE controllers use non-standard I/O port decoding, respect it.
31 */
32 if ((d->class >> 8) != PCI_CLASS_STORAGE_IDE)
33 return;
34 printk("PCI: IDE base address fixup for %s\n", pci_name(d));
35 for(i=0; i<4; i++) {
36 struct resource *r = &d->resource[i];
37 if ((r->start & ~0x80) == 0x374) {
38 r->start |= 2;
39 r->end = r->start;
40 }
41 }
42}
43DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, pci_fixup_ide_bases);
44
45char * __devinit pcibios_setup(char *str)
46{
47 return str;
48}
49
50static int sh5pci_read(struct pci_bus *bus, unsigned int devfn, int where, 25static int sh5pci_read(struct pci_bus *bus, unsigned int devfn, int where,
51 int size, u32 *val) 26 int size, u32 *val)
52{ 27{
diff --git a/arch/sh/drivers/pci/ops-sh7785lcr.c b/arch/sh/drivers/pci/ops-sh7785lcr.c
deleted file mode 100644
index fb0869f0bef8..000000000000
--- a/arch/sh/drivers/pci/ops-sh7785lcr.c
+++ /dev/null
@@ -1,66 +0,0 @@
1/*
2 * Author: Ian DaSilva (idasilva@mvista.com)
3 *
4 * Highly leveraged from pci-bigsur.c, written by Dustin McIntire.
5 *
6 * May be copied or modified under the terms of the GNU General Public
7 * License. See linux/COPYING for more information.
8 *
9 * PCI initialization for the Renesas R0P7785LC0011RL board
10 * Based on arch/sh/drivers/pci/ops-r7780rp.c
11 *
12 */
13#include <linux/kernel.h>
14#include <linux/types.h>
15#include <linux/init.h>
16#include <linux/delay.h>
17#include <linux/pci.h>
18#include "pci-sh4.h"
19
20static char irq_tab[] __initdata = {
21 65, 66, 67, 68,
22};
23
24int __init pcibios_map_platform_irq(struct pci_dev *pdev, u8 slot, u8 pin)
25{
26 return irq_tab[slot];
27}
28
29static struct resource sh7785_io_resource = {
30 .name = "SH7785_IO",
31 .start = SH7780_PCI_IO_BASE,
32 .end = SH7780_PCI_IO_BASE + SH7780_PCI_IO_SIZE - 1,
33 .flags = IORESOURCE_IO
34};
35
36static struct resource sh7785_mem_resource = {
37 .name = "SH7785_mem",
38 .start = SH7780_PCI_MEMORY_BASE,
39 .end = SH7780_PCI_MEMORY_BASE + SH7780_PCI_MEM_SIZE - 1,
40 .flags = IORESOURCE_MEM
41};
42
43struct pci_channel board_pci_channels[] = {
44 { &sh4_pci_ops, &sh7785_io_resource, &sh7785_mem_resource, 0, 0xff },
45 { NULL, NULL, NULL, 0, 0 },
46};
47EXPORT_SYMBOL(board_pci_channels);
48
49static struct sh4_pci_address_map sh7785_pci_map = {
50 .window0 = {
51#if defined(CONFIG_32BIT)
52 .base = SH7780_32BIT_DDR_BASE_ADDR,
53 .size = 0x40000000,
54#else
55 .base = SH7780_CS0_BASE_ADDR,
56 .size = 0x20000000,
57#endif
58 },
59
60 .flags = SH4_PCIC_NO_RESET,
61};
62
63int __init pcibios_init_platform(void)
64{
65 return sh7780_pcic_init(&sh7785_pci_map);
66}
diff --git a/arch/sh/drivers/pci/ops-snapgear.c b/arch/sh/drivers/pci/ops-snapgear.c
deleted file mode 100644
index 53dd893d4e54..000000000000
--- a/arch/sh/drivers/pci/ops-snapgear.c
+++ /dev/null
@@ -1,94 +0,0 @@
1/*
2 * arch/sh/drivers/pci/ops-snapgear.c
3 *
4 * Author: David McCullough <davidm@snapgear.com>
5 *
6 * Ported to new API by Paul Mundt <lethal@linux-sh.org>
7 *
8 * Highly leveraged from pci-bigsur.c, written by Dustin McIntire.
9 *
10 * May be copied or modified under the terms of the GNU General Public
11 * License. See linux/COPYING for more information.
12 *
13 * PCI initialization for the SnapGear boards
14 */
15#include <linux/kernel.h>
16#include <linux/types.h>
17#include <linux/init.h>
18#include <linux/pci.h>
19#include "pci-sh4.h"
20
21#define SNAPGEAR_PCI_IO 0x4000
22#define SNAPGEAR_PCI_MEM 0xfd000000
23
24/* PCI: default LOCAL memory window sizes (seen from PCI bus) */
25#define SNAPGEAR_LSR0_SIZE (64*(1<<20)) //64MB
26#define SNAPGEAR_LSR1_SIZE (64*(1<<20)) //64MB
27
28static struct resource sh7751_io_resource = {
29 .name = "SH7751 IO",
30 .start = SNAPGEAR_PCI_IO,
31 .end = SNAPGEAR_PCI_IO + (64*1024) - 1, /* 64KiB I/O */
32 .flags = IORESOURCE_IO,
33};
34
35static struct resource sh7751_mem_resource = {
36 .name = "SH7751 mem",
37 .start = SNAPGEAR_PCI_MEM,
38 .end = SNAPGEAR_PCI_MEM + (64*1024*1024) - 1, /* 64MiB mem */
39 .flags = IORESOURCE_MEM,
40};
41
42struct pci_channel board_pci_channels[] = {
43 { &sh4_pci_ops, &sh7751_io_resource, &sh7751_mem_resource, 0, 0xff },
44 { 0, }
45};
46
47static struct sh4_pci_address_map sh7751_pci_map = {
48 .window0 = {
49 .base = SH7751_CS2_BASE_ADDR,
50 .size = SNAPGEAR_LSR0_SIZE,
51 },
52
53 .window1 = {
54 .base = SH7751_CS2_BASE_ADDR,
55 .size = SNAPGEAR_LSR1_SIZE,
56 },
57
58 .flags = SH4_PCIC_NO_RESET,
59};
60
61/*
62 * Initialize the SnapGear PCI interface
63 * Setup hardware to be Central Funtion
64 * Copy the BSR regs to the PCI interface
65 * Setup PCI windows into local RAM
66 */
67int __init pcibios_init_platform(void)
68{
69 return sh7751_pcic_init(&sh7751_pci_map);
70}
71
72int __init pcibios_map_platform_irq(struct pci_dev *pdev, u8 slot, u8 pin)
73{
74 int irq = -1;
75
76 switch (slot) {
77 case 8: /* the PCI bridge */ break;
78 case 11: irq = 8; break; /* USB */
79 case 12: irq = 11; break; /* PCMCIA */
80 case 13: irq = 5; break; /* eth0 */
81 case 14: irq = 8; break; /* eth1 */
82 case 15: irq = 11; break; /* safenet (unused) */
83 }
84
85 printk("PCI: Mapping SnapGear IRQ for slot %d, pin %c to irq %d\n",
86 slot, pin - 1 + 'A', irq);
87
88 return irq;
89}
90
91void __init pcibios_fixup(void)
92{
93 /* Nothing to fixup .. */
94}
diff --git a/arch/sh/drivers/pci/pci-auto.c b/arch/sh/drivers/pci/pci-auto.c
deleted file mode 100644
index cf48b12ee58c..000000000000
--- a/arch/sh/drivers/pci/pci-auto.c
+++ /dev/null
@@ -1,545 +0,0 @@
1/*
2 * PCI autoconfiguration library
3 *
4 * Author: Matt Porter <mporter@mvista.com>
5 *
6 * Copyright 2000, 2001 MontaVista Software Inc.
7 * Copyright 2001 Bradley D. LaRonde <brad@ltc.com>
8 * Copyright 2003 Paul Mundt <lethal@linux-sh.org>
9 *
10 * This program is free software; you can redistribute it and/or modify it
11 * under the terms of the GNU General Public License as published by the
12 * Free Software Foundation; either version 2 of the License, or (at your
13 * option) any later version.
14 */
15
16/*
17 * Modified for MIPS by Jun Sun, jsun@mvista.com
18 *
19 * . Simplify the interface between pci_auto and the rest: a single function.
20 * . Assign resources from low address to upper address.
21 * . change most int to u32.
22 *
23 * Further modified to include it as mips generic code, ppopov@mvista.com.
24 *
25 * 2001-10-26 Bradley D. LaRonde <brad@ltc.com>
26 * - Add a top_bus argument to the "early config" functions so that
27 * they can set a fake parent bus pointer to convince the underlying
28 * pci ops to use type 1 configuration for sub busses.
29 * - Set bridge base and limit registers correctly.
30 * - Align io and memory base properly before and after bridge setup.
31 * - Don't fall through to pci_setup_bars for bridge.
32 * - Reformat the debug output to look more like lspci's output.
33 *
34 * Cloned for SuperH by M. R. Brown, mrbrown@0xd6.org
35 *
36 * 2003-08-05 Paul Mundt <lethal@linux-sh.org>
37 * - Don't update the BAR values on systems that already have valid addresses
38 * and don't want these updated for whatever reason, by way of a new config
39 * option check. However, we still read in the old BAR values so that they
40 * can still be reported through the debug output.
41 */
42
43#include <linux/kernel.h>
44#include <linux/init.h>
45#include <linux/types.h>
46#include <linux/pci.h>
47
48#define DEBUG
49#ifdef DEBUG
50#define DBG(x...) printk(x)
51#else
52#define DBG(x...)
53#endif
54
55/*
56 * These functions are used early on before PCI scanning is done
57 * and all of the pci_dev and pci_bus structures have been created.
58 */
59static struct pci_dev *fake_pci_dev(struct pci_channel *hose,
60 int top_bus, int busnr, int devfn)
61{
62 static struct pci_dev dev;
63 static struct pci_bus bus;
64
65 dev.bus = &bus;
66 dev.sysdata = hose;
67 dev.devfn = devfn;
68 bus.number = busnr;
69 bus.ops = hose->pci_ops;
70
71 if(busnr != top_bus)
72 /* Fake a parent bus structure. */
73 bus.parent = &bus;
74 else
75 bus.parent = NULL;
76
77 return &dev;
78}
79
80#define EARLY_PCI_OP(rw, size, type) \
81static int early_##rw##_config_##size(struct pci_channel *hose, \
82 int top_bus, int bus, int devfn, int offset, type value) \
83{ \
84 return pci_##rw##_config_##size( \
85 fake_pci_dev(hose, top_bus, bus, devfn), \
86 offset, value); \
87}
88
89EARLY_PCI_OP(read, byte, u8 *)
90EARLY_PCI_OP(read, word, u16 *)
91EARLY_PCI_OP(read, dword, u32 *)
92EARLY_PCI_OP(write, byte, u8)
93EARLY_PCI_OP(write, word, u16)
94EARLY_PCI_OP(write, dword, u32)
95
96static struct resource *io_resource_inuse;
97static struct resource *mem_resource_inuse;
98
99static u32 pciauto_lower_iospc;
100static u32 pciauto_upper_iospc;
101
102static u32 pciauto_lower_memspc;
103static u32 pciauto_upper_memspc;
104
105static void __init
106pciauto_setup_bars(struct pci_channel *hose,
107 int top_bus,
108 int current_bus,
109 int pci_devfn,
110 int bar_limit)
111{
112 u32 bar_response, bar_size, bar_value;
113 u32 bar, addr_mask, bar_nr = 0;
114 u32 * upper_limit;
115 u32 * lower_limit;
116 int found_mem64 = 0;
117
118 for (bar = PCI_BASE_ADDRESS_0; bar <= bar_limit; bar+=4) {
119 u32 bar_addr;
120
121 /* Read the old BAR value */
122 early_read_config_dword(hose, top_bus,
123 current_bus,
124 pci_devfn,
125 bar,
126 &bar_addr);
127
128 /* Tickle the BAR and get the response */
129 early_write_config_dword(hose, top_bus,
130 current_bus,
131 pci_devfn,
132 bar,
133 0xffffffff);
134
135 early_read_config_dword(hose, top_bus,
136 current_bus,
137 pci_devfn,
138 bar,
139 &bar_response);
140
141 /*
142 * Write the old BAR value back out, only update the BAR
143 * if we implicitly want resources to be updated, which
144 * is done by the generic code further down. -- PFM.
145 */
146 early_write_config_dword(hose, top_bus,
147 current_bus,
148 pci_devfn,
149 bar,
150 bar_addr);
151
152 /* If BAR is not implemented go to the next BAR */
153 if (!bar_response)
154 continue;
155
156 /*
157 * Workaround for a BAR that doesn't use its upper word,
158 * like the ALi 1535D+ PCI DC-97 Controller Modem (M5457).
159 * bdl <brad@ltc.com>
160 */
161 if (!(bar_response & 0xffff0000))
162 bar_response |= 0xffff0000;
163
164retry:
165 /* Check the BAR type and set our address mask */
166 if (bar_response & PCI_BASE_ADDRESS_SPACE) {
167 addr_mask = PCI_BASE_ADDRESS_IO_MASK;
168 upper_limit = &pciauto_upper_iospc;
169 lower_limit = &pciauto_lower_iospc;
170 DBG(" I/O");
171 } else {
172 if ((bar_response & PCI_BASE_ADDRESS_MEM_TYPE_MASK) ==
173 PCI_BASE_ADDRESS_MEM_TYPE_64)
174 found_mem64 = 1;
175
176 addr_mask = PCI_BASE_ADDRESS_MEM_MASK;
177 upper_limit = &pciauto_upper_memspc;
178 lower_limit = &pciauto_lower_memspc;
179 DBG(" Mem");
180 }
181
182
183 /* Calculate requested size */
184 bar_size = ~(bar_response & addr_mask) + 1;
185
186 /* Allocate a base address */
187 bar_value = ((*lower_limit - 1) & ~(bar_size - 1)) + bar_size;
188
189 if ((bar_value + bar_size) > *upper_limit) {
190 if (bar_response & PCI_BASE_ADDRESS_SPACE) {
191 if (io_resource_inuse->child) {
192 io_resource_inuse =
193 io_resource_inuse->child;
194 pciauto_lower_iospc =
195 io_resource_inuse->start;
196 pciauto_upper_iospc =
197 io_resource_inuse->end + 1;
198 goto retry;
199 }
200
201 } else {
202 if (mem_resource_inuse->child) {
203 mem_resource_inuse =
204 mem_resource_inuse->child;
205 pciauto_lower_memspc =
206 mem_resource_inuse->start;
207 pciauto_upper_memspc =
208 mem_resource_inuse->end + 1;
209 goto retry;
210 }
211 }
212 DBG(" unavailable -- skipping, value %x size %x\n",
213 bar_value, bar_size);
214 continue;
215 }
216
217 if (bar_value < *lower_limit || (bar_value + bar_size) >= *upper_limit) {
218 DBG(" unavailable -- skipping, value %x size %x\n",
219 bar_value, bar_size);
220 continue;
221 }
222
223#ifdef CONFIG_PCI_AUTO_UPDATE_RESOURCES
224 /* Write it out and update our limit */
225 early_write_config_dword(hose, top_bus, current_bus, pci_devfn,
226 bar, bar_value);
227#endif
228
229 *lower_limit = bar_value + bar_size;
230
231 /*
232 * If we are a 64-bit decoder then increment to the
233 * upper 32 bits of the bar and force it to locate
234 * in the lower 4GB of memory.
235 */
236 if (found_mem64) {
237 bar += 4;
238 early_write_config_dword(hose, top_bus,
239 current_bus,
240 pci_devfn,
241 bar,
242 0x00000000);
243 }
244
245 DBG(" at 0x%.8x [size=0x%x]\n", bar_value, bar_size);
246
247 bar_nr++;
248 }
249
250}
251
252static void __init
253pciauto_prescan_setup_bridge(struct pci_channel *hose,
254 int top_bus,
255 int current_bus,
256 int pci_devfn,
257 int sub_bus)
258{
259 /* Configure bus number registers */
260 early_write_config_byte(hose, top_bus, current_bus, pci_devfn,
261 PCI_PRIMARY_BUS, current_bus);
262 early_write_config_byte(hose, top_bus, current_bus, pci_devfn,
263 PCI_SECONDARY_BUS, sub_bus + 1);
264 early_write_config_byte(hose, top_bus, current_bus, pci_devfn,
265 PCI_SUBORDINATE_BUS, 0xff);
266
267 /* Align memory and I/O to 1MB and 4KB boundaries. */
268 pciauto_lower_memspc = (pciauto_lower_memspc + (0x100000 - 1))
269 & ~(0x100000 - 1);
270 pciauto_lower_iospc = (pciauto_lower_iospc + (0x1000 - 1))
271 & ~(0x1000 - 1);
272
273 /* Set base (lower limit) of address range behind bridge. */
274 early_write_config_word(hose, top_bus, current_bus, pci_devfn,
275 PCI_MEMORY_BASE, pciauto_lower_memspc >> 16);
276 early_write_config_byte(hose, top_bus, current_bus, pci_devfn,
277 PCI_IO_BASE, (pciauto_lower_iospc & 0x0000f000) >> 8);
278 early_write_config_word(hose, top_bus, current_bus, pci_devfn,
279 PCI_IO_BASE_UPPER16, pciauto_lower_iospc >> 16);
280
281 /* We don't support prefetchable memory for now, so disable */
282 early_write_config_word(hose, top_bus, current_bus, pci_devfn,
283 PCI_PREF_MEMORY_BASE, 0);
284 early_write_config_word(hose, top_bus, current_bus, pci_devfn,
285 PCI_PREF_MEMORY_LIMIT, 0);
286}
287
288static void __init
289pciauto_postscan_setup_bridge(struct pci_channel *hose,
290 int top_bus,
291 int current_bus,
292 int pci_devfn,
293 int sub_bus)
294{
295 u32 temp;
296
297 /*
298 * [jsun] we always bump up baselines a little, so that if there
299 * nothing behind P2P bridge, we don't wind up overlapping IO/MEM
300 * spaces.
301 */
302 pciauto_lower_memspc += 1;
303 pciauto_lower_iospc += 1;
304
305 /* Configure bus number registers */
306 early_write_config_byte(hose, top_bus, current_bus, pci_devfn,
307 PCI_SUBORDINATE_BUS, sub_bus);
308
309 /* Set upper limit of address range behind bridge. */
310 early_write_config_word(hose, top_bus, current_bus, pci_devfn,
311 PCI_MEMORY_LIMIT, pciauto_lower_memspc >> 16);
312 early_write_config_byte(hose, top_bus, current_bus, pci_devfn,
313 PCI_IO_LIMIT, (pciauto_lower_iospc & 0x0000f000) >> 8);
314 early_write_config_word(hose, top_bus, current_bus, pci_devfn,
315 PCI_IO_LIMIT_UPPER16, pciauto_lower_iospc >> 16);
316
317 /* Align memory and I/O to 1MB and 4KB boundaries. */
318 pciauto_lower_memspc = (pciauto_lower_memspc + (0x100000 - 1))
319 & ~(0x100000 - 1);
320 pciauto_lower_iospc = (pciauto_lower_iospc + (0x1000 - 1))
321 & ~(0x1000 - 1);
322
323 /* Enable memory and I/O accesses, enable bus master */
324 early_read_config_dword(hose, top_bus, current_bus, pci_devfn,
325 PCI_COMMAND, &temp);
326 early_write_config_dword(hose, top_bus, current_bus, pci_devfn,
327 PCI_COMMAND, temp | PCI_COMMAND_IO | PCI_COMMAND_MEMORY
328 | PCI_COMMAND_MASTER);
329}
330
331static void __init
332pciauto_prescan_setup_cardbus_bridge(struct pci_channel *hose,
333 int top_bus,
334 int current_bus,
335 int pci_devfn,
336 int sub_bus)
337{
338 /* Configure bus number registers */
339 early_write_config_byte(hose, top_bus, current_bus, pci_devfn,
340 PCI_PRIMARY_BUS, current_bus);
341 early_write_config_byte(hose, top_bus, current_bus, pci_devfn,
342 PCI_SECONDARY_BUS, sub_bus + 1);
343 early_write_config_byte(hose, top_bus, current_bus, pci_devfn,
344 PCI_SUBORDINATE_BUS, 0xff);
345
346 /* Align memory and I/O to 4KB and 4 byte boundaries. */
347 pciauto_lower_memspc = (pciauto_lower_memspc + (0x1000 - 1))
348 & ~(0x1000 - 1);
349 pciauto_lower_iospc = (pciauto_lower_iospc + (0x4 - 1))
350 & ~(0x4 - 1);
351
352 early_write_config_dword(hose, top_bus, current_bus, pci_devfn,
353 PCI_CB_MEMORY_BASE_0, pciauto_lower_memspc);
354 early_write_config_dword(hose, top_bus, current_bus, pci_devfn,
355 PCI_CB_IO_BASE_0, pciauto_lower_iospc);
356}
357
358static void __init
359pciauto_postscan_setup_cardbus_bridge(struct pci_channel *hose,
360 int top_bus,
361 int current_bus,
362 int pci_devfn,
363 int sub_bus)
364{
365 u32 temp;
366
367 /*
368 * [jsun] we always bump up baselines a little, so that if there
369 * nothing behind P2P bridge, we don't wind up overlapping IO/MEM
370 * spaces.
371 */
372 pciauto_lower_memspc += 1;
373 pciauto_lower_iospc += 1;
374
375 /*
376 * Configure subordinate bus number. The PCI subsystem
377 * bus scan will renumber buses (reserving three additional
378 * for this PCI<->CardBus bridge for the case where a CardBus
379 * adapter contains a P2P or CB2CB bridge.
380 */
381
382 early_write_config_byte(hose, top_bus, current_bus, pci_devfn,
383 PCI_SUBORDINATE_BUS, sub_bus);
384
385 /*
386 * Reserve an additional 4MB for mem space and 16KB for
387 * I/O space. This should cover any additional space
388 * requirement of unusual CardBus devices with
389 * additional bridges that can consume more address space.
390 *
391 * Although pcmcia-cs currently will reprogram bridge
392 * windows, the goal is to add an option to leave them
393 * alone and use the bridge window ranges as the regions
394 * that are searched for free resources upon hot-insertion
395 * of a device. This will allow a PCI<->CardBus bridge
396 * configured by this routine to happily live behind a
397 * P2P bridge in a system.
398 */
399 /* Align memory and I/O to 4KB and 4 byte boundaries. */
400 pciauto_lower_memspc = (pciauto_lower_memspc + (0x1000 - 1))
401 & ~(0x1000 - 1);
402 pciauto_lower_iospc = (pciauto_lower_iospc + (0x4 - 1))
403 & ~(0x4 - 1);
404 /* Set up memory and I/O filter limits, assume 32-bit I/O space */
405 early_write_config_dword(hose, top_bus, current_bus, pci_devfn,
406 PCI_CB_MEMORY_LIMIT_0, pciauto_lower_memspc - 1);
407 early_write_config_dword(hose, top_bus, current_bus, pci_devfn,
408 PCI_CB_IO_LIMIT_0, pciauto_lower_iospc - 1);
409
410 /* Enable memory and I/O accesses, enable bus master */
411 early_read_config_dword(hose, top_bus, current_bus, pci_devfn,
412 PCI_COMMAND, &temp);
413 early_write_config_dword(hose, top_bus, current_bus, pci_devfn,
414 PCI_COMMAND, temp | PCI_COMMAND_IO | PCI_COMMAND_MEMORY |
415 PCI_COMMAND_MASTER);
416}
417
418#define PCIAUTO_IDE_MODE_MASK 0x05
419
420static int __init
421pciauto_bus_scan(struct pci_channel *hose, int top_bus, int current_bus)
422{
423 int sub_bus;
424 u32 pci_devfn, pci_class, cmdstat, found_multi=0;
425 unsigned short vid, did;
426 unsigned char header_type;
427 int devfn_start = 0;
428 int devfn_stop = 0xff;
429
430 sub_bus = current_bus;
431
432 if (hose->first_devfn)
433 devfn_start = hose->first_devfn;
434 if (hose->last_devfn)
435 devfn_stop = hose->last_devfn;
436
437 for (pci_devfn=devfn_start; pci_devfn<devfn_stop; pci_devfn++) {
438
439 if (PCI_FUNC(pci_devfn) && !found_multi)
440 continue;
441
442 early_read_config_word(hose, top_bus, current_bus, pci_devfn,
443 PCI_VENDOR_ID, &vid);
444
445 if (vid == 0xffff) continue;
446
447 early_read_config_byte(hose, top_bus, current_bus, pci_devfn,
448 PCI_HEADER_TYPE, &header_type);
449
450 if (!PCI_FUNC(pci_devfn))
451 found_multi = header_type & 0x80;
452
453 early_read_config_word(hose, top_bus, current_bus, pci_devfn,
454 PCI_DEVICE_ID, &did);
455
456 early_read_config_dword(hose, top_bus, current_bus, pci_devfn,
457 PCI_CLASS_REVISION, &pci_class);
458
459 DBG("%.2x:%.2x.%x Class %.4x: %.4x:%.4x",
460 current_bus, PCI_SLOT(pci_devfn), PCI_FUNC(pci_devfn),
461 pci_class >> 16, vid, did);
462 if (pci_class & 0xff)
463 DBG(" (rev %.2x)", pci_class & 0xff);
464 DBG("\n");
465
466 if ((pci_class >> 16) == PCI_CLASS_BRIDGE_PCI) {
467 DBG(" Bridge: primary=%.2x, secondary=%.2x\n",
468 current_bus, sub_bus + 1);
469 pciauto_prescan_setup_bridge(hose, top_bus, current_bus,
470 pci_devfn, sub_bus);
471 DBG("Scanning sub bus %.2x, I/O 0x%.8x, Mem 0x%.8x\n",
472 sub_bus + 1,
473 pciauto_lower_iospc, pciauto_lower_memspc);
474 sub_bus = pciauto_bus_scan(hose, top_bus, sub_bus+1);
475 DBG("Back to bus %.2x\n", current_bus);
476 pciauto_postscan_setup_bridge(hose, top_bus, current_bus,
477 pci_devfn, sub_bus);
478 continue;
479 } else if ((pci_class >> 16) == PCI_CLASS_BRIDGE_CARDBUS) {
480 DBG(" CARDBUS Bridge: primary=%.2x, secondary=%.2x\n",
481 current_bus, sub_bus + 1);
482 DBG("PCI Autoconfig: Found CardBus bridge, device %d function %d\n", PCI_SLOT(pci_devfn), PCI_FUNC(pci_devfn));
483 /* Place CardBus Socket/ExCA registers */
484 pciauto_setup_bars(hose, top_bus, current_bus, pci_devfn, PCI_BASE_ADDRESS_0);
485
486 pciauto_prescan_setup_cardbus_bridge(hose, top_bus,
487 current_bus, pci_devfn, sub_bus);
488
489 DBG("Scanning sub bus %.2x, I/O 0x%.8x, Mem 0x%.8x\n",
490 sub_bus + 1,
491 pciauto_lower_iospc, pciauto_lower_memspc);
492 sub_bus = pciauto_bus_scan(hose, top_bus, sub_bus+1);
493 DBG("Back to bus %.2x, sub_bus is %x\n", current_bus, sub_bus);
494 pciauto_postscan_setup_cardbus_bridge(hose, top_bus,
495 current_bus, pci_devfn, sub_bus);
496 continue;
497 } else if ((pci_class >> 16) == PCI_CLASS_STORAGE_IDE) {
498
499 unsigned char prg_iface;
500
501 early_read_config_byte(hose, top_bus, current_bus,
502 pci_devfn, PCI_CLASS_PROG, &prg_iface);
503 if (!(prg_iface & PCIAUTO_IDE_MODE_MASK)) {
504 DBG("Skipping legacy mode IDE controller\n");
505 continue;
506 }
507 }
508
509 /*
510 * Found a peripheral, enable some standard
511 * settings
512 */
513 early_read_config_dword(hose, top_bus, current_bus, pci_devfn,
514 PCI_COMMAND, &cmdstat);
515 early_write_config_dword(hose, top_bus, current_bus, pci_devfn,
516 PCI_COMMAND, cmdstat | PCI_COMMAND_IO |
517 PCI_COMMAND_MEMORY |
518 PCI_COMMAND_MASTER);
519 early_write_config_byte(hose, top_bus, current_bus, pci_devfn,
520 PCI_LATENCY_TIMER, 0x80);
521
522 /* Allocate PCI I/O and/or memory space */
523 pciauto_setup_bars(hose, top_bus, current_bus, pci_devfn, PCI_BASE_ADDRESS_5);
524 }
525 return sub_bus;
526}
527
528int __init
529pciauto_assign_resources(int busno, struct pci_channel *hose)
530{
531 /* setup resource limits */
532 io_resource_inuse = hose->io_resource;
533 mem_resource_inuse = hose->mem_resource;
534
535 pciauto_lower_iospc = io_resource_inuse->start;
536 pciauto_upper_iospc = io_resource_inuse->end + 1;
537 pciauto_lower_memspc = mem_resource_inuse->start;
538 pciauto_upper_memspc = mem_resource_inuse->end + 1;
539 DBG("Autoconfig PCI channel 0x%p\n", hose);
540 DBG("Scanning bus %.2x, I/O 0x%.8x:0x%.8x, Mem 0x%.8x:0x%.8x\n",
541 busno, pciauto_lower_iospc, pciauto_upper_iospc,
542 pciauto_lower_memspc, pciauto_upper_memspc);
543
544 return pciauto_bus_scan(hose, busno, busno);
545}
diff --git a/arch/sh/drivers/pci/pci-dreamcast.c b/arch/sh/drivers/pci/pci-dreamcast.c
new file mode 100644
index 000000000000..210f9d4af141
--- /dev/null
+++ b/arch/sh/drivers/pci/pci-dreamcast.c
@@ -0,0 +1,102 @@
1/*
2 * PCI support for the Sega Dreamcast
3 *
4 * Copyright (C) 2001, 2002 M. R. Brown
5 * Copyright (C) 2002, 2003 Paul Mundt
6 *
7 * This file originally bore the message (with enclosed-$):
8 * Id: pci.c,v 1.3 2003/05/04 19:29:46 lethal Exp
9 * Dreamcast PCI: Supports SEGA Broadband Adaptor only.
10 *
11 * This file is subject to the terms and conditions of the GNU General Public
12 * License. See the file "COPYING" in the main directory of this archive
13 * for more details.
14 */
15
16#include <linux/sched.h>
17#include <linux/kernel.h>
18#include <linux/param.h>
19#include <linux/interrupt.h>
20#include <linux/init.h>
21#include <linux/irq.h>
22#include <linux/pci.h>
23#include <linux/module.h>
24#include <asm/io.h>
25#include <asm/irq.h>
26#include <mach/pci.h>
27
28static struct resource gapspci_io_resource = {
29 .name = "GAPSPCI IO",
30 .start = GAPSPCI_BBA_CONFIG,
31 .end = GAPSPCI_BBA_CONFIG + GAPSPCI_BBA_CONFIG_SIZE - 1,
32 .flags = IORESOURCE_IO,
33};
34
35static struct resource gapspci_mem_resource = {
36 .name = "GAPSPCI mem",
37 .start = GAPSPCI_DMA_BASE,
38 .end = GAPSPCI_DMA_BASE + GAPSPCI_DMA_SIZE - 1,
39 .flags = IORESOURCE_MEM,
40};
41
42static struct pci_channel dreamcast_pci_controller = {
43 .pci_ops = &gapspci_pci_ops,
44 .io_resource = &gapspci_io_resource,
45 .io_offset = 0x00000000,
46 .mem_resource = &gapspci_mem_resource,
47 .mem_offset = 0x00000000,
48};
49
50/*
51 * gapspci init
52 */
53
54static int __init gapspci_init(void)
55{
56 char idbuf[16];
57 int i;
58
59 /*
60 * FIXME: All of this wants documenting to some degree,
61 * even some basic register definitions would be nice.
62 *
63 * I haven't seen anything this ugly since.. maple.
64 */
65
66 for (i=0; i<16; i++)
67 idbuf[i] = inb(GAPSPCI_REGS+i);
68
69 if (strncmp(idbuf, "GAPSPCI_BRIDGE_2", 16))
70 return -ENODEV;
71
72 outl(0x5a14a501, GAPSPCI_REGS+0x18);
73
74 for (i=0; i<1000000; i++)
75 cpu_relax();
76
77 if (inl(GAPSPCI_REGS+0x18) != 1)
78 return -EINVAL;
79
80 outl(0x01000000, GAPSPCI_REGS+0x20);
81 outl(0x01000000, GAPSPCI_REGS+0x24);
82
83 outl(GAPSPCI_DMA_BASE, GAPSPCI_REGS+0x28);
84 outl(GAPSPCI_DMA_BASE+GAPSPCI_DMA_SIZE, GAPSPCI_REGS+0x2c);
85
86 outl(1, GAPSPCI_REGS+0x14);
87 outl(1, GAPSPCI_REGS+0x34);
88
89 /* Setting Broadband Adapter */
90 outw(0xf900, GAPSPCI_BBA_CONFIG+0x06);
91 outl(0x00000000, GAPSPCI_BBA_CONFIG+0x30);
92 outb(0x00, GAPSPCI_BBA_CONFIG+0x3c);
93 outb(0xf0, GAPSPCI_BBA_CONFIG+0x0d);
94 outw(0x0006, GAPSPCI_BBA_CONFIG+0x04);
95 outl(0x00002001, GAPSPCI_BBA_CONFIG+0x10);
96 outl(0x01000000, GAPSPCI_BBA_CONFIG+0x14);
97
98 register_pci_controller(&dreamcast_pci_controller);
99
100 return 0;
101}
102arch_initcall(gapspci_init);
diff --git a/arch/sh/drivers/pci/pci-sh4.h b/arch/sh/drivers/pci/pci-sh4.h
index a83dcf70c13b..3d5296cde622 100644
--- a/arch/sh/drivers/pci/pci-sh4.h
+++ b/arch/sh/drivers/pci/pci-sh4.h
@@ -149,13 +149,10 @@
149 #define SH4_PCIPDTR_PB0 0x000000001 /* Port 0 Enable */ 149 #define SH4_PCIPDTR_PB0 0x000000001 /* Port 0 Enable */
150#define SH4_PCIPDR 0x220 /* Port IO Data Register */ 150#define SH4_PCIPDR 0x220 /* Port IO Data Register */
151 151
152/* Flags */
153#define SH4_PCIC_NO_RESET 0x0001
154
155/* arch/sh/kernel/drivers/pci/ops-sh4.c */ 152/* arch/sh/kernel/drivers/pci/ops-sh4.c */
156extern struct pci_ops sh4_pci_ops; 153extern struct pci_ops sh4_pci_ops;
157int sh4_pci_check_direct(void); 154int sh4_pci_check_direct(struct pci_channel *chan);
158int pci_fixup_pcic(void); 155int pci_fixup_pcic(struct pci_channel *chan);
159 156
160struct sh4_pci_address_space { 157struct sh4_pci_address_space {
161 unsigned long base; 158 unsigned long base;
@@ -165,16 +162,18 @@ struct sh4_pci_address_space {
165struct sh4_pci_address_map { 162struct sh4_pci_address_map {
166 struct sh4_pci_address_space window0; 163 struct sh4_pci_address_space window0;
167 struct sh4_pci_address_space window1; 164 struct sh4_pci_address_space window1;
168 unsigned long flags;
169}; 165};
170 166
171static inline void pci_write_reg(unsigned long val, unsigned long reg) 167static inline void pci_write_reg(struct pci_channel *chan,
168 unsigned long val, unsigned long reg)
172{ 169{
173 ctrl_outl(val, PCI_REG(reg)); 170 ctrl_outl(val, chan->reg_base + reg);
174} 171}
175 172
176static inline unsigned long pci_read_reg(unsigned long reg) 173static inline unsigned long pci_read_reg(struct pci_channel *chan,
174 unsigned long reg)
177{ 175{
178 return ctrl_inl(PCI_REG(reg)); 176 return ctrl_inl(chan->reg_base + reg);
179} 177}
178
180#endif /* __PCI_SH4_H */ 179#endif /* __PCI_SH4_H */
diff --git a/arch/sh/drivers/pci/pci-sh5.c b/arch/sh/drivers/pci/pci-sh5.c
index 7a97438762c8..cf431852213c 100644
--- a/arch/sh/drivers/pci/pci-sh5.c
+++ b/arch/sh/drivers/pci/pci-sh5.c
@@ -89,8 +89,21 @@ static irqreturn_t pcish5_serr_irq(int irq, void *dev_id)
89 return IRQ_NONE; 89 return IRQ_NONE;
90} 90}
91 91
92int __init sh5pci_init(unsigned long memStart, unsigned long memSize) 92static struct resource sh5_io_resource = { /* place holder */ };
93static struct resource sh5_mem_resource = { /* place holder */ };
94
95static struct pci_channel sh5pci_controller = {
96 .pci_ops = &sh5_pci_ops,
97 .mem_resource = &sh5_mem_resource,
98 .mem_offset = 0x00000000,
99 .io_resource = &sh5_io_resource,
100 .io_offset = 0x00000000,
101};
102
103static int __init sh5pci_init(void)
93{ 104{
105 unsigned long memStart = __pa(memory_start);
106 unsigned long memSize = __pa(memory_end) - memStart;
94 u32 lsr0; 107 u32 lsr0;
95 u32 uval; 108 u32 uval;
96 109
@@ -197,32 +210,14 @@ int __init sh5pci_init(unsigned long memStart, unsigned long memSize)
197 SH5PCI_WRITE(AINTM, ~0); 210 SH5PCI_WRITE(AINTM, ~0);
198 SH5PCI_WRITE(PINTM, ~0); 211 SH5PCI_WRITE(PINTM, ~0);
199 212
200 return 0; 213 sh5_io_resource.start = PCI_IO_AREA;
201} 214 sh5_io_resource.end = PCI_IO_AREA + 0x10000;
202 215
203void __devinit pcibios_fixup_bus(struct pci_bus *bus) 216 sh5_mem_resource.start = memStart;
204{ 217 sh5_mem_resource.end = memStart + memSize;
205 struct pci_dev *dev = bus->self; 218
206 int i; 219 register_pci_controller(&sh5pci_controller);
207 220
208 if (dev) { 221 return 0;
209 for (i= 0; i < 3; i++) {
210 bus->resource[i] =
211 &dev->resource[PCI_BRIDGE_RESOURCES+i];
212 bus->resource[i]->name = bus->name;
213 }
214 bus->resource[0]->flags |= IORESOURCE_IO;
215 bus->resource[1]->flags |= IORESOURCE_MEM;
216
217 /* For now, propagate host limits to the bus;
218 * we'll adjust them later. */
219 bus->resource[0]->end = 64*1024 - 1 ;
220 bus->resource[1]->end = PCIBIOS_MIN_MEM+(256*1024*1024)-1;
221 bus->resource[0]->start = PCIBIOS_MIN_IO;
222 bus->resource[1]->start = PCIBIOS_MIN_MEM;
223
224 /* Turn off downstream PF memory address range by default */
225 bus->resource[2]->start = 1024*1024;
226 bus->resource[2]->end = bus->resource[2]->start - 1;
227 }
228} 222}
223arch_initcall(sh5pci_init);
diff --git a/arch/sh/drivers/pci/pci-sh5.h b/arch/sh/drivers/pci/pci-sh5.h
index 7cff3fc04d30..f277628221f3 100644
--- a/arch/sh/drivers/pci/pci-sh5.h
+++ b/arch/sh/drivers/pci/pci-sh5.h
@@ -107,7 +107,4 @@ extern unsigned long pcicr_virt;
107 107
108extern struct pci_ops sh5_pci_ops; 108extern struct pci_ops sh5_pci_ops;
109 109
110/* arch/sh/drivers/pci/pci-sh5.c */
111int sh5pci_init(unsigned long memStart, unsigned long memSize);
112
113#endif /* __PCI_SH5_H */ 110#endif /* __PCI_SH5_H */
diff --git a/arch/sh/drivers/pci/pci-sh7751.c b/arch/sh/drivers/pci/pci-sh7751.c
index 3065eb184f01..c4fa0bb13976 100644
--- a/arch/sh/drivers/pci/pci-sh7751.c
+++ b/arch/sh/drivers/pci/pci-sh7751.c
@@ -1,88 +1,99 @@
1/* 1/*
2 * Low-Level PCI Support for the SH7751 2 * Low-Level PCI Support for the SH7751
3 * 3 *
4 * Dustin McIntire (dustin@sensoria.com) 4 * Copyright (C) 2003 - 2009 Paul Mundt
5 * Derived from arch/i386/kernel/pci-*.c which bore the message: 5 * Copyright (C) 2001 Dustin McIntire
6 * (c) 1999--2000 Martin Mares <mj@ucw.cz>
7 * 6 *
8 * Ported to the new API by Paul Mundt <lethal@linux-sh.org> 7 * With cleanup by Paul van Gool <pvangool@mimotech.com>, 2003.
9 * With cleanup by Paul van Gool <pvangool@mimotech.com>
10 *
11 * May be copied or modified under the terms of the GNU General Public
12 * License. See linux/COPYING for more information.
13 * 8 *
9 * This file is subject to the terms and conditions of the GNU General Public
10 * License. See the file "COPYING" in the main directory of this archive
11 * for more details.
14 */ 12 */
15#undef DEBUG
16
17#include <linux/init.h> 13#include <linux/init.h>
18#include <linux/pci.h> 14#include <linux/pci.h>
19#include <linux/types.h> 15#include <linux/types.h>
20#include <linux/errno.h> 16#include <linux/errno.h>
21#include <linux/delay.h> 17#include <linux/io.h>
22#include "pci-sh4.h" 18#include "pci-sh4.h"
23#include <asm/addrspace.h> 19#include <asm/addrspace.h>
24#include <asm/io.h>
25 20
26/* 21static int __init __area_sdram_check(struct pci_channel *chan,
27 * Initialization. Try all known PCI access methods. Note that we support 22 unsigned int area)
28 * using both PCI BIOS and direct access: in such cases, we use I/O ports
29 * to access config space.
30 *
31 * Note that the platform specific initialization (BSC registers, and memory
32 * space mapping) will be called via the platform defined function
33 * pcibios_init_platform().
34 */
35static int __init sh7751_pci_init(void)
36{ 23{
37 unsigned int id; 24 unsigned long word;
38 int ret;
39
40 pr_debug("PCI: Starting intialization.\n");
41 25
42 /* check for SH7751/SH7751R hardware */ 26 word = __raw_readl(SH7751_BCR1);
43 id = pci_read_reg(SH7751_PCICONF0);
44 if (id != ((SH7751_DEVICE_ID << 16) | SH7751_VENDOR_ID) &&
45 id != ((SH7751R_DEVICE_ID << 16) | SH7751_VENDOR_ID)) {
46 pr_debug("PCI: This is not an SH7751(R) (%x)\n", id);
47 return -ENODEV;
48 }
49
50 if ((ret = sh4_pci_check_direct()) != 0)
51 return ret;
52
53 return pcibios_init_platform();
54}
55subsys_initcall(sh7751_pci_init);
56
57static int __init __area_sdram_check(unsigned int area)
58{
59 u32 word;
60
61 word = ctrl_inl(SH7751_BCR1);
62 /* check BCR for SDRAM in area */ 27 /* check BCR for SDRAM in area */
63 if (((word >> area) & 1) == 0) { 28 if (((word >> area) & 1) == 0) {
64 printk("PCI: Area %d is not configured for SDRAM. BCR1=0x%x\n", 29 printk("PCI: Area %d is not configured for SDRAM. BCR1=0x%lx\n",
65 area, word); 30 area, word);
66 return 0; 31 return 0;
67 } 32 }
68 pci_write_reg(word, SH4_PCIBCR1); 33 pci_write_reg(chan, word, SH4_PCIBCR1);
69 34
70 word = (u16)ctrl_inw(SH7751_BCR2); 35 word = __raw_readw(SH7751_BCR2);
71 /* check BCR2 for 32bit SDRAM interface*/ 36 /* check BCR2 for 32bit SDRAM interface*/
72 if (((word >> (area << 1)) & 0x3) != 0x3) { 37 if (((word >> (area << 1)) & 0x3) != 0x3) {
73 printk("PCI: Area %d is not 32 bit SDRAM. BCR2=0x%x\n", 38 printk("PCI: Area %d is not 32 bit SDRAM. BCR2=0x%lx\n",
74 area, word); 39 area, word);
75 return 0; 40 return 0;
76 } 41 }
77 pci_write_reg(word, SH4_PCIBCR2); 42 pci_write_reg(chan, word, SH4_PCIBCR2);
78 43
79 return 1; 44 return 1;
80} 45}
81 46
82int __init sh7751_pcic_init(struct sh4_pci_address_map *map) 47static struct resource sh7751_io_resource = {
48 .name = "SH7751_IO",
49 .start = SH7751_PCI_IO_BASE,
50 .end = SH7751_PCI_IO_BASE + SH7751_PCI_IO_SIZE - 1,
51 .flags = IORESOURCE_IO
52};
53
54static struct resource sh7751_mem_resource = {
55 .name = "SH7785_mem",
56 .start = SH7751_PCI_MEMORY_BASE,
57 .end = SH7751_PCI_MEMORY_BASE + SH7751_PCI_MEM_SIZE - 1,
58 .flags = IORESOURCE_MEM
59};
60
61static struct pci_channel sh7751_pci_controller = {
62 .pci_ops = &sh4_pci_ops,
63 .mem_resource = &sh7751_mem_resource,
64 .mem_offset = 0x00000000,
65 .io_resource = &sh7751_io_resource,
66 .io_offset = 0x00000000,
67};
68
69static struct sh4_pci_address_map sh7751_pci_map = {
70 .window0 = {
71 .base = SH7751_CS3_BASE_ADDR,
72 .size = 0x04000000,
73 },
74};
75
76static int __init sh7751_pci_init(void)
83{ 77{
84 u32 reg; 78 struct pci_channel *chan = &sh7751_pci_controller;
85 u32 word; 79 unsigned int id;
80 u32 word, reg;
81 int ret;
82
83 printk(KERN_NOTICE "PCI: Starting intialization.\n");
84
85 chan->reg_base = 0xfe200000;
86
87 /* check for SH7751/SH7751R hardware */
88 id = pci_read_reg(chan, SH7751_PCICONF0);
89 if (id != ((SH7751_DEVICE_ID << 16) | SH7751_VENDOR_ID) &&
90 id != ((SH7751R_DEVICE_ID << 16) | SH7751_VENDOR_ID)) {
91 pr_debug("PCI: This is not an SH7751(R) (%x)\n", id);
92 return -ENODEV;
93 }
94
95 if ((ret = sh4_pci_check_direct(chan)) != 0)
96 return ret;
86 97
87 /* Set the BCR's to enable PCI access */ 98 /* Set the BCR's to enable PCI access */
88 reg = ctrl_inl(SH7751_BCR1); 99 reg = ctrl_inl(SH7751_BCR1);
@@ -90,25 +101,10 @@ int __init sh7751_pcic_init(struct sh4_pci_address_map *map)
90 ctrl_outl(reg, SH7751_BCR1); 101 ctrl_outl(reg, SH7751_BCR1);
91 102
92 /* Turn the clocks back on (not done in reset)*/ 103 /* Turn the clocks back on (not done in reset)*/
93 pci_write_reg(0, SH4_PCICLKR); 104 pci_write_reg(chan, 0, SH4_PCICLKR);
94 /* Clear Powerdown IRQ's (not done in reset) */ 105 /* Clear Powerdown IRQ's (not done in reset) */
95 word = SH4_PCIPINT_D3 | SH4_PCIPINT_D0; 106 word = SH4_PCIPINT_D3 | SH4_PCIPINT_D0;
96 pci_write_reg(word, SH4_PCIPINT); 107 pci_write_reg(chan, word, SH4_PCIPINT);
97
98 /*
99 * This code is unused for some boards as it is done in the
100 * bootloader and doing it here means the MAC addresses loaded
101 * by the bootloader get lost.
102 */
103 if (!(map->flags & SH4_PCIC_NO_RESET)) {
104 /* toggle PCI reset pin */
105 word = SH4_PCICR_PREFIX | SH4_PCICR_PRST;
106 pci_write_reg(word, SH4_PCICR);
107 /* Wait for a long time... not 1 sec. but long enough */
108 mdelay(100);
109 word = SH4_PCICR_PREFIX;
110 pci_write_reg(word, SH4_PCICR);
111 }
112 108
113 /* set the command/status bits to: 109 /* set the command/status bits to:
114 * Wait Cycle Control + Parity Enable + Bus Master + 110 * Wait Cycle Control + Parity Enable + Bus Master +
@@ -116,89 +112,77 @@ int __init sh7751_pcic_init(struct sh4_pci_address_map *map)
116 */ 112 */
117 word = SH7751_PCICONF1_WCC | SH7751_PCICONF1_PER | 113 word = SH7751_PCICONF1_WCC | SH7751_PCICONF1_PER |
118 SH7751_PCICONF1_BUM | SH7751_PCICONF1_MES; 114 SH7751_PCICONF1_BUM | SH7751_PCICONF1_MES;
119 pci_write_reg(word, SH7751_PCICONF1); 115 pci_write_reg(chan, word, SH7751_PCICONF1);
120 116
121 /* define this host as the host bridge */ 117 /* define this host as the host bridge */
122 word = PCI_BASE_CLASS_BRIDGE << 24; 118 word = PCI_BASE_CLASS_BRIDGE << 24;
123 pci_write_reg(word, SH7751_PCICONF2); 119 pci_write_reg(chan, word, SH7751_PCICONF2);
124 120
125 /* Set IO and Mem windows to local address 121 /* Set IO and Mem windows to local address
126 * Make PCI and local address the same for easy 1 to 1 mapping 122 * Make PCI and local address the same for easy 1 to 1 mapping
127 * Window0 = map->window0.size @ non-cached area base = SDRAM
128 * Window1 = map->window1.size @ cached area base = SDRAM
129 */ 123 */
130 word = map->window0.size - 1; 124 word = sh7751_pci_map.window0.size - 1;
131 pci_write_reg(word, SH4_PCILSR0); 125 pci_write_reg(chan, word, SH4_PCILSR0);
132 word = map->window1.size - 1;
133 pci_write_reg(word, SH4_PCILSR1);
134 /* Set the values on window 0 PCI config registers */ 126 /* Set the values on window 0 PCI config registers */
135 word = P2SEGADDR(map->window0.base); 127 word = P2SEGADDR(sh7751_pci_map.window0.base);
136 pci_write_reg(word, SH4_PCILAR0); 128 pci_write_reg(chan, word, SH4_PCILAR0);
137 pci_write_reg(word, SH7751_PCICONF5); 129 pci_write_reg(chan, word, SH7751_PCICONF5);
138 /* Set the values on window 1 PCI config registers */
139 word = PHYSADDR(map->window1.base);
140 pci_write_reg(word, SH4_PCILAR1);
141 pci_write_reg(word, SH7751_PCICONF6);
142 130
143 /* Set the local 16MB PCI memory space window to 131 /* Set the local 16MB PCI memory space window to
144 * the lowest PCI mapped address 132 * the lowest PCI mapped address
145 */ 133 */
146 word = PCIBIOS_MIN_MEM & SH4_PCIMBR_MASK; 134 word = chan->mem_resource->start & SH4_PCIMBR_MASK;
147 pr_debug("PCI: Setting upper bits of Memory window to 0x%x\n", word); 135 pr_debug("PCI: Setting upper bits of Memory window to 0x%x\n", word);
148 pci_write_reg(word , SH4_PCIMBR); 136 pci_write_reg(chan, word , SH4_PCIMBR);
149
150 /* Map IO space into PCI IO window
151 * The IO window is 64K-PCIBIOS_MIN_IO in size
152 * IO addresses will be translated to the
153 * PCI IO window base address
154 */
155 pr_debug("PCI: Mapping IO address 0x%x - 0x%x to base 0x%x\n",
156 PCIBIOS_MIN_IO, (64 << 10),
157 SH7751_PCI_IO_BASE + PCIBIOS_MIN_IO);
158 137
159 /* Make sure the MSB's of IO window are set to access PCI space 138 /* Make sure the MSB's of IO window are set to access PCI space
160 * correctly */ 139 * correctly */
161 word = PCIBIOS_MIN_IO & SH4_PCIIOBR_MASK; 140 word = chan->io_resource->start & SH4_PCIIOBR_MASK;
162 pr_debug("PCI: Setting upper bits of IO window to 0x%x\n", word); 141 pr_debug("PCI: Setting upper bits of IO window to 0x%x\n", word);
163 pci_write_reg(word, SH4_PCIIOBR); 142 pci_write_reg(chan, word, SH4_PCIIOBR);
164 143
165 /* Set PCI WCRx, BCRx's, copy from BSC locations */ 144 /* Set PCI WCRx, BCRx's, copy from BSC locations */
166 145
167 /* check BCR for SDRAM in specified area */ 146 /* check BCR for SDRAM in specified area */
168 switch (map->window0.base) { 147 switch (sh7751_pci_map.window0.base) {
169 case SH7751_CS0_BASE_ADDR: word = __area_sdram_check(0); break; 148 case SH7751_CS0_BASE_ADDR: word = __area_sdram_check(chan, 0); break;
170 case SH7751_CS1_BASE_ADDR: word = __area_sdram_check(1); break; 149 case SH7751_CS1_BASE_ADDR: word = __area_sdram_check(chan, 1); break;
171 case SH7751_CS2_BASE_ADDR: word = __area_sdram_check(2); break; 150 case SH7751_CS2_BASE_ADDR: word = __area_sdram_check(chan, 2); break;
172 case SH7751_CS3_BASE_ADDR: word = __area_sdram_check(3); break; 151 case SH7751_CS3_BASE_ADDR: word = __area_sdram_check(chan, 3); break;
173 case SH7751_CS4_BASE_ADDR: word = __area_sdram_check(4); break; 152 case SH7751_CS4_BASE_ADDR: word = __area_sdram_check(chan, 4); break;
174 case SH7751_CS5_BASE_ADDR: word = __area_sdram_check(5); break; 153 case SH7751_CS5_BASE_ADDR: word = __area_sdram_check(chan, 5); break;
175 case SH7751_CS6_BASE_ADDR: word = __area_sdram_check(6); break; 154 case SH7751_CS6_BASE_ADDR: word = __area_sdram_check(chan, 6); break;
176 } 155 }
177 156
178 if (!word) 157 if (!word)
179 return 0; 158 return -1;
180 159
181 /* configure the wait control registers */ 160 /* configure the wait control registers */
182 word = ctrl_inl(SH7751_WCR1); 161 word = ctrl_inl(SH7751_WCR1);
183 pci_write_reg(word, SH4_PCIWCR1); 162 pci_write_reg(chan, word, SH4_PCIWCR1);
184 word = ctrl_inl(SH7751_WCR2); 163 word = ctrl_inl(SH7751_WCR2);
185 pci_write_reg(word, SH4_PCIWCR2); 164 pci_write_reg(chan, word, SH4_PCIWCR2);
186 word = ctrl_inl(SH7751_WCR3); 165 word = ctrl_inl(SH7751_WCR3);
187 pci_write_reg(word, SH4_PCIWCR3); 166 pci_write_reg(chan, word, SH4_PCIWCR3);
188 word = ctrl_inl(SH7751_MCR); 167 word = ctrl_inl(SH7751_MCR);
189 pci_write_reg(word, SH4_PCIMCR); 168 pci_write_reg(chan, word, SH4_PCIMCR);
190 169
191 /* NOTE: I'm ignoring the PCI error IRQs for now.. 170 /* NOTE: I'm ignoring the PCI error IRQs for now..
192 * TODO: add support for the internal error interrupts and 171 * TODO: add support for the internal error interrupts and
193 * DMA interrupts... 172 * DMA interrupts...
194 */ 173 */
195 174
196 pci_fixup_pcic(); 175 pci_fixup_pcic(chan);
197 176
198 /* SH7751 init done, set central function init complete */ 177 /* SH7751 init done, set central function init complete */
199 /* use round robin mode to stop a device starving/overruning */ 178 /* use round robin mode to stop a device starving/overruning */
200 word = SH4_PCICR_PREFIX | SH4_PCICR_CFIN | SH4_PCICR_ARBM; 179 word = SH4_PCICR_PREFIX | SH4_PCICR_CFIN | SH4_PCICR_ARBM;
201 pci_write_reg(word, SH4_PCICR); 180 pci_write_reg(chan, word, SH4_PCICR);
202 181
203 return 1; 182 __set_io_port_base(SH7751_PCI_IO_BASE);
183
184 register_pci_controller(chan);
185
186 return 0;
204} 187}
188arch_initcall(sh7751_pci_init);
diff --git a/arch/sh/drivers/pci/pci-sh7751.h b/arch/sh/drivers/pci/pci-sh7751.h
index 68e3cb5e6bec..4983a4d20355 100644
--- a/arch/sh/drivers/pci/pci-sh7751.h
+++ b/arch/sh/drivers/pci/pci-sh7751.h
@@ -26,7 +26,6 @@
26#define SH7751_PCI_IO_SIZE 0x40000 /* Size of IO window */ 26#define SH7751_PCI_IO_SIZE 0x40000 /* Size of IO window */
27 27
28#define SH7751_PCIREG_BASE 0xFE200000 /* PCI regs base address */ 28#define SH7751_PCIREG_BASE 0xFE200000 /* PCI regs base address */
29#define PCI_REG(n) (SH7751_PCIREG_BASE+ n)
30 29
31#define SH7751_PCICONF0 0x0 /* PCI Config Reg 0 */ 30#define SH7751_PCICONF0 0x0 /* PCI Config Reg 0 */
32 #define SH7751_PCICONF0_DEVID 0xFFFF0000 /* Device ID */ 31 #define SH7751_PCICONF0_DEVID 0xFFFF0000 /* Device ID */
@@ -58,7 +57,7 @@
58 #define SH7751_PCICONF2_SCC 0x00FF0000 /* Sub-Class Code */ 57 #define SH7751_PCICONF2_SCC 0x00FF0000 /* Sub-Class Code */
59 #define SH7751_PCICONF2_RLPI 0x0000FF00 /* Programming Interface */ 58 #define SH7751_PCICONF2_RLPI 0x0000FF00 /* Programming Interface */
60 #define SH7751_PCICONF2_REV 0x000000FF /* Revision ID */ 59 #define SH7751_PCICONF2_REV 0x000000FF /* Revision ID */
61#define SH7751_PCICONF3 0xC /* PCI Config Reg 3 */ 60#define SH7751_PCICONF3 0xC /* PCI Config Reg 3 */
62 #define SH7751_PCICONF3_BIST7 0x80000000 /* Bist Supported */ 61 #define SH7751_PCICONF3_BIST7 0x80000000 /* Bist Supported */
63 #define SH7751_PCICONF3_BIST6 0x40000000 /* Bist Executing */ 62 #define SH7751_PCICONF3_BIST6 0x40000000 /* Bist Executing */
64 #define SH7751_PCICONF3_BIST3_0 0x0F000000 /* Bist Passed */ 63 #define SH7751_PCICONF3_BIST3_0 0x0F000000 /* Bist Passed */
@@ -73,12 +72,12 @@
73 #define SH7751_PCICONF5_BASE 0xFFFFFFF0 /* Mem Space Base Addr */ 72 #define SH7751_PCICONF5_BASE 0xFFFFFFF0 /* Mem Space Base Addr */
74 #define SH7751_PCICONF5_LAP 0x00000008 /* Prefetch Enabled */ 73 #define SH7751_PCICONF5_LAP 0x00000008 /* Prefetch Enabled */
75 #define SH7751_PCICONF5_LAT 0x00000006 /* Local Memory type */ 74 #define SH7751_PCICONF5_LAT 0x00000006 /* Local Memory type */
76 #define SH7751_PCICONF5_ASI 0x00000001 /* Address Space Type */ 75 #define SH7751_PCICONF5_ASI 0x00000001 /* Address Space Type */
77#define SH7751_PCICONF6 0x18 /* PCI Config Reg 6 */ 76#define SH7751_PCICONF6 0x18 /* PCI Config Reg 6 */
78 #define SH7751_PCICONF6_BASE 0xFFFFFFF0 /* Mem Space Base Addr */ 77 #define SH7751_PCICONF6_BASE 0xFFFFFFF0 /* Mem Space Base Addr */
79 #define SH7751_PCICONF6_LAP 0x00000008 /* Prefetch Enabled */ 78 #define SH7751_PCICONF6_LAP 0x00000008 /* Prefetch Enabled */
80 #define SH7751_PCICONF6_LAT 0x00000006 /* Local Memory type */ 79 #define SH7751_PCICONF6_LAT 0x00000006 /* Local Memory type */
81 #define SH7751_PCICONF6_ASI 0x00000001 /* Address Space Type */ 80 #define SH7751_PCICONF6_ASI 0x00000001 /* Address Space Type */
82/* PCICONF7 - PCICONF10 are undefined */ 81/* PCICONF7 - PCICONF10 are undefined */
83#define SH7751_PCICONF11 0x2C /* PCI Config Reg 11 */ 82#define SH7751_PCICONF11 0x2C /* PCI Config Reg 11 */
84 #define SH7751_PCICONF11_SSID 0xFFFF0000 /* Subsystem ID */ 83 #define SH7751_PCICONF11_SSID 0xFFFF0000 /* Subsystem ID */
@@ -127,9 +126,4 @@
127#define SH7751_CS5_BASE_ADDR (SH7751_CS4_BASE_ADDR + SH7751_MEM_REGION_SIZE) 126#define SH7751_CS5_BASE_ADDR (SH7751_CS4_BASE_ADDR + SH7751_MEM_REGION_SIZE)
128#define SH7751_CS6_BASE_ADDR (SH7751_CS5_BASE_ADDR + SH7751_MEM_REGION_SIZE) 127#define SH7751_CS6_BASE_ADDR (SH7751_CS5_BASE_ADDR + SH7751_MEM_REGION_SIZE)
129 128
130struct sh4_pci_address_map;
131
132/* arch/sh/drivers/pci/pci-sh7751.c */
133int sh7751_pcic_init(struct sh4_pci_address_map *map);
134
135#endif /* _PCI_SH7751_H_ */ 129#endif /* _PCI_SH7751_H_ */
diff --git a/arch/sh/drivers/pci/pci-sh7780.c b/arch/sh/drivers/pci/pci-sh7780.c
index bae6a2cf047d..ae13ff925c61 100644
--- a/arch/sh/drivers/pci/pci-sh7780.c
+++ b/arch/sh/drivers/pci/pci-sh7780.c
@@ -1,19 +1,12 @@
1/* 1/*
2 * Low-Level PCI Support for the SH7780 2 * Low-Level PCI Support for the SH7780
3 * 3 *
4 * Dustin McIntire (dustin@sensoria.com) 4 * Copyright (C) 2005 - 2009 Paul Mundt
5 * Derived from arch/i386/kernel/pci-*.c which bore the message:
6 * (c) 1999--2000 Martin Mares <mj@ucw.cz>
7 *
8 * Ported to the new API by Paul Mundt <lethal@linux-sh.org>
9 * With cleanup by Paul van Gool <pvangool@mimotech.com>
10 *
11 * May be copied or modified under the terms of the GNU General Public
12 * License. See linux/COPYING for more information.
13 * 5 *
6 * This file is subject to the terms and conditions of the GNU General Public
7 * License. See the file "COPYING" in the main directory of this archive
8 * for more details.
14 */ 9 */
15#undef DEBUG
16
17#include <linux/types.h> 10#include <linux/types.h>
18#include <linux/kernel.h> 11#include <linux/kernel.h>
19#include <linux/init.h> 12#include <linux/init.h>
@@ -22,135 +15,137 @@
22#include <linux/delay.h> 15#include <linux/delay.h>
23#include "pci-sh4.h" 16#include "pci-sh4.h"
24 17
25#define INTC_BASE 0xffd00000 18extern u8 pci_cache_line_size;
26#define INTC_ICR0 (INTC_BASE+0x0) 19
27#define INTC_ICR1 (INTC_BASE+0x1c) 20static struct resource sh7785_io_resource = {
28#define INTC_INTPRI (INTC_BASE+0x10) 21 .name = "SH7785_IO",
29#define INTC_INTREQ (INTC_BASE+0x24) 22 .start = SH7780_PCI_IO_BASE,
30#define INTC_INTMSK0 (INTC_BASE+0x44) 23 .end = SH7780_PCI_IO_BASE + SH7780_PCI_IO_SIZE - 1,
31#define INTC_INTMSK1 (INTC_BASE+0x48) 24 .flags = IORESOURCE_IO
32#define INTC_INTMSK2 (INTC_BASE+0x40080) 25};
33#define INTC_INTMSKCLR0 (INTC_BASE+0x64) 26
34#define INTC_INTMSKCLR1 (INTC_BASE+0x68) 27static struct resource sh7785_mem_resource = {
35#define INTC_INTMSKCLR2 (INTC_BASE+0x40084) 28 .name = "SH7785_mem",
36#define INTC_INT2MSKR (INTC_BASE+0x40038) 29 .start = SH7780_PCI_MEMORY_BASE,
37#define INTC_INT2MSKCR (INTC_BASE+0x4003c) 30 .end = SH7780_PCI_MEMORY_BASE + SH7780_PCI_MEM_SIZE - 1,
31 .flags = IORESOURCE_MEM
32};
33
34static struct pci_channel sh7780_pci_controller = {
35 .pci_ops = &sh4_pci_ops,
36 .mem_resource = &sh7785_mem_resource,
37 .mem_offset = 0x00000000,
38 .io_resource = &sh7785_io_resource,
39 .io_offset = 0x00000000,
40};
41
42static struct sh4_pci_address_map sh7780_pci_map = {
43 .window0 = {
44#if defined(CONFIG_32BIT)
45 .base = SH7780_32BIT_DDR_BASE_ADDR,
46 .size = 0x40000000,
47#else
48 .base = SH7780_CS0_BASE_ADDR,
49 .size = 0x20000000,
50#endif
51 },
52};
38 53
39/*
40 * Initialization. Try all known PCI access methods. Note that we support
41 * using both PCI BIOS and direct access: in such cases, we use I/O ports
42 * to access config space.
43 *
44 * Note that the platform specific initialization (BSC registers, and memory
45 * space mapping) will be called via the platform defined function
46 * pcibios_init_platform().
47 */
48static int __init sh7780_pci_init(void) 54static int __init sh7780_pci_init(void)
49{ 55{
56 struct pci_channel *chan = &sh7780_pci_controller;
50 unsigned int id; 57 unsigned int id;
51 int ret, match = 0; 58 const char *type = NULL;
52 59 int ret;
53 pr_debug("PCI: Starting intialization.\n"); 60 u32 word;
54
55 ctrl_outl(0x00000001, SH7780_PCI_VCR2); /* Enable PCIC */
56
57 /* check for SH7780/SH7780R hardware */
58 id = pci_read_reg(SH7780_PCIVID);
59 if ((id & 0xffff) == SH7780_VENDOR_ID) {
60 switch ((id >> 16) & 0xffff) {
61 case SH7763_DEVICE_ID:
62 case SH7780_DEVICE_ID:
63 case SH7781_DEVICE_ID:
64 case SH7785_DEVICE_ID:
65 match = 1;
66 break;
67 }
68 }
69 61
70 if (unlikely(!match)) { 62 printk(KERN_NOTICE "PCI: Starting intialization.\n");
71 printk(KERN_ERR "PCI: This is not an SH7780 (%x)\n", id); 63
64 chan->reg_base = 0xfe040000;
65
66 /* Enable CPU access to the PCIC registers. */
67 __raw_writel(PCIECR_ENBL, PCIECR);
68
69 id = __raw_readw(chan->reg_base + SH7780_PCIVID);
70 if (id != SH7780_VENDOR_ID) {
71 printk(KERN_ERR "PCI: Unknown vendor ID 0x%04x.\n", id);
72 return -ENODEV; 72 return -ENODEV;
73 } 73 }
74 74
75 /* Setup the INTC */ 75 id = __raw_readw(chan->reg_base + SH7780_PCIDID);
76 if (mach_is_7780se()) { 76 type = (id == SH7763_DEVICE_ID) ? "SH7763" :
77 /* ICR0: IRL=use separately */ 77 (id == SH7780_DEVICE_ID) ? "SH7780" :
78 ctrl_outl(0x00C00020, INTC_ICR0); 78 (id == SH7781_DEVICE_ID) ? "SH7781" :
79 /* ICR1: detect low level(for 2ndcut) */ 79 (id == SH7785_DEVICE_ID) ? "SH7785" :
80 ctrl_outl(0xAAAA0000, INTC_ICR1); 80 NULL;
81 /* INTPRI: priority=3(all) */ 81 if (unlikely(!type)) {
82 ctrl_outl(0x33333333, INTC_INTPRI); 82 printk(KERN_ERR "PCI: Found an unsupported Renesas host "
83 "controller, device id 0x%04x.\n", id);
84 return -EINVAL;
83 } 85 }
84 86
85 if ((ret = sh4_pci_check_direct()) != 0) 87 printk(KERN_NOTICE "PCI: Found a Renesas %s host "
86 return ret; 88 "controller, revision %d.\n", type,
89 __raw_readb(chan->reg_base + SH7780_PCIRID));
87 90
88 return pcibios_init_platform(); 91 if ((ret = sh4_pci_check_direct(chan)) != 0)
89} 92 return ret;
90core_initcall(sh7780_pci_init);
91
92int __init sh7780_pcic_init(struct sh4_pci_address_map *map)
93{
94 u32 word;
95 93
96 /* 94 /*
97 * This code is unused for some boards as it is done in the 95 * Set the class and sub-class codes.
98 * bootloader and doing it here means the MAC addresses loaded
99 * by the bootloader get lost.
100 */
101 if (!(map->flags & SH4_PCIC_NO_RESET)) {
102 /* toggle PCI reset pin */
103 word = SH4_PCICR_PREFIX | SH4_PCICR_PRST;
104 pci_write_reg(word, SH4_PCICR);
105 /* Wait for a long time... not 1 sec. but long enough */
106 mdelay(100);
107 word = SH4_PCICR_PREFIX;
108 pci_write_reg(word, SH4_PCICR);
109 }
110
111 /* set the command/status bits to:
112 * Wait Cycle Control + Parity Enable + Bus Master +
113 * Mem space enable
114 */ 96 */
115 pci_write_reg(0x00000046, SH7780_PCICMD); 97 __raw_writeb(PCI_CLASS_BRIDGE_HOST >> 8,
98 chan->reg_base + SH7780_PCIBCC);
99 __raw_writeb(PCI_CLASS_BRIDGE_HOST & 0xff,
100 chan->reg_base + SH7780_PCISUB);
116 101
117 /* define this host as the host bridge */ 102 pci_cache_line_size = pci_read_reg(chan, SH7780_PCICLS) / 4;
118 word = PCI_BASE_CLASS_BRIDGE << 24;
119 pci_write_reg(word, SH7780_PCIRID);
120 103
121 /* Set IO and Mem windows to local address 104 /*
105 * Set IO and Mem windows to local address
122 * Make PCI and local address the same for easy 1 to 1 mapping 106 * Make PCI and local address the same for easy 1 to 1 mapping
123 */ 107 */
124 pci_write_reg(map->window0.size - 0xfffff, SH4_PCILSR0); 108 pci_write_reg(chan, sh7780_pci_map.window0.size - 0xfffff, SH4_PCILSR0);
125 pci_write_reg(map->window1.size - 0xfffff, SH4_PCILSR1);
126 /* Set the values on window 0 PCI config registers */ 109 /* Set the values on window 0 PCI config registers */
127 pci_write_reg(map->window0.base, SH4_PCILAR0); 110 pci_write_reg(chan, sh7780_pci_map.window0.base, SH4_PCILAR0);
128 pci_write_reg(map->window0.base, SH7780_PCIMBAR0); 111 pci_write_reg(chan, sh7780_pci_map.window0.base, SH7780_PCIMBAR0);
129 /* Set the values on window 1 PCI config registers */
130 pci_write_reg(map->window1.base, SH4_PCILAR1);
131 pci_write_reg(map->window1.base, SH7780_PCIMBAR1);
132
133 /* Map IO space into PCI IO window
134 * The IO window is 64K-PCIBIOS_MIN_IO in size
135 * IO addresses will be translated to the
136 * PCI IO window base address
137 */
138 pr_debug("PCI: Mapping IO address 0x%x - 0x%x to base 0x%x\n",
139 PCIBIOS_MIN_IO, (64 << 10),
140 SH7780_PCI_IO_BASE + PCIBIOS_MIN_IO);
141 112
142 /* NOTE: I'm ignoring the PCI error IRQs for now.. 113 pci_write_reg(chan, 0x0000380f, SH4_PCIAINTM);
143 * TODO: add support for the internal error interrupts and 114
144 * DMA interrupts... 115 /* Set up standard PCI config registers */
145 */ 116 __raw_writew(0xFB00, chan->reg_base + SH7780_PCISTATUS);
117 __raw_writew(0x0047, chan->reg_base + SH7780_PCICMD);
118 __raw_writew(0x1912, chan->reg_base + SH7780_PCISVID);
119 __raw_writew(0x0001, chan->reg_base + SH7780_PCISID);
120
121 __raw_writeb(0x00, chan->reg_base + SH7780_PCIPIF);
146 122
147 /* Apply any last-minute PCIC fixups */ 123 /* Apply any last-minute PCIC fixups */
148 pci_fixup_pcic(); 124 pci_fixup_pcic(chan);
125
126 pci_write_reg(chan, 0xfd000000, SH7780_PCIMBR0);
127 pci_write_reg(chan, 0x00fc0000, SH7780_PCIMBMR0);
128
129#ifdef CONFIG_32BIT
130 pci_write_reg(chan, 0xc0000000, SH7780_PCIMBR2);
131 pci_write_reg(chan, 0x20000000 - SH7780_PCI_IO_SIZE, SH7780_PCIMBMR2);
132#endif
133
134 /* Set IOBR for windows containing area specified in pci.h */
135 pci_write_reg(chan, chan->io_resource->start & ~(SH7780_PCI_IO_SIZE-1),
136 SH7780_PCIIOBR);
137 pci_write_reg(chan, ((SH7780_PCI_IO_SIZE-1) & (7<<18)),
138 SH7780_PCIIOBMR);
149 139
150 /* SH7780 init done, set central function init complete */ 140 /* SH7780 init done, set central function init complete */
151 /* use round robin mode to stop a device starving/overruning */ 141 /* use round robin mode to stop a device starving/overruning */
152 word = SH4_PCICR_PREFIX | SH4_PCICR_CFIN | SH4_PCICR_FTO; 142 word = SH4_PCICR_PREFIX | SH4_PCICR_CFIN | SH4_PCICR_FTO;
153 pci_write_reg(word, SH4_PCICR); 143 pci_write_reg(chan, word, SH4_PCICR);
144
145 __set_io_port_base(SH7780_PCI_IO_BASE);
146
147 register_pci_controller(chan);
154 148
155 return 1; 149 return 0;
156} 150}
151arch_initcall(sh7780_pci_init);
diff --git a/arch/sh/drivers/pci/pci-sh7780.h b/arch/sh/drivers/pci/pci-sh7780.h
index 93adc7119b79..4a52478c97cf 100644
--- a/arch/sh/drivers/pci/pci-sh7780.h
+++ b/arch/sh/drivers/pci/pci-sh7780.h
@@ -20,9 +20,8 @@
20#define SH7785_DEVICE_ID 0x0007 20#define SH7785_DEVICE_ID 0x0007
21 21
22/* SH7780 Control Registers */ 22/* SH7780 Control Registers */
23#define SH7780_PCI_VCR0 0xFE000000 23#define PCIECR 0xFE000008
24#define SH7780_PCI_VCR1 0xFE000004 24#define PCIECR_ENBL 0x01
25#define SH7780_PCI_VCR2 0xFE000008
26 25
27/* SH7780 Specific Values */ 26/* SH7780 Specific Values */
28#define SH7780_PCI_CONFIG_BASE 0xFD000000 /* Config space base addr */ 27#define SH7780_PCI_CONFIG_BASE 0xFD000000 /* Config space base addr */
@@ -35,7 +34,6 @@
35#define SH7780_PCI_IO_SIZE 0x00400000 /* Size of IO window */ 34#define SH7780_PCI_IO_SIZE 0x00400000 /* Size of IO window */
36 35
37#define SH7780_PCIREG_BASE 0xFE040000 /* PCI regs base address */ 36#define SH7780_PCIREG_BASE 0xFE040000 /* PCI regs base address */
38#define PCI_REG(n) (SH7780_PCIREG_BASE+n)
39 37
40/* SH7780 PCI Config Registers */ 38/* SH7780 PCI Config Registers */
41#define SH7780_PCIVID 0x000 /* Vendor ID */ 39#define SH7780_PCIVID 0x000 /* Vendor ID */
@@ -67,11 +65,6 @@
67#define SH7780_PCIPMCSR_BSE 0x046 65#define SH7780_PCIPMCSR_BSE 0x046
68#define SH7780_PCICDD 0x047 66#define SH7780_PCICDD 0x047
69 67
70#define SH7780_PCICR 0x100 /* PCI Control Register */
71#define SH7780_PCILSR 0x104 /* PCI Local Space Register0 */
72#define SH7780_PCILSR1 0x108 /* PCI Local Space Register1 */
73#define SH7780_PCILAR0 0x10C /* PCI Local Address Register1 */
74#define SH7780_PCILAR1 0x110 /* PCI Local Address Register1 */
75#define SH7780_PCIIR 0x114 /* PCI Interrupt Register */ 68#define SH7780_PCIIR 0x114 /* PCI Interrupt Register */
76#define SH7780_PCIIMR 0x118 /* PCI Interrupt Mask Register */ 69#define SH7780_PCIIMR 0x118 /* PCI Interrupt Mask Register */
77#define SH7780_PCIAIR 0x11C /* Error Address Register */ 70#define SH7780_PCIAIR 0x11C /* Error Address Register */
@@ -106,9 +99,4 @@
106 99
107#define SH7780_32BIT_DDR_BASE_ADDR 0x40000000 100#define SH7780_32BIT_DDR_BASE_ADDR 0x40000000
108 101
109struct sh4_pci_address_map;
110
111/* arch/sh/drivers/pci/pci-sh7780.c */
112int sh7780_pcic_init(struct sh4_pci_address_map *map);
113
114#endif /* _PCI_SH7780_H_ */ 102#endif /* _PCI_SH7780_H_ */
diff --git a/arch/sh/drivers/pci/pci.c b/arch/sh/drivers/pci/pci.c
index 0d6ac7a1db49..54d77cbb8b39 100644
--- a/arch/sh/drivers/pci/pci.c
+++ b/arch/sh/drivers/pci/pci.c
@@ -1,67 +1,156 @@
1/* 1/*
2 * arch/sh/drivers/pci/pci.c 2 * New-style PCI core.
3 * 3 *
4 * Copyright (c) 2002 M. R. Brown <mrbrown@linux-sh.org> 4 * Copyright (c) 2004 - 2009 Paul Mundt
5 * Copyright (c) 2004 - 2006 Paul Mundt <lethal@linux-sh.org> 5 * Copyright (c) 2002 M. R. Brown
6 * 6 *
7 * These functions are collected here to reduce duplication of common 7 * Modelled after arch/mips/pci/pci.c:
8 * code amongst the many platform-specific PCI support code files. 8 * Copyright (C) 2003, 04 Ralf Baechle (ralf@linux-mips.org)
9 *
10 * These routines require the following board-specific routines:
11 * void pcibios_fixup_irqs();
12 *
13 * See include/asm-sh/pci.h for more information.
14 * 9 *
15 * This file is subject to the terms and conditions of the GNU General Public 10 * This file is subject to the terms and conditions of the GNU General Public
16 * License. See the file "COPYING" in the main directory of this archive 11 * License. See the file "COPYING" in the main directory of this archive
17 * for more details. 12 * for more details.
18 */ 13 */
19#include <linux/kernel.h> 14#include <linux/kernel.h>
15#include <linux/mm.h>
20#include <linux/pci.h> 16#include <linux/pci.h>
21#include <linux/init.h> 17#include <linux/init.h>
18#include <linux/types.h>
22#include <linux/dma-debug.h> 19#include <linux/dma-debug.h>
23#include <asm/io.h> 20#include <linux/io.h>
21#include <linux/mutex.h>
24 22
25static int __init pcibios_init(void) 23unsigned long PCIBIOS_MIN_IO = 0x0000;
24unsigned long PCIBIOS_MIN_MEM = 0;
25
26/*
27 * The PCI controller list.
28 */
29static struct pci_channel *hose_head, **hose_tail = &hose_head;
30
31static int pci_initialized;
32
33static void __devinit pcibios_scanbus(struct pci_channel *hose)
26{ 34{
27 struct pci_channel *p; 35 static int next_busno;
28 struct pci_bus *bus; 36 struct pci_bus *bus;
29 int busno;
30 37
31#ifdef CONFIG_PCI_AUTO 38 bus = pci_scan_bus(next_busno, hose->pci_ops, hose);
32 /* assign resources */ 39 if (bus) {
33 busno = 0; 40 next_busno = bus->subordinate + 1;
34 for (p = board_pci_channels; p->pci_ops != NULL; p++) 41 /* Don't allow 8-bit bus number overflow inside the hose -
35 busno = pciauto_assign_resources(busno, p) + 1; 42 reserve some space for bridges. */
36#endif 43 if (next_busno > 224)
44 next_busno = 0;
45
46 pci_bus_size_bridges(bus);
47 pci_bus_assign_resources(bus);
48 pci_enable_bridges(bus);
49 }
50}
51
52static DEFINE_MUTEX(pci_scan_mutex);
37 53
38 /* scan the buses */ 54void __devinit register_pci_controller(struct pci_channel *hose)
39 busno = 0; 55{
40 for (p = board_pci_channels; p->pci_ops != NULL; p++) { 56 if (request_resource(&iomem_resource, hose->mem_resource) < 0)
41 bus = pci_scan_bus(busno, p->pci_ops, p); 57 goto out;
42 busno = bus->subordinate + 1; 58 if (request_resource(&ioport_resource, hose->io_resource) < 0) {
59 release_resource(hose->mem_resource);
60 goto out;
43 } 61 }
44 62
63 *hose_tail = hose;
64 hose_tail = &hose->next;
65
66 /*
67 * Do not panic here but later - this might hapen before console init.
68 */
69 if (!hose->io_map_base) {
70 printk(KERN_WARNING
71 "registering PCI controller with io_map_base unset\n");
72 }
73
74 /*
75 * Scan the bus if it is register after the PCI subsystem
76 * initialization.
77 */
78 if (pci_initialized) {
79 mutex_lock(&pci_scan_mutex);
80 pcibios_scanbus(hose);
81 mutex_unlock(&pci_scan_mutex);
82 }
83
84 return;
85
86out:
87 printk(KERN_WARNING
88 "Skipping PCI bus scan due to resource conflict\n");
89}
90
91static int __init pcibios_init(void)
92{
93 struct pci_channel *hose;
94
95 /* Scan all of the recorded PCI controllers. */
96 for (hose = hose_head; hose; hose = hose->next)
97 pcibios_scanbus(hose);
98
45 pci_fixup_irqs(pci_common_swizzle, pcibios_map_platform_irq); 99 pci_fixup_irqs(pci_common_swizzle, pcibios_map_platform_irq);
46 100
47 dma_debug_add_bus(&pci_bus_type); 101 dma_debug_add_bus(&pci_bus_type);
48 102
103 pci_initialized = 1;
104
49 return 0; 105 return 0;
50} 106}
51subsys_initcall(pcibios_init); 107subsys_initcall(pcibios_init);
52 108
109static void pcibios_fixup_device_resources(struct pci_dev *dev,
110 struct pci_bus *bus)
111{
112 /* Update device resources. */
113 struct pci_channel *hose = bus->sysdata;
114 unsigned long offset = 0;
115 int i;
116
117 for (i = 0; i < PCI_NUM_RESOURCES; i++) {
118 if (!dev->resource[i].start)
119 continue;
120 if (dev->resource[i].flags & IORESOURCE_PCI_FIXED)
121 continue;
122 if (dev->resource[i].flags & IORESOURCE_IO)
123 offset = hose->io_offset;
124 else if (dev->resource[i].flags & IORESOURCE_MEM)
125 offset = hose->mem_offset;
126
127 dev->resource[i].start += offset;
128 dev->resource[i].end += offset;
129 }
130}
131
53/* 132/*
54 * Called after each bus is probed, but before its children 133 * Called after each bus is probed, but before its children
55 * are examined. 134 * are examined.
56 */ 135 */
57void __devinit __weak pcibios_fixup_bus(struct pci_bus *bus) 136void __devinit pcibios_fixup_bus(struct pci_bus *bus)
58{ 137{
59 pci_read_bridge_bases(bus); 138 struct pci_dev *dev = bus->self;
60} 139 struct list_head *ln;
140 struct pci_channel *chan = bus->sysdata;
61 141
62void pcibios_align_resource(void *data, struct resource *res, 142 if (!dev) {
63 resource_size_t size, resource_size_t align) 143 bus->resource[0] = chan->io_resource;
64 __attribute__ ((weak)); 144 bus->resource[1] = chan->mem_resource;
145 }
146
147 for (ln = bus->devices.next; ln != &bus->devices; ln = ln->next) {
148 dev = pci_dev_b(ln);
149
150 if ((dev->class >> 8) != PCI_CLASS_BRIDGE_PCI)
151 pcibios_fixup_device_resources(dev, bus);
152 }
153}
65 154
66/* 155/*
67 * We need to avoid collisions with `mirrored' VGA ports 156 * We need to avoid collisions with `mirrored' VGA ports
@@ -72,14 +161,58 @@ void pcibios_align_resource(void *data, struct resource *res,
72void pcibios_align_resource(void *data, struct resource *res, 161void pcibios_align_resource(void *data, struct resource *res,
73 resource_size_t size, resource_size_t align) 162 resource_size_t size, resource_size_t align)
74{ 163{
164 struct pci_dev *dev = data;
165 struct pci_channel *chan = dev->sysdata;
166 resource_size_t start = res->start;
167
75 if (res->flags & IORESOURCE_IO) { 168 if (res->flags & IORESOURCE_IO) {
76 resource_size_t start = res->start; 169 if (start < PCIBIOS_MIN_IO + chan->io_resource->start)
170 start = PCIBIOS_MIN_IO + chan->io_resource->start;
77 171
172 /*
173 * Put everything into 0x00-0xff region modulo 0x400.
174 */
78 if (start & 0x300) { 175 if (start & 0x300) {
79 start = (start + 0x3ff) & ~0x3ff; 176 start = (start + 0x3ff) & ~0x3ff;
80 res->start = start; 177 res->start = start;
81 } 178 }
179 } else if (res->flags & IORESOURCE_MEM) {
180 if (start < PCIBIOS_MIN_MEM + chan->mem_resource->start)
181 start = PCIBIOS_MIN_MEM + chan->mem_resource->start;
82 } 182 }
183
184 res->start = start;
185}
186
187void pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region,
188 struct resource *res)
189{
190 struct pci_channel *hose = dev->sysdata;
191 unsigned long offset = 0;
192
193 if (res->flags & IORESOURCE_IO)
194 offset = hose->io_offset;
195 else if (res->flags & IORESOURCE_MEM)
196 offset = hose->mem_offset;
197
198 region->start = res->start - offset;
199 region->end = res->end - offset;
200}
201
202void __devinit
203pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,
204 struct pci_bus_region *region)
205{
206 struct pci_channel *hose = dev->sysdata;
207 unsigned long offset = 0;
208
209 if (res->flags & IORESOURCE_IO)
210 offset = hose->io_offset;
211 else if (res->flags & IORESOURCE_MEM)
212 offset = hose->mem_offset;
213
214 res->start = region->start + offset;
215 res->end = region->end + offset;
83} 216}
84 217
85int pcibios_enable_device(struct pci_dev *dev, int mask) 218int pcibios_enable_device(struct pci_dev *dev, int mask)
@@ -90,13 +223,21 @@ int pcibios_enable_device(struct pci_dev *dev, int mask)
90 223
91 pci_read_config_word(dev, PCI_COMMAND, &cmd); 224 pci_read_config_word(dev, PCI_COMMAND, &cmd);
92 old_cmd = cmd; 225 old_cmd = cmd;
93 for(idx=0; idx<6; idx++) { 226 for (idx=0; idx < PCI_NUM_RESOURCES; idx++) {
94 if (!(mask & (1 << idx))) 227 /* Only set up the requested stuff */
228 if (!(mask & (1<<idx)))
95 continue; 229 continue;
230
96 r = &dev->resource[idx]; 231 r = &dev->resource[idx];
232 if (!(r->flags & (IORESOURCE_IO | IORESOURCE_MEM)))
233 continue;
234 if ((idx == PCI_ROM_RESOURCE) &&
235 (!(r->flags & IORESOURCE_ROM_ENABLE)))
236 continue;
97 if (!r->start && r->end) { 237 if (!r->start && r->end) {
98 printk(KERN_ERR "PCI: Device %s not available because " 238 printk(KERN_ERR "PCI: Device %s not available "
99 "of resource collisions\n", pci_name(dev)); 239 "because of resource collisions\n",
240 pci_name(dev));
100 return -EINVAL; 241 return -EINVAL;
101 } 242 }
102 if (r->flags & IORESOURCE_IO) 243 if (r->flags & IORESOURCE_IO)
@@ -104,10 +245,8 @@ int pcibios_enable_device(struct pci_dev *dev, int mask)
104 if (r->flags & IORESOURCE_MEM) 245 if (r->flags & IORESOURCE_MEM)
105 cmd |= PCI_COMMAND_MEMORY; 246 cmd |= PCI_COMMAND_MEMORY;
106 } 247 }
107 if (dev->resource[PCI_ROM_RESOURCE].start)
108 cmd |= PCI_COMMAND_MEMORY;
109 if (cmd != old_cmd) { 248 if (cmd != old_cmd) {
110 printk(KERN_INFO "PCI: Enabling device %s (%04x -> %04x)\n", 249 printk("PCI: Enabling device %s (%04x -> %04x)\n",
111 pci_name(dev), old_cmd, cmd); 250 pci_name(dev), old_cmd, cmd);
112 pci_write_config_word(dev, PCI_COMMAND, cmd); 251 pci_write_config_word(dev, PCI_COMMAND, cmd);
113 } 252 }
@@ -140,6 +279,43 @@ void __init pcibios_update_irq(struct pci_dev *dev, int irq)
140 pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq); 279 pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq);
141} 280}
142 281
282char * __devinit pcibios_setup(char *str)
283{
284 return str;
285}
286
287int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
288 enum pci_mmap_state mmap_state, int write_combine)
289{
290 /*
291 * I/O space can be accessed via normal processor loads and stores on
292 * this platform but for now we elect not to do this and portable
293 * drivers should not do this anyway.
294 */
295 if (mmap_state == pci_mmap_io)
296 return -EINVAL;
297
298 /*
299 * Ignore write-combine; for now only return uncached mappings.
300 */
301 vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
302
303 return remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff,
304 vma->vm_end - vma->vm_start,
305 vma->vm_page_prot);
306}
307
308static void __iomem *ioport_map_pci(struct pci_dev *dev,
309 unsigned long port, unsigned int nr)
310{
311 struct pci_channel *chan = dev->sysdata;
312
313 if (!chan->io_map_base)
314 chan->io_map_base = generic_io_base;
315
316 return (void __iomem *)(chan->io_map_base + port);
317}
318
143void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen) 319void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)
144{ 320{
145 resource_size_t start = pci_resource_start(dev, bar); 321 resource_size_t start = pci_resource_start(dev, bar);
@@ -151,20 +327,24 @@ void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)
151 if (maxlen && len > maxlen) 327 if (maxlen && len > maxlen)
152 len = maxlen; 328 len = maxlen;
153 329
330 if (flags & IORESOURCE_IO)
331 return ioport_map_pci(dev, start, len);
332
154 /* 333 /*
155 * Presently the IORESOURCE_MEM case is a bit special, most 334 * Presently the IORESOURCE_MEM case is a bit special, most
156 * SH7751 style PCI controllers have PCI memory at a fixed 335 * SH7751 style PCI controllers have PCI memory at a fixed
157 * location in the address space where no remapping is desired 336 * location in the address space where no remapping is desired.
158 * (typically at 0xfd000000, but is_pci_memaddr() will know 337 * With the IORESOURCE_MEM case more care has to be taken
159 * best). With the IORESOURCE_MEM case more care has to be taken
160 * to inhibit page table mapping for legacy cores, but this is 338 * to inhibit page table mapping for legacy cores, but this is
161 * punted off to __ioremap(). 339 * punted off to __ioremap().
162 * -- PFM. 340 * -- PFM.
163 */ 341 */
164 if (flags & IORESOURCE_IO) 342 if (flags & IORESOURCE_MEM) {
165 return ioport_map(start, len); 343 if (flags & IORESOURCE_CACHEABLE)
166 if (flags & IORESOURCE_MEM) 344 return ioremap(start, len);
167 return ioremap(start, len); 345
346 return ioremap_nocache(start, len);
347 }
168 348
169 return NULL; 349 return NULL;
170} 350}
@@ -175,3 +355,10 @@ void pci_iounmap(struct pci_dev *dev, void __iomem *addr)
175 iounmap(addr); 355 iounmap(addr);
176} 356}
177EXPORT_SYMBOL(pci_iounmap); 357EXPORT_SYMBOL(pci_iounmap);
358
359#ifdef CONFIG_HOTPLUG
360EXPORT_SYMBOL(pcibios_resource_to_bus);
361EXPORT_SYMBOL(pcibios_bus_to_resource);
362EXPORT_SYMBOL(PCIBIOS_MIN_IO);
363EXPORT_SYMBOL(PCIBIOS_MIN_MEM);
364#endif
diff --git a/arch/sh/include/asm/pci.h b/arch/sh/include/asm/pci.h
index df1d383e18a5..5b2e0fcdfc22 100644
--- a/arch/sh/include/asm/pci.h
+++ b/arch/sh/include/asm/pci.h
@@ -17,54 +17,29 @@
17 * external) PCI controllers. 17 * external) PCI controllers.
18 */ 18 */
19struct pci_channel { 19struct pci_channel {
20 struct pci_ops *pci_ops; 20 struct pci_channel *next;
21 struct resource *io_resource;
22 struct resource *mem_resource;
23 int first_devfn;
24 int last_devfn;
25};
26 21
27/* 22 struct pci_ops *pci_ops;
28 * Each board initializes this array and terminates it with a NULL entry. 23 struct resource *io_resource;
29 */ 24 struct resource *mem_resource;
30extern struct pci_channel board_pci_channels[];
31 25
32#define PCIBIOS_MIN_IO board_pci_channels->io_resource->start 26 unsigned long io_offset;
33#define PCIBIOS_MIN_MEM board_pci_channels->mem_resource->start 27 unsigned long mem_offset;
34 28
35/* 29 unsigned long reg_base;
36 * I/O routine helpers
37 */
38#if defined(CONFIG_CPU_SUBTYPE_SH7780) || defined(CONFIG_CPU_SUBTYPE_SH7785)
39#define PCI_IO_AREA 0xFE400000
40#define PCI_IO_SIZE 0x00400000
41#elif defined(CONFIG_CPU_SH5)
42extern unsigned long PCI_IO_AREA;
43#define PCI_IO_SIZE 0x00010000
44#else
45#define PCI_IO_AREA 0xFE240000
46#define PCI_IO_SIZE 0x00040000
47#endif
48 30
49#define PCI_MEM_SIZE 0x01000000 31 unsigned long io_map_base;
32};
50 33
51#define SH4_PCIIOBR_MASK 0xFFFC0000 34extern void register_pci_controller(struct pci_channel *hose);
52#define pci_ioaddr(addr) (PCI_IO_AREA + (addr & ~SH4_PCIIOBR_MASK))
53 35
54#if defined(CONFIG_PCI) 36extern unsigned long PCIBIOS_MIN_IO, PCIBIOS_MIN_MEM;
55#define is_pci_ioaddr(port) \
56 (((port) >= PCIBIOS_MIN_IO) && \
57 ((port) < (PCIBIOS_MIN_IO + PCI_IO_SIZE)))
58#define is_pci_memaddr(port) \
59 (((port) >= PCIBIOS_MIN_MEM) && \
60 ((port) < (PCIBIOS_MIN_MEM + PCI_MEM_SIZE)))
61#else
62#define is_pci_ioaddr(port) (0)
63#define is_pci_memaddr(port) (0)
64#endif
65 37
66struct pci_dev; 38struct pci_dev;
67 39
40#define HAVE_PCI_MMAP
41extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
42 enum pci_mmap_state mmap_state, int write_combine);
68extern void pcibios_set_master(struct pci_dev *dev); 43extern void pcibios_set_master(struct pci_dev *dev);
69 44
70static inline void pcibios_penalize_isa_irq(int irq, int active) 45static inline void pcibios_penalize_isa_irq(int irq, int active)
@@ -123,22 +98,51 @@ static inline void pci_dma_burst_advice(struct pci_dev *pdev,
123} 98}
124#endif 99#endif
125 100
101#ifdef CONFIG_SUPERH32
102/*
103 * If we're on an SH7751 or SH7780 PCI controller, PCI memory is mapped
104 * at the end of the address space in a special non-translatable area.
105 */
106#define PCI_MEM_FIXED_START 0xfd000000
107#define PCI_MEM_FIXED_END (PCI_MEM_FIXED_START + 0x01000000)
108
109#define is_pci_memory_fixed_range(s, e) \
110 ((s) >= PCI_MEM_FIXED_START && (e) < PCI_MEM_FIXED_END)
111#else
112#define is_pci_memory_fixed_range(s, e) (0)
113#endif
114
126/* Board-specific fixup routines. */ 115/* Board-specific fixup routines. */
127void pcibios_fixup(void);
128int pcibios_init_platform(void);
129int pcibios_map_platform_irq(struct pci_dev *dev, u8 slot, u8 pin); 116int pcibios_map_platform_irq(struct pci_dev *dev, u8 slot, u8 pin);
130 117
131#ifdef CONFIG_PCI_AUTO 118extern void pcibios_resource_to_bus(struct pci_dev *dev,
132int pciauto_assign_resources(int busno, struct pci_channel *hose); 119 struct pci_bus_region *region, struct resource *res);
133#endif
134 120
135#endif /* __KERNEL__ */ 121extern void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,
122 struct pci_bus_region *region);
123
124static inline struct resource *
125pcibios_select_root(struct pci_dev *pdev, struct resource *res)
126{
127 struct resource *root = NULL;
136 128
137/* generic pci stuff */ 129 if (res->flags & IORESOURCE_IO)
138#include <asm-generic/pci.h> 130 root = &ioport_resource;
131 if (res->flags & IORESOURCE_MEM)
132 root = &iomem_resource;
133
134 return root;
135}
136
137/* Chances are this interrupt is wired PC-style ... */
138static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
139{
140 return channel ? 15 : 14;
141}
139 142
140/* generic DMA-mapping stuff */ 143/* generic DMA-mapping stuff */
141#include <asm-generic/pci-dma-compat.h> 144#include <asm-generic/pci-dma-compat.h>
142 145
146#endif /* __KERNEL__ */
143#endif /* __ASM_SH_PCI_H */ 147#endif /* __ASM_SH_PCI_H */
144 148
diff --git a/arch/sh/include/mach-dreamcast/mach/pci.h b/arch/sh/include/mach-dreamcast/mach/pci.h
index 75fc9009e092..0314d975e626 100644
--- a/arch/sh/include/mach-dreamcast/mach/pci.h
+++ b/arch/sh/include/mach-dreamcast/mach/pci.h
@@ -21,5 +21,7 @@
21 21
22#define GAPSPCI_IRQ HW_EVENT_EXTERNAL 22#define GAPSPCI_IRQ HW_EVENT_EXTERNAL
23 23
24extern struct pci_ops gapspci_pci_ops;
25
24#endif /* __ASM_SH_DREAMCAST_PCI_H */ 26#endif /* __ASM_SH_DREAMCAST_PCI_H */
25 27
diff --git a/arch/sh/kernel/head_32.S b/arch/sh/kernel/head_32.S
index 788605ff7088..a78be74b8d3e 100644
--- a/arch/sh/kernel/head_32.S
+++ b/arch/sh/kernel/head_32.S
@@ -10,6 +10,7 @@
10 * 10 *
11 * Head.S contains the SH exception handlers and startup code. 11 * Head.S contains the SH exception handlers and startup code.
12 */ 12 */
13#include <linux/init.h>
13#include <linux/linkage.h> 14#include <linux/linkage.h>
14#include <asm/thread_info.h> 15#include <asm/thread_info.h>
15 16
@@ -40,7 +41,7 @@ ENTRY(empty_zero_page)
401: 411:
41 .skip PAGE_SIZE - empty_zero_page - 1b 42 .skip PAGE_SIZE - empty_zero_page - 1b
42 43
43 .section .text.head, "ax" 44 __HEAD
44 45
45/* 46/*
46 * Condition at the entry of _stext: 47 * Condition at the entry of _stext:
diff --git a/arch/sh/kernel/head_64.S b/arch/sh/kernel/head_64.S
index 7ccfb995a398..3ea765844c74 100644
--- a/arch/sh/kernel/head_64.S
+++ b/arch/sh/kernel/head_64.S
@@ -8,6 +8,9 @@
8 * License. See the file "COPYING" in the main directory of this archive 8 * License. See the file "COPYING" in the main directory of this archive
9 * for more details. 9 * for more details.
10 */ 10 */
11
12#include <linux/init.h>
13
11#include <asm/page.h> 14#include <asm/page.h>
12#include <asm/cache.h> 15#include <asm/cache.h>
13#include <asm/tlb.h> 16#include <asm/tlb.h>
@@ -110,7 +113,7 @@ empty_bad_pte_table:
110fpu_in_use: .quad 0 113fpu_in_use: .quad 0
111 114
112 115
113 .section .text.head, "ax" 116 __HEAD
114 .balign L1_CACHE_BYTES 117 .balign L1_CACHE_BYTES
115/* 118/*
116 * Condition at the entry of __stext: 119 * Condition at the entry of __stext:
diff --git a/arch/sh/kernel/io.c b/arch/sh/kernel/io.c
index 29cf4588fc05..4f85fffaa557 100644
--- a/arch/sh/kernel/io.c
+++ b/arch/sh/kernel/io.c
@@ -12,6 +12,7 @@
12 * for more details. 12 * for more details.
13 */ 13 */
14#include <linux/module.h> 14#include <linux/module.h>
15#include <linux/pci.h>
15#include <asm/machvec.h> 16#include <asm/machvec.h>
16#include <asm/io.h> 17#include <asm/io.h>
17 18
diff --git a/arch/sh/kernel/vmlinux_32.lds.S b/arch/sh/kernel/vmlinux_32.lds.S
index d0b2a715cd14..dd9b2ee1312d 100644
--- a/arch/sh/kernel/vmlinux_32.lds.S
+++ b/arch/sh/kernel/vmlinux_32.lds.S
@@ -31,7 +31,7 @@ SECTIONS
31 } = 0 31 } = 0
32 32
33 .text : { 33 .text : {
34 *(.text.head) 34 HEAD_TEXT
35 TEXT_TEXT 35 TEXT_TEXT
36 SCHED_TEXT 36 SCHED_TEXT
37 LOCK_TEXT 37 LOCK_TEXT
diff --git a/arch/sh/kernel/vmlinux_64.lds.S b/arch/sh/kernel/vmlinux_64.lds.S
index 33fa46451406..69664460c688 100644
--- a/arch/sh/kernel/vmlinux_64.lds.S
+++ b/arch/sh/kernel/vmlinux_64.lds.S
@@ -42,7 +42,7 @@ SECTIONS
42 } = 0 42 } = 0
43 43
44 .text : C_PHYS(.text) { 44 .text : C_PHYS(.text) {
45 *(.text.head) 45 HEAD_TEXT
46 TEXT_TEXT 46 TEXT_TEXT
47 *(.text64) 47 *(.text64)
48 *(.text..SHmedia32) 48 *(.text..SHmedia32)
diff --git a/arch/sh/mm/ioremap_32.c b/arch/sh/mm/ioremap_32.c
index 60cc486d2c2c..da2f4186f2cd 100644
--- a/arch/sh/mm/ioremap_32.c
+++ b/arch/sh/mm/ioremap_32.c
@@ -46,17 +46,15 @@ void __iomem *__ioremap(unsigned long phys_addr, unsigned long size,
46 return NULL; 46 return NULL;
47 47
48 /* 48 /*
49 * If we're on an SH7751 or SH7780 PCI controller, PCI memory is 49 * If we're in the fixed PCI memory range, mapping through page
50 * mapped at the end of the address space (typically 0xfd000000) 50 * tables is not only pointless, but also fundamentally broken.
51 * in a non-translatable area, so mapping through page tables for 51 * Just return the physical address instead.
52 * this area is not only pointless, but also fundamentally
53 * broken. Just return the physical address instead.
54 * 52 *
55 * For boards that map a small PCI memory aperture somewhere in 53 * For boards that map a small PCI memory aperture somewhere in
56 * P1/P2 space, ioremap() will already do the right thing, 54 * P1/P2 space, ioremap() will already do the right thing,
57 * and we'll never get this far. 55 * and we'll never get this far.
58 */ 56 */
59 if (is_pci_memaddr(phys_addr) && is_pci_memaddr(last_addr)) 57 if (is_pci_memory_fixed_range(phys_addr, size))
60 return (void __iomem *)phys_addr; 58 return (void __iomem *)phys_addr;
61 59
62#if !defined(CONFIG_PMB_FIXED) 60#if !defined(CONFIG_PMB_FIXED)
@@ -121,7 +119,9 @@ void __iounmap(void __iomem *addr)
121 unsigned long seg = PXSEG(vaddr); 119 unsigned long seg = PXSEG(vaddr);
122 struct vm_struct *p; 120 struct vm_struct *p;
123 121
124 if (seg < P3SEG || vaddr >= P3_ADDR_MAX || is_pci_memaddr(vaddr)) 122 if (seg < P3SEG || vaddr >= P3_ADDR_MAX)
123 return;
124 if (is_pci_memory_fixed_range(vaddr, 0))
125 return; 125 return;
126 126
127#ifdef CONFIG_PMB 127#ifdef CONFIG_PMB
diff --git a/arch/sparc/configs/sparc32_defconfig b/arch/sparc/configs/sparc32_defconfig
index 09ab46e4c59d..8bcd27af724b 100644
--- a/arch/sparc/configs/sparc32_defconfig
+++ b/arch/sparc/configs/sparc32_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28 3# Linux kernel version: 2.6.30-rc2
4# Thu Jan 8 16:45:44 2009 4# Fri Apr 17 04:04:46 2009
5# 5#
6# CONFIG_64BIT is not set 6# CONFIG_64BIT is not set
7CONFIG_SPARC=y 7CONFIG_SPARC=y
@@ -30,17 +30,27 @@ CONFIG_SWAP=y
30CONFIG_SYSVIPC=y 30CONFIG_SYSVIPC=y
31CONFIG_SYSVIPC_SYSCTL=y 31CONFIG_SYSVIPC_SYSCTL=y
32CONFIG_POSIX_MQUEUE=y 32CONFIG_POSIX_MQUEUE=y
33CONFIG_POSIX_MQUEUE_SYSCTL=y
33# CONFIG_BSD_PROCESS_ACCT is not set 34# CONFIG_BSD_PROCESS_ACCT is not set
34# CONFIG_TASKSTATS is not set 35# CONFIG_TASKSTATS is not set
35# CONFIG_AUDIT is not set 36# CONFIG_AUDIT is not set
37
38#
39# RCU Subsystem
40#
41CONFIG_CLASSIC_RCU=y
42# CONFIG_TREE_RCU is not set
43# CONFIG_PREEMPT_RCU is not set
44# CONFIG_TREE_RCU_TRACE is not set
45# CONFIG_PREEMPT_RCU_TRACE is not set
36# CONFIG_IKCONFIG is not set 46# CONFIG_IKCONFIG is not set
37CONFIG_LOG_BUF_SHIFT=14 47CONFIG_LOG_BUF_SHIFT=14
38# CONFIG_CGROUPS is not set
39CONFIG_GROUP_SCHED=y 48CONFIG_GROUP_SCHED=y
40CONFIG_FAIR_GROUP_SCHED=y 49CONFIG_FAIR_GROUP_SCHED=y
41CONFIG_RT_GROUP_SCHED=y 50CONFIG_RT_GROUP_SCHED=y
42CONFIG_USER_SCHED=y 51CONFIG_USER_SCHED=y
43# CONFIG_CGROUP_SCHED is not set 52# CONFIG_CGROUP_SCHED is not set
53# CONFIG_CGROUPS is not set
44CONFIG_SYSFS_DEPRECATED=y 54CONFIG_SYSFS_DEPRECATED=y
45CONFIG_SYSFS_DEPRECATED_V2=y 55CONFIG_SYSFS_DEPRECATED_V2=y
46# CONFIG_RELAY is not set 56# CONFIG_RELAY is not set
@@ -49,24 +59,28 @@ CONFIG_NAMESPACES=y
49# CONFIG_IPC_NS is not set 59# CONFIG_IPC_NS is not set
50# CONFIG_USER_NS is not set 60# CONFIG_USER_NS is not set
51# CONFIG_PID_NS is not set 61# CONFIG_PID_NS is not set
62# CONFIG_NET_NS is not set
52CONFIG_BLK_DEV_INITRD=y 63CONFIG_BLK_DEV_INITRD=y
53CONFIG_INITRAMFS_SOURCE="" 64CONFIG_INITRAMFS_SOURCE=""
65CONFIG_RD_GZIP=y
66CONFIG_RD_BZIP2=y
67CONFIG_RD_LZMA=y
54# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 68# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
55CONFIG_SYSCTL=y 69CONFIG_SYSCTL=y
70CONFIG_ANON_INODES=y
56# CONFIG_EMBEDDED is not set 71# CONFIG_EMBEDDED is not set
57CONFIG_UID16=y 72CONFIG_UID16=y
58CONFIG_SYSCTL_SYSCALL=y 73CONFIG_SYSCTL_SYSCALL=y
59CONFIG_KALLSYMS=y 74CONFIG_KALLSYMS=y
60# CONFIG_KALLSYMS_ALL is not set 75# CONFIG_KALLSYMS_ALL is not set
61# CONFIG_KALLSYMS_EXTRA_PASS is not set 76# CONFIG_KALLSYMS_EXTRA_PASS is not set
77# CONFIG_STRIP_ASM_SYMS is not set
62CONFIG_HOTPLUG=y 78CONFIG_HOTPLUG=y
63CONFIG_PRINTK=y 79CONFIG_PRINTK=y
64CONFIG_BUG=y 80CONFIG_BUG=y
65CONFIG_ELF_CORE=y 81CONFIG_ELF_CORE=y
66CONFIG_COMPAT_BRK=y
67CONFIG_BASE_FULL=y 82CONFIG_BASE_FULL=y
68CONFIG_FUTEX=y 83CONFIG_FUTEX=y
69CONFIG_ANON_INODES=y
70CONFIG_EPOLL=y 84CONFIG_EPOLL=y
71CONFIG_SIGNALFD=y 85CONFIG_SIGNALFD=y
72CONFIG_TIMERFD=y 86CONFIG_TIMERFD=y
@@ -75,12 +89,15 @@ CONFIG_SHMEM=y
75CONFIG_AIO=y 89CONFIG_AIO=y
76CONFIG_VM_EVENT_COUNTERS=y 90CONFIG_VM_EVENT_COUNTERS=y
77CONFIG_PCI_QUIRKS=y 91CONFIG_PCI_QUIRKS=y
92CONFIG_COMPAT_BRK=y
78CONFIG_SLAB=y 93CONFIG_SLAB=y
79# CONFIG_SLUB is not set 94# CONFIG_SLUB is not set
80# CONFIG_SLOB is not set 95# CONFIG_SLOB is not set
81# CONFIG_PROFILING is not set 96# CONFIG_PROFILING is not set
97# CONFIG_MARKERS is not set
82CONFIG_HAVE_OPROFILE=y 98CONFIG_HAVE_OPROFILE=y
83CONFIG_HAVE_ARCH_TRACEHOOK=y 99CONFIG_HAVE_ARCH_TRACEHOOK=y
100# CONFIG_SLOW_WORK is not set
84# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 101# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
85CONFIG_SLABINFO=y 102CONFIG_SLABINFO=y
86CONFIG_RT_MUTEXES=y 103CONFIG_RT_MUTEXES=y
@@ -93,7 +110,6 @@ CONFIG_MODULE_UNLOAD=y
93# CONFIG_MODULE_SRCVERSION_ALL is not set 110# CONFIG_MODULE_SRCVERSION_ALL is not set
94CONFIG_BLOCK=y 111CONFIG_BLOCK=y
95# CONFIG_LBD is not set 112# CONFIG_LBD is not set
96# CONFIG_BLK_DEV_IO_TRACE is not set
97# CONFIG_BLK_DEV_BSG is not set 113# CONFIG_BLK_DEV_BSG is not set
98# CONFIG_BLK_DEV_INTEGRITY is not set 114# CONFIG_BLK_DEV_INTEGRITY is not set
99 115
@@ -109,11 +125,6 @@ CONFIG_IOSCHED_CFQ=y
109CONFIG_DEFAULT_CFQ=y 125CONFIG_DEFAULT_CFQ=y
110# CONFIG_DEFAULT_NOOP is not set 126# CONFIG_DEFAULT_NOOP is not set
111CONFIG_DEFAULT_IOSCHED="cfq" 127CONFIG_DEFAULT_IOSCHED="cfq"
112CONFIG_CLASSIC_RCU=y
113# CONFIG_TREE_RCU is not set
114# CONFIG_PREEMPT_RCU is not set
115# CONFIG_TREE_RCU_TRACE is not set
116# CONFIG_PREEMPT_RCU_TRACE is not set
117# CONFIG_FREEZER is not set 128# CONFIG_FREEZER is not set
118 129
119# 130#
@@ -144,6 +155,8 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
144CONFIG_ZONE_DMA_FLAG=1 155CONFIG_ZONE_DMA_FLAG=1
145CONFIG_BOUNCE=y 156CONFIG_BOUNCE=y
146CONFIG_UNEVICTABLE_LRU=y 157CONFIG_UNEVICTABLE_LRU=y
158CONFIG_HAVE_MLOCK=y
159CONFIG_HAVE_MLOCKED_PAGE_BIT=y
147CONFIG_SUN_PM=y 160CONFIG_SUN_PM=y
148# CONFIG_SPARC_LED is not set 161# CONFIG_SPARC_LED is not set
149CONFIG_SERIAL_CONSOLE=y 162CONFIG_SERIAL_CONSOLE=y
@@ -159,6 +172,7 @@ CONFIG_PCI_SYSCALL=y
159CONFIG_PCI_LEGACY=y 172CONFIG_PCI_LEGACY=y
160# CONFIG_PCI_DEBUG is not set 173# CONFIG_PCI_DEBUG is not set
161# CONFIG_PCI_STUB is not set 174# CONFIG_PCI_STUB is not set
175# CONFIG_PCI_IOV is not set
162# CONFIG_PCCARD is not set 176# CONFIG_PCCARD is not set
163CONFIG_SUN_OPENPROMFS=m 177CONFIG_SUN_OPENPROMFS=m
164CONFIG_SPARC32_PCI=y 178CONFIG_SPARC32_PCI=y
@@ -175,8 +189,6 @@ CONFIG_NET=y
175# 189#
176# Networking options 190# Networking options
177# 191#
178# CONFIG_NET_NS is not set
179CONFIG_COMPAT_NET_DEV_OPS=y
180CONFIG_PACKET=y 192CONFIG_PACKET=y
181# CONFIG_PACKET_MMAP is not set 193# CONFIG_PACKET_MMAP is not set
182CONFIG_UNIX=y 194CONFIG_UNIX=y
@@ -251,6 +263,7 @@ CONFIG_IPV6_TUNNEL=m
251# CONFIG_LAPB is not set 263# CONFIG_LAPB is not set
252# CONFIG_ECONET is not set 264# CONFIG_ECONET is not set
253# CONFIG_WAN_ROUTER is not set 265# CONFIG_WAN_ROUTER is not set
266# CONFIG_PHONET is not set
254# CONFIG_NET_SCHED is not set 267# CONFIG_NET_SCHED is not set
255# CONFIG_DCB is not set 268# CONFIG_DCB is not set
256 269
@@ -263,7 +276,6 @@ CONFIG_NET_PKTGEN=m
263# CONFIG_IRDA is not set 276# CONFIG_IRDA is not set
264# CONFIG_BT is not set 277# CONFIG_BT is not set
265# CONFIG_AF_RXRPC is not set 278# CONFIG_AF_RXRPC is not set
266# CONFIG_PHONET is not set
267CONFIG_WIRELESS=y 279CONFIG_WIRELESS=y
268# CONFIG_CFG80211 is not set 280# CONFIG_CFG80211 is not set
269CONFIG_WIRELESS_OLD_REGULATORY=y 281CONFIG_WIRELESS_OLD_REGULATORY=y
@@ -313,12 +325,16 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
313# CONFIG_BLK_DEV_HD is not set 325# CONFIG_BLK_DEV_HD is not set
314CONFIG_MISC_DEVICES=y 326CONFIG_MISC_DEVICES=y
315# CONFIG_PHANTOM is not set 327# CONFIG_PHANTOM is not set
316# CONFIG_EEPROM_93CX6 is not set
317# CONFIG_SGI_IOC4 is not set 328# CONFIG_SGI_IOC4 is not set
318# CONFIG_TIFM_CORE is not set 329# CONFIG_TIFM_CORE is not set
319# CONFIG_ENCLOSURE_SERVICES is not set 330# CONFIG_ENCLOSURE_SERVICES is not set
320# CONFIG_HP_ILO is not set 331# CONFIG_HP_ILO is not set
321# CONFIG_C2PORT is not set 332# CONFIG_C2PORT is not set
333
334#
335# EEPROM support
336#
337# CONFIG_EEPROM_93CX6 is not set
322CONFIG_HAVE_IDE=y 338CONFIG_HAVE_IDE=y
323# CONFIG_IDE is not set 339# CONFIG_IDE is not set
324 340
@@ -375,8 +391,10 @@ CONFIG_SCSI_LOWLEVEL=y
375# CONFIG_MEGARAID_NEWGEN is not set 391# CONFIG_MEGARAID_NEWGEN is not set
376# CONFIG_MEGARAID_LEGACY is not set 392# CONFIG_MEGARAID_LEGACY is not set
377# CONFIG_MEGARAID_SAS is not set 393# CONFIG_MEGARAID_SAS is not set
394# CONFIG_SCSI_MPT2SAS is not set
378# CONFIG_SCSI_HPTIOP is not set 395# CONFIG_SCSI_HPTIOP is not set
379# CONFIG_LIBFC is not set 396# CONFIG_LIBFC is not set
397# CONFIG_LIBFCOE is not set
380# CONFIG_FCOE is not set 398# CONFIG_FCOE is not set
381# CONFIG_SCSI_DMX3191D is not set 399# CONFIG_SCSI_DMX3191D is not set
382# CONFIG_SCSI_FUTURE_DOMAIN is not set 400# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -398,6 +416,7 @@ CONFIG_SCSI_QLOGICPTI=m
398CONFIG_SCSI_SUNESP=y 416CONFIG_SCSI_SUNESP=y
399# CONFIG_SCSI_SRP is not set 417# CONFIG_SCSI_SRP is not set
400# CONFIG_SCSI_DH is not set 418# CONFIG_SCSI_DH is not set
419# CONFIG_SCSI_OSD_INITIATOR is not set
401# CONFIG_ATA is not set 420# CONFIG_ATA is not set
402# CONFIG_MD is not set 421# CONFIG_MD is not set
403# CONFIG_FUSION is not set 422# CONFIG_FUSION is not set
@@ -413,6 +432,7 @@ CONFIG_SCSI_SUNESP=y
413# CONFIG_IEEE1394 is not set 432# CONFIG_IEEE1394 is not set
414# CONFIG_I2O is not set 433# CONFIG_I2O is not set
415CONFIG_NETDEVICES=y 434CONFIG_NETDEVICES=y
435CONFIG_COMPAT_NET_DEV_OPS=y
416CONFIG_DUMMY=m 436CONFIG_DUMMY=m
417# CONFIG_BONDING is not set 437# CONFIG_BONDING is not set
418# CONFIG_MACVLAN is not set 438# CONFIG_MACVLAN is not set
@@ -430,6 +450,8 @@ CONFIG_SUNQE=m
430# CONFIG_SUNGEM is not set 450# CONFIG_SUNGEM is not set
431# CONFIG_CASSINI is not set 451# CONFIG_CASSINI is not set
432# CONFIG_NET_VENDOR_3COM is not set 452# CONFIG_NET_VENDOR_3COM is not set
453# CONFIG_ETHOC is not set
454# CONFIG_DNET is not set
433# CONFIG_NET_TULIP is not set 455# CONFIG_NET_TULIP is not set
434# CONFIG_HP100 is not set 456# CONFIG_HP100 is not set
435# CONFIG_IBM_NEW_EMAC_ZMII is not set 457# CONFIG_IBM_NEW_EMAC_ZMII is not set
@@ -448,6 +470,7 @@ CONFIG_NETDEV_1000=y
448# CONFIG_E1000 is not set 470# CONFIG_E1000 is not set
449# CONFIG_IP1000 is not set 471# CONFIG_IP1000 is not set
450# CONFIG_IGB is not set 472# CONFIG_IGB is not set
473# CONFIG_IGBVF is not set
451# CONFIG_MYRI_SBUS is not set 474# CONFIG_MYRI_SBUS is not set
452# CONFIG_NS83820 is not set 475# CONFIG_NS83820 is not set
453# CONFIG_HAMACHI is not set 476# CONFIG_HAMACHI is not set
@@ -462,6 +485,7 @@ CONFIG_NETDEV_1000=y
462# CONFIG_QLA3XXX is not set 485# CONFIG_QLA3XXX is not set
463# CONFIG_ATL1 is not set 486# CONFIG_ATL1 is not set
464# CONFIG_ATL1E is not set 487# CONFIG_ATL1E is not set
488# CONFIG_ATL1C is not set
465# CONFIG_JME is not set 489# CONFIG_JME is not set
466CONFIG_NETDEV_10000=y 490CONFIG_NETDEV_10000=y
467# CONFIG_CHELSIO_T1 is not set 491# CONFIG_CHELSIO_T1 is not set
@@ -471,6 +495,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
471# CONFIG_IXGBE is not set 495# CONFIG_IXGBE is not set
472# CONFIG_IXGB is not set 496# CONFIG_IXGB is not set
473# CONFIG_S2IO is not set 497# CONFIG_S2IO is not set
498# CONFIG_VXGE is not set
474# CONFIG_MYRI10GE is not set 499# CONFIG_MYRI10GE is not set
475# CONFIG_NETXEN_NIC is not set 500# CONFIG_NETXEN_NIC is not set
476# CONFIG_NIU is not set 501# CONFIG_NIU is not set
@@ -480,6 +505,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
480# CONFIG_BNX2X is not set 505# CONFIG_BNX2X is not set
481# CONFIG_QLGE is not set 506# CONFIG_QLGE is not set
482# CONFIG_SFC is not set 507# CONFIG_SFC is not set
508# CONFIG_BE2NET is not set
483# CONFIG_TR is not set 509# CONFIG_TR is not set
484 510
485# 511#
@@ -487,7 +513,6 @@ CONFIG_CHELSIO_T3_DEPENDS=y
487# 513#
488# CONFIG_WLAN_PRE80211 is not set 514# CONFIG_WLAN_PRE80211 is not set
489# CONFIG_WLAN_80211 is not set 515# CONFIG_WLAN_80211 is not set
490# CONFIG_IWLWIFI_LEDS is not set
491 516
492# 517#
493# Enable WiMAX (Networking options) to see the WiMAX drivers 518# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -537,7 +562,6 @@ CONFIG_MOUSE_PS2=m
537CONFIG_MOUSE_PS2_ALPS=y 562CONFIG_MOUSE_PS2_ALPS=y
538CONFIG_MOUSE_PS2_LOGIPS2PP=y 563CONFIG_MOUSE_PS2_LOGIPS2PP=y
539CONFIG_MOUSE_PS2_SYNAPTICS=y 564CONFIG_MOUSE_PS2_SYNAPTICS=y
540CONFIG_MOUSE_PS2_LIFEBOOK=y
541CONFIG_MOUSE_PS2_TRACKPOINT=y 565CONFIG_MOUSE_PS2_TRACKPOINT=y
542# CONFIG_MOUSE_PS2_ELANTECH is not set 566# CONFIG_MOUSE_PS2_ELANTECH is not set
543# CONFIG_MOUSE_PS2_TOUCHKIT is not set 567# CONFIG_MOUSE_PS2_TOUCHKIT is not set
@@ -597,6 +621,7 @@ CONFIG_LEGACY_PTYS=y
597CONFIG_LEGACY_PTY_COUNT=256 621CONFIG_LEGACY_PTY_COUNT=256
598# CONFIG_IPMI_HANDLER is not set 622# CONFIG_IPMI_HANDLER is not set
599CONFIG_HW_RANDOM=m 623CONFIG_HW_RANDOM=m
624# CONFIG_HW_RANDOM_TIMERIOMEM is not set
600# CONFIG_R3964 is not set 625# CONFIG_R3964 is not set
601# CONFIG_APPLICOM is not set 626# CONFIG_APPLICOM is not set
602# CONFIG_RAW_DRIVER is not set 627# CONFIG_RAW_DRIVER is not set
@@ -688,7 +713,6 @@ CONFIG_HID=y
688# 713#
689# Special HID drivers 714# Special HID drivers
690# 715#
691CONFIG_HID_COMPAT=y
692CONFIG_USB_SUPPORT=y 716CONFIG_USB_SUPPORT=y
693CONFIG_USB_ARCH_HAS_HCD=y 717CONFIG_USB_ARCH_HAS_HCD=y
694CONFIG_USB_ARCH_HAS_OHCI=y 718CONFIG_USB_ARCH_HAS_OHCI=y
@@ -700,7 +724,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
700# 724#
701 725
702# 726#
703# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; 727# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
704# 728#
705# CONFIG_USB_GADGET is not set 729# CONFIG_USB_GADGET is not set
706 730
@@ -750,6 +774,7 @@ CONFIG_RTC_DRV_M48T59=y
750# on-CPU RTC drivers 774# on-CPU RTC drivers
751# 775#
752# CONFIG_DMADEVICES is not set 776# CONFIG_DMADEVICES is not set
777# CONFIG_AUXDISPLAY is not set
753# CONFIG_UIO is not set 778# CONFIG_UIO is not set
754# CONFIG_STAGING is not set 779# CONFIG_STAGING is not set
755 780
@@ -777,6 +802,7 @@ CONFIG_FS_POSIX_ACL=y
777CONFIG_FILE_LOCKING=y 802CONFIG_FILE_LOCKING=y
778# CONFIG_XFS_FS is not set 803# CONFIG_XFS_FS is not set
779# CONFIG_OCFS2_FS is not set 804# CONFIG_OCFS2_FS is not set
805# CONFIG_BTRFS_FS is not set
780CONFIG_DNOTIFY=y 806CONFIG_DNOTIFY=y
781CONFIG_INOTIFY=y 807CONFIG_INOTIFY=y
782CONFIG_INOTIFY_USER=y 808CONFIG_INOTIFY_USER=y
@@ -786,6 +812,11 @@ CONFIG_AUTOFS4_FS=m
786# CONFIG_FUSE_FS is not set 812# CONFIG_FUSE_FS is not set
787 813
788# 814#
815# Caches
816#
817# CONFIG_FSCACHE is not set
818
819#
789# CD-ROM/DVD Filesystems 820# CD-ROM/DVD Filesystems
790# 821#
791CONFIG_ISO9660_FS=m 822CONFIG_ISO9660_FS=m
@@ -820,14 +851,20 @@ CONFIG_MISC_FILESYSTEMS=y
820# CONFIG_BFS_FS is not set 851# CONFIG_BFS_FS is not set
821# CONFIG_EFS_FS is not set 852# CONFIG_EFS_FS is not set
822# CONFIG_CRAMFS is not set 853# CONFIG_CRAMFS is not set
854# CONFIG_SQUASHFS is not set
823# CONFIG_VXFS_FS is not set 855# CONFIG_VXFS_FS is not set
824# CONFIG_MINIX_FS is not set 856# CONFIG_MINIX_FS is not set
825# CONFIG_OMFS_FS is not set 857# CONFIG_OMFS_FS is not set
826# CONFIG_HPFS_FS is not set 858# CONFIG_HPFS_FS is not set
827# CONFIG_QNX4FS_FS is not set 859# CONFIG_QNX4FS_FS is not set
828CONFIG_ROMFS_FS=m 860CONFIG_ROMFS_FS=m
861CONFIG_ROMFS_BACKED_BY_BLOCK=y
862# CONFIG_ROMFS_BACKED_BY_MTD is not set
863# CONFIG_ROMFS_BACKED_BY_BOTH is not set
864CONFIG_ROMFS_ON_BLOCK=y
829# CONFIG_SYSV_FS is not set 865# CONFIG_SYSV_FS is not set
830# CONFIG_UFS_FS is not set 866# CONFIG_UFS_FS is not set
867# CONFIG_NILFS2_FS is not set
831CONFIG_NETWORK_FILESYSTEMS=y 868CONFIG_NETWORK_FILESYSTEMS=y
832CONFIG_NFS_FS=y 869CONFIG_NFS_FS=y
833# CONFIG_NFS_V3 is not set 870# CONFIG_NFS_V3 is not set
@@ -838,7 +875,6 @@ CONFIG_LOCKD=y
838CONFIG_NFS_COMMON=y 875CONFIG_NFS_COMMON=y
839CONFIG_SUNRPC=y 876CONFIG_SUNRPC=y
840CONFIG_SUNRPC_GSS=m 877CONFIG_SUNRPC_GSS=m
841# CONFIG_SUNRPC_REGISTER_V4 is not set
842CONFIG_RPCSEC_GSS_KRB5=m 878CONFIG_RPCSEC_GSS_KRB5=m
843# CONFIG_RPCSEC_GSS_SPKM3 is not set 879# CONFIG_RPCSEC_GSS_SPKM3 is not set
844# CONFIG_SMB_FS is not set 880# CONFIG_SMB_FS is not set
@@ -911,6 +947,9 @@ CONFIG_DEBUG_KERNEL=y
911CONFIG_DETECT_SOFTLOCKUP=y 947CONFIG_DETECT_SOFTLOCKUP=y
912# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set 948# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
913CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 949CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
950CONFIG_DETECT_HUNG_TASK=y
951# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
952CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
914# CONFIG_SCHED_DEBUG is not set 953# CONFIG_SCHED_DEBUG is not set
915# CONFIG_SCHEDSTATS is not set 954# CONFIG_SCHEDSTATS is not set
916# CONFIG_TIMER_STATS is not set 955# CONFIG_TIMER_STATS is not set
@@ -939,15 +978,7 @@ CONFIG_DEBUG_MEMORY_INIT=y
939# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 978# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
940# CONFIG_FAULT_INJECTION is not set 979# CONFIG_FAULT_INJECTION is not set
941# CONFIG_SYSCTL_SYSCALL_CHECK is not set 980# CONFIG_SYSCTL_SYSCALL_CHECK is not set
942 981# CONFIG_PAGE_POISONING is not set
943#
944# Tracers
945#
946# CONFIG_SCHED_TRACER is not set
947# CONFIG_CONTEXT_SWITCH_TRACER is not set
948# CONFIG_BOOT_TRACER is not set
949# CONFIG_TRACE_BRANCH_PROFILING is not set
950# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
951# CONFIG_SAMPLES is not set 982# CONFIG_SAMPLES is not set
952CONFIG_HAVE_ARCH_KGDB=y 983CONFIG_HAVE_ARCH_KGDB=y
953CONFIG_KGDB=y 984CONFIG_KGDB=y
@@ -979,10 +1010,12 @@ CONFIG_CRYPTO_BLKCIPHER2=y
979CONFIG_CRYPTO_HASH=y 1010CONFIG_CRYPTO_HASH=y
980CONFIG_CRYPTO_HASH2=y 1011CONFIG_CRYPTO_HASH2=y
981CONFIG_CRYPTO_RNG2=y 1012CONFIG_CRYPTO_RNG2=y
1013CONFIG_CRYPTO_PCOMP=y
982CONFIG_CRYPTO_MANAGER=y 1014CONFIG_CRYPTO_MANAGER=y
983CONFIG_CRYPTO_MANAGER2=y 1015CONFIG_CRYPTO_MANAGER2=y
984# CONFIG_CRYPTO_GF128MUL is not set 1016# CONFIG_CRYPTO_GF128MUL is not set
985CONFIG_CRYPTO_NULL=m 1017CONFIG_CRYPTO_NULL=m
1018CONFIG_CRYPTO_WORKQUEUE=y
986# CONFIG_CRYPTO_CRYPTD is not set 1019# CONFIG_CRYPTO_CRYPTD is not set
987CONFIG_CRYPTO_AUTHENC=y 1020CONFIG_CRYPTO_AUTHENC=y
988# CONFIG_CRYPTO_TEST is not set 1021# CONFIG_CRYPTO_TEST is not set
@@ -1052,6 +1085,7 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
1052# Compression 1085# Compression
1053# 1086#
1054CONFIG_CRYPTO_DEFLATE=y 1087CONFIG_CRYPTO_DEFLATE=y
1088# CONFIG_CRYPTO_ZLIB is not set
1055# CONFIG_CRYPTO_LZO is not set 1089# CONFIG_CRYPTO_LZO is not set
1056 1090
1057# 1091#
@@ -1059,6 +1093,7 @@ CONFIG_CRYPTO_DEFLATE=y
1059# 1093#
1060# CONFIG_CRYPTO_ANSI_CPRNG is not set 1094# CONFIG_CRYPTO_ANSI_CPRNG is not set
1061# CONFIG_CRYPTO_HW is not set 1095# CONFIG_CRYPTO_HW is not set
1096# CONFIG_BINARY_PRINTF is not set
1062 1097
1063# 1098#
1064# Library routines 1099# Library routines
@@ -1074,7 +1109,10 @@ CONFIG_CRC32=y
1074CONFIG_LIBCRC32C=m 1109CONFIG_LIBCRC32C=m
1075CONFIG_ZLIB_INFLATE=y 1110CONFIG_ZLIB_INFLATE=y
1076CONFIG_ZLIB_DEFLATE=y 1111CONFIG_ZLIB_DEFLATE=y
1077CONFIG_PLIST=y 1112CONFIG_DECOMPRESS_GZIP=y
1113CONFIG_DECOMPRESS_BZIP2=y
1114CONFIG_DECOMPRESS_LZMA=y
1078CONFIG_HAS_IOMEM=y 1115CONFIG_HAS_IOMEM=y
1079CONFIG_HAS_IOPORT=y 1116CONFIG_HAS_IOPORT=y
1080CONFIG_HAS_DMA=y 1117CONFIG_HAS_DMA=y
1118CONFIG_NLATTR=y
diff --git a/arch/sparc/configs/sparc64_defconfig b/arch/sparc/configs/sparc64_defconfig
index ade49941def2..b5d63bd8716e 100644
--- a/arch/sparc/configs/sparc64_defconfig
+++ b/arch/sparc/configs/sparc64_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28 3# Linux kernel version: 2.6.30-rc2
4# Fri Jan 2 18:14:26 2009 4# Fri Apr 17 02:03:07 2009
5# 5#
6CONFIG_64BIT=y
6CONFIG_SPARC=y 7CONFIG_SPARC=y
8# CONFIG_SPARC32 is not set
7CONFIG_SPARC64=y 9CONFIG_SPARC64=y
8CONFIG_ARCH_DEFCONFIG="arch/sparc/configs/sparc64_defconfig" 10CONFIG_ARCH_DEFCONFIG="arch/sparc/configs/sparc64_defconfig"
9CONFIG_BITS=64 11CONFIG_BITS=64
10CONFIG_64BIT=y
11CONFIG_GENERIC_TIME=y 12CONFIG_GENERIC_TIME=y
12CONFIG_GENERIC_CMOS_UPDATE=y 13CONFIG_GENERIC_CMOS_UPDATE=y
13CONFIG_GENERIC_CLOCKEVENTS=y 14CONFIG_GENERIC_CLOCKEVENTS=y
@@ -22,6 +23,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
22CONFIG_MMU=y 23CONFIG_MMU=y
23CONFIG_ARCH_NO_VIRT_TO_BUS=y 24CONFIG_ARCH_NO_VIRT_TO_BUS=y
24CONFIG_OF=y 25CONFIG_OF=y
26CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
25CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 27CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
26 28
27# 29#
@@ -36,17 +38,27 @@ CONFIG_SWAP=y
36CONFIG_SYSVIPC=y 38CONFIG_SYSVIPC=y
37CONFIG_SYSVIPC_SYSCTL=y 39CONFIG_SYSVIPC_SYSCTL=y
38CONFIG_POSIX_MQUEUE=y 40CONFIG_POSIX_MQUEUE=y
41CONFIG_POSIX_MQUEUE_SYSCTL=y
39# CONFIG_BSD_PROCESS_ACCT is not set 42# CONFIG_BSD_PROCESS_ACCT is not set
40# CONFIG_TASKSTATS is not set 43# CONFIG_TASKSTATS is not set
41# CONFIG_AUDIT is not set 44# CONFIG_AUDIT is not set
45
46#
47# RCU Subsystem
48#
49CONFIG_CLASSIC_RCU=y
50# CONFIG_TREE_RCU is not set
51# CONFIG_PREEMPT_RCU is not set
52# CONFIG_TREE_RCU_TRACE is not set
53# CONFIG_PREEMPT_RCU_TRACE is not set
42# CONFIG_IKCONFIG is not set 54# CONFIG_IKCONFIG is not set
43CONFIG_LOG_BUF_SHIFT=18 55CONFIG_LOG_BUF_SHIFT=18
44# CONFIG_CGROUPS is not set
45CONFIG_GROUP_SCHED=y 56CONFIG_GROUP_SCHED=y
46CONFIG_FAIR_GROUP_SCHED=y 57CONFIG_FAIR_GROUP_SCHED=y
47CONFIG_RT_GROUP_SCHED=y 58CONFIG_RT_GROUP_SCHED=y
48CONFIG_USER_SCHED=y 59CONFIG_USER_SCHED=y
49# CONFIG_CGROUP_SCHED is not set 60# CONFIG_CGROUP_SCHED is not set
61# CONFIG_CGROUPS is not set
50CONFIG_SYSFS_DEPRECATED=y 62CONFIG_SYSFS_DEPRECATED=y
51CONFIG_SYSFS_DEPRECATED_V2=y 63CONFIG_SYSFS_DEPRECATED_V2=y
52CONFIG_RELAY=y 64CONFIG_RELAY=y
@@ -55,24 +67,28 @@ CONFIG_NAMESPACES=y
55# CONFIG_IPC_NS is not set 67# CONFIG_IPC_NS is not set
56# CONFIG_USER_NS is not set 68# CONFIG_USER_NS is not set
57# CONFIG_PID_NS is not set 69# CONFIG_PID_NS is not set
70# CONFIG_NET_NS is not set
58CONFIG_BLK_DEV_INITRD=y 71CONFIG_BLK_DEV_INITRD=y
59CONFIG_INITRAMFS_SOURCE="" 72CONFIG_INITRAMFS_SOURCE=""
73CONFIG_RD_GZIP=y
74CONFIG_RD_BZIP2=y
75CONFIG_RD_LZMA=y
60CONFIG_CC_OPTIMIZE_FOR_SIZE=y 76CONFIG_CC_OPTIMIZE_FOR_SIZE=y
61CONFIG_SYSCTL=y 77CONFIG_SYSCTL=y
78CONFIG_ANON_INODES=y
62# CONFIG_EMBEDDED is not set 79# CONFIG_EMBEDDED is not set
63CONFIG_UID16=y 80CONFIG_UID16=y
64CONFIG_SYSCTL_SYSCALL=y 81CONFIG_SYSCTL_SYSCALL=y
65CONFIG_KALLSYMS=y 82CONFIG_KALLSYMS=y
66# CONFIG_KALLSYMS_ALL is not set 83# CONFIG_KALLSYMS_ALL is not set
67# CONFIG_KALLSYMS_EXTRA_PASS is not set 84# CONFIG_KALLSYMS_EXTRA_PASS is not set
85# CONFIG_STRIP_ASM_SYMS is not set
68CONFIG_HOTPLUG=y 86CONFIG_HOTPLUG=y
69CONFIG_PRINTK=y 87CONFIG_PRINTK=y
70CONFIG_BUG=y 88CONFIG_BUG=y
71CONFIG_ELF_CORE=y 89CONFIG_ELF_CORE=y
72# CONFIG_COMPAT_BRK is not set
73CONFIG_BASE_FULL=y 90CONFIG_BASE_FULL=y
74CONFIG_FUTEX=y 91CONFIG_FUTEX=y
75CONFIG_ANON_INODES=y
76CONFIG_EPOLL=y 92CONFIG_EPOLL=y
77CONFIG_SIGNALFD=y 93CONFIG_SIGNALFD=y
78CONFIG_TIMERFD=y 94CONFIG_TIMERFD=y
@@ -82,6 +98,7 @@ CONFIG_AIO=y
82CONFIG_VM_EVENT_COUNTERS=y 98CONFIG_VM_EVENT_COUNTERS=y
83CONFIG_PCI_QUIRKS=y 99CONFIG_PCI_QUIRKS=y
84CONFIG_SLUB_DEBUG=y 100CONFIG_SLUB_DEBUG=y
101# CONFIG_COMPAT_BRK is not set
85# CONFIG_SLAB is not set 102# CONFIG_SLAB is not set
86CONFIG_SLUB=y 103CONFIG_SLUB=y
87# CONFIG_SLOB is not set 104# CONFIG_SLOB is not set
@@ -91,15 +108,16 @@ CONFIG_TRACEPOINTS=y
91CONFIG_OPROFILE=m 108CONFIG_OPROFILE=m
92CONFIG_HAVE_OPROFILE=y 109CONFIG_HAVE_OPROFILE=y
93CONFIG_KPROBES=y 110CONFIG_KPROBES=y
111CONFIG_HAVE_SYSCALL_WRAPPERS=y
94CONFIG_KRETPROBES=y 112CONFIG_KRETPROBES=y
95CONFIG_HAVE_KPROBES=y 113CONFIG_HAVE_KPROBES=y
96CONFIG_HAVE_KRETPROBES=y 114CONFIG_HAVE_KRETPROBES=y
97CONFIG_HAVE_ARCH_TRACEHOOK=y 115CONFIG_HAVE_ARCH_TRACEHOOK=y
98CONFIG_USE_GENERIC_SMP_HELPERS=y 116CONFIG_USE_GENERIC_SMP_HELPERS=y
117# CONFIG_SLOW_WORK is not set
99# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 118# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
100CONFIG_SLABINFO=y 119CONFIG_SLABINFO=y
101CONFIG_RT_MUTEXES=y 120CONFIG_RT_MUTEXES=y
102# CONFIG_TINY_SHMEM is not set
103CONFIG_BASE_SMALL=0 121CONFIG_BASE_SMALL=0
104CONFIG_MODULES=y 122CONFIG_MODULES=y
105# CONFIG_MODULE_FORCE_LOAD is not set 123# CONFIG_MODULE_FORCE_LOAD is not set
@@ -107,10 +125,8 @@ CONFIG_MODULE_UNLOAD=y
107CONFIG_MODULE_FORCE_UNLOAD=y 125CONFIG_MODULE_FORCE_UNLOAD=y
108CONFIG_MODVERSIONS=y 126CONFIG_MODVERSIONS=y
109CONFIG_MODULE_SRCVERSION_ALL=y 127CONFIG_MODULE_SRCVERSION_ALL=y
110CONFIG_KMOD=y
111CONFIG_STOP_MACHINE=y 128CONFIG_STOP_MACHINE=y
112CONFIG_BLOCK=y 129CONFIG_BLOCK=y
113CONFIG_BLK_DEV_IO_TRACE=y
114CONFIG_BLK_DEV_BSG=y 130CONFIG_BLK_DEV_BSG=y
115# CONFIG_BLK_DEV_INTEGRITY is not set 131# CONFIG_BLK_DEV_INTEGRITY is not set
116CONFIG_BLOCK_COMPAT=y 132CONFIG_BLOCK_COMPAT=y
@@ -127,11 +143,6 @@ CONFIG_DEFAULT_AS=y
127# CONFIG_DEFAULT_CFQ is not set 143# CONFIG_DEFAULT_CFQ is not set
128# CONFIG_DEFAULT_NOOP is not set 144# CONFIG_DEFAULT_NOOP is not set
129CONFIG_DEFAULT_IOSCHED="anticipatory" 145CONFIG_DEFAULT_IOSCHED="anticipatory"
130CONFIG_CLASSIC_RCU=y
131# CONFIG_TREE_RCU is not set
132# CONFIG_PREEMPT_RCU is not set
133# CONFIG_TREE_RCU_TRACE is not set
134# CONFIG_PREEMPT_RCU_TRACE is not set
135# CONFIG_FREEZER is not set 146# CONFIG_FREEZER is not set
136 147
137# 148#
@@ -185,11 +196,12 @@ CONFIG_SPARSEMEM_VMEMMAP=y
185CONFIG_PAGEFLAGS_EXTENDED=y 196CONFIG_PAGEFLAGS_EXTENDED=y
186CONFIG_SPLIT_PTLOCK_CPUS=4 197CONFIG_SPLIT_PTLOCK_CPUS=4
187CONFIG_MIGRATION=y 198CONFIG_MIGRATION=y
188CONFIG_RESOURCES_64BIT=y
189CONFIG_PHYS_ADDR_T_64BIT=y 199CONFIG_PHYS_ADDR_T_64BIT=y
190CONFIG_ZONE_DMA_FLAG=0 200CONFIG_ZONE_DMA_FLAG=0
191CONFIG_NR_QUICK=1 201CONFIG_NR_QUICK=1
192CONFIG_UNEVICTABLE_LRU=y 202CONFIG_UNEVICTABLE_LRU=y
203CONFIG_HAVE_MLOCK=y
204CONFIG_HAVE_MLOCKED_PAGE_BIT=y
193CONFIG_SCHED_SMT=y 205CONFIG_SCHED_SMT=y
194CONFIG_SCHED_MC=y 206CONFIG_SCHED_MC=y
195# CONFIG_PREEMPT_NONE is not set 207# CONFIG_PREEMPT_NONE is not set
@@ -210,6 +222,8 @@ CONFIG_ARCH_SUPPORTS_MSI=y
210CONFIG_PCI_MSI=y 222CONFIG_PCI_MSI=y
211# CONFIG_PCI_LEGACY is not set 223# CONFIG_PCI_LEGACY is not set
212# CONFIG_PCI_DEBUG is not set 224# CONFIG_PCI_DEBUG is not set
225# CONFIG_PCI_STUB is not set
226# CONFIG_PCI_IOV is not set
213# CONFIG_PCCARD is not set 227# CONFIG_PCCARD is not set
214CONFIG_SUN_OPENPROMFS=m 228CONFIG_SUN_OPENPROMFS=m
215CONFIG_SPARC64_PCI=y 229CONFIG_SPARC64_PCI=y
@@ -229,8 +243,6 @@ CONFIG_NET=y
229# 243#
230# Networking options 244# Networking options
231# 245#
232# CONFIG_NET_NS is not set
233CONFIG_COMPAT_NET_DEV_OPS=y
234CONFIG_PACKET=y 246CONFIG_PACKET=y
235CONFIG_PACKET_MMAP=y 247CONFIG_PACKET_MMAP=y
236CONFIG_UNIX=y 248CONFIG_UNIX=y
@@ -292,25 +304,7 @@ CONFIG_IPV6_TUNNEL=m
292# CONFIG_IPV6_MROUTE is not set 304# CONFIG_IPV6_MROUTE is not set
293# CONFIG_NETWORK_SECMARK is not set 305# CONFIG_NETWORK_SECMARK is not set
294# CONFIG_NETFILTER is not set 306# CONFIG_NETFILTER is not set
295CONFIG_IP_DCCP=m 307# CONFIG_IP_DCCP is not set
296CONFIG_INET_DCCP_DIAG=m
297CONFIG_IP_DCCP_ACKVEC=y
298
299#
300# DCCP CCIDs Configuration (EXPERIMENTAL)
301#
302CONFIG_IP_DCCP_CCID2=m
303# CONFIG_IP_DCCP_CCID2_DEBUG is not set
304CONFIG_IP_DCCP_CCID3=m
305# CONFIG_IP_DCCP_CCID3_DEBUG is not set
306CONFIG_IP_DCCP_CCID3_RTO=100
307CONFIG_IP_DCCP_TFRC_LIB=m
308
309#
310# DCCP Kernel Hacking
311#
312# CONFIG_IP_DCCP_DEBUG is not set
313# CONFIG_NET_DCCPPROBE is not set
314# CONFIG_IP_SCTP is not set 308# CONFIG_IP_SCTP is not set
315# CONFIG_TIPC is not set 309# CONFIG_TIPC is not set
316# CONFIG_ATM is not set 310# CONFIG_ATM is not set
@@ -326,6 +320,7 @@ CONFIG_VLAN_8021Q=m
326# CONFIG_LAPB is not set 320# CONFIG_LAPB is not set
327# CONFIG_ECONET is not set 321# CONFIG_ECONET is not set
328# CONFIG_WAN_ROUTER is not set 322# CONFIG_WAN_ROUTER is not set
323# CONFIG_PHONET is not set
329# CONFIG_NET_SCHED is not set 324# CONFIG_NET_SCHED is not set
330# CONFIG_DCB is not set 325# CONFIG_DCB is not set
331 326
@@ -334,18 +329,19 @@ CONFIG_VLAN_8021Q=m
334# 329#
335CONFIG_NET_PKTGEN=m 330CONFIG_NET_PKTGEN=m
336CONFIG_NET_TCPPROBE=m 331CONFIG_NET_TCPPROBE=m
332# CONFIG_NET_DROP_MONITOR is not set
337# CONFIG_HAMRADIO is not set 333# CONFIG_HAMRADIO is not set
338# CONFIG_CAN is not set 334# CONFIG_CAN is not set
339# CONFIG_IRDA is not set 335# CONFIG_IRDA is not set
340# CONFIG_BT is not set 336# CONFIG_BT is not set
341# CONFIG_AF_RXRPC is not set 337# CONFIG_AF_RXRPC is not set
342# CONFIG_PHONET is not set
343CONFIG_WIRELESS=y 338CONFIG_WIRELESS=y
344# CONFIG_CFG80211 is not set 339# CONFIG_CFG80211 is not set
345CONFIG_WIRELESS_OLD_REGULATORY=y 340CONFIG_WIRELESS_OLD_REGULATORY=y
346# CONFIG_WIRELESS_EXT is not set 341# CONFIG_WIRELESS_EXT is not set
347# CONFIG_LIB80211 is not set 342# CONFIG_LIB80211 is not set
348# CONFIG_MAC80211 is not set 343# CONFIG_MAC80211 is not set
344# CONFIG_WIMAX is not set
349# CONFIG_RFKILL is not set 345# CONFIG_RFKILL is not set
350# CONFIG_NET_9P is not set 346# CONFIG_NET_9P is not set
351 347
@@ -389,19 +385,27 @@ CONFIG_SUNVDC=m
389# CONFIG_BLK_DEV_HD is not set 385# CONFIG_BLK_DEV_HD is not set
390CONFIG_MISC_DEVICES=y 386CONFIG_MISC_DEVICES=y
391# CONFIG_PHANTOM is not set 387# CONFIG_PHANTOM is not set
392# CONFIG_EEPROM_93CX6 is not set
393# CONFIG_SGI_IOC4 is not set 388# CONFIG_SGI_IOC4 is not set
394# CONFIG_TIFM_CORE is not set 389# CONFIG_TIFM_CORE is not set
395# CONFIG_ICS932S401 is not set 390# CONFIG_ICS932S401 is not set
396# CONFIG_ENCLOSURE_SERVICES is not set 391# CONFIG_ENCLOSURE_SERVICES is not set
397# CONFIG_HP_ILO is not set 392# CONFIG_HP_ILO is not set
393# CONFIG_ISL29003 is not set
398# CONFIG_C2PORT is not set 394# CONFIG_C2PORT is not set
395
396#
397# EEPROM support
398#
399# CONFIG_EEPROM_AT24 is not set
400# CONFIG_EEPROM_LEGACY is not set
401# CONFIG_EEPROM_93CX6 is not set
399CONFIG_HAVE_IDE=y 402CONFIG_HAVE_IDE=y
400CONFIG_IDE=y 403CONFIG_IDE=y
401 404
402# 405#
403# Please see Documentation/ide/ide.txt for help/info on IDE drives 406# Please see Documentation/ide/ide.txt for help/info on IDE drives
404# 407#
408CONFIG_IDE_XFER_MODE=y
405CONFIG_IDE_TIMINGS=y 409CONFIG_IDE_TIMINGS=y
406CONFIG_IDE_ATAPI=y 410CONFIG_IDE_ATAPI=y
407# CONFIG_BLK_DEV_IDE_SATA is not set 411# CONFIG_BLK_DEV_IDE_SATA is not set
@@ -439,6 +443,7 @@ CONFIG_BLK_DEV_ALI15X3=y
439# CONFIG_BLK_DEV_JMICRON is not set 443# CONFIG_BLK_DEV_JMICRON is not set
440# CONFIG_BLK_DEV_SC1200 is not set 444# CONFIG_BLK_DEV_SC1200 is not set
441# CONFIG_BLK_DEV_PIIX is not set 445# CONFIG_BLK_DEV_PIIX is not set
446# CONFIG_BLK_DEV_IT8172 is not set
442# CONFIG_BLK_DEV_IT8213 is not set 447# CONFIG_BLK_DEV_IT8213 is not set
443# CONFIG_BLK_DEV_IT821X is not set 448# CONFIG_BLK_DEV_IT821X is not set
444# CONFIG_BLK_DEV_NS87415 is not set 449# CONFIG_BLK_DEV_NS87415 is not set
@@ -506,8 +511,10 @@ CONFIG_SCSI_LOWLEVEL=y
506# CONFIG_MEGARAID_NEWGEN is not set 511# CONFIG_MEGARAID_NEWGEN is not set
507# CONFIG_MEGARAID_LEGACY is not set 512# CONFIG_MEGARAID_LEGACY is not set
508# CONFIG_MEGARAID_SAS is not set 513# CONFIG_MEGARAID_SAS is not set
514# CONFIG_SCSI_MPT2SAS is not set
509# CONFIG_SCSI_HPTIOP is not set 515# CONFIG_SCSI_HPTIOP is not set
510# CONFIG_LIBFC is not set 516# CONFIG_LIBFC is not set
517# CONFIG_LIBFCOE is not set
511# CONFIG_FCOE is not set 518# CONFIG_FCOE is not set
512# CONFIG_SCSI_DMX3191D is not set 519# CONFIG_SCSI_DMX3191D is not set
513# CONFIG_SCSI_FUTURE_DOMAIN is not set 520# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -528,6 +535,7 @@ CONFIG_SCSI_LOWLEVEL=y
528# CONFIG_SCSI_SUNESP is not set 535# CONFIG_SCSI_SUNESP is not set
529# CONFIG_SCSI_SRP is not set 536# CONFIG_SCSI_SRP is not set
530# CONFIG_SCSI_DH is not set 537# CONFIG_SCSI_DH is not set
538# CONFIG_SCSI_OSD_INITIATOR is not set
531# CONFIG_ATA is not set 539# CONFIG_ATA is not set
532CONFIG_MD=y 540CONFIG_MD=y
533CONFIG_BLK_DEV_MD=m 541CONFIG_BLK_DEV_MD=m
@@ -536,7 +544,7 @@ CONFIG_MD_RAID0=m
536CONFIG_MD_RAID1=m 544CONFIG_MD_RAID1=m
537CONFIG_MD_RAID10=m 545CONFIG_MD_RAID10=m
538CONFIG_MD_RAID456=m 546CONFIG_MD_RAID456=m
539# CONFIG_MD_RAID5_RESHAPE is not set 547CONFIG_MD_RAID6_PQ=m
540CONFIG_MD_MULTIPATH=m 548CONFIG_MD_MULTIPATH=m
541# CONFIG_MD_FAULTY is not set 549# CONFIG_MD_FAULTY is not set
542CONFIG_BLK_DEV_DM=m 550CONFIG_BLK_DEV_DM=m
@@ -561,6 +569,7 @@ CONFIG_DM_ZERO=m
561# CONFIG_IEEE1394 is not set 569# CONFIG_IEEE1394 is not set
562# CONFIG_I2O is not set 570# CONFIG_I2O is not set
563CONFIG_NETDEVICES=y 571CONFIG_NETDEVICES=y
572CONFIG_COMPAT_NET_DEV_OPS=y
564# CONFIG_DUMMY is not set 573# CONFIG_DUMMY is not set
565# CONFIG_BONDING is not set 574# CONFIG_BONDING is not set
566# CONFIG_MACVLAN is not set 575# CONFIG_MACVLAN is not set
@@ -589,14 +598,16 @@ CONFIG_PHYLIB=m
589# CONFIG_MDIO_BITBANG is not set 598# CONFIG_MDIO_BITBANG is not set
590CONFIG_NET_ETHERNET=y 599CONFIG_NET_ETHERNET=y
591CONFIG_MII=m 600CONFIG_MII=m
592# CONFIG_SUNLANCE is not set 601CONFIG_SUNLANCE=m
593# CONFIG_HAPPYMEAL is not set 602CONFIG_HAPPYMEAL=m
594# CONFIG_SUNBMAC is not set 603# CONFIG_SUNBMAC is not set
595# CONFIG_SUNQE is not set 604# CONFIG_SUNQE is not set
596# CONFIG_SUNGEM is not set 605CONFIG_SUNGEM=m
597CONFIG_CASSINI=m 606# CONFIG_CASSINI is not set
598CONFIG_SUNVNET=m 607CONFIG_SUNVNET=m
599# CONFIG_NET_VENDOR_3COM is not set 608# CONFIG_NET_VENDOR_3COM is not set
609# CONFIG_ETHOC is not set
610# CONFIG_DNET is not set
600# CONFIG_NET_TULIP is not set 611# CONFIG_NET_TULIP is not set
601# CONFIG_HP100 is not set 612# CONFIG_HP100 is not set
602# CONFIG_IBM_NEW_EMAC_ZMII is not set 613# CONFIG_IBM_NEW_EMAC_ZMII is not set
@@ -631,9 +642,10 @@ CONFIG_NETDEV_1000=y
631# CONFIG_ACENIC is not set 642# CONFIG_ACENIC is not set
632# CONFIG_DL2K is not set 643# CONFIG_DL2K is not set
633CONFIG_E1000=m 644CONFIG_E1000=m
634# CONFIG_E1000E is not set 645CONFIG_E1000E=m
635# CONFIG_IP1000 is not set 646# CONFIG_IP1000 is not set
636# CONFIG_IGB is not set 647# CONFIG_IGB is not set
648# CONFIG_IGBVF is not set
637# CONFIG_MYRI_SBUS is not set 649# CONFIG_MYRI_SBUS is not set
638# CONFIG_NS83820 is not set 650# CONFIG_NS83820 is not set
639# CONFIG_HAMACHI is not set 651# CONFIG_HAMACHI is not set
@@ -648,6 +660,7 @@ CONFIG_BNX2=m
648# CONFIG_QLA3XXX is not set 660# CONFIG_QLA3XXX is not set
649# CONFIG_ATL1 is not set 661# CONFIG_ATL1 is not set
650# CONFIG_ATL1E is not set 662# CONFIG_ATL1E is not set
663# CONFIG_ATL1C is not set
651# CONFIG_JME is not set 664# CONFIG_JME is not set
652CONFIG_NETDEV_10000=y 665CONFIG_NETDEV_10000=y
653# CONFIG_CHELSIO_T1 is not set 666# CONFIG_CHELSIO_T1 is not set
@@ -657,6 +670,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
657# CONFIG_IXGBE is not set 670# CONFIG_IXGBE is not set
658# CONFIG_IXGB is not set 671# CONFIG_IXGB is not set
659# CONFIG_S2IO is not set 672# CONFIG_S2IO is not set
673# CONFIG_VXGE is not set
660# CONFIG_MYRI10GE is not set 674# CONFIG_MYRI10GE is not set
661# CONFIG_NETXEN_NIC is not set 675# CONFIG_NETXEN_NIC is not set
662CONFIG_NIU=m 676CONFIG_NIU=m
@@ -666,6 +680,7 @@ CONFIG_NIU=m
666# CONFIG_BNX2X is not set 680# CONFIG_BNX2X is not set
667# CONFIG_QLGE is not set 681# CONFIG_QLGE is not set
668# CONFIG_SFC is not set 682# CONFIG_SFC is not set
683# CONFIG_BE2NET is not set
669# CONFIG_TR is not set 684# CONFIG_TR is not set
670 685
671# 686#
@@ -673,7 +688,10 @@ CONFIG_NIU=m
673# 688#
674# CONFIG_WLAN_PRE80211 is not set 689# CONFIG_WLAN_PRE80211 is not set
675# CONFIG_WLAN_80211 is not set 690# CONFIG_WLAN_80211 is not set
676# CONFIG_IWLWIFI_LEDS is not set 691
692#
693# Enable WiMAX (Networking options) to see the WiMAX drivers
694#
677 695
678# 696#
679# USB Network Adapters 697# USB Network Adapters
@@ -738,7 +756,6 @@ CONFIG_MOUSE_PS2=y
738CONFIG_MOUSE_PS2_ALPS=y 756CONFIG_MOUSE_PS2_ALPS=y
739CONFIG_MOUSE_PS2_LOGIPS2PP=y 757CONFIG_MOUSE_PS2_LOGIPS2PP=y
740CONFIG_MOUSE_PS2_SYNAPTICS=y 758CONFIG_MOUSE_PS2_SYNAPTICS=y
741CONFIG_MOUSE_PS2_LIFEBOOK=y
742CONFIG_MOUSE_PS2_TRACKPOINT=y 759CONFIG_MOUSE_PS2_TRACKPOINT=y
743# CONFIG_MOUSE_PS2_ELANTECH is not set 760# CONFIG_MOUSE_PS2_ELANTECH is not set
744# CONFIG_MOUSE_PS2_TOUCHKIT is not set 761# CONFIG_MOUSE_PS2_TOUCHKIT is not set
@@ -805,6 +822,7 @@ CONFIG_UNIX98_PTYS=y
805# CONFIG_LEGACY_PTYS is not set 822# CONFIG_LEGACY_PTYS is not set
806# CONFIG_IPMI_HANDLER is not set 823# CONFIG_IPMI_HANDLER is not set
807CONFIG_HW_RANDOM=m 824CONFIG_HW_RANDOM=m
825# CONFIG_HW_RANDOM_TIMERIOMEM is not set
808CONFIG_HW_RANDOM_N2RNG=m 826CONFIG_HW_RANDOM_N2RNG=m
809# CONFIG_R3964 is not set 827# CONFIG_R3964 is not set
810# CONFIG_APPLICOM is not set 828# CONFIG_APPLICOM is not set
@@ -867,12 +885,9 @@ CONFIG_I2C_ALGOBIT=y
867# Miscellaneous I2C Chip support 885# Miscellaneous I2C Chip support
868# 886#
869# CONFIG_DS1682 is not set 887# CONFIG_DS1682 is not set
870# CONFIG_EEPROM_AT24 is not set
871# CONFIG_EEPROM_LEGACY is not set
872# CONFIG_SENSORS_PCF8574 is not set 888# CONFIG_SENSORS_PCF8574 is not set
873# CONFIG_PCF8575 is not set 889# CONFIG_PCF8575 is not set
874# CONFIG_SENSORS_PCA9539 is not set 890# CONFIG_SENSORS_PCA9539 is not set
875# CONFIG_SENSORS_PCF8591 is not set
876# CONFIG_SENSORS_MAX6875 is not set 891# CONFIG_SENSORS_MAX6875 is not set
877# CONFIG_SENSORS_TSL2550 is not set 892# CONFIG_SENSORS_TSL2550 is not set
878# CONFIG_I2C_DEBUG_CORE is not set 893# CONFIG_I2C_DEBUG_CORE is not set
@@ -897,12 +912,14 @@ CONFIG_HWMON=y
897# CONFIG_SENSORS_ADT7462 is not set 912# CONFIG_SENSORS_ADT7462 is not set
898# CONFIG_SENSORS_ADT7470 is not set 913# CONFIG_SENSORS_ADT7470 is not set
899# CONFIG_SENSORS_ADT7473 is not set 914# CONFIG_SENSORS_ADT7473 is not set
915# CONFIG_SENSORS_ADT7475 is not set
900# CONFIG_SENSORS_ATXP1 is not set 916# CONFIG_SENSORS_ATXP1 is not set
901# CONFIG_SENSORS_DS1621 is not set 917# CONFIG_SENSORS_DS1621 is not set
902# CONFIG_SENSORS_I5K_AMB is not set 918# CONFIG_SENSORS_I5K_AMB is not set
903# CONFIG_SENSORS_F71805F is not set 919# CONFIG_SENSORS_F71805F is not set
904# CONFIG_SENSORS_F71882FG is not set 920# CONFIG_SENSORS_F71882FG is not set
905# CONFIG_SENSORS_F75375S is not set 921# CONFIG_SENSORS_F75375S is not set
922# CONFIG_SENSORS_G760A is not set
906# CONFIG_SENSORS_GL518SM is not set 923# CONFIG_SENSORS_GL518SM is not set
907# CONFIG_SENSORS_GL520SM is not set 924# CONFIG_SENSORS_GL520SM is not set
908# CONFIG_SENSORS_IT87 is not set 925# CONFIG_SENSORS_IT87 is not set
@@ -917,10 +934,14 @@ CONFIG_HWMON=y
917# CONFIG_SENSORS_LM90 is not set 934# CONFIG_SENSORS_LM90 is not set
918# CONFIG_SENSORS_LM92 is not set 935# CONFIG_SENSORS_LM92 is not set
919# CONFIG_SENSORS_LM93 is not set 936# CONFIG_SENSORS_LM93 is not set
937# CONFIG_SENSORS_LTC4215 is not set
938# CONFIG_SENSORS_LTC4245 is not set
939# CONFIG_SENSORS_LM95241 is not set
920# CONFIG_SENSORS_MAX1619 is not set 940# CONFIG_SENSORS_MAX1619 is not set
921# CONFIG_SENSORS_MAX6650 is not set 941# CONFIG_SENSORS_MAX6650 is not set
922# CONFIG_SENSORS_PC87360 is not set 942# CONFIG_SENSORS_PC87360 is not set
923# CONFIG_SENSORS_PC87427 is not set 943# CONFIG_SENSORS_PC87427 is not set
944# CONFIG_SENSORS_PCF8591 is not set
924# CONFIG_SENSORS_SIS5595 is not set 945# CONFIG_SENSORS_SIS5595 is not set
925# CONFIG_SENSORS_DME1737 is not set 946# CONFIG_SENSORS_DME1737 is not set
926# CONFIG_SENSORS_SMSC47M1 is not set 947# CONFIG_SENSORS_SMSC47M1 is not set
@@ -957,10 +978,12 @@ CONFIG_SSB_POSSIBLE=y
957# CONFIG_MFD_CORE is not set 978# CONFIG_MFD_CORE is not set
958# CONFIG_MFD_SM501 is not set 979# CONFIG_MFD_SM501 is not set
959# CONFIG_HTC_PASIC3 is not set 980# CONFIG_HTC_PASIC3 is not set
981# CONFIG_TWL4030_CORE is not set
960# CONFIG_MFD_TMIO is not set 982# CONFIG_MFD_TMIO is not set
961# CONFIG_PMIC_DA903X is not set 983# CONFIG_PMIC_DA903X is not set
962# CONFIG_MFD_WM8400 is not set 984# CONFIG_MFD_WM8400 is not set
963# CONFIG_MFD_WM8350_I2C is not set 985# CONFIG_MFD_WM8350_I2C is not set
986# CONFIG_MFD_PCF50633 is not set
964# CONFIG_REGULATOR is not set 987# CONFIG_REGULATOR is not set
965 988
966# 989#
@@ -1053,6 +1076,7 @@ CONFIG_FB_ATY_GX=y
1053# CONFIG_FB_VIRTUAL is not set 1076# CONFIG_FB_VIRTUAL is not set
1054# CONFIG_FB_METRONOME is not set 1077# CONFIG_FB_METRONOME is not set
1055# CONFIG_FB_MB862XX is not set 1078# CONFIG_FB_MB862XX is not set
1079# CONFIG_FB_BROADSHEET is not set
1056# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 1080# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
1057 1081
1058# 1082#
@@ -1141,6 +1165,8 @@ CONFIG_SND_ALI5451=m
1141# CONFIG_SND_INDIGO is not set 1165# CONFIG_SND_INDIGO is not set
1142# CONFIG_SND_INDIGOIO is not set 1166# CONFIG_SND_INDIGOIO is not set
1143# CONFIG_SND_INDIGODJ is not set 1167# CONFIG_SND_INDIGODJ is not set
1168# CONFIG_SND_INDIGOIOX is not set
1169# CONFIG_SND_INDIGODJX is not set
1144# CONFIG_SND_EMU10K1 is not set 1170# CONFIG_SND_EMU10K1 is not set
1145# CONFIG_SND_EMU10K1X is not set 1171# CONFIG_SND_EMU10K1X is not set
1146# CONFIG_SND_ENS1370 is not set 1172# CONFIG_SND_ENS1370 is not set
@@ -1197,28 +1223,31 @@ CONFIG_USB_HIDDEV=y
1197# 1223#
1198# Special HID drivers 1224# Special HID drivers
1199# 1225#
1200CONFIG_HID_COMPAT=y
1201CONFIG_HID_A4TECH=y 1226CONFIG_HID_A4TECH=y
1202CONFIG_HID_APPLE=y 1227CONFIG_HID_APPLE=y
1203CONFIG_HID_BELKIN=y 1228CONFIG_HID_BELKIN=y
1204CONFIG_HID_BRIGHT=y
1205CONFIG_HID_CHERRY=y 1229CONFIG_HID_CHERRY=y
1206CONFIG_HID_CHICONY=y 1230CONFIG_HID_CHICONY=y
1207CONFIG_HID_CYPRESS=y 1231CONFIG_HID_CYPRESS=y
1208CONFIG_HID_DELL=y 1232# CONFIG_DRAGONRISE_FF is not set
1209CONFIG_HID_EZKEY=y 1233CONFIG_HID_EZKEY=y
1234CONFIG_HID_KYE=y
1210CONFIG_HID_GYRATION=y 1235CONFIG_HID_GYRATION=y
1236CONFIG_HID_KENSINGTON=y
1211CONFIG_HID_LOGITECH=y 1237CONFIG_HID_LOGITECH=y
1212# CONFIG_LOGITECH_FF is not set 1238# CONFIG_LOGITECH_FF is not set
1213# CONFIG_LOGIRUMBLEPAD2_FF is not set 1239# CONFIG_LOGIRUMBLEPAD2_FF is not set
1214CONFIG_HID_MICROSOFT=y 1240CONFIG_HID_MICROSOFT=y
1215CONFIG_HID_MONTEREY=y 1241CONFIG_HID_MONTEREY=y
1242CONFIG_HID_NTRIG=y
1216CONFIG_HID_PANTHERLORD=y 1243CONFIG_HID_PANTHERLORD=y
1217# CONFIG_PANTHERLORD_FF is not set 1244# CONFIG_PANTHERLORD_FF is not set
1218CONFIG_HID_PETALYNX=y 1245CONFIG_HID_PETALYNX=y
1219CONFIG_HID_SAMSUNG=y 1246CONFIG_HID_SAMSUNG=y
1220CONFIG_HID_SONY=y 1247CONFIG_HID_SONY=y
1221CONFIG_HID_SUNPLUS=y 1248CONFIG_HID_SUNPLUS=y
1249# CONFIG_GREENASIA_FF is not set
1250CONFIG_HID_TOPSEED=y
1222# CONFIG_THRUSTMASTER_FF is not set 1251# CONFIG_THRUSTMASTER_FF is not set
1223# CONFIG_ZEROPLUS_FF is not set 1252# CONFIG_ZEROPLUS_FF is not set
1224CONFIG_USB_SUPPORT=y 1253CONFIG_USB_SUPPORT=y
@@ -1247,6 +1276,7 @@ CONFIG_USB_DEVICEFS=y
1247CONFIG_USB_EHCI_HCD=m 1276CONFIG_USB_EHCI_HCD=m
1248# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1277# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1249# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1278# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1279# CONFIG_USB_OXU210HP_HCD is not set
1250# CONFIG_USB_ISP116X_HCD is not set 1280# CONFIG_USB_ISP116X_HCD is not set
1251# CONFIG_USB_ISP1760_HCD is not set 1281# CONFIG_USB_ISP1760_HCD is not set
1252CONFIG_USB_OHCI_HCD=y 1282CONFIG_USB_OHCI_HCD=y
@@ -1268,18 +1298,17 @@ CONFIG_USB_UHCI_HCD=m
1268# CONFIG_USB_TMC is not set 1298# CONFIG_USB_TMC is not set
1269 1299
1270# 1300#
1271# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; 1301# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
1272# 1302#
1273 1303
1274# 1304#
1275# see USB_STORAGE Help for more information 1305# also be needed; see USB_STORAGE Help for more info
1276# 1306#
1277CONFIG_USB_STORAGE=m 1307CONFIG_USB_STORAGE=m
1278# CONFIG_USB_STORAGE_DEBUG is not set 1308# CONFIG_USB_STORAGE_DEBUG is not set
1279# CONFIG_USB_STORAGE_DATAFAB is not set 1309# CONFIG_USB_STORAGE_DATAFAB is not set
1280# CONFIG_USB_STORAGE_FREECOM is not set 1310# CONFIG_USB_STORAGE_FREECOM is not set
1281# CONFIG_USB_STORAGE_ISD200 is not set 1311# CONFIG_USB_STORAGE_ISD200 is not set
1282# CONFIG_USB_STORAGE_DPCM is not set
1283# CONFIG_USB_STORAGE_USBAT is not set 1312# CONFIG_USB_STORAGE_USBAT is not set
1284# CONFIG_USB_STORAGE_SDDR09 is not set 1313# CONFIG_USB_STORAGE_SDDR09 is not set
1285# CONFIG_USB_STORAGE_SDDR55 is not set 1314# CONFIG_USB_STORAGE_SDDR55 is not set
@@ -1315,7 +1344,6 @@ CONFIG_USB_STORAGE=m
1315# CONFIG_USB_LED is not set 1344# CONFIG_USB_LED is not set
1316# CONFIG_USB_CYPRESS_CY7C63 is not set 1345# CONFIG_USB_CYPRESS_CY7C63 is not set
1317# CONFIG_USB_CYTHERM is not set 1346# CONFIG_USB_CYTHERM is not set
1318# CONFIG_USB_PHIDGET is not set
1319# CONFIG_USB_IDMOUSE is not set 1347# CONFIG_USB_IDMOUSE is not set
1320# CONFIG_USB_FTDI_ELAN is not set 1348# CONFIG_USB_FTDI_ELAN is not set
1321# CONFIG_USB_APPLEDISPLAY is not set 1349# CONFIG_USB_APPLEDISPLAY is not set
@@ -1327,6 +1355,11 @@ CONFIG_USB_STORAGE=m
1327# CONFIG_USB_ISIGHTFW is not set 1355# CONFIG_USB_ISIGHTFW is not set
1328# CONFIG_USB_VST is not set 1356# CONFIG_USB_VST is not set
1329# CONFIG_USB_GADGET is not set 1357# CONFIG_USB_GADGET is not set
1358
1359#
1360# OTG and related infrastructure
1361#
1362# CONFIG_NOP_USB_XCEIV is not set
1330# CONFIG_UWB is not set 1363# CONFIG_UWB is not set
1331# CONFIG_MMC is not set 1364# CONFIG_MMC is not set
1332# CONFIG_MEMSTICK is not set 1365# CONFIG_MEMSTICK is not set
@@ -1390,6 +1423,7 @@ CONFIG_RTC_DRV_BQ4802=y
1390CONFIG_RTC_DRV_SUN4V=y 1423CONFIG_RTC_DRV_SUN4V=y
1391CONFIG_RTC_DRV_STARFIRE=y 1424CONFIG_RTC_DRV_STARFIRE=y
1392# CONFIG_DMADEVICES is not set 1425# CONFIG_DMADEVICES is not set
1426# CONFIG_AUXDISPLAY is not set
1393# CONFIG_UIO is not set 1427# CONFIG_UIO is not set
1394# CONFIG_STAGING is not set 1428# CONFIG_STAGING is not set
1395 1429
@@ -1412,6 +1446,7 @@ CONFIG_EXT2_FS_POSIX_ACL=y
1412CONFIG_EXT2_FS_SECURITY=y 1446CONFIG_EXT2_FS_SECURITY=y
1413# CONFIG_EXT2_FS_XIP is not set 1447# CONFIG_EXT2_FS_XIP is not set
1414CONFIG_EXT3_FS=y 1448CONFIG_EXT3_FS=y
1449# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
1415CONFIG_EXT3_FS_XATTR=y 1450CONFIG_EXT3_FS_XATTR=y
1416CONFIG_EXT3_FS_POSIX_ACL=y 1451CONFIG_EXT3_FS_POSIX_ACL=y
1417CONFIG_EXT3_FS_SECURITY=y 1452CONFIG_EXT3_FS_SECURITY=y
@@ -1426,6 +1461,7 @@ CONFIG_FILE_LOCKING=y
1426# CONFIG_XFS_FS is not set 1461# CONFIG_XFS_FS is not set
1427# CONFIG_GFS2_FS is not set 1462# CONFIG_GFS2_FS is not set
1428# CONFIG_OCFS2_FS is not set 1463# CONFIG_OCFS2_FS is not set
1464# CONFIG_BTRFS_FS is not set
1429CONFIG_DNOTIFY=y 1465CONFIG_DNOTIFY=y
1430CONFIG_INOTIFY=y 1466CONFIG_INOTIFY=y
1431CONFIG_INOTIFY_USER=y 1467CONFIG_INOTIFY_USER=y
@@ -1435,6 +1471,11 @@ CONFIG_INOTIFY_USER=y
1435# CONFIG_FUSE_FS is not set 1471# CONFIG_FUSE_FS is not set
1436 1472
1437# 1473#
1474# Caches
1475#
1476# CONFIG_FSCACHE is not set
1477
1478#
1438# CD-ROM/DVD Filesystems 1479# CD-ROM/DVD Filesystems
1439# 1480#
1440# CONFIG_ISO9660_FS is not set 1481# CONFIG_ISO9660_FS is not set
@@ -1460,10 +1501,7 @@ CONFIG_TMPFS=y
1460CONFIG_HUGETLBFS=y 1501CONFIG_HUGETLBFS=y
1461CONFIG_HUGETLB_PAGE=y 1502CONFIG_HUGETLB_PAGE=y
1462# CONFIG_CONFIGFS_FS is not set 1503# CONFIG_CONFIGFS_FS is not set
1463 1504CONFIG_MISC_FILESYSTEMS=y
1464#
1465# Miscellaneous filesystems
1466#
1467# CONFIG_ADFS_FS is not set 1505# CONFIG_ADFS_FS is not set
1468# CONFIG_AFFS_FS is not set 1506# CONFIG_AFFS_FS is not set
1469# CONFIG_ECRYPT_FS is not set 1507# CONFIG_ECRYPT_FS is not set
@@ -1473,6 +1511,7 @@ CONFIG_HUGETLB_PAGE=y
1473# CONFIG_BFS_FS is not set 1511# CONFIG_BFS_FS is not set
1474# CONFIG_EFS_FS is not set 1512# CONFIG_EFS_FS is not set
1475# CONFIG_CRAMFS is not set 1513# CONFIG_CRAMFS is not set
1514# CONFIG_SQUASHFS is not set
1476# CONFIG_VXFS_FS is not set 1515# CONFIG_VXFS_FS is not set
1477# CONFIG_MINIX_FS is not set 1516# CONFIG_MINIX_FS is not set
1478# CONFIG_OMFS_FS is not set 1517# CONFIG_OMFS_FS is not set
@@ -1481,6 +1520,7 @@ CONFIG_HUGETLB_PAGE=y
1481# CONFIG_ROMFS_FS is not set 1520# CONFIG_ROMFS_FS is not set
1482# CONFIG_SYSV_FS is not set 1521# CONFIG_SYSV_FS is not set
1483# CONFIG_UFS_FS is not set 1522# CONFIG_UFS_FS is not set
1523# CONFIG_NILFS2_FS is not set
1484CONFIG_NETWORK_FILESYSTEMS=y 1524CONFIG_NETWORK_FILESYSTEMS=y
1485# CONFIG_NFS_FS is not set 1525# CONFIG_NFS_FS is not set
1486# CONFIG_NFSD is not set 1526# CONFIG_NFSD is not set
@@ -1555,6 +1595,9 @@ CONFIG_DEBUG_KERNEL=y
1555CONFIG_DETECT_SOFTLOCKUP=y 1595CONFIG_DETECT_SOFTLOCKUP=y
1556# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set 1596# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
1557CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 1597CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
1598CONFIG_DETECT_HUNG_TASK=y
1599# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
1600CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
1558# CONFIG_SCHED_DEBUG is not set 1601# CONFIG_SCHED_DEBUG is not set
1559CONFIG_SCHEDSTATS=y 1602CONFIG_SCHEDSTATS=y
1560# CONFIG_TIMER_STATS is not set 1603# CONFIG_TIMER_STATS is not set
@@ -1590,10 +1633,12 @@ CONFIG_DEBUG_MEMORY_INIT=y
1590# CONFIG_FAULT_INJECTION is not set 1633# CONFIG_FAULT_INJECTION is not set
1591# CONFIG_LATENCYTOP is not set 1634# CONFIG_LATENCYTOP is not set
1592CONFIG_SYSCTL_SYSCALL_CHECK=y 1635CONFIG_SYSCTL_SYSCALL_CHECK=y
1636# CONFIG_DEBUG_PAGEALLOC is not set
1593CONFIG_NOP_TRACER=y 1637CONFIG_NOP_TRACER=y
1594CONFIG_HAVE_FUNCTION_TRACER=y 1638CONFIG_HAVE_FUNCTION_TRACER=y
1595CONFIG_RING_BUFFER=y 1639CONFIG_RING_BUFFER=y
1596CONFIG_TRACING=y 1640CONFIG_TRACING=y
1641CONFIG_TRACING_SUPPORT=y
1597 1642
1598# 1643#
1599# Tracers 1644# Tracers
@@ -1602,18 +1647,21 @@ CONFIG_TRACING=y
1602# CONFIG_IRQSOFF_TRACER is not set 1647# CONFIG_IRQSOFF_TRACER is not set
1603# CONFIG_SCHED_TRACER is not set 1648# CONFIG_SCHED_TRACER is not set
1604# CONFIG_CONTEXT_SWITCH_TRACER is not set 1649# CONFIG_CONTEXT_SWITCH_TRACER is not set
1650# CONFIG_EVENT_TRACER is not set
1605# CONFIG_BOOT_TRACER is not set 1651# CONFIG_BOOT_TRACER is not set
1606# CONFIG_TRACE_BRANCH_PROFILING is not set 1652# CONFIG_TRACE_BRANCH_PROFILING is not set
1607# CONFIG_STACK_TRACER is not set 1653# CONFIG_STACK_TRACER is not set
1654# CONFIG_KMEMTRACE is not set
1655# CONFIG_WORKQUEUE_TRACER is not set
1656CONFIG_BLK_DEV_IO_TRACE=y
1608# CONFIG_FTRACE_STARTUP_TEST is not set 1657# CONFIG_FTRACE_STARTUP_TEST is not set
1609# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1658# CONFIG_DYNAMIC_DEBUG is not set
1610# CONFIG_SAMPLES is not set 1659# CONFIG_SAMPLES is not set
1611CONFIG_HAVE_ARCH_KGDB=y 1660CONFIG_HAVE_ARCH_KGDB=y
1612# CONFIG_KGDB is not set 1661# CONFIG_KGDB is not set
1613# CONFIG_DEBUG_STACK_USAGE is not set 1662# CONFIG_DEBUG_STACK_USAGE is not set
1614# CONFIG_DEBUG_DCFLUSH is not set 1663# CONFIG_DEBUG_DCFLUSH is not set
1615# CONFIG_STACK_DEBUG is not set 1664# CONFIG_STACK_DEBUG is not set
1616# CONFIG_DEBUG_PAGEALLOC is not set
1617 1665
1618# 1666#
1619# Security options 1667# Security options
@@ -1642,10 +1690,12 @@ CONFIG_CRYPTO_BLKCIPHER2=y
1642CONFIG_CRYPTO_HASH=y 1690CONFIG_CRYPTO_HASH=y
1643CONFIG_CRYPTO_HASH2=y 1691CONFIG_CRYPTO_HASH2=y
1644CONFIG_CRYPTO_RNG2=y 1692CONFIG_CRYPTO_RNG2=y
1693CONFIG_CRYPTO_PCOMP=y
1645CONFIG_CRYPTO_MANAGER=y 1694CONFIG_CRYPTO_MANAGER=y
1646CONFIG_CRYPTO_MANAGER2=y 1695CONFIG_CRYPTO_MANAGER2=y
1647CONFIG_CRYPTO_GF128MUL=m 1696CONFIG_CRYPTO_GF128MUL=m
1648CONFIG_CRYPTO_NULL=m 1697CONFIG_CRYPTO_NULL=m
1698CONFIG_CRYPTO_WORKQUEUE=y
1649# CONFIG_CRYPTO_CRYPTD is not set 1699# CONFIG_CRYPTO_CRYPTD is not set
1650CONFIG_CRYPTO_AUTHENC=y 1700CONFIG_CRYPTO_AUTHENC=y
1651CONFIG_CRYPTO_TEST=m 1701CONFIG_CRYPTO_TEST=m
@@ -1715,6 +1765,7 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
1715# Compression 1765# Compression
1716# 1766#
1717CONFIG_CRYPTO_DEFLATE=y 1767CONFIG_CRYPTO_DEFLATE=y
1768# CONFIG_CRYPTO_ZLIB is not set
1718# CONFIG_CRYPTO_LZO is not set 1769# CONFIG_CRYPTO_LZO is not set
1719 1770
1720# 1771#
@@ -1723,11 +1774,13 @@ CONFIG_CRYPTO_DEFLATE=y
1723# CONFIG_CRYPTO_ANSI_CPRNG is not set 1774# CONFIG_CRYPTO_ANSI_CPRNG is not set
1724CONFIG_CRYPTO_HW=y 1775CONFIG_CRYPTO_HW=y
1725# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1776# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1777CONFIG_BINARY_PRINTF=y
1726 1778
1727# 1779#
1728# Library routines 1780# Library routines
1729# 1781#
1730CONFIG_BITREVERSE=y 1782CONFIG_BITREVERSE=y
1783CONFIG_GENERIC_FIND_LAST_BIT=y
1731CONFIG_CRC_CCITT=m 1784CONFIG_CRC_CCITT=m
1732CONFIG_CRC16=m 1785CONFIG_CRC16=m
1733# CONFIG_CRC_T10DIF is not set 1786# CONFIG_CRC_T10DIF is not set
@@ -1737,8 +1790,11 @@ CONFIG_CRC32=y
1737CONFIG_LIBCRC32C=m 1790CONFIG_LIBCRC32C=m
1738CONFIG_ZLIB_INFLATE=y 1791CONFIG_ZLIB_INFLATE=y
1739CONFIG_ZLIB_DEFLATE=y 1792CONFIG_ZLIB_DEFLATE=y
1740CONFIG_PLIST=y 1793CONFIG_DECOMPRESS_GZIP=y
1794CONFIG_DECOMPRESS_BZIP2=y
1795CONFIG_DECOMPRESS_LZMA=y
1741CONFIG_HAS_IOMEM=y 1796CONFIG_HAS_IOMEM=y
1742CONFIG_HAS_IOPORT=y 1797CONFIG_HAS_IOPORT=y
1743CONFIG_HAS_DMA=y 1798CONFIG_HAS_DMA=y
1744CONFIG_HAVE_LMB=y 1799CONFIG_HAVE_LMB=y
1800CONFIG_NLATTR=y
diff --git a/arch/sparc/kernel/head_32.S b/arch/sparc/kernel/head_32.S
index f0b4b516304f..e91f01a57598 100644
--- a/arch/sparc/kernel/head_32.S
+++ b/arch/sparc/kernel/head_32.S
@@ -72,7 +72,7 @@ sun4e_notsup:
72 .align 4 72 .align 4
73 73
74 /* The Sparc trap table, bootloader gives us control at _start. */ 74 /* The Sparc trap table, bootloader gives us control at _start. */
75 .section .text.head,"ax" 75 __HEAD
76 .globl start, _stext, _start, __stext 76 .globl start, _stext, _start, __stext
77 .globl trapbase 77 .globl trapbase
78_start: /* danger danger */ 78_start: /* danger danger */
diff --git a/arch/sparc/kernel/of_device_32.c b/arch/sparc/kernel/of_device_32.c
index 0a83bd737654..c8f14c1dc521 100644
--- a/arch/sparc/kernel/of_device_32.c
+++ b/arch/sparc/kernel/of_device_32.c
@@ -246,8 +246,25 @@ static unsigned long of_bus_pci_get_flags(const u32 *addr, unsigned long flags)
246 246
247static int of_bus_sbus_match(struct device_node *np) 247static int of_bus_sbus_match(struct device_node *np)
248{ 248{
249 return !strcmp(np->name, "sbus") || 249 struct device_node *dp = np;
250 !strcmp(np->name, "sbi"); 250
251 while (dp) {
252 if (!strcmp(dp->name, "sbus") ||
253 !strcmp(dp->name, "sbi"))
254 return 1;
255
256 /* Have a look at use_1to1_mapping(). We're trying
257 * to match SBUS if that's the top-level bus and we
258 * don't have some intervening real bus that provides
259 * ranges based translations.
260 */
261 if (of_find_property(dp, "ranges", NULL) != NULL)
262 break;
263
264 dp = dp->parent;
265 }
266
267 return 0;
251} 268}
252 269
253static void of_bus_sbus_count_cells(struct device_node *child, 270static void of_bus_sbus_count_cells(struct device_node *child,
diff --git a/arch/sparc/kernel/of_device_64.c b/arch/sparc/kernel/of_device_64.c
index 27381f1baffc..5ac287ac03de 100644
--- a/arch/sparc/kernel/of_device_64.c
+++ b/arch/sparc/kernel/of_device_64.c
@@ -300,8 +300,25 @@ static unsigned long of_bus_pci_get_flags(const u32 *addr, unsigned long flags)
300 300
301static int of_bus_sbus_match(struct device_node *np) 301static int of_bus_sbus_match(struct device_node *np)
302{ 302{
303 return !strcmp(np->name, "sbus") || 303 struct device_node *dp = np;
304 !strcmp(np->name, "sbi"); 304
305 while (dp) {
306 if (!strcmp(dp->name, "sbus") ||
307 !strcmp(dp->name, "sbi"))
308 return 1;
309
310 /* Have a look at use_1to1_mapping(). We're trying
311 * to match SBUS if that's the top-level bus and we
312 * don't have some intervening real bus that provides
313 * ranges based translations.
314 */
315 if (of_find_property(dp, "ranges", NULL) != NULL)
316 break;
317
318 dp = dp->parent;
319 }
320
321 return 0;
305} 322}
306 323
307static void of_bus_sbus_count_cells(struct device_node *child, 324static void of_bus_sbus_count_cells(struct device_node *child,
diff --git a/arch/sparc/kernel/vmlinux.lds.S b/arch/sparc/kernel/vmlinux.lds.S
index 76267085b13b..fcbbd000ec08 100644
--- a/arch/sparc/kernel/vmlinux.lds.S
+++ b/arch/sparc/kernel/vmlinux.lds.S
@@ -41,7 +41,7 @@ SECTIONS
41 .text TEXTSTART : 41 .text TEXTSTART :
42 { 42 {
43 _text = .; 43 _text = .;
44 *(.text.head) 44 HEAD_TEXT
45 TEXT_TEXT 45 TEXT_TEXT
46 SCHED_TEXT 46 SCHED_TEXT
47 LOCK_TEXT 47 LOCK_TEXT
diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h
index 5623c50d67b2..c45f415ce315 100644
--- a/arch/x86/include/asm/desc.h
+++ b/arch/x86/include/asm/desc.h
@@ -37,7 +37,7 @@ extern gate_desc idt_table[];
37struct gdt_page { 37struct gdt_page {
38 struct desc_struct gdt[GDT_ENTRIES]; 38 struct desc_struct gdt[GDT_ENTRIES];
39} __attribute__((aligned(PAGE_SIZE))); 39} __attribute__((aligned(PAGE_SIZE)));
40DECLARE_PER_CPU(struct gdt_page, gdt_page); 40DECLARE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page);
41 41
42static inline struct desc_struct *get_cpu_gdt_table(unsigned int cpu) 42static inline struct desc_struct *get_cpu_gdt_table(unsigned int cpu)
43{ 43{
diff --git a/arch/x86/include/asm/hardirq.h b/arch/x86/include/asm/hardirq.h
index 039db6aa8e02..37555e52f980 100644
--- a/arch/x86/include/asm/hardirq.h
+++ b/arch/x86/include/asm/hardirq.h
@@ -26,7 +26,7 @@ typedef struct {
26#endif 26#endif
27} ____cacheline_aligned irq_cpustat_t; 27} ____cacheline_aligned irq_cpustat_t;
28 28
29DECLARE_PER_CPU(irq_cpustat_t, irq_stat); 29DECLARE_PER_CPU_SHARED_ALIGNED(irq_cpustat_t, irq_stat);
30 30
31/* We can have at most NR_VECTORS irqs routed to a cpu at a time */ 31/* We can have at most NR_VECTORS irqs routed to a cpu at a time */
32#define MAX_HARDIRQS_PER_CPU NR_VECTORS 32#define MAX_HARDIRQS_PER_CPU NR_VECTORS
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
index fcf4d92e7e04..c2cceae709c8 100644
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -138,7 +138,7 @@ extern struct tss_struct doublefault_tss;
138extern __u32 cleared_cpu_caps[NCAPINTS]; 138extern __u32 cleared_cpu_caps[NCAPINTS];
139 139
140#ifdef CONFIG_SMP 140#ifdef CONFIG_SMP
141DECLARE_PER_CPU(struct cpuinfo_x86, cpu_info); 141DECLARE_PER_CPU_SHARED_ALIGNED(struct cpuinfo_x86, cpu_info);
142#define cpu_data(cpu) per_cpu(cpu_info, cpu) 142#define cpu_data(cpu) per_cpu(cpu_info, cpu)
143#define current_cpu_data __get_cpu_var(cpu_info) 143#define current_cpu_data __get_cpu_var(cpu_info)
144#else 144#else
@@ -270,7 +270,7 @@ struct tss_struct {
270 270
271} ____cacheline_aligned; 271} ____cacheline_aligned;
272 272
273DECLARE_PER_CPU(struct tss_struct, init_tss); 273DECLARE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss);
274 274
275/* 275/*
276 * Save the original ist values for checking stack pointers during debugging 276 * Save the original ist values for checking stack pointers during debugging
@@ -393,7 +393,7 @@ union irq_stack_union {
393 }; 393 };
394}; 394};
395 395
396DECLARE_PER_CPU(union irq_stack_union, irq_stack_union); 396DECLARE_PER_CPU_FIRST(union irq_stack_union, irq_stack_union);
397DECLARE_INIT_PER_CPU(irq_stack_union); 397DECLARE_INIT_PER_CPU(irq_stack_union);
398 398
399DECLARE_PER_CPU(char *, irq_stack_ptr); 399DECLARE_PER_CPU(char *, irq_stack_ptr);
diff --git a/arch/x86/include/asm/tlbflush.h b/arch/x86/include/asm/tlbflush.h
index d3539f998f88..16a5c84b0329 100644
--- a/arch/x86/include/asm/tlbflush.h
+++ b/arch/x86/include/asm/tlbflush.h
@@ -152,7 +152,7 @@ struct tlb_state {
152 struct mm_struct *active_mm; 152 struct mm_struct *active_mm;
153 int state; 153 int state;
154}; 154};
155DECLARE_PER_CPU(struct tlb_state, cpu_tlbstate); 155DECLARE_PER_CPU_SHARED_ALIGNED(struct tlb_state, cpu_tlbstate);
156 156
157static inline void reset_lazy_tlbstate(void) 157static inline void reset_lazy_tlbstate(void)
158{ 158{
diff --git a/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c b/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
index ecdb682ab516..208ecf6643df 100644
--- a/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
+++ b/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
@@ -65,14 +65,18 @@ enum {
65struct acpi_cpufreq_data { 65struct acpi_cpufreq_data {
66 struct acpi_processor_performance *acpi_data; 66 struct acpi_processor_performance *acpi_data;
67 struct cpufreq_frequency_table *freq_table; 67 struct cpufreq_frequency_table *freq_table;
68 unsigned int max_freq;
69 unsigned int resume; 68 unsigned int resume;
70 unsigned int cpu_feature; 69 unsigned int cpu_feature;
71 u64 saved_aperf, saved_mperf;
72}; 70};
73 71
74static DEFINE_PER_CPU(struct acpi_cpufreq_data *, drv_data); 72static DEFINE_PER_CPU(struct acpi_cpufreq_data *, drv_data);
75 73
74struct acpi_msr_data {
75 u64 saved_aperf, saved_mperf;
76};
77
78static DEFINE_PER_CPU(struct acpi_msr_data, msr_data);
79
76DEFINE_TRACE(power_mark); 80DEFINE_TRACE(power_mark);
77 81
78/* acpi_perf_data is a pointer to percpu data. */ 82/* acpi_perf_data is a pointer to percpu data. */
@@ -287,11 +291,11 @@ static unsigned int get_measured_perf(struct cpufreq_policy *policy,
287 return 0; 291 return 0;
288 292
289 cur.aperf.whole = readin.aperf.whole - 293 cur.aperf.whole = readin.aperf.whole -
290 per_cpu(drv_data, cpu)->saved_aperf; 294 per_cpu(msr_data, cpu).saved_aperf;
291 cur.mperf.whole = readin.mperf.whole - 295 cur.mperf.whole = readin.mperf.whole -
292 per_cpu(drv_data, cpu)->saved_mperf; 296 per_cpu(msr_data, cpu).saved_mperf;
293 per_cpu(drv_data, cpu)->saved_aperf = readin.aperf.whole; 297 per_cpu(msr_data, cpu).saved_aperf = readin.aperf.whole;
294 per_cpu(drv_data, cpu)->saved_mperf = readin.mperf.whole; 298 per_cpu(msr_data, cpu).saved_mperf = readin.mperf.whole;
295 299
296#ifdef __i386__ 300#ifdef __i386__
297 /* 301 /*
@@ -335,7 +339,7 @@ static unsigned int get_measured_perf(struct cpufreq_policy *policy,
335 339
336#endif 340#endif
337 341
338 retval = per_cpu(drv_data, policy->cpu)->max_freq * perf_percent / 100; 342 retval = (policy->cpuinfo.max_freq * perf_percent) / 100;
339 343
340 return retval; 344 return retval;
341} 345}
@@ -688,16 +692,11 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
688 /* Check for high latency (>20uS) from buggy BIOSes, like on T42 */ 692 /* Check for high latency (>20uS) from buggy BIOSes, like on T42 */
689 if (perf->control_register.space_id == ACPI_ADR_SPACE_FIXED_HARDWARE && 693 if (perf->control_register.space_id == ACPI_ADR_SPACE_FIXED_HARDWARE &&
690 policy->cpuinfo.transition_latency > 20 * 1000) { 694 policy->cpuinfo.transition_latency > 20 * 1000) {
691 static int print_once;
692 policy->cpuinfo.transition_latency = 20 * 1000; 695 policy->cpuinfo.transition_latency = 20 * 1000;
693 if (!print_once) { 696 printk_once(KERN_INFO "Capping off P-state tranision"
694 print_once = 1; 697 " latency at 20 uS\n");
695 printk(KERN_INFO "Capping off P-state tranision latency"
696 " at 20 uS\n");
697 }
698 } 698 }
699 699
700 data->max_freq = perf->states[0].core_frequency * 1000;
701 /* table init */ 700 /* table init */
702 for (i = 0; i < perf->state_count; i++) { 701 for (i = 0; i < perf->state_count; i++) {
703 if (i > 0 && perf->states[i].core_frequency >= 702 if (i > 0 && perf->states[i].core_frequency >=
@@ -716,6 +715,9 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
716 if (result) 715 if (result)
717 goto err_freqfree; 716 goto err_freqfree;
718 717
718 if (perf->states[0].core_frequency * 1000 != policy->cpuinfo.max_freq)
719 printk(KERN_WARNING FW_WARN "P-state 0 is not max freq\n");
720
719 switch (perf->control_register.space_id) { 721 switch (perf->control_register.space_id) {
720 case ACPI_ADR_SPACE_SYSTEM_IO: 722 case ACPI_ADR_SPACE_SYSTEM_IO:
721 /* Current speed is unknown and not detectable by IO port */ 723 /* Current speed is unknown and not detectable by IO port */
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index 2a36f7f7c4c7..b6caf1329b1b 100644
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -1248,7 +1248,7 @@ static struct kvm_mmu_page *kvm_mmu_get_page(struct kvm_vcpu *vcpu,
1248 pgprintk("%s: adding gfn %lx role %x\n", __func__, gfn, role.word); 1248 pgprintk("%s: adding gfn %lx role %x\n", __func__, gfn, role.word);
1249 sp->gfn = gfn; 1249 sp->gfn = gfn;
1250 sp->role = role; 1250 sp->role = role;
1251 sp->global = role.cr4_pge; 1251 sp->global = 0;
1252 hlist_add_head(&sp->hash_link, bucket); 1252 hlist_add_head(&sp->hash_link, bucket);
1253 if (!direct) { 1253 if (!direct) {
1254 if (rmap_write_protect(vcpu->kvm, gfn)) 1254 if (rmap_write_protect(vcpu->kvm, gfn))
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 8ca100a9ecac..7c1ce5ac6131 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -2775,6 +2775,9 @@ out:
2775 2775
2776void kvm_arch_exit(void) 2776void kvm_arch_exit(void)
2777{ 2777{
2778 if (!boot_cpu_has(X86_FEATURE_CONSTANT_TSC))
2779 cpufreq_unregister_notifier(&kvmclock_cpufreq_notifier_block,
2780 CPUFREQ_TRANSITION_NOTIFIER);
2778 kvm_x86_ops = NULL; 2781 kvm_x86_ops = NULL;
2779 kvm_mmu_module_exit(); 2782 kvm_mmu_module_exit();
2780} 2783}
@@ -4159,6 +4162,11 @@ EXPORT_SYMBOL_GPL(kvm_put_guest_fpu);
4159 4162
4160void kvm_arch_vcpu_free(struct kvm_vcpu *vcpu) 4163void kvm_arch_vcpu_free(struct kvm_vcpu *vcpu)
4161{ 4164{
4165 if (vcpu->arch.time_page) {
4166 kvm_release_page_dirty(vcpu->arch.time_page);
4167 vcpu->arch.time_page = NULL;
4168 }
4169
4162 kvm_x86_ops->vcpu_free(vcpu); 4170 kvm_x86_ops->vcpu_free(vcpu);
4163} 4171}
4164 4172
diff --git a/arch/xtensa/kernel/head.S b/arch/xtensa/kernel/head.S
index 0817f9db836e..d9ddc1ba761c 100644
--- a/arch/xtensa/kernel/head.S
+++ b/arch/xtensa/kernel/head.S
@@ -19,6 +19,7 @@
19#include <asm/page.h> 19#include <asm/page.h>
20#include <asm/cacheasm.h> 20#include <asm/cacheasm.h>
21 21
22#include <linux/init.h>
22#include <linux/linkage.h> 23#include <linux/linkage.h>
23 24
24/* 25/*
@@ -45,7 +46,7 @@
45 * instruction. 46 * instruction.
46 */ 47 */
47 48
48 .section .head.text, "ax" 49 __HEAD
49 .globl _start 50 .globl _start
50_start: _j 2f 51_start: _j 2f
51 .align 4 52 .align 4
diff --git a/arch/xtensa/kernel/vmlinux.lds.S b/arch/xtensa/kernel/vmlinux.lds.S
index c1be9a4a740c..5accf51053da 100644
--- a/arch/xtensa/kernel/vmlinux.lds.S
+++ b/arch/xtensa/kernel/vmlinux.lds.S
@@ -85,8 +85,8 @@ SECTIONS
85 85
86 .text : 86 .text :
87 { 87 {
88 /* The .head.text section must be the first section! */ 88 /* The HEAD_TEXT section must be the first section! */
89 *(.head.text) 89 HEAD_TEXT
90 *(.literal .text) 90 *(.literal .text)
91 VMLINUX_SYMBOL(__sched_text_start) = .; 91 VMLINUX_SYMBOL(__sched_text_start) = .;
92 *(.sched.literal .sched.text) 92 *(.sched.literal .sched.text)
generated by cgit v1.2.2 (git 2.25.0) at 2024-09-24 15:26:19 -0400