aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-03-18 02:44:31 -0400
committerDavid S. Miller <davem@davemloft.net>2008-03-18 02:44:31 -0400
commit2f633928cbba8a5858bb39b11e7219a41b0fbef5 (patch)
tree9a82f4b7f2c3afe4b0208d8e44ea61bae90a7d22 /arch/sh
parent5e226e4d9016daee170699f8a4188a5505021756 (diff)
parentbde4f8fa8db2abd5ac9c542d76012d0fedab050f (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/sh')
-rw-r--r--arch/sh/Kconfig8
-rw-r--r--arch/sh/Makefile1
-rw-r--r--arch/sh/boards/hp6xx/hp6xx_apm.c22
-rw-r--r--arch/sh/boards/renesas/sh7710voipgw/Makefile1
-rw-r--r--arch/sh/boards/renesas/sh7710voipgw/setup.c94
-rw-r--r--arch/sh/boards/renesas/x3proto/ilsel.c2
-rw-r--r--arch/sh/boards/superh/microdev/io.c2
-rw-r--r--arch/sh/configs/r7780mp_defconfig91
-rw-r--r--arch/sh/configs/se7780_defconfig646
-rw-r--r--arch/sh/configs/sh7710voipgw_defconfig595
-rw-r--r--arch/sh/drivers/dma/dma-sh.c2
-rw-r--r--arch/sh/drivers/heartbeat.c2
-rw-r--r--arch/sh/drivers/pci/ops-dreamcast.c44
-rw-r--r--arch/sh/kernel/cpu/init.c2
-rw-r--r--arch/sh/kernel/cpu/sh2/setup-sh7619.c2
-rw-r--r--arch/sh/kernel/cpu/sh2a/clock-sh7203.c4
-rw-r--r--arch/sh/kernel/cpu/sh2a/setup-sh7203.c2
-rw-r--r--arch/sh/kernel/cpu/sh2a/setup-sh7206.c2
-rw-r--r--arch/sh/kernel/cpu/sh3/probe.c4
-rw-r--r--arch/sh/kernel/cpu/sh3/setup-sh7705.c2
-rw-r--r--arch/sh/kernel/cpu/sh3/setup-sh770x.c8
-rw-r--r--arch/sh/kernel/cpu/sh3/setup-sh7710.c2
-rw-r--r--arch/sh/kernel/cpu/sh3/setup-sh7720.c2
-rw-r--r--arch/sh/kernel/cpu/sh4/setup-sh4-202.c2
-rw-r--r--arch/sh/kernel/cpu/sh4/setup-sh7750.c2
-rw-r--r--arch/sh/kernel/cpu/sh4/setup-sh7760.c2
-rw-r--r--arch/sh/kernel/cpu/sh4/sq.c4
-rw-r--r--arch/sh/kernel/cpu/sh4a/setup-sh7343.c2
-rw-r--r--arch/sh/kernel/cpu/sh4a/setup-sh7366.c2
-rw-r--r--arch/sh/kernel/cpu/sh4a/setup-sh7722.c2
-rw-r--r--arch/sh/kernel/cpu/sh4a/setup-sh7763.c2
-rw-r--r--arch/sh/kernel/cpu/sh4a/setup-sh7770.c2
-rw-r--r--arch/sh/kernel/cpu/sh4a/setup-sh7780.c2
-rw-r--r--arch/sh/kernel/cpu/sh4a/setup-sh7785.c2
-rw-r--r--arch/sh/kernel/cpu/sh4a/setup-shx3.c2
-rw-r--r--arch/sh/kernel/cpu/sh5/unwind.c2
-rw-r--r--arch/sh/kernel/io_trapped.c2
-rw-r--r--arch/sh/kernel/sh_ksyms_32.c5
-rw-r--r--arch/sh/kernel/sh_ksyms_64.c1
-rw-r--r--arch/sh/kernel/timers/timer-cmt.c2
-rw-r--r--arch/sh/kernel/timers/timer-mtu2.c2
-rw-r--r--arch/sh/kernel/topology.c2
-rw-r--r--arch/sh/kernel/traps_64.c2
-rw-r--r--arch/sh/lib64/c-checksum.c2
-rw-r--r--arch/sh/lib64/udelay.c21
-rw-r--r--arch/sh/mm/Kconfig2
-rw-r--r--arch/sh/mm/init.c2
-rw-r--r--arch/sh/mm/ioremap_32.c2
-rw-r--r--arch/sh/mm/ioremap_64.c4
-rw-r--r--arch/sh/mm/pg-sh7705.c1
-rw-r--r--arch/sh/mm/tlbflush_64.c6
-rw-r--r--arch/sh/tools/mach-types1
52 files changed, 669 insertions, 956 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index b3400b5ad5c6..95b7534e9e3c 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -330,6 +330,7 @@ config CPU_SUBTYPE_SH5_101
330 330
331config CPU_SUBTYPE_SH5_103 331config CPU_SUBTYPE_SH5_103
332 bool "Support SH5-103 processor" 332 bool "Support SH5-103 processor"
333 select CPU_SH5
333 334
334endchoice 335endchoice
335 336
@@ -455,13 +456,6 @@ config SH_SECUREEDGE5410
455 This includes both the OEM SecureEdge products as well as the 456 This includes both the OEM SecureEdge products as well as the
456 SME product line. 457 SME product line.
457 458
458config SH_7710VOIPGW
459 bool "SH7710-VOIP-GW"
460 depends on CPU_SUBTYPE_SH7710
461 help
462 Select this option to build a kernel for the SH7710 based
463 VOIP GW.
464
465config SH_RTS7751R2D 459config SH_RTS7751R2D
466 bool "RTS7751R2D" 460 bool "RTS7751R2D"
467 depends on CPU_SUBTYPE_SH7751R 461 depends on CPU_SUBTYPE_SH7751R
diff --git a/arch/sh/Makefile b/arch/sh/Makefile
index 81381e5773c8..c510c225144f 100644
--- a/arch/sh/Makefile
+++ b/arch/sh/Makefile
@@ -118,7 +118,6 @@ machdir-$(CONFIG_SH_EDOSK7705) += renesas/edosk7705
118machdir-$(CONFIG_SH_HIGHLANDER) += renesas/r7780rp 118machdir-$(CONFIG_SH_HIGHLANDER) += renesas/r7780rp
119machdir-$(CONFIG_SH_MIGOR) += renesas/migor 119machdir-$(CONFIG_SH_MIGOR) += renesas/migor
120machdir-$(CONFIG_SH_SDK7780) += renesas/sdk7780 120machdir-$(CONFIG_SH_SDK7780) += renesas/sdk7780
121machdir-$(CONFIG_SH_7710VOIPGW) += renesas/sh7710voipgw
122machdir-$(CONFIG_SH_X3PROTO) += renesas/x3proto 121machdir-$(CONFIG_SH_X3PROTO) += renesas/x3proto
123machdir-$(CONFIG_SH_SH4202_MICRODEV) += superh/microdev 122machdir-$(CONFIG_SH_SH4202_MICRODEV) += superh/microdev
124machdir-$(CONFIG_SH_LANDISK) += landisk 123machdir-$(CONFIG_SH_LANDISK) += landisk
diff --git a/arch/sh/boards/hp6xx/hp6xx_apm.c b/arch/sh/boards/hp6xx/hp6xx_apm.c
index 640ca2a74f16..177f4f028e0d 100644
--- a/arch/sh/boards/hp6xx/hp6xx_apm.c
+++ b/arch/sh/boards/hp6xx/hp6xx_apm.c
@@ -2,6 +2,7 @@
2 * bios-less APM driver for hp680 2 * bios-less APM driver for hp680
3 * 3 *
4 * Copyright 2005 (c) Andriy Skulysh <askulysh@gmail.com> 4 * Copyright 2005 (c) Andriy Skulysh <askulysh@gmail.com>
5 * Copyright 2008 (c) Kristoffer Ericson <kristoffer.ericson@gmail.com>
5 * 6 *
6 * This program is free software; you can redistribute it and/or 7 * This program is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU General Public License. 8 * modify it under the terms of the GNU General Public License.
@@ -15,17 +16,19 @@
15#include <asm/adc.h> 16#include <asm/adc.h>
16#include <asm/hp6xx.h> 17#include <asm/hp6xx.h>
17 18
18#define SH7709_PGDR 0xa400012c 19/* percentage values */
19
20#define APM_CRITICAL 10 20#define APM_CRITICAL 10
21#define APM_LOW 30 21#define APM_LOW 30
22 22
23/* resonably sane values */
23#define HP680_BATTERY_MAX 898 24#define HP680_BATTERY_MAX 898
24#define HP680_BATTERY_MIN 486 25#define HP680_BATTERY_MIN 486
25#define HP680_BATTERY_AC_ON 1023 26#define HP680_BATTERY_AC_ON 1023
26 27
27#define MODNAME "hp6x0_apm" 28#define MODNAME "hp6x0_apm"
28 29
30#define PGDR 0xa400012c
31
29static void hp6x0_apm_get_power_status(struct apm_power_info *info) 32static void hp6x0_apm_get_power_status(struct apm_power_info *info)
30{ 33{
31 int battery, backup, charging, percentage; 34 int battery, backup, charging, percentage;
@@ -38,17 +41,26 @@ static void hp6x0_apm_get_power_status(struct apm_power_info *info)
38 percentage = 100 * (battery - HP680_BATTERY_MIN) / 41 percentage = 100 * (battery - HP680_BATTERY_MIN) /
39 (HP680_BATTERY_MAX - HP680_BATTERY_MIN); 42 (HP680_BATTERY_MAX - HP680_BATTERY_MIN);
40 43
44 /* % of full battery */
45 info->battery_life = percentage;
46
47 /* We want our estimates in minutes */
48 info->units = 0;
49
50 /* Extremely(!!) rough estimate, we will replace this with a datalist later on */
51 info->time = (2 * battery);
52
41 info->ac_line_status = (battery > HP680_BATTERY_AC_ON) ? 53 info->ac_line_status = (battery > HP680_BATTERY_AC_ON) ?
42 APM_AC_ONLINE : APM_AC_OFFLINE; 54 APM_AC_ONLINE : APM_AC_OFFLINE;
43 55
44 pgdr = ctrl_inb(SH7709_PGDR); 56 pgdr = ctrl_inb(PGDR);
45 if (pgdr & PGDR_MAIN_BATTERY_OUT) { 57 if (pgdr & PGDR_MAIN_BATTERY_OUT) {
46 info->battery_status = APM_BATTERY_STATUS_NOT_PRESENT; 58 info->battery_status = APM_BATTERY_STATUS_NOT_PRESENT;
47 info->battery_flag = 0x80; 59 info->battery_flag = 0x80;
48 } else if (charging < 8) { 60 } else if (charging < 8) {
49 info->battery_status = APM_BATTERY_STATUS_CHARGING; 61 info->battery_status = APM_BATTERY_STATUS_CHARGING;
50 info->battery_flag = 0x08; 62 info->battery_flag = 0x08;
51 info->ac_line_status = 0xff; 63 info->ac_line_status = 0x01;
52 } else if (percentage <= APM_CRITICAL) { 64 } else if (percentage <= APM_CRITICAL) {
53 info->battery_status = APM_BATTERY_STATUS_CRITICAL; 65 info->battery_status = APM_BATTERY_STATUS_CRITICAL;
54 info->battery_flag = 0x04; 66 info->battery_flag = 0x04;
@@ -59,8 +71,6 @@ static void hp6x0_apm_get_power_status(struct apm_power_info *info)
59 info->battery_status = APM_BATTERY_STATUS_HIGH; 71 info->battery_status = APM_BATTERY_STATUS_HIGH;
60 info->battery_flag = 0x01; 72 info->battery_flag = 0x01;
61 } 73 }
62
63 info->units = 0;
64} 74}
65 75
66static irqreturn_t hp6x0_apm_interrupt(int irq, void *dev) 76static irqreturn_t hp6x0_apm_interrupt(int irq, void *dev)
diff --git a/arch/sh/boards/renesas/sh7710voipgw/Makefile b/arch/sh/boards/renesas/sh7710voipgw/Makefile
deleted file mode 100644
index 77037567633b..000000000000
--- a/arch/sh/boards/renesas/sh7710voipgw/Makefile
+++ /dev/null
@@ -1 +0,0 @@
1obj-y := setup.o
diff --git a/arch/sh/boards/renesas/sh7710voipgw/setup.c b/arch/sh/boards/renesas/sh7710voipgw/setup.c
deleted file mode 100644
index 0d56fd83bcba..000000000000
--- a/arch/sh/boards/renesas/sh7710voipgw/setup.c
+++ /dev/null
@@ -1,94 +0,0 @@
1/*
2 * Renesas Technology SH7710 VoIP Gateway
3 *
4 * Copyright (C) 2006 Ranjit Deshpande
5 * Kenati Technologies Inc.
6 *
7 * May be copied or modified under the terms of the GNU General Public
8 * License. See linux/COPYING for more information.
9 */
10#include <linux/init.h>
11#include <asm/machvec.h>
12#include <asm/irq.h>
13#include <asm/io.h>
14
15static struct ipr_data sh7710voipgw_ipr_map[] = {
16 { TIMER2_IRQ, TIMER2_IPR_ADDR, TIMER2_IPR_POS, TIMER2_PRIORITY },
17 { WDT_IRQ, WDT_IPR_ADDR, WDT_IPR_POS, WDT_PRIORITY },
18
19 /* SCIF0 */
20 { SCIF0_ERI_IRQ, SCIF0_IPR_ADDR, SCIF0_IPR_POS, SCIF0_PRIORITY },
21 { SCIF0_RXI_IRQ, SCIF0_IPR_ADDR, SCIF0_IPR_POS, SCIF0_PRIORITY },
22 { SCIF0_BRI_IRQ, SCIF0_IPR_ADDR, SCIF0_IPR_POS, SCIF0_PRIORITY },
23 { SCIF0_TXI_IRQ, SCIF0_IPR_ADDR, SCIF0_IPR_POS, SCIF0_PRIORITY },
24
25 /* DMAC-1 */
26 { DMTE0_IRQ, DMA_IPR_ADDR, DMA_IPR_POS, DMA_PRIORITY },
27 { DMTE1_IRQ, DMA_IPR_ADDR, DMA_IPR_POS, DMA_PRIORITY },
28 { DMTE2_IRQ, DMA_IPR_ADDR, DMA_IPR_POS, DMA_PRIORITY },
29 { DMTE3_IRQ, DMA_IPR_ADDR, DMA_IPR_POS, DMA_PRIORITY },
30
31 /* DMAC-2 */
32 { DMTE4_IRQ, DMA2_IPR_ADDR, DMA2_IPR_POS, DMA2_PRIORITY },
33 { DMTE4_IRQ, DMA2_IPR_ADDR, DMA2_IPR_POS, DMA2_PRIORITY },
34
35 /* IPSEC */
36 { IPSEC_IRQ, IPSEC_IPR_ADDR, IPSEC_IPR_POS, IPSEC_PRIORITY },
37
38 /* EDMAC */
39 { EDMAC0_IRQ, EDMAC0_IPR_ADDR, EDMAC0_IPR_POS, EDMAC0_PRIORITY },
40 { EDMAC1_IRQ, EDMAC1_IPR_ADDR, EDMAC1_IPR_POS, EDMAC1_PRIORITY },
41 { EDMAC2_IRQ, EDMAC2_IPR_ADDR, EDMAC2_IPR_POS, EDMAC2_PRIORITY },
42
43 /* SIOF0 */
44 { SIOF0_ERI_IRQ, SIOF0_IPR_ADDR, SIOF0_IPR_POS, SIOF0_PRIORITY },
45 { SIOF0_TXI_IRQ, SIOF0_IPR_ADDR, SIOF0_IPR_POS, SIOF0_PRIORITY },
46 { SIOF0_RXI_IRQ, SIOF0_IPR_ADDR, SIOF0_IPR_POS, SIOF0_PRIORITY },
47 { SIOF0_CCI_IRQ, SIOF0_IPR_ADDR, SIOF0_IPR_POS, SIOF0_PRIORITY },
48
49 /* SIOF1 */
50 { SIOF1_ERI_IRQ, SIOF1_IPR_ADDR, SIOF1_IPR_POS, SIOF1_PRIORITY },
51 { SIOF1_TXI_IRQ, SIOF1_IPR_ADDR, SIOF1_IPR_POS, SIOF1_PRIORITY },
52 { SIOF1_RXI_IRQ, SIOF1_IPR_ADDR, SIOF1_IPR_POS, SIOF1_PRIORITY },
53 { SIOF1_CCI_IRQ, SIOF1_IPR_ADDR, SIOF1_IPR_POS, SIOF1_PRIORITY },
54
55 /* SLIC IRQ's */
56 { IRQ1_IRQ, IRQ1_IPR_ADDR, IRQ1_IPR_POS, IRQ1_PRIORITY },
57 { IRQ2_IRQ, IRQ2_IPR_ADDR, IRQ2_IPR_POS, IRQ2_PRIORITY },
58};
59
60/*
61 * Initialize IRQ setting
62 */
63static void __init sh7710voipgw_init_irq(void)
64{
65 /* Disable all interrupts in IPR registers */
66 ctrl_outw(0x0, INTC_IPRA);
67 ctrl_outw(0x0, INTC_IPRB);
68 ctrl_outw(0x0, INTC_IPRC);
69 ctrl_outw(0x0, INTC_IPRD);
70 ctrl_outw(0x0, INTC_IPRE);
71 ctrl_outw(0x0, INTC_IPRF);
72 ctrl_outw(0x0, INTC_IPRG);
73 ctrl_outw(0x0, INTC_IPRH);
74 ctrl_outw(0x0, INTC_IPRI);
75
76 /* Ack all interrupt sources in the IRR0 register */
77 ctrl_outb(0x3f, INTC_IRR0);
78
79 /* Use IRQ0 - IRQ3 as active low interrupt lines i.e. disable
80 * IRL mode.
81 */
82 ctrl_outw(0x2aa, INTC_ICR1);
83
84 make_ipr_irq(sh7710voipgw_ipr_map, ARRAY_SIZE(sh7710voipgw_ipr_map));
85}
86
87/*
88 * The Machine Vector
89 */
90static struct sh_machine_vector mv_sh7710voipgw __initmv = {
91 .mv_name = "SH7710 VoIP Gateway",
92 .mv_nr_irqs = 104,
93 .mv_init_irq = sh7710voipgw_init_irq,
94};
diff --git a/arch/sh/boards/renesas/x3proto/ilsel.c b/arch/sh/boards/renesas/x3proto/ilsel.c
index 6d4454fef97c..b5c673c39337 100644
--- a/arch/sh/boards/renesas/x3proto/ilsel.c
+++ b/arch/sh/boards/renesas/x3proto/ilsel.c
@@ -68,7 +68,7 @@ static void __ilsel_enable(ilsel_source_t set, unsigned int bit)
68 shift = mk_ilsel_shift(bit); 68 shift = mk_ilsel_shift(bit);
69 69
70 pr_debug("%s: bit#%d: addr - 0x%08lx (shift %d, set %d)\n", 70 pr_debug("%s: bit#%d: addr - 0x%08lx (shift %d, set %d)\n",
71 __FUNCTION__, bit, addr, shift, set); 71 __func__, bit, addr, shift, set);
72 72
73 tmp = ctrl_inw(addr); 73 tmp = ctrl_inw(addr);
74 tmp &= ~(0xf << shift); 74 tmp &= ~(0xf << shift);
diff --git a/arch/sh/boards/superh/microdev/io.c b/arch/sh/boards/superh/microdev/io.c
index b704e20d7e4d..9f8a540f7e14 100644
--- a/arch/sh/boards/superh/microdev/io.c
+++ b/arch/sh/boards/superh/microdev/io.c
@@ -127,7 +127,7 @@ static unsigned long microdev_isa_port2addr(unsigned long offset)
127 * safe default. 127 * safe default.
128 */ 128 */
129 printk("Warning: unexpected port in %s( offset = 0x%lx )\n", 129 printk("Warning: unexpected port in %s( offset = 0x%lx )\n",
130 __FUNCTION__, offset); 130 __func__, offset);
131 result = PVR; 131 result = PVR;
132 } 132 }
133 133
diff --git a/arch/sh/configs/r7780mp_defconfig b/arch/sh/configs/r7780mp_defconfig
index 2ad804ec920a..1a072615ffd4 100644
--- a/arch/sh/configs/r7780mp_defconfig
+++ b/arch/sh/configs/r7780mp_defconfig
@@ -1,9 +1,10 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.24-rc2 3# Linux kernel version: 2.6.25-rc4
4# Tue Nov 13 20:32:39 2007 4# Thu Mar 6 15:39:59 2008
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y
7CONFIG_RWSEM_GENERIC_SPINLOCK=y 8CONFIG_RWSEM_GENERIC_SPINLOCK=y
8CONFIG_GENERIC_BUG=y 9CONFIG_GENERIC_BUG=y
9CONFIG_GENERIC_FIND_NEXT_BIT=y 10CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -19,6 +20,8 @@ CONFIG_LOCKDEP_SUPPORT=y
19# CONFIG_ARCH_HAS_ILOG2_U32 is not set 20# CONFIG_ARCH_HAS_ILOG2_U32 is not set
20# CONFIG_ARCH_HAS_ILOG2_U64 is not set 21# CONFIG_ARCH_HAS_ILOG2_U64 is not set
21CONFIG_ARCH_NO_VIRT_TO_BUS=y 22CONFIG_ARCH_NO_VIRT_TO_BUS=y
23CONFIG_ARCH_SUPPORTS_AOUT=y
24CONFIG_IO_TRAPPED=y
22CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 25CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
23 26
24# 27#
@@ -37,17 +40,20 @@ CONFIG_SYSVIPC_SYSCTL=y
37CONFIG_BSD_PROCESS_ACCT=y 40CONFIG_BSD_PROCESS_ACCT=y
38# CONFIG_BSD_PROCESS_ACCT_V3 is not set 41# CONFIG_BSD_PROCESS_ACCT_V3 is not set
39# CONFIG_TASKSTATS is not set 42# CONFIG_TASKSTATS is not set
40# CONFIG_USER_NS is not set
41# CONFIG_AUDIT is not set 43# CONFIG_AUDIT is not set
42CONFIG_IKCONFIG=y 44CONFIG_IKCONFIG=y
43CONFIG_IKCONFIG_PROC=y 45CONFIG_IKCONFIG_PROC=y
44CONFIG_LOG_BUF_SHIFT=14 46CONFIG_LOG_BUF_SHIFT=14
45# CONFIG_CGROUPS is not set 47# CONFIG_CGROUPS is not set
48CONFIG_GROUP_SCHED=y
46CONFIG_FAIR_GROUP_SCHED=y 49CONFIG_FAIR_GROUP_SCHED=y
47CONFIG_FAIR_USER_SCHED=y 50# CONFIG_RT_GROUP_SCHED is not set
48# CONFIG_FAIR_CGROUP_SCHED is not set 51CONFIG_USER_SCHED=y
49# CONFIG_SYSFS_DEPRECATED is not set 52# CONFIG_CGROUP_SCHED is not set
53CONFIG_SYSFS_DEPRECATED=y
54CONFIG_SYSFS_DEPRECATED_V2=y
50# CONFIG_RELAY is not set 55# CONFIG_RELAY is not set
56# CONFIG_NAMESPACES is not set
51# CONFIG_BLK_DEV_INITRD is not set 57# CONFIG_BLK_DEV_INITRD is not set
52CONFIG_CC_OPTIMIZE_FOR_SIZE=y 58CONFIG_CC_OPTIMIZE_FOR_SIZE=y
53CONFIG_SYSCTL=y 59CONFIG_SYSCTL=y
@@ -61,17 +67,27 @@ CONFIG_HOTPLUG=y
61CONFIG_PRINTK=y 67CONFIG_PRINTK=y
62CONFIG_BUG=y 68CONFIG_BUG=y
63CONFIG_ELF_CORE=y 69CONFIG_ELF_CORE=y
70CONFIG_COMPAT_BRK=y
64CONFIG_BASE_FULL=y 71CONFIG_BASE_FULL=y
65# CONFIG_FUTEX is not set 72# CONFIG_FUTEX is not set
66CONFIG_ANON_INODES=y 73CONFIG_ANON_INODES=y
67# CONFIG_EPOLL is not set 74# CONFIG_EPOLL is not set
68CONFIG_SIGNALFD=y 75CONFIG_SIGNALFD=y
76CONFIG_TIMERFD=y
69CONFIG_EVENTFD=y 77CONFIG_EVENTFD=y
70CONFIG_SHMEM=y 78CONFIG_SHMEM=y
71CONFIG_VM_EVENT_COUNTERS=y 79CONFIG_VM_EVENT_COUNTERS=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
83CONFIG_PROFILING=y
84# CONFIG_MARKERS is not set
85CONFIG_OPROFILE=m
86CONFIG_HAVE_OPROFILE=y
87# CONFIG_HAVE_KPROBES is not set
88# CONFIG_HAVE_KRETPROBES is not set
89CONFIG_PROC_PAGE_MONITOR=y
90CONFIG_SLABINFO=y
75# CONFIG_TINY_SHMEM is not set 91# CONFIG_TINY_SHMEM is not set
76CONFIG_BASE_SMALL=0 92CONFIG_BASE_SMALL=0
77CONFIG_MODULES=y 93CONFIG_MODULES=y
@@ -98,6 +114,8 @@ CONFIG_IOSCHED_NOOP=y
98# CONFIG_DEFAULT_CFQ is not set 114# CONFIG_DEFAULT_CFQ is not set
99CONFIG_DEFAULT_NOOP=y 115CONFIG_DEFAULT_NOOP=y
100CONFIG_DEFAULT_IOSCHED="noop" 116CONFIG_DEFAULT_IOSCHED="noop"
117CONFIG_CLASSIC_RCU=y
118# CONFIG_PREEMPT_RCU is not set
101 119
102# 120#
103# System type 121# System type
@@ -105,7 +123,9 @@ CONFIG_DEFAULT_IOSCHED="noop"
105CONFIG_CPU_SH4=y 123CONFIG_CPU_SH4=y
106CONFIG_CPU_SH4A=y 124CONFIG_CPU_SH4A=y
107# CONFIG_CPU_SUBTYPE_SH7619 is not set 125# CONFIG_CPU_SUBTYPE_SH7619 is not set
126# CONFIG_CPU_SUBTYPE_SH7203 is not set
108# CONFIG_CPU_SUBTYPE_SH7206 is not set 127# CONFIG_CPU_SUBTYPE_SH7206 is not set
128# CONFIG_CPU_SUBTYPE_SH7263 is not set
109# CONFIG_CPU_SUBTYPE_SH7705 is not set 129# CONFIG_CPU_SUBTYPE_SH7705 is not set
110# CONFIG_CPU_SUBTYPE_SH7706 is not set 130# CONFIG_CPU_SUBTYPE_SH7706 is not set
111# CONFIG_CPU_SUBTYPE_SH7707 is not set 131# CONFIG_CPU_SUBTYPE_SH7707 is not set
@@ -114,6 +134,7 @@ CONFIG_CPU_SH4A=y
114# CONFIG_CPU_SUBTYPE_SH7710 is not set 134# CONFIG_CPU_SUBTYPE_SH7710 is not set
115# CONFIG_CPU_SUBTYPE_SH7712 is not set 135# CONFIG_CPU_SUBTYPE_SH7712 is not set
116# CONFIG_CPU_SUBTYPE_SH7720 is not set 136# CONFIG_CPU_SUBTYPE_SH7720 is not set
137# CONFIG_CPU_SUBTYPE_SH7721 is not set
117# CONFIG_CPU_SUBTYPE_SH7750 is not set 138# CONFIG_CPU_SUBTYPE_SH7750 is not set
118# CONFIG_CPU_SUBTYPE_SH7091 is not set 139# CONFIG_CPU_SUBTYPE_SH7091 is not set
119# CONFIG_CPU_SUBTYPE_SH7750R is not set 140# CONFIG_CPU_SUBTYPE_SH7750R is not set
@@ -122,12 +143,16 @@ CONFIG_CPU_SH4A=y
122# CONFIG_CPU_SUBTYPE_SH7751R is not set 143# CONFIG_CPU_SUBTYPE_SH7751R is not set
123# CONFIG_CPU_SUBTYPE_SH7760 is not set 144# CONFIG_CPU_SUBTYPE_SH7760 is not set
124# CONFIG_CPU_SUBTYPE_SH4_202 is not set 145# CONFIG_CPU_SUBTYPE_SH4_202 is not set
146# CONFIG_CPU_SUBTYPE_SH7763 is not set
125# CONFIG_CPU_SUBTYPE_SH7770 is not set 147# CONFIG_CPU_SUBTYPE_SH7770 is not set
126CONFIG_CPU_SUBTYPE_SH7780=y 148CONFIG_CPU_SUBTYPE_SH7780=y
127# CONFIG_CPU_SUBTYPE_SH7785 is not set 149# CONFIG_CPU_SUBTYPE_SH7785 is not set
128# CONFIG_CPU_SUBTYPE_SHX3 is not set 150# CONFIG_CPU_SUBTYPE_SHX3 is not set
129# CONFIG_CPU_SUBTYPE_SH7343 is not set 151# CONFIG_CPU_SUBTYPE_SH7343 is not set
130# CONFIG_CPU_SUBTYPE_SH7722 is not set 152# CONFIG_CPU_SUBTYPE_SH7722 is not set
153# CONFIG_CPU_SUBTYPE_SH7366 is not set
154# CONFIG_CPU_SUBTYPE_SH5_101 is not set
155# CONFIG_CPU_SUBTYPE_SH5_103 is not set
131 156
132# 157#
133# Memory management options 158# Memory management options
@@ -137,7 +162,8 @@ CONFIG_MMU=y
137CONFIG_PAGE_OFFSET=0x80000000 162CONFIG_PAGE_OFFSET=0x80000000
138CONFIG_MEMORY_START=0x08000000 163CONFIG_MEMORY_START=0x08000000
139CONFIG_MEMORY_SIZE=0x08000000 164CONFIG_MEMORY_SIZE=0x08000000
140# CONFIG_32BIT is not set 165CONFIG_29BIT=y
166# CONFIG_PMB is not set
141CONFIG_VSYSCALL=y 167CONFIG_VSYSCALL=y
142CONFIG_ARCH_FLATMEM_ENABLE=y 168CONFIG_ARCH_FLATMEM_ENABLE=y
143CONFIG_ARCH_SPARSEMEM_ENABLE=y 169CONFIG_ARCH_SPARSEMEM_ENABLE=y
@@ -153,6 +179,7 @@ CONFIG_HUGETLB_PAGE_SIZE_64K=y
153# CONFIG_HUGETLB_PAGE_SIZE_1MB is not set 179# CONFIG_HUGETLB_PAGE_SIZE_1MB is not set
154# CONFIG_HUGETLB_PAGE_SIZE_4MB is not set 180# CONFIG_HUGETLB_PAGE_SIZE_4MB is not set
155# CONFIG_HUGETLB_PAGE_SIZE_64MB is not set 181# CONFIG_HUGETLB_PAGE_SIZE_64MB is not set
182# CONFIG_HUGETLB_PAGE_SIZE_512MB is not set
156CONFIG_SELECT_MEMORY_MODEL=y 183CONFIG_SELECT_MEMORY_MODEL=y
157CONFIG_FLATMEM_MANUAL=y 184CONFIG_FLATMEM_MANUAL=y
158# CONFIG_DISCONTIGMEM_MANUAL is not set 185# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -190,6 +217,7 @@ CONFIG_CPU_HAS_FPU=y
190# Board support 217# Board support
191# 218#
192# CONFIG_SH_7780_SOLUTION_ENGINE is not set 219# CONFIG_SH_7780_SOLUTION_ENGINE is not set
220# CONFIG_SH_SDK7780 is not set
193CONFIG_SH_HIGHLANDER=y 221CONFIG_SH_HIGHLANDER=y
194# CONFIG_SH_R7780RP is not set 222# CONFIG_SH_R7780RP is not set
195CONFIG_SH_R7780MP=y 223CONFIG_SH_R7780MP=y
@@ -234,12 +262,13 @@ CONFIG_HZ_250=y
234# CONFIG_HZ_300 is not set 262# CONFIG_HZ_300 is not set
235# CONFIG_HZ_1000 is not set 263# CONFIG_HZ_1000 is not set
236CONFIG_HZ=250 264CONFIG_HZ=250
265# CONFIG_SCHED_HRTICK is not set
237CONFIG_KEXEC=y 266CONFIG_KEXEC=y
238# CONFIG_CRASH_DUMP is not set 267# CONFIG_CRASH_DUMP is not set
239# CONFIG_PREEMPT_NONE is not set 268# CONFIG_PREEMPT_NONE is not set
240# CONFIG_PREEMPT_VOLUNTARY is not set 269# CONFIG_PREEMPT_VOLUNTARY is not set
241CONFIG_PREEMPT=y 270CONFIG_PREEMPT=y
242CONFIG_PREEMPT_BKL=y 271CONFIG_RCU_TRACE=y
243CONFIG_GUSA=y 272CONFIG_GUSA=y
244 273
245# 274#
@@ -284,6 +313,7 @@ CONFIG_XFRM=y
284# CONFIG_XFRM_USER is not set 313# CONFIG_XFRM_USER is not set
285# CONFIG_XFRM_SUB_POLICY is not set 314# CONFIG_XFRM_SUB_POLICY is not set
286# CONFIG_XFRM_MIGRATE is not set 315# CONFIG_XFRM_MIGRATE is not set
316# CONFIG_XFRM_STATISTICS is not set
287# CONFIG_NET_KEY is not set 317# CONFIG_NET_KEY is not set
288CONFIG_INET=y 318CONFIG_INET=y
289# CONFIG_IP_MULTICAST is not set 319# CONFIG_IP_MULTICAST is not set
@@ -344,6 +374,7 @@ CONFIG_LLC=m
344# 374#
345# CONFIG_NET_PKTGEN is not set 375# CONFIG_NET_PKTGEN is not set
346# CONFIG_HAMRADIO is not set 376# CONFIG_HAMRADIO is not set
377# CONFIG_CAN is not set
347# CONFIG_IRDA is not set 378# CONFIG_IRDA is not set
348# CONFIG_BT is not set 379# CONFIG_BT is not set
349# CONFIG_AF_RXRPC is not set 380# CONFIG_AF_RXRPC is not set
@@ -386,7 +417,7 @@ CONFIG_BLK_DEV=y
386CONFIG_BLK_DEV_RAM=y 417CONFIG_BLK_DEV_RAM=y
387CONFIG_BLK_DEV_RAM_COUNT=16 418CONFIG_BLK_DEV_RAM_COUNT=16
388CONFIG_BLK_DEV_RAM_SIZE=4096 419CONFIG_BLK_DEV_RAM_SIZE=4096
389CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 420# CONFIG_BLK_DEV_XIP is not set
390# CONFIG_CDROM_PKTCDVD is not set 421# CONFIG_CDROM_PKTCDVD is not set
391# CONFIG_ATA_OVER_ETH is not set 422# CONFIG_ATA_OVER_ETH is not set
392CONFIG_MISC_DEVICES=y 423CONFIG_MISC_DEVICES=y
@@ -394,6 +425,8 @@ CONFIG_MISC_DEVICES=y
394CONFIG_EEPROM_93CX6=y 425CONFIG_EEPROM_93CX6=y
395# CONFIG_SGI_IOC4 is not set 426# CONFIG_SGI_IOC4 is not set
396# CONFIG_TIFM_CORE is not set 427# CONFIG_TIFM_CORE is not set
428# CONFIG_ENCLOSURE_SERVICES is not set
429CONFIG_HAVE_IDE=y
397# CONFIG_IDE is not set 430# CONFIG_IDE is not set
398 431
399# 432#
@@ -453,6 +486,7 @@ CONFIG_SCSI_LOWLEVEL=y
453# CONFIG_SCSI_IPS is not set 486# CONFIG_SCSI_IPS is not set
454# CONFIG_SCSI_INITIO is not set 487# CONFIG_SCSI_INITIO is not set
455# CONFIG_SCSI_INIA100 is not set 488# CONFIG_SCSI_INIA100 is not set
489# CONFIG_SCSI_MVSAS is not set
456# CONFIG_SCSI_STEX is not set 490# CONFIG_SCSI_STEX is not set
457# CONFIG_SCSI_SYM53C8XX_2 is not set 491# CONFIG_SCSI_SYM53C8XX_2 is not set
458# CONFIG_SCSI_IPR is not set 492# CONFIG_SCSI_IPR is not set
@@ -506,6 +540,7 @@ CONFIG_SATA_SIL=y
506# CONFIG_PATA_MPIIX is not set 540# CONFIG_PATA_MPIIX is not set
507# CONFIG_PATA_OLDPIIX is not set 541# CONFIG_PATA_OLDPIIX is not set
508# CONFIG_PATA_NETCELL is not set 542# CONFIG_PATA_NETCELL is not set
543# CONFIG_PATA_NINJA32 is not set
509# CONFIG_PATA_NS87410 is not set 544# CONFIG_PATA_NS87410 is not set
510# CONFIG_PATA_NS87415 is not set 545# CONFIG_PATA_NS87415 is not set
511# CONFIG_PATA_OPTI is not set 546# CONFIG_PATA_OPTI is not set
@@ -538,7 +573,6 @@ CONFIG_NETDEVICES=y
538# CONFIG_EQUALIZER is not set 573# CONFIG_EQUALIZER is not set
539# CONFIG_TUN is not set 574# CONFIG_TUN is not set
540# CONFIG_VETH is not set 575# CONFIG_VETH is not set
541# CONFIG_IP1000 is not set
542# CONFIG_ARCNET is not set 576# CONFIG_ARCNET is not set
543# CONFIG_PHYLIB is not set 577# CONFIG_PHYLIB is not set
544CONFIG_NET_ETHERNET=y 578CONFIG_NET_ETHERNET=y
@@ -551,7 +585,6 @@ CONFIG_AX88796_93CX6=y
551# CONFIG_CASSINI is not set 585# CONFIG_CASSINI is not set
552# CONFIG_NET_VENDOR_3COM is not set 586# CONFIG_NET_VENDOR_3COM is not set
553# CONFIG_SMC91X is not set 587# CONFIG_SMC91X is not set
554# CONFIG_SMC911X is not set
555# CONFIG_NET_TULIP is not set 588# CONFIG_NET_TULIP is not set
556# CONFIG_HP100 is not set 589# CONFIG_HP100 is not set
557# CONFIG_IBM_NEW_EMAC_ZMII is not set 590# CONFIG_IBM_NEW_EMAC_ZMII is not set
@@ -576,6 +609,7 @@ CONFIG_8139TOO=m
576# CONFIG_8139TOO_TUNE_TWISTER is not set 609# CONFIG_8139TOO_TUNE_TWISTER is not set
577CONFIG_8139TOO_8129=y 610CONFIG_8139TOO_8129=y
578# CONFIG_8139_OLD_RX_RESET is not set 611# CONFIG_8139_OLD_RX_RESET is not set
612# CONFIG_R6040 is not set
579# CONFIG_SIS900 is not set 613# CONFIG_SIS900 is not set
580# CONFIG_EPIC100 is not set 614# CONFIG_EPIC100 is not set
581# CONFIG_SUNDANCE is not set 615# CONFIG_SUNDANCE is not set
@@ -591,6 +625,9 @@ CONFIG_E1000=m
591# CONFIG_E1000_NAPI is not set 625# CONFIG_E1000_NAPI is not set
592# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set 626# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
593# CONFIG_E1000E is not set 627# CONFIG_E1000E is not set
628# CONFIG_E1000E_ENABLED is not set
629# CONFIG_IP1000 is not set
630# CONFIG_IGB is not set
594# CONFIG_NS83820 is not set 631# CONFIG_NS83820 is not set
595# CONFIG_HAMACHI is not set 632# CONFIG_HAMACHI is not set
596# CONFIG_YELLOWFIN is not set 633# CONFIG_YELLOWFIN is not set
@@ -616,6 +653,7 @@ CONFIG_NETDEV_10000=y
616# CONFIG_NIU is not set 653# CONFIG_NIU is not set
617# CONFIG_MLX4_CORE is not set 654# CONFIG_MLX4_CORE is not set
618# CONFIG_TEHUTI is not set 655# CONFIG_TEHUTI is not set
656# CONFIG_BNX2X is not set
619# CONFIG_TR is not set 657# CONFIG_TR is not set
620 658
621# 659#
@@ -629,7 +667,6 @@ CONFIG_NETDEV_10000=y
629# CONFIG_PPP is not set 667# CONFIG_PPP is not set
630# CONFIG_SLIP is not set 668# CONFIG_SLIP is not set
631# CONFIG_NET_FC is not set 669# CONFIG_NET_FC is not set
632# CONFIG_SHAPER is not set
633# CONFIG_NETCONSOLE is not set 670# CONFIG_NETCONSOLE is not set
634# CONFIG_NETPOLL is not set 671# CONFIG_NETPOLL is not set
635# CONFIG_NET_POLL_CONTROLLER is not set 672# CONFIG_NET_POLL_CONTROLLER is not set
@@ -686,6 +723,7 @@ CONFIG_SERIO_LIBPS2=y
686# 723#
687# CONFIG_VT is not set 724# CONFIG_VT is not set
688# CONFIG_SERIAL_NONSTANDARD is not set 725# CONFIG_SERIAL_NONSTANDARD is not set
726# CONFIG_NOZOMI is not set
689 727
690# 728#
691# Serial drivers 729# Serial drivers
@@ -722,6 +760,7 @@ CONFIG_DEVPORT=y
722# CONFIG_POWER_SUPPLY is not set 760# CONFIG_POWER_SUPPLY is not set
723CONFIG_HWMON=y 761CONFIG_HWMON=y
724# CONFIG_HWMON_VID is not set 762# CONFIG_HWMON_VID is not set
763# CONFIG_SENSORS_I5K_AMB is not set
725# CONFIG_SENSORS_F71805F is not set 764# CONFIG_SENSORS_F71805F is not set
726# CONFIG_SENSORS_F71882FG is not set 765# CONFIG_SENSORS_F71882FG is not set
727# CONFIG_SENSORS_IT87 is not set 766# CONFIG_SENSORS_IT87 is not set
@@ -736,6 +775,7 @@ CONFIG_HWMON=y
736# CONFIG_SENSORS_W83627HF is not set 775# CONFIG_SENSORS_W83627HF is not set
737# CONFIG_SENSORS_W83627EHF is not set 776# CONFIG_SENSORS_W83627EHF is not set
738# CONFIG_HWMON_DEBUG_CHIP is not set 777# CONFIG_HWMON_DEBUG_CHIP is not set
778CONFIG_THERMAL=y
739# CONFIG_WATCHDOG is not set 779# CONFIG_WATCHDOG is not set
740 780
741# 781#
@@ -800,12 +840,9 @@ CONFIG_USB_ARCH_HAS_EHCI=y
800# 840#
801# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 841# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
802# 842#
803
804#
805# USB Gadget Support
806#
807# CONFIG_USB_GADGET is not set 843# CONFIG_USB_GADGET is not set
808# CONFIG_MMC is not set 844# CONFIG_MMC is not set
845# CONFIG_MEMSTICK is not set
809# CONFIG_NEW_LEDS is not set 846# CONFIG_NEW_LEDS is not set
810# CONFIG_INFINIBAND is not set 847# CONFIG_INFINIBAND is not set
811CONFIG_RTC_LIB=y 848CONFIG_RTC_LIB=y
@@ -830,9 +867,10 @@ CONFIG_RTC_INTF_DEV=y
830# 867#
831# Platform RTC drivers 868# Platform RTC drivers
832# 869#
870# CONFIG_RTC_DRV_DS1511 is not set
833# CONFIG_RTC_DRV_DS1553 is not set 871# CONFIG_RTC_DRV_DS1553 is not set
834# CONFIG_RTC_DRV_STK17TA8 is not set
835# CONFIG_RTC_DRV_DS1742 is not set 872# CONFIG_RTC_DRV_DS1742 is not set
873# CONFIG_RTC_DRV_STK17TA8 is not set
836# CONFIG_RTC_DRV_M48T86 is not set 874# CONFIG_RTC_DRV_M48T86 is not set
837# CONFIG_RTC_DRV_M48T59 is not set 875# CONFIG_RTC_DRV_M48T59 is not set
838# CONFIG_RTC_DRV_V3020 is not set 876# CONFIG_RTC_DRV_V3020 is not set
@@ -867,12 +905,10 @@ CONFIG_FS_POSIX_ACL=y
867# CONFIG_XFS_FS is not set 905# CONFIG_XFS_FS is not set
868# CONFIG_GFS2_FS is not set 906# CONFIG_GFS2_FS is not set
869# CONFIG_OCFS2_FS is not set 907# CONFIG_OCFS2_FS is not set
870CONFIG_MINIX_FS=y 908CONFIG_DNOTIFY=y
871# CONFIG_ROMFS_FS is not set
872CONFIG_INOTIFY=y 909CONFIG_INOTIFY=y
873CONFIG_INOTIFY_USER=y 910CONFIG_INOTIFY_USER=y
874# CONFIG_QUOTA is not set 911# CONFIG_QUOTA is not set
875CONFIG_DNOTIFY=y
876# CONFIG_AUTOFS_FS is not set 912# CONFIG_AUTOFS_FS is not set
877# CONFIG_AUTOFS4_FS is not set 913# CONFIG_AUTOFS4_FS is not set
878CONFIG_FUSE_FS=m 914CONFIG_FUSE_FS=m
@@ -920,8 +956,10 @@ CONFIG_CONFIGFS_FS=m
920# CONFIG_EFS_FS is not set 956# CONFIG_EFS_FS is not set
921# CONFIG_CRAMFS is not set 957# CONFIG_CRAMFS is not set
922# CONFIG_VXFS_FS is not set 958# CONFIG_VXFS_FS is not set
959CONFIG_MINIX_FS=y
923# CONFIG_HPFS_FS is not set 960# CONFIG_HPFS_FS is not set
924# CONFIG_QNX4FS_FS is not set 961# CONFIG_QNX4FS_FS is not set
962# CONFIG_ROMFS_FS is not set
925# CONFIG_SYSV_FS is not set 963# CONFIG_SYSV_FS is not set
926# CONFIG_UFS_FS is not set 964# CONFIG_UFS_FS is not set
927CONFIG_NETWORK_FILESYSTEMS=y 965CONFIG_NETWORK_FILESYSTEMS=y
@@ -997,10 +1035,6 @@ CONFIG_NLS_ISO8859_1=y
997# CONFIG_NLS_KOI8_U is not set 1035# CONFIG_NLS_KOI8_U is not set
998# CONFIG_NLS_UTF8 is not set 1036# CONFIG_NLS_UTF8 is not set
999# CONFIG_DLM is not set 1037# CONFIG_DLM is not set
1000CONFIG_INSTRUMENTATION=y
1001CONFIG_PROFILING=y
1002CONFIG_OPROFILE=m
1003# CONFIG_MARKERS is not set
1004 1038
1005# 1039#
1006# Kernel hacking 1040# Kernel hacking
@@ -1035,9 +1069,9 @@ CONFIG_DEBUG_INFO=y
1035# CONFIG_DEBUG_LIST is not set 1069# CONFIG_DEBUG_LIST is not set
1036# CONFIG_DEBUG_SG is not set 1070# CONFIG_DEBUG_SG is not set
1037# CONFIG_FRAME_POINTER is not set 1071# CONFIG_FRAME_POINTER is not set
1038CONFIG_FORCED_INLINING=y
1039# CONFIG_BOOT_PRINTK_DELAY is not set 1072# CONFIG_BOOT_PRINTK_DELAY is not set
1040# CONFIG_RCU_TORTURE_TEST is not set 1073# CONFIG_RCU_TORTURE_TEST is not set
1074# CONFIG_BACKTRACE_SELF_TEST is not set
1041# CONFIG_FAULT_INJECTION is not set 1075# CONFIG_FAULT_INJECTION is not set
1042# CONFIG_SAMPLES is not set 1076# CONFIG_SAMPLES is not set
1043CONFIG_SH_STANDARD_BIOS=y 1077CONFIG_SH_STANDARD_BIOS=y
@@ -1059,6 +1093,7 @@ CONFIG_DEBUG_STACKOVERFLOW=y
1059CONFIG_CRYPTO=y 1093CONFIG_CRYPTO=y
1060CONFIG_CRYPTO_ALGAPI=y 1094CONFIG_CRYPTO_ALGAPI=y
1061CONFIG_CRYPTO_BLKCIPHER=y 1095CONFIG_CRYPTO_BLKCIPHER=y
1096# CONFIG_CRYPTO_SEQIV is not set
1062CONFIG_CRYPTO_HASH=y 1097CONFIG_CRYPTO_HASH=y
1063CONFIG_CRYPTO_MANAGER=y 1098CONFIG_CRYPTO_MANAGER=y
1064CONFIG_CRYPTO_HMAC=y 1099CONFIG_CRYPTO_HMAC=y
@@ -1077,6 +1112,9 @@ CONFIG_CRYPTO_CBC=y
1077CONFIG_CRYPTO_PCBC=m 1112CONFIG_CRYPTO_PCBC=m
1078# CONFIG_CRYPTO_LRW is not set 1113# CONFIG_CRYPTO_LRW is not set
1079# CONFIG_CRYPTO_XTS is not set 1114# CONFIG_CRYPTO_XTS is not set
1115# CONFIG_CRYPTO_CTR is not set
1116# CONFIG_CRYPTO_GCM is not set
1117# CONFIG_CRYPTO_CCM is not set
1080# CONFIG_CRYPTO_CRYPTD is not set 1118# CONFIG_CRYPTO_CRYPTD is not set
1081CONFIG_CRYPTO_DES=y 1119CONFIG_CRYPTO_DES=y
1082# CONFIG_CRYPTO_FCRYPT is not set 1120# CONFIG_CRYPTO_FCRYPT is not set
@@ -1091,13 +1129,16 @@ CONFIG_CRYPTO_DES=y
1091# CONFIG_CRYPTO_KHAZAD is not set 1129# CONFIG_CRYPTO_KHAZAD is not set
1092# CONFIG_CRYPTO_ANUBIS is not set 1130# CONFIG_CRYPTO_ANUBIS is not set
1093# CONFIG_CRYPTO_SEED is not set 1131# CONFIG_CRYPTO_SEED is not set
1132# CONFIG_CRYPTO_SALSA20 is not set
1094# CONFIG_CRYPTO_DEFLATE is not set 1133# CONFIG_CRYPTO_DEFLATE is not set
1095# CONFIG_CRYPTO_MICHAEL_MIC is not set 1134# CONFIG_CRYPTO_MICHAEL_MIC is not set
1096# CONFIG_CRYPTO_CRC32C is not set 1135# CONFIG_CRYPTO_CRC32C is not set
1097# CONFIG_CRYPTO_CAMELLIA is not set 1136# CONFIG_CRYPTO_CAMELLIA is not set
1098# CONFIG_CRYPTO_TEST is not set 1137# CONFIG_CRYPTO_TEST is not set
1099# CONFIG_CRYPTO_AUTHENC is not set 1138# CONFIG_CRYPTO_AUTHENC is not set
1139# CONFIG_CRYPTO_LZO is not set
1100CONFIG_CRYPTO_HW=y 1140CONFIG_CRYPTO_HW=y
1141# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1101 1142
1102# 1143#
1103# Library routines 1144# Library routines
diff --git a/arch/sh/configs/se7780_defconfig b/arch/sh/configs/se7780_defconfig
index f68743dc3931..30f5ee40c312 100644
--- a/arch/sh/configs/se7780_defconfig
+++ b/arch/sh/configs/se7780_defconfig
@@ -1,9 +1,10 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.21-rc3 3# Linux kernel version: 2.6.25-rc3
4# Thu Mar 15 14:06:20 2007 4# Thu Feb 28 10:18:04 2008
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y
7CONFIG_RWSEM_GENERIC_SPINLOCK=y 8CONFIG_RWSEM_GENERIC_SPINLOCK=y
8CONFIG_GENERIC_BUG=y 9CONFIG_GENERIC_BUG=y
9CONFIG_GENERIC_FIND_NEXT_BIT=y 10CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -11,38 +12,44 @@ CONFIG_GENERIC_HWEIGHT=y
11CONFIG_GENERIC_HARDIRQS=y 12CONFIG_GENERIC_HARDIRQS=y
12CONFIG_GENERIC_IRQ_PROBE=y 13CONFIG_GENERIC_IRQ_PROBE=y
13CONFIG_GENERIC_CALIBRATE_DELAY=y 14CONFIG_GENERIC_CALIBRATE_DELAY=y
14# CONFIG_GENERIC_TIME is not set 15CONFIG_GENERIC_TIME=y
16CONFIG_GENERIC_CLOCKEVENTS=y
17CONFIG_SYS_SUPPORTS_PCI=y
15CONFIG_STACKTRACE_SUPPORT=y 18CONFIG_STACKTRACE_SUPPORT=y
16CONFIG_LOCKDEP_SUPPORT=y 19CONFIG_LOCKDEP_SUPPORT=y
17# CONFIG_ARCH_HAS_ILOG2_U32 is not set 20# CONFIG_ARCH_HAS_ILOG2_U32 is not set
18# CONFIG_ARCH_HAS_ILOG2_U64 is not set 21# CONFIG_ARCH_HAS_ILOG2_U64 is not set
22CONFIG_ARCH_NO_VIRT_TO_BUS=y
23CONFIG_ARCH_SUPPORTS_AOUT=y
19CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 24CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
20 25
21# 26#
22# Code maturity level options 27# General setup
23# 28#
24# CONFIG_EXPERIMENTAL is not set 29# CONFIG_EXPERIMENTAL is not set
25CONFIG_BROKEN_ON_SMP=y 30CONFIG_BROKEN_ON_SMP=y
26CONFIG_INIT_ENV_ARG_LIMIT=32 31CONFIG_INIT_ENV_ARG_LIMIT=32
27
28#
29# General setup
30#
31CONFIG_LOCALVERSION="" 32CONFIG_LOCALVERSION=""
32CONFIG_LOCALVERSION_AUTO=y 33CONFIG_LOCALVERSION_AUTO=y
33# CONFIG_SWAP is not set 34# CONFIG_SWAP is not set
34CONFIG_SYSVIPC=y 35CONFIG_SYSVIPC=y
35# CONFIG_IPC_NS is not set
36CONFIG_SYSVIPC_SYSCTL=y 36CONFIG_SYSVIPC_SYSCTL=y
37# CONFIG_BSD_PROCESS_ACCT is not set 37# CONFIG_BSD_PROCESS_ACCT is not set
38# CONFIG_TASKSTATS is not set 38# CONFIG_TASKSTATS is not set
39# CONFIG_UTS_NS is not set
40# CONFIG_AUDIT is not set 39# CONFIG_AUDIT is not set
41CONFIG_IKCONFIG=y 40CONFIG_IKCONFIG=y
42CONFIG_IKCONFIG_PROC=y 41CONFIG_IKCONFIG_PROC=y
42CONFIG_LOG_BUF_SHIFT=14
43# CONFIG_CGROUPS is not set
44CONFIG_GROUP_SCHED=y
45CONFIG_FAIR_GROUP_SCHED=y
46CONFIG_USER_SCHED=y
47# CONFIG_CGROUP_SCHED is not set
43CONFIG_SYSFS_DEPRECATED=y 48CONFIG_SYSFS_DEPRECATED=y
44# CONFIG_RELAY is not set 49# CONFIG_RELAY is not set
50# CONFIG_NAMESPACES is not set
45# CONFIG_BLK_DEV_INITRD is not set 51# CONFIG_BLK_DEV_INITRD is not set
52CONFIG_CC_OPTIMIZE_FOR_SIZE=y
46CONFIG_SYSCTL=y 53CONFIG_SYSCTL=y
47CONFIG_EMBEDDED=y 54CONFIG_EMBEDDED=y
48CONFIG_UID16=y 55CONFIG_UID16=y
@@ -52,31 +59,36 @@ CONFIG_SYSCTL_SYSCALL=y
52CONFIG_PRINTK=y 59CONFIG_PRINTK=y
53CONFIG_BUG=y 60CONFIG_BUG=y
54CONFIG_ELF_CORE=y 61CONFIG_ELF_CORE=y
62CONFIG_COMPAT_BRK=y
55CONFIG_BASE_FULL=y 63CONFIG_BASE_FULL=y
56CONFIG_FUTEX=y 64CONFIG_FUTEX=y
65CONFIG_ANON_INODES=y
57# CONFIG_EPOLL is not set 66# CONFIG_EPOLL is not set
67CONFIG_SIGNALFD=y
68CONFIG_TIMERFD=y
69CONFIG_EVENTFD=y
58CONFIG_SHMEM=y 70CONFIG_SHMEM=y
59CONFIG_SLAB=y
60CONFIG_VM_EVENT_COUNTERS=y 71CONFIG_VM_EVENT_COUNTERS=y
72CONFIG_SLAB=y
73# CONFIG_SLUB is not set
74# CONFIG_SLOB is not set
75# CONFIG_PROFILING is not set
76# CONFIG_MARKERS is not set
77CONFIG_HAVE_OPROFILE=y
78# CONFIG_HAVE_KPROBES is not set
79CONFIG_PROC_PAGE_MONITOR=y
80CONFIG_SLABINFO=y
61CONFIG_RT_MUTEXES=y 81CONFIG_RT_MUTEXES=y
62# CONFIG_TINY_SHMEM is not set 82# CONFIG_TINY_SHMEM is not set
63CONFIG_BASE_SMALL=0 83CONFIG_BASE_SMALL=0
64# CONFIG_SLOB is not set
65
66#
67# Loadable module support
68#
69CONFIG_MODULES=y 84CONFIG_MODULES=y
70CONFIG_MODULE_UNLOAD=y 85CONFIG_MODULE_UNLOAD=y
71# CONFIG_MODVERSIONS is not set 86# CONFIG_MODVERSIONS is not set
72# CONFIG_MODULE_SRCVERSION_ALL is not set 87# CONFIG_MODULE_SRCVERSION_ALL is not set
73CONFIG_KMOD=y 88CONFIG_KMOD=y
74
75#
76# Block layer
77#
78CONFIG_BLOCK=y 89CONFIG_BLOCK=y
79# CONFIG_LBD is not set 90# CONFIG_LBD is not set
91# CONFIG_BLK_DEV_IO_TRACE is not set
80# CONFIG_LSF is not set 92# CONFIG_LSF is not set
81 93
82# 94#
@@ -91,68 +103,27 @@ CONFIG_DEFAULT_DEADLINE=y
91# CONFIG_DEFAULT_CFQ is not set 103# CONFIG_DEFAULT_CFQ is not set
92# CONFIG_DEFAULT_NOOP is not set 104# CONFIG_DEFAULT_NOOP is not set
93CONFIG_DEFAULT_IOSCHED="deadline" 105CONFIG_DEFAULT_IOSCHED="deadline"
106CONFIG_CLASSIC_RCU=y
107# CONFIG_PREEMPT_RCU is not set
94 108
95# 109#
96# System type 110# System type
97# 111#
98CONFIG_SOLUTION_ENGINE=y
99# CONFIG_SH_SOLUTION_ENGINE is not set
100# CONFIG_SH_7751_SOLUTION_ENGINE is not set
101CONFIG_SH_7780_SOLUTION_ENGINE=y
102# CONFIG_SH_7300_SOLUTION_ENGINE is not set
103# CONFIG_SH_7343_SOLUTION_ENGINE is not set
104# CONFIG_SH_73180_SOLUTION_ENGINE is not set
105# CONFIG_SH_7751_SYSTEMH is not set
106# CONFIG_SH_HP6XX is not set
107# CONFIG_SH_SATURN is not set
108# CONFIG_SH_DREAMCAST is not set
109# CONFIG_SH_MPC1211 is not set
110# CONFIG_SH_SH03 is not set
111# CONFIG_SH_SECUREEDGE5410 is not set
112# CONFIG_SH_HS7751RVOIP is not set
113# CONFIG_SH_7710VOIPGW is not set
114# CONFIG_SH_RTS7751R2D is not set
115# CONFIG_SH_HIGHLANDER is not set
116# CONFIG_SH_EDOSK7705 is not set
117# CONFIG_SH_SH4202_MICRODEV is not set
118# CONFIG_SH_LANDISK is not set
119# CONFIG_SH_TITAN is not set
120# CONFIG_SH_SHMIN is not set
121# CONFIG_SH_7206_SOLUTION_ENGINE is not set
122# CONFIG_SH_7619_SOLUTION_ENGINE is not set
123# CONFIG_SH_UNKNOWN is not set
124
125#
126# Processor selection
127#
128CONFIG_CPU_SH4=y 112CONFIG_CPU_SH4=y
129CONFIG_CPU_SH4A=y 113CONFIG_CPU_SH4A=y
130
131#
132# SH-2 Processor Support
133#
134# CONFIG_CPU_SUBTYPE_SH7604 is not set
135# CONFIG_CPU_SUBTYPE_SH7619 is not set 114# CONFIG_CPU_SUBTYPE_SH7619 is not set
136 115# CONFIG_CPU_SUBTYPE_SH7203 is not set
137#
138# SH-2A Processor Support
139#
140# CONFIG_CPU_SUBTYPE_SH7206 is not set 116# CONFIG_CPU_SUBTYPE_SH7206 is not set
141 117# CONFIG_CPU_SUBTYPE_SH7263 is not set
142#
143# SH-3 Processor Support
144#
145# CONFIG_CPU_SUBTYPE_SH7300 is not set
146# CONFIG_CPU_SUBTYPE_SH7705 is not set 118# CONFIG_CPU_SUBTYPE_SH7705 is not set
147# CONFIG_CPU_SUBTYPE_SH7706 is not set 119# CONFIG_CPU_SUBTYPE_SH7706 is not set
148# CONFIG_CPU_SUBTYPE_SH7707 is not set 120# CONFIG_CPU_SUBTYPE_SH7707 is not set
149# CONFIG_CPU_SUBTYPE_SH7708 is not set 121# CONFIG_CPU_SUBTYPE_SH7708 is not set
150# CONFIG_CPU_SUBTYPE_SH7709 is not set 122# CONFIG_CPU_SUBTYPE_SH7709 is not set
151# CONFIG_CPU_SUBTYPE_SH7710 is not set 123# CONFIG_CPU_SUBTYPE_SH7710 is not set
152 124# CONFIG_CPU_SUBTYPE_SH7712 is not set
153# 125# CONFIG_CPU_SUBTYPE_SH7720 is not set
154# SH-4 Processor Support 126# CONFIG_CPU_SUBTYPE_SH7721 is not set
155#
156# CONFIG_CPU_SUBTYPE_SH7750 is not set 127# CONFIG_CPU_SUBTYPE_SH7750 is not set
157# CONFIG_CPU_SUBTYPE_SH7091 is not set 128# CONFIG_CPU_SUBTYPE_SH7091 is not set
158# CONFIG_CPU_SUBTYPE_SH7750R is not set 129# CONFIG_CPU_SUBTYPE_SH7750R is not set
@@ -161,52 +132,58 @@ CONFIG_CPU_SH4A=y
161# CONFIG_CPU_SUBTYPE_SH7751R is not set 132# CONFIG_CPU_SUBTYPE_SH7751R is not set
162# CONFIG_CPU_SUBTYPE_SH7760 is not set 133# CONFIG_CPU_SUBTYPE_SH7760 is not set
163# CONFIG_CPU_SUBTYPE_SH4_202 is not set 134# CONFIG_CPU_SUBTYPE_SH4_202 is not set
164 135# CONFIG_CPU_SUBTYPE_SH7763 is not set
165#
166# ST40 Processor Support
167#
168# CONFIG_CPU_SUBTYPE_ST40STB1 is not set
169# CONFIG_CPU_SUBTYPE_ST40GX1 is not set
170
171#
172# SH-4A Processor Support
173#
174# CONFIG_CPU_SUBTYPE_SH7770 is not set 136# CONFIG_CPU_SUBTYPE_SH7770 is not set
175CONFIG_CPU_SUBTYPE_SH7780=y 137CONFIG_CPU_SUBTYPE_SH7780=y
176# CONFIG_CPU_SUBTYPE_SH7785 is not set 138# CONFIG_CPU_SUBTYPE_SH7785 is not set
177 139# CONFIG_CPU_SUBTYPE_SHX3 is not set
178#
179# SH4AL-DSP Processor Support
180#
181# CONFIG_CPU_SUBTYPE_SH73180 is not set
182# CONFIG_CPU_SUBTYPE_SH7343 is not set 140# CONFIG_CPU_SUBTYPE_SH7343 is not set
183# CONFIG_CPU_SUBTYPE_SH7722 is not set 141# CONFIG_CPU_SUBTYPE_SH7722 is not set
142# CONFIG_CPU_SUBTYPE_SH7366 is not set
143# CONFIG_CPU_SUBTYPE_SH5_101 is not set
144# CONFIG_CPU_SUBTYPE_SH5_103 is not set
184 145
185# 146#
186# Memory management options 147# Memory management options
187# 148#
149CONFIG_QUICKLIST=y
188CONFIG_MMU=y 150CONFIG_MMU=y
189CONFIG_PAGE_OFFSET=0x80000000 151CONFIG_PAGE_OFFSET=0x80000000
190CONFIG_MEMORY_START=0x08000000 152CONFIG_MEMORY_START=0x08000000
191CONFIG_MEMORY_SIZE=0x08000000 153CONFIG_MEMORY_SIZE=0x08000000
192CONFIG_32BIT=y 154CONFIG_29BIT=y
155# CONFIG_PMB is not set
193CONFIG_VSYSCALL=y 156CONFIG_VSYSCALL=y
157CONFIG_ARCH_FLATMEM_ENABLE=y
158CONFIG_ARCH_SPARSEMEM_ENABLE=y
159CONFIG_ARCH_SPARSEMEM_DEFAULT=y
160CONFIG_MAX_ACTIVE_REGIONS=1
161CONFIG_ARCH_POPULATES_NODE_MAP=y
162CONFIG_ARCH_SELECT_MEMORY_MODEL=y
163CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
194CONFIG_PAGE_SIZE_4KB=y 164CONFIG_PAGE_SIZE_4KB=y
195# CONFIG_PAGE_SIZE_8KB is not set 165# CONFIG_PAGE_SIZE_8KB is not set
196# CONFIG_PAGE_SIZE_64KB is not set 166# CONFIG_PAGE_SIZE_64KB is not set
197CONFIG_FLATMEM=y 167CONFIG_SELECT_MEMORY_MODEL=y
198CONFIG_FLAT_NODE_MEM_MAP=y 168# CONFIG_FLATMEM_MANUAL is not set
199# CONFIG_SPARSEMEM_STATIC is not set 169# CONFIG_DISCONTIGMEM_MANUAL is not set
170CONFIG_SPARSEMEM_MANUAL=y
171CONFIG_SPARSEMEM=y
172CONFIG_HAVE_MEMORY_PRESENT=y
173CONFIG_SPARSEMEM_STATIC=y
174# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
200CONFIG_SPLIT_PTLOCK_CPUS=4 175CONFIG_SPLIT_PTLOCK_CPUS=4
201# CONFIG_RESOURCES_64BIT is not set 176# CONFIG_RESOURCES_64BIT is not set
202CONFIG_ZONE_DMA_FLAG=0 177CONFIG_ZONE_DMA_FLAG=0
178CONFIG_NR_QUICK=2
203 179
204# 180#
205# Cache configuration 181# Cache configuration
206# 182#
207# CONFIG_SH_DIRECT_MAPPED is not set 183# CONFIG_SH_DIRECT_MAPPED is not set
208# CONFIG_SH_WRITETHROUGH is not set 184CONFIG_CACHE_WRITEBACK=y
209# CONFIG_SH_OCRAM is not set 185# CONFIG_CACHE_WRITETHROUGH is not set
186# CONFIG_CACHE_OFF is not set
210 187
211# 188#
212# Processor features 189# Processor features
@@ -214,20 +191,29 @@ CONFIG_ZONE_DMA_FLAG=0
214CONFIG_CPU_LITTLE_ENDIAN=y 191CONFIG_CPU_LITTLE_ENDIAN=y
215# CONFIG_CPU_BIG_ENDIAN is not set 192# CONFIG_CPU_BIG_ENDIAN is not set
216CONFIG_SH_FPU=y 193CONFIG_SH_FPU=y
217# CONFIG_SH_DSP is not set
218# CONFIG_SH_STORE_QUEUES is not set 194# CONFIG_SH_STORE_QUEUES is not set
219CONFIG_CPU_HAS_INTEVT=y 195CONFIG_CPU_HAS_INTEVT=y
220CONFIG_CPU_HAS_INTC2_IRQ=y
221CONFIG_CPU_HAS_INTC_IRQ=y
222CONFIG_CPU_HAS_SR_RB=y 196CONFIG_CPU_HAS_SR_RB=y
197CONFIG_CPU_HAS_FPU=y
198
199#
200# Board support
201#
202CONFIG_SOLUTION_ENGINE=y
203CONFIG_SH_7780_SOLUTION_ENGINE=y
204# CONFIG_SH_SDK7780 is not set
205# CONFIG_SH_HIGHLANDER is not set
223 206
224# 207#
225# Timer and clock configuration 208# Timer and clock configuration
226# 209#
227CONFIG_SH_TMU=y 210CONFIG_SH_TMU=y
228CONFIG_SH_TIMER_IRQ=28 211CONFIG_SH_TIMER_IRQ=28
229# CONFIG_NO_IDLE_HZ is not set
230CONFIG_SH_PCLK_FREQ=33333333 212CONFIG_SH_PCLK_FREQ=33333333
213# CONFIG_TICK_ONESHOT is not set
214# CONFIG_NO_HZ is not set
215# CONFIG_HIGH_RES_TIMERS is not set
216CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
231 217
232# 218#
233# CPU Frequency scaling 219# CPU Frequency scaling
@@ -242,7 +228,6 @@ CONFIG_SH_PCLK_FREQ=33333333
242# 228#
243# Companion Chips 229# Companion Chips
244# 230#
245# CONFIG_HD6446X_SERIES is not set
246 231
247# 232#
248# Additional SuperH Device Drivers 233# Additional SuperH Device Drivers
@@ -258,40 +243,36 @@ CONFIG_HZ_250=y
258# CONFIG_HZ_300 is not set 243# CONFIG_HZ_300 is not set
259# CONFIG_HZ_1000 is not set 244# CONFIG_HZ_1000 is not set
260CONFIG_HZ=250 245CONFIG_HZ=250
261# CONFIG_SMP is not set 246# CONFIG_SCHED_HRTICK is not set
262CONFIG_PREEMPT_NONE=y 247CONFIG_PREEMPT_NONE=y
263# CONFIG_PREEMPT_VOLUNTARY is not set 248# CONFIG_PREEMPT_VOLUNTARY is not set
264# CONFIG_PREEMPT is not set 249# CONFIG_PREEMPT is not set
250CONFIG_RCU_TRACE=y
251CONFIG_GUSA=y
265 252
266# 253#
267# Boot options 254# Boot options
268# 255#
269CONFIG_ZERO_PAGE_OFFSET=0x00001000 256CONFIG_ZERO_PAGE_OFFSET=0x00001000
270CONFIG_BOOT_LINK_OFFSET=0x00810000 257CONFIG_BOOT_LINK_OFFSET=0x00810000
271# CONFIG_UBC_WAKEUP is not set 258CONFIG_CMDLINE_BOOL=y
272# CONFIG_CMDLINE_BOOL is not set 259CONFIG_CMDLINE="console=ttySC0.115200 root=/dev/sda1"
273 260
274# 261#
275# Bus options 262# Bus options
276# 263#
264# CONFIG_CF_ENABLER is not set
277CONFIG_PCI=y 265CONFIG_PCI=y
278CONFIG_SH_PCIDMA_NONCOHERENT=y 266CONFIG_SH_PCIDMA_NONCOHERENT=y
279CONFIG_PCI_AUTO=y 267CONFIG_PCI_AUTO=y
280CONFIG_PCI_AUTO_UPDATE_RESOURCES=y 268CONFIG_PCI_AUTO_UPDATE_RESOURCES=y
281 269# CONFIG_ARCH_SUPPORTS_MSI is not set
282# 270CONFIG_PCI_LEGACY=y
283# PCCARD (PCMCIA/CardBus) support
284#
285
286#
287# PCI Hotplug Support
288#
289 271
290# 272#
291# Executable file formats 273# Executable file formats
292# 274#
293CONFIG_BINFMT_ELF=y 275CONFIG_BINFMT_ELF=y
294# CONFIG_BINFMT_FLAT is not set
295# CONFIG_BINFMT_MISC is not set 276# CONFIG_BINFMT_MISC is not set
296 277
297# 278#
@@ -302,7 +283,6 @@ CONFIG_NET=y
302# 283#
303# Networking options 284# Networking options
304# 285#
305# CONFIG_NETDEBUG is not set
306CONFIG_PACKET=y 286CONFIG_PACKET=y
307# CONFIG_PACKET_MMAP is not set 287# CONFIG_PACKET_MMAP is not set
308CONFIG_UNIX=y 288CONFIG_UNIX=y
@@ -329,6 +309,7 @@ CONFIG_IP_PNP=y
329CONFIG_INET_XFRM_MODE_TRANSPORT=y 309CONFIG_INET_XFRM_MODE_TRANSPORT=y
330CONFIG_INET_XFRM_MODE_TUNNEL=y 310CONFIG_INET_XFRM_MODE_TUNNEL=y
331CONFIG_INET_XFRM_MODE_BEET=y 311CONFIG_INET_XFRM_MODE_BEET=y
312# CONFIG_INET_LRO is not set
332CONFIG_INET_DIAG=y 313CONFIG_INET_DIAG=y
333CONFIG_INET_TCP_DIAG=y 314CONFIG_INET_TCP_DIAG=y
334# CONFIG_TCP_CONG_ADVANCED is not set 315# CONFIG_TCP_CONG_ADVANCED is not set
@@ -349,16 +330,13 @@ CONFIG_IPV6=y
349# CONFIG_IPV6_TUNNEL is not set 330# CONFIG_IPV6_TUNNEL is not set
350# CONFIG_NETWORK_SECMARK is not set 331# CONFIG_NETWORK_SECMARK is not set
351# CONFIG_NETFILTER is not set 332# CONFIG_NETFILTER is not set
333# CONFIG_ATM is not set
352# CONFIG_BRIDGE is not set 334# CONFIG_BRIDGE is not set
353# CONFIG_VLAN_8021Q is not set 335# CONFIG_VLAN_8021Q is not set
354# CONFIG_DECNET is not set 336# CONFIG_DECNET is not set
355# CONFIG_LLC2 is not set 337# CONFIG_LLC2 is not set
356# CONFIG_IPX is not set 338# CONFIG_IPX is not set
357# CONFIG_ATALK is not set 339# CONFIG_ATALK is not set
358
359#
360# QoS and/or fair queueing
361#
362# CONFIG_NET_SCHED is not set 340# CONFIG_NET_SCHED is not set
363 341
364# 342#
@@ -366,9 +344,18 @@ CONFIG_IPV6=y
366# 344#
367# CONFIG_NET_PKTGEN is not set 345# CONFIG_NET_PKTGEN is not set
368# CONFIG_HAMRADIO is not set 346# CONFIG_HAMRADIO is not set
347# CONFIG_CAN is not set
369# CONFIG_IRDA is not set 348# CONFIG_IRDA is not set
370# CONFIG_BT is not set 349# CONFIG_BT is not set
350
351#
352# Wireless
353#
354# CONFIG_CFG80211 is not set
355# CONFIG_WIRELESS_EXT is not set
356# CONFIG_MAC80211 is not set
371# CONFIG_IEEE80211 is not set 357# CONFIG_IEEE80211 is not set
358# CONFIG_RFKILL is not set
372 359
373# 360#
374# Device Drivers 361# Device Drivers
@@ -380,15 +367,7 @@ CONFIG_IPV6=y
380CONFIG_STANDALONE=y 367CONFIG_STANDALONE=y
381# CONFIG_PREVENT_FIRMWARE_BUILD is not set 368# CONFIG_PREVENT_FIRMWARE_BUILD is not set
382# CONFIG_SYS_HYPERVISOR is not set 369# CONFIG_SYS_HYPERVISOR is not set
383
384#
385# Connector - unified userspace <-> kernelspace linker
386#
387# CONFIG_CONNECTOR is not set 370# CONFIG_CONNECTOR is not set
388
389#
390# Memory Technology Devices (MTD)
391#
392CONFIG_MTD=y 371CONFIG_MTD=y
393# CONFIG_MTD_DEBUG is not set 372# CONFIG_MTD_DEBUG is not set
394# CONFIG_MTD_CONCAT is not set 373# CONFIG_MTD_CONCAT is not set
@@ -407,6 +386,7 @@ CONFIG_MTD_BLOCK=y
407# CONFIG_INFTL is not set 386# CONFIG_INFTL is not set
408# CONFIG_RFD_FTL is not set 387# CONFIG_RFD_FTL is not set
409# CONFIG_SSFDC is not set 388# CONFIG_SSFDC is not set
389# CONFIG_MTD_OOPS is not set
410 390
411# 391#
412# RAM/ROM/Flash chip drivers 392# RAM/ROM/Flash chip drivers
@@ -437,13 +417,13 @@ CONFIG_MTD_CFI_UTIL=y
437# CONFIG_MTD_RAM is not set 417# CONFIG_MTD_RAM is not set
438CONFIG_MTD_ROM=y 418CONFIG_MTD_ROM=y
439# CONFIG_MTD_ABSENT is not set 419# CONFIG_MTD_ABSENT is not set
440# CONFIG_MTD_OBSOLETE_CHIPS is not set
441 420
442# 421#
443# Mapping drivers for chip access 422# Mapping drivers for chip access
444# 423#
445# CONFIG_MTD_COMPLEX_MAPPINGS is not set 424# CONFIG_MTD_COMPLEX_MAPPINGS is not set
446# CONFIG_MTD_PHYSMAP is not set 425# CONFIG_MTD_PHYSMAP is not set
426# CONFIG_MTD_INTEL_VR_NOR is not set
447# CONFIG_MTD_PLATRAM is not set 427# CONFIG_MTD_PLATRAM is not set
448 428
449# 429#
@@ -461,31 +441,15 @@ CONFIG_MTD_ROM=y
461# CONFIG_MTD_DOC2000 is not set 441# CONFIG_MTD_DOC2000 is not set
462# CONFIG_MTD_DOC2001 is not set 442# CONFIG_MTD_DOC2001 is not set
463# CONFIG_MTD_DOC2001PLUS is not set 443# CONFIG_MTD_DOC2001PLUS is not set
464
465#
466# NAND Flash Device Drivers
467#
468# CONFIG_MTD_NAND is not set 444# CONFIG_MTD_NAND is not set
469
470#
471# OneNAND Flash Device Drivers
472#
473# CONFIG_MTD_ONENAND is not set 445# CONFIG_MTD_ONENAND is not set
474 446
475# 447#
476# Parallel port support 448# UBI - Unsorted block images
477# 449#
450# CONFIG_MTD_UBI is not set
478# CONFIG_PARPORT is not set 451# CONFIG_PARPORT is not set
479 452CONFIG_BLK_DEV=y
480#
481# Plug and Play support
482#
483# CONFIG_PNPACPI is not set
484
485#
486# Block devices
487#
488# CONFIG_BLK_CPQ_DA is not set
489# CONFIG_BLK_CPQ_CISS_DA is not set 453# CONFIG_BLK_CPQ_CISS_DA is not set
490# CONFIG_BLK_DEV_DAC960 is not set 454# CONFIG_BLK_DEV_DAC960 is not set
491# CONFIG_BLK_DEV_COW_COMMON is not set 455# CONFIG_BLK_DEV_COW_COMMON is not set
@@ -497,15 +461,12 @@ CONFIG_BLK_DEV_LOOP=y
497# CONFIG_BLK_DEV_RAM is not set 461# CONFIG_BLK_DEV_RAM is not set
498# CONFIG_CDROM_PKTCDVD is not set 462# CONFIG_CDROM_PKTCDVD is not set
499# CONFIG_ATA_OVER_ETH is not set 463# CONFIG_ATA_OVER_ETH is not set
500 464CONFIG_MISC_DEVICES=y
501# 465# CONFIG_PHANTOM is not set
502# Misc devices 466# CONFIG_EEPROM_93CX6 is not set
503#
504# CONFIG_SGI_IOC4 is not set 467# CONFIG_SGI_IOC4 is not set
505 468# CONFIG_ENCLOSURE_SERVICES is not set
506# 469CONFIG_HAVE_IDE=y
507# ATA/ATAPI/MFM/RLL support
508#
509# CONFIG_IDE is not set 470# CONFIG_IDE is not set
510 471
511# 472#
@@ -513,6 +474,7 @@ CONFIG_BLK_DEV_LOOP=y
513# 474#
514# CONFIG_RAID_ATTRS is not set 475# CONFIG_RAID_ATTRS is not set
515CONFIG_SCSI=y 476CONFIG_SCSI=y
477CONFIG_SCSI_DMA=y
516# CONFIG_SCSI_NETLINK is not set 478# CONFIG_SCSI_NETLINK is not set
517CONFIG_SCSI_PROC_FS=y 479CONFIG_SCSI_PROC_FS=y
518 480
@@ -533,6 +495,7 @@ CONFIG_CHR_DEV_SG=y
533# CONFIG_SCSI_CONSTANTS is not set 495# CONFIG_SCSI_CONSTANTS is not set
534# CONFIG_SCSI_LOGGING is not set 496# CONFIG_SCSI_LOGGING is not set
535# CONFIG_SCSI_SCAN_ASYNC is not set 497# CONFIG_SCSI_SCAN_ASYNC is not set
498CONFIG_SCSI_WAIT_SCAN=m
536 499
537# 500#
538# SCSI Transports 501# SCSI Transports
@@ -540,12 +503,9 @@ CONFIG_CHR_DEV_SG=y
540# CONFIG_SCSI_SPI_ATTRS is not set 503# CONFIG_SCSI_SPI_ATTRS is not set
541# CONFIG_SCSI_FC_ATTRS is not set 504# CONFIG_SCSI_FC_ATTRS is not set
542# CONFIG_SCSI_ISCSI_ATTRS is not set 505# CONFIG_SCSI_ISCSI_ATTRS is not set
543# CONFIG_SCSI_SAS_ATTRS is not set
544# CONFIG_SCSI_SAS_LIBSAS is not set 506# CONFIG_SCSI_SAS_LIBSAS is not set
545 507# CONFIG_SCSI_SRP_ATTRS is not set
546# 508CONFIG_SCSI_LOWLEVEL=y
547# SCSI low-level drivers
548#
549# CONFIG_ISCSI_TCP is not set 509# CONFIG_ISCSI_TCP is not set
550# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 510# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
551# CONFIG_SCSI_3W_9XXX is not set 511# CONFIG_SCSI_3W_9XXX is not set
@@ -555,7 +515,6 @@ CONFIG_CHR_DEV_SG=y
555# CONFIG_SCSI_AIC7XXX_OLD is not set 515# CONFIG_SCSI_AIC7XXX_OLD is not set
556# CONFIG_SCSI_AIC79XX is not set 516# CONFIG_SCSI_AIC79XX is not set
557# CONFIG_SCSI_AIC94XX is not set 517# CONFIG_SCSI_AIC94XX is not set
558# CONFIG_SCSI_DPT_I2O is not set
559# CONFIG_SCSI_ARCMSR is not set 518# CONFIG_SCSI_ARCMSR is not set
560# CONFIG_MEGARAID_NEWGEN is not set 519# CONFIG_MEGARAID_NEWGEN is not set
561# CONFIG_MEGARAID_LEGACY is not set 520# CONFIG_MEGARAID_LEGACY is not set
@@ -566,6 +525,7 @@ CONFIG_CHR_DEV_SG=y
566# CONFIG_SCSI_IPS is not set 525# CONFIG_SCSI_IPS is not set
567# CONFIG_SCSI_INITIO is not set 526# CONFIG_SCSI_INITIO is not set
568# CONFIG_SCSI_INIA100 is not set 527# CONFIG_SCSI_INIA100 is not set
528# CONFIG_SCSI_MVSAS is not set
569# CONFIG_SCSI_STEX is not set 529# CONFIG_SCSI_STEX is not set
570# CONFIG_SCSI_SYM53C8XX_2 is not set 530# CONFIG_SCSI_SYM53C8XX_2 is not set
571# CONFIG_SCSI_IPR is not set 531# CONFIG_SCSI_IPR is not set
@@ -577,10 +537,6 @@ CONFIG_CHR_DEV_SG=y
577# CONFIG_SCSI_NSP32 is not set 537# CONFIG_SCSI_NSP32 is not set
578# CONFIG_SCSI_DEBUG is not set 538# CONFIG_SCSI_DEBUG is not set
579# CONFIG_SCSI_SRP is not set 539# CONFIG_SCSI_SRP is not set
580
581#
582# Serial ATA (prod) and Parallel ATA (experimental) drivers
583#
584CONFIG_ATA=y 540CONFIG_ATA=y
585# CONFIG_ATA_NONSTANDARD is not set 541# CONFIG_ATA_NONSTANDARD is not set
586# CONFIG_SATA_AHCI is not set 542# CONFIG_SATA_AHCI is not set
@@ -597,62 +553,48 @@ CONFIG_SATA_SIL=y
597# CONFIG_SATA_VIA is not set 553# CONFIG_SATA_VIA is not set
598# CONFIG_SATA_VITESSE is not set 554# CONFIG_SATA_VITESSE is not set
599# CONFIG_PATA_AMD is not set 555# CONFIG_PATA_AMD is not set
556# CONFIG_PATA_ARTOP is not set
557# CONFIG_PATA_ATIIXP is not set
558# CONFIG_PATA_CMD64X is not set
600# CONFIG_PATA_CS5520 is not set 559# CONFIG_PATA_CS5520 is not set
601# CONFIG_PATA_EFAR is not set 560# CONFIG_PATA_EFAR is not set
602# CONFIG_ATA_GENERIC is not set 561# CONFIG_ATA_GENERIC is not set
562# CONFIG_PATA_HPT366 is not set
603# CONFIG_PATA_HPT3X3 is not set 563# CONFIG_PATA_HPT3X3 is not set
564# CONFIG_PATA_IT821X is not set
604# CONFIG_PATA_JMICRON is not set 565# CONFIG_PATA_JMICRON is not set
605# CONFIG_PATA_TRIFLEX is not set 566# CONFIG_PATA_TRIFLEX is not set
606# CONFIG_PATA_MARVELL is not set 567# CONFIG_PATA_MARVELL is not set
607# CONFIG_PATA_MPIIX is not set 568# CONFIG_PATA_MPIIX is not set
569# CONFIG_PATA_OLDPIIX is not set
608# CONFIG_PATA_NETCELL is not set 570# CONFIG_PATA_NETCELL is not set
609# CONFIG_PATA_RZ1000 is not set 571# CONFIG_PATA_RZ1000 is not set
572# CONFIG_PATA_SERVERWORKS is not set
610# CONFIG_PATA_PDC2027X is not set 573# CONFIG_PATA_PDC2027X is not set
611# CONFIG_PATA_SIL680 is not set 574# CONFIG_PATA_SIL680 is not set
612# CONFIG_PATA_VIA is not set 575# CONFIG_PATA_VIA is not set
613# CONFIG_PATA_WINBOND is not set 576# CONFIG_PATA_WINBOND is not set
614# CONFIG_PATA_PLATFORM is not set 577# CONFIG_PATA_PLATFORM is not set
615
616#
617# Multi-device support (RAID and LVM)
618#
619# CONFIG_MD is not set 578# CONFIG_MD is not set
620
621#
622# Fusion MPT device support
623#
624# CONFIG_FUSION is not set 579# CONFIG_FUSION is not set
625# CONFIG_FUSION_SPI is not set
626# CONFIG_FUSION_FC is not set
627# CONFIG_FUSION_SAS is not set
628 580
629# 581#
630# IEEE 1394 (FireWire) support 582# IEEE 1394 (FireWire) support
631# 583#
632# CONFIG_IEEE1394 is not set
633 584
634# 585#
635# I2O device support 586# An alternative FireWire stack is available with EXPERIMENTAL=y
636# 587#
588# CONFIG_IEEE1394 is not set
637# CONFIG_I2O is not set 589# CONFIG_I2O is not set
638
639#
640# Network device support
641#
642CONFIG_NETDEVICES=y 590CONFIG_NETDEVICES=y
591# CONFIG_NETDEVICES_MULTIQUEUE is not set
643# CONFIG_DUMMY is not set 592# CONFIG_DUMMY is not set
644# CONFIG_BONDING is not set 593# CONFIG_BONDING is not set
645# CONFIG_EQUALIZER is not set 594# CONFIG_EQUALIZER is not set
646# CONFIG_TUN is not set 595# CONFIG_TUN is not set
647 596# CONFIG_VETH is not set
648#
649# ARCnet devices
650#
651# CONFIG_ARCNET is not set 597# CONFIG_ARCNET is not set
652
653#
654# PHY device support
655#
656CONFIG_PHYLIB=y 598CONFIG_PHYLIB=y
657 599
658# 600#
@@ -666,85 +608,59 @@ CONFIG_PHYLIB=y
666# CONFIG_VITESSE_PHY is not set 608# CONFIG_VITESSE_PHY is not set
667CONFIG_SMSC_PHY=y 609CONFIG_SMSC_PHY=y
668# CONFIG_BROADCOM_PHY is not set 610# CONFIG_BROADCOM_PHY is not set
611# CONFIG_ICPLUS_PHY is not set
612# CONFIG_REALTEK_PHY is not set
669# CONFIG_FIXED_PHY is not set 613# CONFIG_FIXED_PHY is not set
670 614# CONFIG_MDIO_BITBANG is not set
671#
672# Ethernet (10 or 100Mbit)
673#
674CONFIG_NET_ETHERNET=y 615CONFIG_NET_ETHERNET=y
675CONFIG_MII=y 616CONFIG_MII=y
617# CONFIG_AX88796 is not set
676# CONFIG_STNIC is not set 618# CONFIG_STNIC is not set
677# CONFIG_HAPPYMEAL is not set 619# CONFIG_HAPPYMEAL is not set
678# CONFIG_SUNGEM is not set 620# CONFIG_SUNGEM is not set
679# CONFIG_CASSINI is not set 621# CONFIG_CASSINI is not set
680# CONFIG_NET_VENDOR_3COM is not set 622# CONFIG_NET_VENDOR_3COM is not set
681CONFIG_SMC91X=y 623CONFIG_SMC91X=y
682
683#
684# Tulip family network device support
685#
686# CONFIG_NET_TULIP is not set 624# CONFIG_NET_TULIP is not set
687# CONFIG_HP100 is not set 625# CONFIG_HP100 is not set
626# CONFIG_IBM_NEW_EMAC_ZMII is not set
627# CONFIG_IBM_NEW_EMAC_RGMII is not set
628# CONFIG_IBM_NEW_EMAC_TAH is not set
629# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
688CONFIG_NET_PCI=y 630CONFIG_NET_PCI=y
689# CONFIG_PCNET32 is not set 631# CONFIG_PCNET32 is not set
690# CONFIG_AMD8111_ETH is not set 632# CONFIG_AMD8111_ETH is not set
691# CONFIG_ADAPTEC_STARFIRE is not set 633# CONFIG_ADAPTEC_STARFIRE is not set
692# CONFIG_B44 is not set 634# CONFIG_B44 is not set
693# CONFIG_FORCEDETH is not set 635# CONFIG_FORCEDETH is not set
694# CONFIG_DGRS is not set
695# CONFIG_EEPRO100 is not set 636# CONFIG_EEPRO100 is not set
696# CONFIG_E100 is not set 637# CONFIG_E100 is not set
697# CONFIG_FEALNX is not set 638# CONFIG_FEALNX is not set
698# CONFIG_NATSEMI is not set 639# CONFIG_NATSEMI is not set
699# CONFIG_NE2K_PCI is not set 640# CONFIG_NE2K_PCI is not set
700# CONFIG_8139TOO is not set 641# CONFIG_8139TOO is not set
642# CONFIG_R6040 is not set
701# CONFIG_SIS900 is not set 643# CONFIG_SIS900 is not set
702# CONFIG_EPIC100 is not set 644# CONFIG_EPIC100 is not set
703# CONFIG_SUNDANCE is not set 645# CONFIG_SUNDANCE is not set
704# CONFIG_TLAN is not set 646# CONFIG_TLAN is not set
705# CONFIG_VIA_RHINE is not set 647# CONFIG_VIA_RHINE is not set
706 648# CONFIG_NETDEV_1000 is not set
707# 649# CONFIG_NETDEV_10000 is not set
708# Ethernet (1000 Mbit)
709#
710# CONFIG_ACENIC is not set
711# CONFIG_DL2K is not set
712# CONFIG_E1000 is not set
713# CONFIG_NS83820 is not set
714# CONFIG_HAMACHI is not set
715# CONFIG_R8169 is not set
716# CONFIG_SIS190 is not set
717# CONFIG_SKGE is not set
718# CONFIG_SKY2 is not set
719# CONFIG_SK98LIN is not set
720# CONFIG_VIA_VELOCITY is not set
721# CONFIG_TIGON3 is not set
722# CONFIG_BNX2 is not set
723# CONFIG_QLA3XXX is not set
724
725#
726# Ethernet (10000 Mbit)
727#
728# CONFIG_CHELSIO_T1 is not set
729# CONFIG_CHELSIO_T3 is not set
730# CONFIG_IXGB is not set
731# CONFIG_S2IO is not set
732# CONFIG_MYRI10GE is not set
733# CONFIG_NETXEN_NIC is not set
734
735#
736# Token Ring devices
737#
738# CONFIG_TR is not set 650# CONFIG_TR is not set
739 651
740# 652#
741# Wireless LAN (non-hamradio) 653# Wireless LAN
742# 654#
743# CONFIG_NET_RADIO is not set 655# CONFIG_WLAN_PRE80211 is not set
656# CONFIG_WLAN_80211 is not set
744 657
745# 658#
746# Wan interfaces 659# USB Network Adapters
747# 660#
661# CONFIG_USB_KAWETH is not set
662# CONFIG_USB_PEGASUS is not set
663# CONFIG_USB_USBNET is not set
748# CONFIG_WAN is not set 664# CONFIG_WAN is not set
749# CONFIG_FDDI is not set 665# CONFIG_FDDI is not set
750# CONFIG_PPP is not set 666# CONFIG_PPP is not set
@@ -752,15 +668,7 @@ CONFIG_NET_PCI=y
752# CONFIG_NET_FC is not set 668# CONFIG_NET_FC is not set
753# CONFIG_NETPOLL is not set 669# CONFIG_NETPOLL is not set
754# CONFIG_NET_POLL_CONTROLLER is not set 670# CONFIG_NET_POLL_CONTROLLER is not set
755
756#
757# ISDN subsystem
758#
759# CONFIG_ISDN is not set 671# CONFIG_ISDN is not set
760
761#
762# Telephony Support
763#
764# CONFIG_PHONE is not set 672# CONFIG_PHONE is not set
765 673
766# 674#
@@ -768,6 +676,7 @@ CONFIG_NET_PCI=y
768# 676#
769CONFIG_INPUT=y 677CONFIG_INPUT=y
770# CONFIG_INPUT_FF_MEMLESS is not set 678# CONFIG_INPUT_FF_MEMLESS is not set
679# CONFIG_INPUT_POLLDEV is not set
771 680
772# 681#
773# Userland interfaces 682# Userland interfaces
@@ -777,7 +686,6 @@ CONFIG_INPUT_MOUSEDEV=y
777CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 686CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
778CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 687CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
779# CONFIG_INPUT_JOYDEV is not set 688# CONFIG_INPUT_JOYDEV is not set
780# CONFIG_INPUT_TSDEV is not set
781# CONFIG_INPUT_EVDEV is not set 689# CONFIG_INPUT_EVDEV is not set
782# CONFIG_INPUT_EVBUG is not set 690# CONFIG_INPUT_EVBUG is not set
783 691
@@ -787,6 +695,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
787# CONFIG_INPUT_KEYBOARD is not set 695# CONFIG_INPUT_KEYBOARD is not set
788# CONFIG_INPUT_MOUSE is not set 696# CONFIG_INPUT_MOUSE is not set
789# CONFIG_INPUT_JOYSTICK is not set 697# CONFIG_INPUT_JOYSTICK is not set
698# CONFIG_INPUT_TABLET is not set
790# CONFIG_INPUT_TOUCHSCREEN is not set 699# CONFIG_INPUT_TOUCHSCREEN is not set
791# CONFIG_INPUT_MISC is not set 700# CONFIG_INPUT_MISC is not set
792 701
@@ -821,31 +730,12 @@ CONFIG_SERIAL_CORE_CONSOLE=y
821# CONFIG_SERIAL_JSM is not set 730# CONFIG_SERIAL_JSM is not set
822CONFIG_UNIX98_PTYS=y 731CONFIG_UNIX98_PTYS=y
823# CONFIG_LEGACY_PTYS is not set 732# CONFIG_LEGACY_PTYS is not set
824
825#
826# IPMI
827#
828# CONFIG_IPMI_HANDLER is not set 733# CONFIG_IPMI_HANDLER is not set
829
830#
831# Watchdog Cards
832#
833# CONFIG_WATCHDOG is not set
834# CONFIG_HW_RANDOM is not set 734# CONFIG_HW_RANDOM is not set
835# CONFIG_GEN_RTC is not set
836# CONFIG_DTLK is not set
837# CONFIG_R3964 is not set 735# CONFIG_R3964 is not set
838# CONFIG_APPLICOM is not set 736# CONFIG_APPLICOM is not set
839# CONFIG_DRM is not set
840# CONFIG_RAW_DRIVER is not set 737# CONFIG_RAW_DRIVER is not set
841 738CONFIG_DEVPORT=y
842#
843# TPM devices
844#
845
846#
847# I2C support
848#
849# CONFIG_I2C is not set 739# CONFIG_I2C is not set
850 740
851# 741#
@@ -853,18 +743,27 @@ CONFIG_UNIX98_PTYS=y
853# 743#
854# CONFIG_SPI is not set 744# CONFIG_SPI is not set
855# CONFIG_SPI_MASTER is not set 745# CONFIG_SPI_MASTER is not set
856
857#
858# Dallas's 1-wire bus
859#
860# CONFIG_W1 is not set 746# CONFIG_W1 is not set
861 747# CONFIG_POWER_SUPPLY is not set
862#
863# Hardware Monitoring support
864#
865CONFIG_HWMON=y 748CONFIG_HWMON=y
866# CONFIG_HWMON_VID is not set 749# CONFIG_HWMON_VID is not set
750# CONFIG_SENSORS_IT87 is not set
751# CONFIG_SENSORS_PC87360 is not set
752# CONFIG_SENSORS_SIS5595 is not set
753# CONFIG_SENSORS_SMSC47M1 is not set
754# CONFIG_SENSORS_VIA686A is not set
755# CONFIG_SENSORS_VT8231 is not set
756# CONFIG_SENSORS_W83627HF is not set
757# CONFIG_SENSORS_W83627EHF is not set
867# CONFIG_HWMON_DEBUG_CHIP is not set 758# CONFIG_HWMON_DEBUG_CHIP is not set
759CONFIG_THERMAL=y
760# CONFIG_WATCHDOG is not set
761
762#
763# Sonics Silicon Backplane
764#
765CONFIG_SSB_POSSIBLE=y
766# CONFIG_SSB is not set
868 767
869# 768#
870# Multifunction device drivers 769# Multifunction device drivers
@@ -875,23 +774,27 @@ CONFIG_HWMON=y
875# Multimedia devices 774# Multimedia devices
876# 775#
877# CONFIG_VIDEO_DEV is not set 776# CONFIG_VIDEO_DEV is not set
878 777# CONFIG_DVB_CORE is not set
879# 778# CONFIG_DAB is not set
880# Digital Video Broadcasting Devices
881#
882# CONFIG_DVB is not set
883# CONFIG_USB_DABUSB is not set
884 779
885# 780#
886# Graphics support 781# Graphics support
887# 782#
888# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 783# CONFIG_DRM is not set
784# CONFIG_VGASTATE is not set
785# CONFIG_VIDEO_OUTPUT_CONTROL is not set
889CONFIG_FB=y 786CONFIG_FB=y
890CONFIG_FIRMWARE_EDID=y 787CONFIG_FIRMWARE_EDID=y
891# CONFIG_FB_DDC is not set 788# CONFIG_FB_DDC is not set
892# CONFIG_FB_CFB_FILLRECT is not set 789# CONFIG_FB_CFB_FILLRECT is not set
893# CONFIG_FB_CFB_COPYAREA is not set 790# CONFIG_FB_CFB_COPYAREA is not set
894# CONFIG_FB_CFB_IMAGEBLIT is not set 791# CONFIG_FB_CFB_IMAGEBLIT is not set
792# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
793# CONFIG_FB_SYS_FILLRECT is not set
794# CONFIG_FB_SYS_COPYAREA is not set
795# CONFIG_FB_SYS_IMAGEBLIT is not set
796# CONFIG_FB_SYS_FOPS is not set
797CONFIG_FB_DEFERRED_IO=y
895# CONFIG_FB_SVGALIB is not set 798# CONFIG_FB_SVGALIB is not set
896# CONFIG_FB_MACMODES is not set 799# CONFIG_FB_MACMODES is not set
897# CONFIG_FB_BACKLIGHT is not set 800# CONFIG_FB_BACKLIGHT is not set
@@ -899,14 +802,13 @@ CONFIG_FIRMWARE_EDID=y
899# CONFIG_FB_TILEBLITTING is not set 802# CONFIG_FB_TILEBLITTING is not set
900 803
901# 804#
902# Frambuffer hardware drivers 805# Frame buffer hardware drivers
903# 806#
904# CONFIG_FB_CIRRUS is not set 807# CONFIG_FB_CIRRUS is not set
905# CONFIG_FB_PM2 is not set 808# CONFIG_FB_PM2 is not set
906# CONFIG_FB_CYBER2000 is not set 809# CONFIG_FB_CYBER2000 is not set
907# CONFIG_FB_ASILIANT is not set 810# CONFIG_FB_ASILIANT is not set
908# CONFIG_FB_IMSTT is not set 811# CONFIG_FB_IMSTT is not set
909# CONFIG_FB_EPSON1355 is not set
910# CONFIG_FB_S1D13XXX is not set 812# CONFIG_FB_S1D13XXX is not set
911# CONFIG_FB_NVIDIA is not set 813# CONFIG_FB_NVIDIA is not set
912# CONFIG_FB_RIVA is not set 814# CONFIG_FB_RIVA is not set
@@ -920,22 +822,27 @@ CONFIG_FIRMWARE_EDID=y
920# CONFIG_FB_KYRO is not set 822# CONFIG_FB_KYRO is not set
921# CONFIG_FB_3DFX is not set 823# CONFIG_FB_3DFX is not set
922# CONFIG_FB_VOODOO1 is not set 824# CONFIG_FB_VOODOO1 is not set
825# CONFIG_FB_VT8623 is not set
923# CONFIG_FB_TRIDENT is not set 826# CONFIG_FB_TRIDENT is not set
827# CONFIG_FB_ARK is not set
924# CONFIG_FB_VIRTUAL is not set 828# CONFIG_FB_VIRTUAL is not set
829# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
830
831#
832# Display device support
833#
834# CONFIG_DISPLAY_SUPPORT is not set
925 835
926# 836#
927# Console display driver support 837# Console display driver support
928# 838#
929CONFIG_DUMMY_CONSOLE=y 839CONFIG_DUMMY_CONSOLE=y
930CONFIG_FRAMEBUFFER_CONSOLE=y 840CONFIG_FRAMEBUFFER_CONSOLE=y
841# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
931# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set 842# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
932# CONFIG_FONTS is not set 843# CONFIG_FONTS is not set
933CONFIG_FONT_8x8=y 844CONFIG_FONT_8x8=y
934CONFIG_FONT_8x16=y 845CONFIG_FONT_8x16=y
935
936#
937# Logo configuration
938#
939CONFIG_LOGO=y 846CONFIG_LOGO=y
940# CONFIG_LOGO_LINUX_MONO is not set 847# CONFIG_LOGO_LINUX_MONO is not set
941# CONFIG_LOGO_LINUX_VGA16 is not set 848# CONFIG_LOGO_LINUX_VGA16 is not set
@@ -958,39 +865,38 @@ CONFIG_SOUND=y
958# Open Sound System 865# Open Sound System
959# 866#
960CONFIG_SOUND_PRIME=y 867CONFIG_SOUND_PRIME=y
961# CONFIG_OBSOLETE_OSS is not set
962# CONFIG_SOUND_BT878 is not set
963# CONFIG_SOUND_ICH is not set
964# CONFIG_SOUND_TRIDENT is not set 868# CONFIG_SOUND_TRIDENT is not set
965# CONFIG_SOUND_MSNDCLAS is not set 869# CONFIG_SOUND_MSNDCLAS is not set
966# CONFIG_SOUND_MSNDPIN is not set 870# CONFIG_SOUND_MSNDPIN is not set
967# CONFIG_SOUND_VIA82CXXX is not set 871CONFIG_HID_SUPPORT=y
968
969#
970# HID Devices
971#
972CONFIG_HID=y 872CONFIG_HID=y
973# CONFIG_HID_DEBUG is not set 873# CONFIG_HID_DEBUG is not set
874# CONFIG_HIDRAW is not set
974 875
975# 876#
976# USB support 877# USB Input Devices
977# 878#
879CONFIG_USB_HID=y
880# CONFIG_USB_HIDINPUT_POWERBOOK is not set
881# CONFIG_USB_HIDDEV is not set
882CONFIG_USB_SUPPORT=y
978CONFIG_USB_ARCH_HAS_HCD=y 883CONFIG_USB_ARCH_HAS_HCD=y
979CONFIG_USB_ARCH_HAS_OHCI=y 884CONFIG_USB_ARCH_HAS_OHCI=y
980CONFIG_USB_ARCH_HAS_EHCI=y 885CONFIG_USB_ARCH_HAS_EHCI=y
981CONFIG_USB=y 886CONFIG_USB=y
982CONFIG_USB_DEBUG=y 887# CONFIG_USB_DEBUG is not set
888# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
983 889
984# 890#
985# Miscellaneous USB options 891# Miscellaneous USB options
986# 892#
987CONFIG_USB_DEVICEFS=y 893CONFIG_USB_DEVICEFS=y
894# CONFIG_USB_DEVICE_CLASS is not set
988 895
989# 896#
990# USB Host Controller Drivers 897# USB Host Controller Drivers
991# 898#
992CONFIG_USB_EHCI_HCD=y 899CONFIG_USB_EHCI_HCD=y
993# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
994# CONFIG_USB_ISP116X_HCD is not set 900# CONFIG_USB_ISP116X_HCD is not set
995CONFIG_USB_OHCI_HCD=y 901CONFIG_USB_OHCI_HCD=y
996# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set 902# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
@@ -998,6 +904,7 @@ CONFIG_USB_OHCI_HCD=y
998CONFIG_USB_OHCI_LITTLE_ENDIAN=y 904CONFIG_USB_OHCI_LITTLE_ENDIAN=y
999# CONFIG_USB_UHCI_HCD is not set 905# CONFIG_USB_UHCI_HCD is not set
1000# CONFIG_USB_SL811_HCD is not set 906# CONFIG_USB_SL811_HCD is not set
907# CONFIG_USB_R8A66597_HCD is not set
1001 908
1002# 909#
1003# USB Device Class drivers 910# USB Device Class drivers
@@ -1015,49 +922,20 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1015CONFIG_USB_STORAGE=y 922CONFIG_USB_STORAGE=y
1016# CONFIG_USB_STORAGE_DEBUG is not set 923# CONFIG_USB_STORAGE_DEBUG is not set
1017# CONFIG_USB_STORAGE_FREECOM is not set 924# CONFIG_USB_STORAGE_FREECOM is not set
925# CONFIG_USB_STORAGE_ISD200 is not set
1018# CONFIG_USB_STORAGE_DPCM is not set 926# CONFIG_USB_STORAGE_DPCM is not set
1019# CONFIG_USB_STORAGE_KARMA is not set 927# CONFIG_USB_STORAGE_KARMA is not set
1020# CONFIG_USB_LIBUSUAL is not set 928# CONFIG_USB_LIBUSUAL is not set
1021 929
1022# 930#
1023# USB Input Devices
1024#
1025CONFIG_USB_HID=y
1026# CONFIG_USB_HIDINPUT_POWERBOOK is not set
1027# CONFIG_USB_HIDDEV is not set
1028# CONFIG_USB_AIPTEK is not set
1029# CONFIG_USB_WACOM is not set
1030# CONFIG_USB_ACECAD is not set
1031# CONFIG_USB_KBTAB is not set
1032# CONFIG_USB_POWERMATE is not set
1033# CONFIG_USB_TOUCHSCREEN is not set
1034# CONFIG_USB_XPAD is not set
1035# CONFIG_USB_ATI_REMOTE is not set
1036# CONFIG_USB_ATI_REMOTE2 is not set
1037# CONFIG_USB_APPLETOUCH is not set
1038# CONFIG_USB_GTCO is not set
1039
1040#
1041# USB Imaging devices 931# USB Imaging devices
1042# 932#
1043# CONFIG_USB_MICROTEK is not set 933# CONFIG_USB_MICROTEK is not set
1044
1045#
1046# USB Network Adapters
1047#
1048# CONFIG_USB_KAWETH is not set
1049# CONFIG_USB_PEGASUS is not set
1050# CONFIG_USB_USBNET_MII is not set
1051# CONFIG_USB_USBNET is not set
1052CONFIG_USB_MON=y 934CONFIG_USB_MON=y
1053 935
1054# 936#
1055# USB port drivers 937# USB port drivers
1056# 938#
1057
1058#
1059# USB Serial Converter support
1060#
1061# CONFIG_USB_SERIAL is not set 939# CONFIG_USB_SERIAL is not set
1062 940
1063# 941#
@@ -1078,67 +956,17 @@ CONFIG_USB_MON=y
1078# CONFIG_USB_LD is not set 956# CONFIG_USB_LD is not set
1079# CONFIG_USB_TRANCEVIBRATOR is not set 957# CONFIG_USB_TRANCEVIBRATOR is not set
1080# CONFIG_USB_IOWARRIOR is not set 958# CONFIG_USB_IOWARRIOR is not set
1081
1082#
1083# USB DSL modem support
1084#
1085
1086#
1087# USB Gadget Support
1088#
1089# CONFIG_USB_GADGET is not set 959# CONFIG_USB_GADGET is not set
1090
1091#
1092# MMC/SD Card support
1093#
1094# CONFIG_MMC is not set 960# CONFIG_MMC is not set
1095 961# CONFIG_MEMSTICK is not set
1096#
1097# LED devices
1098#
1099# CONFIG_NEW_LEDS is not set 962# CONFIG_NEW_LEDS is not set
1100
1101#
1102# LED drivers
1103#
1104
1105#
1106# LED Triggers
1107#
1108
1109#
1110# InfiniBand support
1111#
1112# CONFIG_INFINIBAND is not set 963# CONFIG_INFINIBAND is not set
964# CONFIG_RTC_CLASS is not set
1113 965
1114# 966#
1115# EDAC - error detection and reporting (RAS) (EXPERIMENTAL) 967# Userspace I/O
1116#
1117
1118#
1119# Real Time Clock
1120#
1121
1122#
1123# DMA Engine support
1124#
1125# CONFIG_DMA_ENGINE is not set
1126
1127#
1128# DMA Clients
1129#
1130
1131#
1132# DMA Devices
1133#
1134
1135#
1136# Auxiliary Display support
1137#
1138
1139#
1140# Virtualization
1141# 968#
969# CONFIG_UIO is not set
1142 970
1143# 971#
1144# File systems 972# File systems
@@ -1151,12 +979,11 @@ CONFIG_EXT2_FS=y
1151# CONFIG_JFS_FS is not set 979# CONFIG_JFS_FS is not set
1152# CONFIG_FS_POSIX_ACL is not set 980# CONFIG_FS_POSIX_ACL is not set
1153# CONFIG_XFS_FS is not set 981# CONFIG_XFS_FS is not set
1154# CONFIG_MINIX_FS is not set 982# CONFIG_OCFS2_FS is not set
1155# CONFIG_ROMFS_FS is not set 983# CONFIG_DNOTIFY is not set
1156CONFIG_INOTIFY=y 984CONFIG_INOTIFY=y
1157CONFIG_INOTIFY_USER=y 985CONFIG_INOTIFY_USER=y
1158# CONFIG_QUOTA is not set 986# CONFIG_QUOTA is not set
1159# CONFIG_DNOTIFY is not set
1160# CONFIG_AUTOFS_FS is not set 987# CONFIG_AUTOFS_FS is not set
1161# CONFIG_AUTOFS4_FS is not set 988# CONFIG_AUTOFS4_FS is not set
1162# CONFIG_FUSE_FS is not set 989# CONFIG_FUSE_FS is not set
@@ -1181,14 +1008,14 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
1181# Pseudo filesystems 1008# Pseudo filesystems
1182# 1009#
1183CONFIG_PROC_FS=y 1010CONFIG_PROC_FS=y
1184# CONFIG_PROC_KCORE is not set 1011CONFIG_PROC_KCORE=y
1185CONFIG_PROC_SYSCTL=y 1012CONFIG_PROC_SYSCTL=y
1186# CONFIG_SYSFS is not set 1013CONFIG_SYSFS=y
1187CONFIG_TMPFS=y 1014CONFIG_TMPFS=y
1188# CONFIG_TMPFS_POSIX_ACL is not set 1015# CONFIG_TMPFS_POSIX_ACL is not set
1189# CONFIG_HUGETLBFS is not set 1016# CONFIG_HUGETLBFS is not set
1190# CONFIG_HUGETLB_PAGE is not set 1017# CONFIG_HUGETLB_PAGE is not set
1191CONFIG_RAMFS=y 1018# CONFIG_CONFIGFS_FS is not set
1192 1019
1193# 1020#
1194# Miscellaneous filesystems 1021# Miscellaneous filesystems
@@ -1197,14 +1024,13 @@ CONFIG_RAMFS=y
1197# CONFIG_JFFS2_FS is not set 1024# CONFIG_JFFS2_FS is not set
1198CONFIG_CRAMFS=y 1025CONFIG_CRAMFS=y
1199# CONFIG_VXFS_FS is not set 1026# CONFIG_VXFS_FS is not set
1027# CONFIG_MINIX_FS is not set
1200# CONFIG_HPFS_FS is not set 1028# CONFIG_HPFS_FS is not set
1201# CONFIG_QNX4FS_FS is not set 1029# CONFIG_QNX4FS_FS is not set
1030# CONFIG_ROMFS_FS is not set
1202# CONFIG_SYSV_FS is not set 1031# CONFIG_SYSV_FS is not set
1203# CONFIG_UFS_FS is not set 1032# CONFIG_UFS_FS is not set
1204 1033CONFIG_NETWORK_FILESYSTEMS=y
1205#
1206# Network File Systems
1207#
1208CONFIG_NFS_FS=y 1034CONFIG_NFS_FS=y
1209CONFIG_NFS_V3=y 1035CONFIG_NFS_V3=y
1210# CONFIG_NFS_V3_ACL is not set 1036# CONFIG_NFS_V3_ACL is not set
@@ -1225,10 +1051,6 @@ CONFIG_SUNRPC=y
1225# 1051#
1226# CONFIG_PARTITION_ADVANCED is not set 1052# CONFIG_PARTITION_ADVANCED is not set
1227CONFIG_MSDOS_PARTITION=y 1053CONFIG_MSDOS_PARTITION=y
1228
1229#
1230# Native Language Support
1231#
1232CONFIG_NLS=y 1054CONFIG_NLS=y
1233CONFIG_NLS_DEFAULT="iso8859-1" 1055CONFIG_NLS_DEFAULT="iso8859-1"
1234# CONFIG_NLS_CODEPAGE_437 is not set 1056# CONFIG_NLS_CODEPAGE_437 is not set
@@ -1275,13 +1097,15 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1275# 1097#
1276CONFIG_TRACE_IRQFLAGS_SUPPORT=y 1098CONFIG_TRACE_IRQFLAGS_SUPPORT=y
1277# CONFIG_PRINTK_TIME is not set 1099# CONFIG_PRINTK_TIME is not set
1100CONFIG_ENABLE_WARN_DEPRECATED=y
1278CONFIG_ENABLE_MUST_CHECK=y 1101CONFIG_ENABLE_MUST_CHECK=y
1279# CONFIG_MAGIC_SYSRQ is not set 1102# CONFIG_MAGIC_SYSRQ is not set
1280# CONFIG_UNUSED_SYMBOLS is not set 1103# CONFIG_UNUSED_SYMBOLS is not set
1104CONFIG_DEBUG_FS=y
1281# CONFIG_HEADERS_CHECK is not set 1105# CONFIG_HEADERS_CHECK is not set
1282# CONFIG_DEBUG_KERNEL is not set 1106# CONFIG_DEBUG_KERNEL is not set
1283CONFIG_LOG_BUF_SHIFT=14
1284# CONFIG_DEBUG_BUGVERBOSE is not set 1107# CONFIG_DEBUG_BUGVERBOSE is not set
1108# CONFIG_SAMPLES is not set
1285# CONFIG_SH_STANDARD_BIOS is not set 1109# CONFIG_SH_STANDARD_BIOS is not set
1286# CONFIG_EARLY_SCIF_CONSOLE is not set 1110# CONFIG_EARLY_SCIF_CONSOLE is not set
1287# CONFIG_SH_KGDB is not set 1111# CONFIG_SH_KGDB is not set
@@ -1290,11 +1114,48 @@ CONFIG_LOG_BUF_SHIFT=14
1290# Security options 1114# Security options
1291# 1115#
1292# CONFIG_KEYS is not set 1116# CONFIG_KEYS is not set
1293 1117# CONFIG_SECURITY is not set
1294# 1118CONFIG_CRYPTO=y
1295# Cryptographic options 1119# CONFIG_CRYPTO_SEQIV is not set
1296# 1120# CONFIG_CRYPTO_MANAGER is not set
1297# CONFIG_CRYPTO is not set 1121# CONFIG_CRYPTO_HMAC is not set
1122# CONFIG_CRYPTO_NULL is not set
1123# CONFIG_CRYPTO_MD4 is not set
1124# CONFIG_CRYPTO_MD5 is not set
1125# CONFIG_CRYPTO_SHA1 is not set
1126# CONFIG_CRYPTO_SHA256 is not set
1127# CONFIG_CRYPTO_SHA512 is not set
1128# CONFIG_CRYPTO_WP512 is not set
1129# CONFIG_CRYPTO_TGR192 is not set
1130# CONFIG_CRYPTO_ECB is not set
1131# CONFIG_CRYPTO_CBC is not set
1132# CONFIG_CRYPTO_PCBC is not set
1133# CONFIG_CRYPTO_CTR is not set
1134# CONFIG_CRYPTO_GCM is not set
1135# CONFIG_CRYPTO_CCM is not set
1136# CONFIG_CRYPTO_CRYPTD is not set
1137# CONFIG_CRYPTO_DES is not set
1138# CONFIG_CRYPTO_FCRYPT is not set
1139# CONFIG_CRYPTO_BLOWFISH is not set
1140# CONFIG_CRYPTO_TWOFISH is not set
1141# CONFIG_CRYPTO_SERPENT is not set
1142# CONFIG_CRYPTO_AES is not set
1143# CONFIG_CRYPTO_CAST5 is not set
1144# CONFIG_CRYPTO_CAST6 is not set
1145# CONFIG_CRYPTO_TEA is not set
1146# CONFIG_CRYPTO_ARC4 is not set
1147# CONFIG_CRYPTO_KHAZAD is not set
1148# CONFIG_CRYPTO_ANUBIS is not set
1149# CONFIG_CRYPTO_SEED is not set
1150# CONFIG_CRYPTO_DEFLATE is not set
1151# CONFIG_CRYPTO_MICHAEL_MIC is not set
1152# CONFIG_CRYPTO_CRC32C is not set
1153# CONFIG_CRYPTO_CAMELLIA is not set
1154# CONFIG_CRYPTO_TEST is not set
1155# CONFIG_CRYPTO_AUTHENC is not set
1156# CONFIG_CRYPTO_LZO is not set
1157CONFIG_CRYPTO_HW=y
1158# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1298 1159
1299# 1160#
1300# Library routines 1161# Library routines
@@ -1302,9 +1163,12 @@ CONFIG_LOG_BUF_SHIFT=14
1302CONFIG_BITREVERSE=y 1163CONFIG_BITREVERSE=y
1303# CONFIG_CRC_CCITT is not set 1164# CONFIG_CRC_CCITT is not set
1304# CONFIG_CRC16 is not set 1165# CONFIG_CRC16 is not set
1166# CONFIG_CRC_ITU_T is not set
1305CONFIG_CRC32=y 1167CONFIG_CRC32=y
1168# CONFIG_CRC7 is not set
1306# CONFIG_LIBCRC32C is not set 1169# CONFIG_LIBCRC32C is not set
1307CONFIG_ZLIB_INFLATE=y 1170CONFIG_ZLIB_INFLATE=y
1308CONFIG_PLIST=y 1171CONFIG_PLIST=y
1309CONFIG_HAS_IOMEM=y 1172CONFIG_HAS_IOMEM=y
1310CONFIG_HAS_IOPORT=y 1173CONFIG_HAS_IOPORT=y
1174CONFIG_HAS_DMA=y
diff --git a/arch/sh/configs/sh7710voipgw_defconfig b/arch/sh/configs/sh7710voipgw_defconfig
index 9380c321169a..37e49a589207 100644
--- a/arch/sh/configs/sh7710voipgw_defconfig
+++ b/arch/sh/configs/sh7710voipgw_defconfig
@@ -1,40 +1,55 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18 3# Linux kernel version: 2.6.25-rc4
4# Tue Oct 3 12:48:56 2006 4# Thu Mar 6 16:02:29 2008
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y
7CONFIG_RWSEM_GENERIC_SPINLOCK=y 8CONFIG_RWSEM_GENERIC_SPINLOCK=y
9CONFIG_GENERIC_BUG=y
8CONFIG_GENERIC_FIND_NEXT_BIT=y 10CONFIG_GENERIC_FIND_NEXT_BIT=y
9CONFIG_GENERIC_HWEIGHT=y 11CONFIG_GENERIC_HWEIGHT=y
10CONFIG_GENERIC_HARDIRQS=y 12CONFIG_GENERIC_HARDIRQS=y
11CONFIG_GENERIC_IRQ_PROBE=y 13CONFIG_GENERIC_IRQ_PROBE=y
12CONFIG_GENERIC_CALIBRATE_DELAY=y 14CONFIG_GENERIC_CALIBRATE_DELAY=y
15CONFIG_GENERIC_TIME=y
16CONFIG_GENERIC_CLOCKEVENTS=y
17CONFIG_STACKTRACE_SUPPORT=y
18CONFIG_LOCKDEP_SUPPORT=y
19# CONFIG_ARCH_HAS_ILOG2_U32 is not set
20# CONFIG_ARCH_HAS_ILOG2_U64 is not set
21CONFIG_ARCH_NO_VIRT_TO_BUS=y
22CONFIG_ARCH_SUPPORTS_AOUT=y
13CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 23CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
14 24
15# 25#
16# Code maturity level options 26# General setup
17# 27#
18CONFIG_EXPERIMENTAL=y 28CONFIG_EXPERIMENTAL=y
19CONFIG_BROKEN_ON_SMP=y 29CONFIG_BROKEN_ON_SMP=y
20CONFIG_INIT_ENV_ARG_LIMIT=32 30CONFIG_INIT_ENV_ARG_LIMIT=32
21
22#
23# General setup
24#
25CONFIG_LOCALVERSION="" 31CONFIG_LOCALVERSION=""
26CONFIG_LOCALVERSION_AUTO=y 32CONFIG_LOCALVERSION_AUTO=y
27# CONFIG_SWAP is not set 33# CONFIG_SWAP is not set
28CONFIG_SYSVIPC=y 34CONFIG_SYSVIPC=y
29# CONFIG_IPC_NS is not set 35CONFIG_SYSVIPC_SYSCTL=y
30CONFIG_POSIX_MQUEUE=y 36CONFIG_POSIX_MQUEUE=y
31# CONFIG_BSD_PROCESS_ACCT is not set 37# CONFIG_BSD_PROCESS_ACCT is not set
32# CONFIG_TASKSTATS is not set 38# CONFIG_TASKSTATS is not set
33# CONFIG_UTS_NS is not set
34# CONFIG_AUDIT is not set 39# CONFIG_AUDIT is not set
35# CONFIG_IKCONFIG is not set 40# CONFIG_IKCONFIG is not set
41CONFIG_LOG_BUF_SHIFT=14
42# CONFIG_CGROUPS is not set
43CONFIG_GROUP_SCHED=y
44CONFIG_FAIR_GROUP_SCHED=y
45# CONFIG_RT_GROUP_SCHED is not set
46CONFIG_USER_SCHED=y
47# CONFIG_CGROUP_SCHED is not set
48CONFIG_SYSFS_DEPRECATED=y
49CONFIG_SYSFS_DEPRECATED_V2=y
36# CONFIG_RELAY is not set 50# CONFIG_RELAY is not set
37CONFIG_INITRAMFS_SOURCE="" 51# CONFIG_NAMESPACES is not set
52# CONFIG_BLK_DEV_INITRD is not set
38CONFIG_CC_OPTIMIZE_FOR_SIZE=y 53CONFIG_CC_OPTIMIZE_FOR_SIZE=y
39CONFIG_SYSCTL=y 54CONFIG_SYSCTL=y
40CONFIG_EMBEDDED=y 55CONFIG_EMBEDDED=y
@@ -46,33 +61,39 @@ CONFIG_HOTPLUG=y
46CONFIG_PRINTK=y 61CONFIG_PRINTK=y
47CONFIG_BUG=y 62CONFIG_BUG=y
48CONFIG_ELF_CORE=y 63CONFIG_ELF_CORE=y
64CONFIG_COMPAT_BRK=y
49CONFIG_BASE_FULL=y 65CONFIG_BASE_FULL=y
50# CONFIG_FUTEX is not set 66# CONFIG_FUTEX is not set
67CONFIG_ANON_INODES=y
51# CONFIG_EPOLL is not set 68# CONFIG_EPOLL is not set
69CONFIG_SIGNALFD=y
70CONFIG_TIMERFD=y
71CONFIG_EVENTFD=y
52# CONFIG_SHMEM is not set 72# CONFIG_SHMEM is not set
53CONFIG_SLAB=y
54CONFIG_VM_EVENT_COUNTERS=y 73CONFIG_VM_EVENT_COUNTERS=y
74CONFIG_SLAB=y
75# CONFIG_SLUB is not set
76# CONFIG_SLOB is not set
77# CONFIG_PROFILING is not set
78# CONFIG_MARKERS is not set
79CONFIG_HAVE_OPROFILE=y
80# CONFIG_HAVE_KPROBES is not set
81# CONFIG_HAVE_KRETPROBES is not set
82CONFIG_PROC_PAGE_MONITOR=y
83CONFIG_SLABINFO=y
55CONFIG_TINY_SHMEM=y 84CONFIG_TINY_SHMEM=y
56CONFIG_BASE_SMALL=0 85CONFIG_BASE_SMALL=0
57# CONFIG_SLOB is not set
58
59#
60# Loadable module support
61#
62CONFIG_MODULES=y 86CONFIG_MODULES=y
63CONFIG_MODULE_UNLOAD=y 87CONFIG_MODULE_UNLOAD=y
64CONFIG_MODULE_FORCE_UNLOAD=y 88CONFIG_MODULE_FORCE_UNLOAD=y
65# CONFIG_MODVERSIONS is not set 89# CONFIG_MODVERSIONS is not set
66# CONFIG_MODULE_SRCVERSION_ALL is not set 90# CONFIG_MODULE_SRCVERSION_ALL is not set
67# CONFIG_KMOD is not set 91# CONFIG_KMOD is not set
68
69#
70# Block layer
71#
72CONFIG_BLOCK=y 92CONFIG_BLOCK=y
73# CONFIG_LBD is not set 93# CONFIG_LBD is not set
74# CONFIG_BLK_DEV_IO_TRACE is not set 94# CONFIG_BLK_DEV_IO_TRACE is not set
75# CONFIG_LSF is not set 95# CONFIG_LSF is not set
96# CONFIG_BLK_DEV_BSG is not set
76 97
77# 98#
78# IO Schedulers 99# IO Schedulers
@@ -86,59 +107,26 @@ CONFIG_DEFAULT_DEADLINE=y
86# CONFIG_DEFAULT_CFQ is not set 107# CONFIG_DEFAULT_CFQ is not set
87# CONFIG_DEFAULT_NOOP is not set 108# CONFIG_DEFAULT_NOOP is not set
88CONFIG_DEFAULT_IOSCHED="deadline" 109CONFIG_DEFAULT_IOSCHED="deadline"
110CONFIG_CLASSIC_RCU=y
111# CONFIG_PREEMPT_RCU is not set
89 112
90# 113#
91# System type 114# System type
92# 115#
93# CONFIG_SH_SOLUTION_ENGINE is not set
94# CONFIG_SH_7751_SOLUTION_ENGINE is not set
95# CONFIG_SH_7300_SOLUTION_ENGINE is not set
96# CONFIG_SH_7343_SOLUTION_ENGINE is not set
97# CONFIG_SH_73180_SOLUTION_ENGINE is not set
98# CONFIG_SH_7751_SYSTEMH is not set
99# CONFIG_SH_HP6XX is not set
100# CONFIG_SH_EC3104 is not set
101# CONFIG_SH_SATURN is not set
102# CONFIG_SH_DREAMCAST is not set
103# CONFIG_SH_BIGSUR is not set
104# CONFIG_SH_MPC1211 is not set
105# CONFIG_SH_SH03 is not set
106# CONFIG_SH_SECUREEDGE5410 is not set
107# CONFIG_SH_HS7751RVOIP is not set
108CONFIG_SH_7710VOIPGW=y
109# CONFIG_SH_RTS7751R2D is not set
110# CONFIG_SH_R7780RP is not set
111# CONFIG_SH_EDOSK7705 is not set
112# CONFIG_SH_SH4202_MICRODEV is not set
113# CONFIG_SH_LANDISK is not set
114# CONFIG_SH_TITAN is not set
115# CONFIG_SH_SHMIN is not set
116# CONFIG_SH_UNKNOWN is not set
117
118#
119# Processor selection
120#
121CONFIG_CPU_SH3=y 116CONFIG_CPU_SH3=y
122 117# CONFIG_CPU_SUBTYPE_SH7619 is not set
123# 118# CONFIG_CPU_SUBTYPE_SH7203 is not set
124# SH-2 Processor Support 119# CONFIG_CPU_SUBTYPE_SH7206 is not set
125# 120# CONFIG_CPU_SUBTYPE_SH7263 is not set
126# CONFIG_CPU_SUBTYPE_SH7604 is not set
127
128#
129# SH-3 Processor Support
130#
131# CONFIG_CPU_SUBTYPE_SH7300 is not set
132# CONFIG_CPU_SUBTYPE_SH7705 is not set 121# CONFIG_CPU_SUBTYPE_SH7705 is not set
133# CONFIG_CPU_SUBTYPE_SH7706 is not set 122# CONFIG_CPU_SUBTYPE_SH7706 is not set
134# CONFIG_CPU_SUBTYPE_SH7707 is not set 123# CONFIG_CPU_SUBTYPE_SH7707 is not set
135# CONFIG_CPU_SUBTYPE_SH7708 is not set 124# CONFIG_CPU_SUBTYPE_SH7708 is not set
136# CONFIG_CPU_SUBTYPE_SH7709 is not set 125# CONFIG_CPU_SUBTYPE_SH7709 is not set
137CONFIG_CPU_SUBTYPE_SH7710=y 126CONFIG_CPU_SUBTYPE_SH7710=y
138 127# CONFIG_CPU_SUBTYPE_SH7712 is not set
139# 128# CONFIG_CPU_SUBTYPE_SH7720 is not set
140# SH-4 Processor Support 129# CONFIG_CPU_SUBTYPE_SH7721 is not set
141#
142# CONFIG_CPU_SUBTYPE_SH7750 is not set 130# CONFIG_CPU_SUBTYPE_SH7750 is not set
143# CONFIG_CPU_SUBTYPE_SH7091 is not set 131# CONFIG_CPU_SUBTYPE_SH7091 is not set
144# CONFIG_CPU_SUBTYPE_SH7750R is not set 132# CONFIG_CPU_SUBTYPE_SH7750R is not set
@@ -147,65 +135,84 @@ CONFIG_CPU_SUBTYPE_SH7710=y
147# CONFIG_CPU_SUBTYPE_SH7751R is not set 135# CONFIG_CPU_SUBTYPE_SH7751R is not set
148# CONFIG_CPU_SUBTYPE_SH7760 is not set 136# CONFIG_CPU_SUBTYPE_SH7760 is not set
149# CONFIG_CPU_SUBTYPE_SH4_202 is not set 137# CONFIG_CPU_SUBTYPE_SH4_202 is not set
150 138# CONFIG_CPU_SUBTYPE_SH7763 is not set
151#
152# ST40 Processor Support
153#
154# CONFIG_CPU_SUBTYPE_ST40STB1 is not set
155# CONFIG_CPU_SUBTYPE_ST40GX1 is not set
156
157#
158# SH-4A Processor Support
159#
160# CONFIG_CPU_SUBTYPE_SH7770 is not set 139# CONFIG_CPU_SUBTYPE_SH7770 is not set
161# CONFIG_CPU_SUBTYPE_SH7780 is not set 140# CONFIG_CPU_SUBTYPE_SH7780 is not set
162 141# CONFIG_CPU_SUBTYPE_SH7785 is not set
163# 142# CONFIG_CPU_SUBTYPE_SHX3 is not set
164# SH4AL-DSP Processor Support
165#
166# CONFIG_CPU_SUBTYPE_SH73180 is not set
167# CONFIG_CPU_SUBTYPE_SH7343 is not set 143# CONFIG_CPU_SUBTYPE_SH7343 is not set
144# CONFIG_CPU_SUBTYPE_SH7722 is not set
145# CONFIG_CPU_SUBTYPE_SH7366 is not set
146# CONFIG_CPU_SUBTYPE_SH5_101 is not set
147# CONFIG_CPU_SUBTYPE_SH5_103 is not set
168 148
169# 149#
170# Memory management options 150# Memory management options
171# 151#
152CONFIG_QUICKLIST=y
172CONFIG_MMU=y 153CONFIG_MMU=y
173CONFIG_PAGE_OFFSET=0x80000000 154CONFIG_PAGE_OFFSET=0x80000000
174CONFIG_MEMORY_START=0x0c000000 155CONFIG_MEMORY_START=0x0c000000
175CONFIG_MEMORY_SIZE=0x00800000 156CONFIG_MEMORY_SIZE=0x00800000
157CONFIG_29BIT=y
176CONFIG_VSYSCALL=y 158CONFIG_VSYSCALL=y
159CONFIG_ARCH_FLATMEM_ENABLE=y
160CONFIG_ARCH_SPARSEMEM_ENABLE=y
161CONFIG_ARCH_SPARSEMEM_DEFAULT=y
162CONFIG_MAX_ACTIVE_REGIONS=1
163CONFIG_ARCH_POPULATES_NODE_MAP=y
164CONFIG_ARCH_SELECT_MEMORY_MODEL=y
165CONFIG_PAGE_SIZE_4KB=y
166# CONFIG_PAGE_SIZE_8KB is not set
167# CONFIG_PAGE_SIZE_64KB is not set
177CONFIG_SELECT_MEMORY_MODEL=y 168CONFIG_SELECT_MEMORY_MODEL=y
178CONFIG_FLATMEM_MANUAL=y 169CONFIG_FLATMEM_MANUAL=y
179# CONFIG_DISCONTIGMEM_MANUAL is not set 170# CONFIG_DISCONTIGMEM_MANUAL is not set
180# CONFIG_SPARSEMEM_MANUAL is not set 171# CONFIG_SPARSEMEM_MANUAL is not set
181CONFIG_FLATMEM=y 172CONFIG_FLATMEM=y
182CONFIG_FLAT_NODE_MEM_MAP=y 173CONFIG_FLAT_NODE_MEM_MAP=y
183# CONFIG_SPARSEMEM_STATIC is not set 174CONFIG_SPARSEMEM_STATIC=y
175# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
184CONFIG_SPLIT_PTLOCK_CPUS=4 176CONFIG_SPLIT_PTLOCK_CPUS=4
185# CONFIG_RESOURCES_64BIT is not set 177# CONFIG_RESOURCES_64BIT is not set
178CONFIG_ZONE_DMA_FLAG=0
179CONFIG_NR_QUICK=2
186 180
187# 181#
188# Cache configuration 182# Cache configuration
189# 183#
190# CONFIG_SH_DIRECT_MAPPED is not set 184# CONFIG_SH_DIRECT_MAPPED is not set
191# CONFIG_SH_WRITETHROUGH is not set 185CONFIG_CACHE_WRITEBACK=y
192# CONFIG_SH_OCRAM is not set 186# CONFIG_CACHE_WRITETHROUGH is not set
187# CONFIG_CACHE_OFF is not set
193 188
194# 189#
195# Processor features 190# Processor features
196# 191#
197CONFIG_CPU_LITTLE_ENDIAN=y 192CONFIG_CPU_LITTLE_ENDIAN=y
193# CONFIG_CPU_BIG_ENDIAN is not set
198# CONFIG_SH_FPU_EMU is not set 194# CONFIG_SH_FPU_EMU is not set
199CONFIG_SH_DSP=y 195CONFIG_SH_DSP=y
200# CONFIG_SH_ADC is not set 196# CONFIG_SH_ADC is not set
201CONFIG_CPU_HAS_INTEVT=y 197CONFIG_CPU_HAS_INTEVT=y
202CONFIG_CPU_HAS_SR_RB=y 198CONFIG_CPU_HAS_SR_RB=y
199CONFIG_CPU_HAS_DSP=y
203 200
204# 201#
205# Timer support 202# Board support
203#
204# CONFIG_SH_SOLUTION_ENGINE is not set
205
206#
207# Timer and clock configuration
206# 208#
207CONFIG_SH_TMU=y 209CONFIG_SH_TMU=y
210CONFIG_SH_TIMER_IRQ=16
208CONFIG_SH_PCLK_FREQ=32768000 211CONFIG_SH_PCLK_FREQ=32768000
212# CONFIG_TICK_ONESHOT is not set
213# CONFIG_NO_HZ is not set
214# CONFIG_HIGH_RES_TIMERS is not set
215CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
209 216
210# 217#
211# CPU Frequency scaling 218# CPU Frequency scaling
@@ -220,56 +227,51 @@ CONFIG_SH_PCLK_FREQ=32768000
220# 227#
221# Companion Chips 228# Companion Chips
222# 229#
223# CONFIG_HD6446X_SERIES is not set 230
231#
232# Additional SuperH Device Drivers
233#
234# CONFIG_HEARTBEAT is not set
235# CONFIG_PUSH_SWITCH is not set
224 236
225# 237#
226# Kernel features 238# Kernel features
227# 239#
228# CONFIG_HZ_100 is not set 240# CONFIG_HZ_100 is not set
229CONFIG_HZ_250=y 241CONFIG_HZ_250=y
242# CONFIG_HZ_300 is not set
230# CONFIG_HZ_1000 is not set 243# CONFIG_HZ_1000 is not set
231CONFIG_HZ=250 244CONFIG_HZ=250
245# CONFIG_SCHED_HRTICK is not set
232# CONFIG_KEXEC is not set 246# CONFIG_KEXEC is not set
233# CONFIG_SMP is not set 247# CONFIG_CRASH_DUMP is not set
234CONFIG_PREEMPT_NONE=y 248CONFIG_PREEMPT_NONE=y
235# CONFIG_PREEMPT_VOLUNTARY is not set 249# CONFIG_PREEMPT_VOLUNTARY is not set
236# CONFIG_PREEMPT is not set 250# CONFIG_PREEMPT is not set
251CONFIG_RCU_TRACE=y
252CONFIG_GUSA=y
253# CONFIG_GUSA_RB is not set
237 254
238# 255#
239# Boot options 256# Boot options
240# 257#
241CONFIG_ZERO_PAGE_OFFSET=0x00001000 258CONFIG_ZERO_PAGE_OFFSET=0x00001000
242CONFIG_BOOT_LINK_OFFSET=0x00800000 259CONFIG_BOOT_LINK_OFFSET=0x00800000
243# CONFIG_UBC_WAKEUP is not set
244# CONFIG_CMDLINE_BOOL is not set 260# CONFIG_CMDLINE_BOOL is not set
245 261
246# 262#
247# Bus options 263# Bus options
248# 264#
249# CONFIG_PCI is not set 265# CONFIG_ARCH_SUPPORTS_MSI is not set
250
251#
252# PCCARD (PCMCIA/CardBus) support
253#
254# CONFIG_PCCARD is not set 266# CONFIG_PCCARD is not set
255 267
256# 268#
257# PCI Hotplug Support
258#
259
260#
261# Executable file formats 269# Executable file formats
262# 270#
263CONFIG_BINFMT_ELF=y 271CONFIG_BINFMT_ELF=y
264# CONFIG_BINFMT_FLAT is not set
265# CONFIG_BINFMT_MISC is not set 272# CONFIG_BINFMT_MISC is not set
266 273
267# 274#
268# Power management options (EXPERIMENTAL)
269#
270# CONFIG_PM is not set
271
272#
273# Networking 275# Networking
274# 276#
275CONFIG_NET=y 277CONFIG_NET=y
@@ -277,13 +279,14 @@ CONFIG_NET=y
277# 279#
278# Networking options 280# Networking options
279# 281#
280# CONFIG_NETDEBUG is not set
281CONFIG_PACKET=y 282CONFIG_PACKET=y
282# CONFIG_PACKET_MMAP is not set 283# CONFIG_PACKET_MMAP is not set
283CONFIG_UNIX=y 284CONFIG_UNIX=y
284CONFIG_XFRM=y 285CONFIG_XFRM=y
285# CONFIG_XFRM_USER is not set 286# CONFIG_XFRM_USER is not set
286# CONFIG_XFRM_SUB_POLICY is not set 287# CONFIG_XFRM_SUB_POLICY is not set
288# CONFIG_XFRM_MIGRATE is not set
289# CONFIG_XFRM_STATISTICS is not set
287# CONFIG_NET_KEY is not set 290# CONFIG_NET_KEY is not set
288CONFIG_INET=y 291CONFIG_INET=y
289# CONFIG_IP_MULTICAST is not set 292# CONFIG_IP_MULTICAST is not set
@@ -301,14 +304,13 @@ CONFIG_SYN_COOKIES=y
301# CONFIG_INET_TUNNEL is not set 304# CONFIG_INET_TUNNEL is not set
302CONFIG_INET_XFRM_MODE_TRANSPORT=y 305CONFIG_INET_XFRM_MODE_TRANSPORT=y
303CONFIG_INET_XFRM_MODE_TUNNEL=y 306CONFIG_INET_XFRM_MODE_TUNNEL=y
307CONFIG_INET_XFRM_MODE_BEET=y
308# CONFIG_INET_LRO is not set
304# CONFIG_INET_DIAG is not set 309# CONFIG_INET_DIAG is not set
305# CONFIG_TCP_CONG_ADVANCED is not set 310# CONFIG_TCP_CONG_ADVANCED is not set
306CONFIG_TCP_CONG_CUBIC=y 311CONFIG_TCP_CONG_CUBIC=y
307CONFIG_DEFAULT_TCP_CONG="cubic" 312CONFIG_DEFAULT_TCP_CONG="cubic"
308 313# CONFIG_TCP_MD5SIG is not set
309#
310# IP: Virtual Server Configuration
311#
312# CONFIG_IP_VS is not set 314# CONFIG_IP_VS is not set
313# CONFIG_IPV6 is not set 315# CONFIG_IPV6 is not set
314# CONFIG_INET6_XFRM_TUNNEL is not set 316# CONFIG_INET6_XFRM_TUNNEL is not set
@@ -316,44 +318,24 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
316# CONFIG_NETWORK_SECMARK is not set 318# CONFIG_NETWORK_SECMARK is not set
317CONFIG_NETFILTER=y 319CONFIG_NETFILTER=y
318# CONFIG_NETFILTER_DEBUG is not set 320# CONFIG_NETFILTER_DEBUG is not set
321CONFIG_NETFILTER_ADVANCED=y
319 322
320# 323#
321# Core Netfilter Configuration 324# Core Netfilter Configuration
322# 325#
323# CONFIG_NETFILTER_NETLINK is not set 326# CONFIG_NETFILTER_NETLINK_QUEUE is not set
327# CONFIG_NETFILTER_NETLINK_LOG is not set
328# CONFIG_NF_CONNTRACK is not set
324# CONFIG_NETFILTER_XTABLES is not set 329# CONFIG_NETFILTER_XTABLES is not set
325 330
326# 331#
327# IP: Netfilter Configuration 332# IP: Netfilter Configuration
328# 333#
329CONFIG_IP_NF_CONNTRACK=y
330# CONFIG_IP_NF_CT_ACCT is not set
331# CONFIG_IP_NF_CONNTRACK_MARK is not set
332# CONFIG_IP_NF_CONNTRACK_EVENTS is not set
333# CONFIG_IP_NF_CT_PROTO_SCTP is not set
334CONFIG_IP_NF_FTP=m
335# CONFIG_IP_NF_IRC is not set
336# CONFIG_IP_NF_NETBIOS_NS is not set
337# CONFIG_IP_NF_TFTP is not set
338# CONFIG_IP_NF_AMANDA is not set
339CONFIG_IP_NF_PPTP=m
340# CONFIG_IP_NF_H323 is not set
341# CONFIG_IP_NF_SIP is not set
342# CONFIG_IP_NF_QUEUE is not set 334# CONFIG_IP_NF_QUEUE is not set
343 335# CONFIG_IP_NF_IPTABLES is not set
344# 336# CONFIG_IP_NF_ARPTABLES is not set
345# DCCP Configuration (EXPERIMENTAL)
346#
347# CONFIG_IP_DCCP is not set 337# CONFIG_IP_DCCP is not set
348
349#
350# SCTP Configuration (EXPERIMENTAL)
351#
352# CONFIG_IP_SCTP is not set 338# CONFIG_IP_SCTP is not set
353
354#
355# TIPC Configuration (EXPERIMENTAL)
356#
357# CONFIG_TIPC is not set 339# CONFIG_TIPC is not set
358# CONFIG_ATM is not set 340# CONFIG_ATM is not set
359# CONFIG_BRIDGE is not set 341# CONFIG_BRIDGE is not set
@@ -366,14 +348,7 @@ CONFIG_IP_NF_PPTP=m
366# CONFIG_LAPB is not set 348# CONFIG_LAPB is not set
367# CONFIG_ECONET is not set 349# CONFIG_ECONET is not set
368# CONFIG_WAN_ROUTER is not set 350# CONFIG_WAN_ROUTER is not set
369
370#
371# QoS and/or fair queueing
372#
373CONFIG_NET_SCHED=y 351CONFIG_NET_SCHED=y
374CONFIG_NET_SCH_CLK_JIFFIES=y
375# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
376# CONFIG_NET_SCH_CLK_CPU is not set
377 352
378# 353#
379# Queueing/Scheduling 354# Queueing/Scheduling
@@ -382,6 +357,7 @@ CONFIG_NET_SCH_CBQ=y
382# CONFIG_NET_SCH_HTB is not set 357# CONFIG_NET_SCH_HTB is not set
383# CONFIG_NET_SCH_HFSC is not set 358# CONFIG_NET_SCH_HFSC is not set
384# CONFIG_NET_SCH_PRIO is not set 359# CONFIG_NET_SCH_PRIO is not set
360# CONFIG_NET_SCH_RR is not set
385# CONFIG_NET_SCH_RED is not set 361# CONFIG_NET_SCH_RED is not set
386# CONFIG_NET_SCH_SFQ is not set 362# CONFIG_NET_SCH_SFQ is not set
387# CONFIG_NET_SCH_TEQL is not set 363# CONFIG_NET_SCH_TEQL is not set
@@ -389,7 +365,6 @@ CONFIG_NET_SCH_CBQ=y
389# CONFIG_NET_SCH_GRED is not set 365# CONFIG_NET_SCH_GRED is not set
390# CONFIG_NET_SCH_DSMARK is not set 366# CONFIG_NET_SCH_DSMARK is not set
391# CONFIG_NET_SCH_NETEM is not set 367# CONFIG_NET_SCH_NETEM is not set
392CONFIG_NET_SCH_INGRESS=y
393 368
394# 369#
395# Classification 370# Classification
@@ -405,20 +380,31 @@ CONFIG_NET_CLS_U32=y
405# CONFIG_CLS_U32_MARK is not set 380# CONFIG_CLS_U32_MARK is not set
406# CONFIG_NET_CLS_RSVP is not set 381# CONFIG_NET_CLS_RSVP is not set
407# CONFIG_NET_CLS_RSVP6 is not set 382# CONFIG_NET_CLS_RSVP6 is not set
383# CONFIG_NET_CLS_FLOW is not set
408# CONFIG_NET_EMATCH is not set 384# CONFIG_NET_EMATCH is not set
409# CONFIG_NET_CLS_ACT is not set 385# CONFIG_NET_CLS_ACT is not set
410CONFIG_NET_CLS_POLICE=y
411# CONFIG_NET_CLS_IND is not set 386# CONFIG_NET_CLS_IND is not set
412CONFIG_NET_ESTIMATOR=y 387CONFIG_NET_SCH_FIFO=y
413 388
414# 389#
415# Network testing 390# Network testing
416# 391#
417# CONFIG_NET_PKTGEN is not set 392# CONFIG_NET_PKTGEN is not set
418# CONFIG_HAMRADIO is not set 393# CONFIG_HAMRADIO is not set
394# CONFIG_CAN is not set
419# CONFIG_IRDA is not set 395# CONFIG_IRDA is not set
420# CONFIG_BT is not set 396# CONFIG_BT is not set
397# CONFIG_AF_RXRPC is not set
398
399#
400# Wireless
401#
402# CONFIG_CFG80211 is not set
403# CONFIG_WIRELESS_EXT is not set
404# CONFIG_MAC80211 is not set
421# CONFIG_IEEE80211 is not set 405# CONFIG_IEEE80211 is not set
406# CONFIG_RFKILL is not set
407# CONFIG_NET_9P is not set
422 408
423# 409#
424# Device Drivers 410# Device Drivers
@@ -427,19 +413,12 @@ CONFIG_NET_ESTIMATOR=y
427# 413#
428# Generic Driver Options 414# Generic Driver Options
429# 415#
416CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
430CONFIG_STANDALONE=y 417CONFIG_STANDALONE=y
431CONFIG_PREVENT_FIRMWARE_BUILD=y 418CONFIG_PREVENT_FIRMWARE_BUILD=y
432CONFIG_FW_LOADER=y 419CONFIG_FW_LOADER=y
433# CONFIG_SYS_HYPERVISOR is not set 420# CONFIG_SYS_HYPERVISOR is not set
434
435#
436# Connector - unified userspace <-> kernelspace linker
437#
438# CONFIG_CONNECTOR is not set 421# CONFIG_CONNECTOR is not set
439
440#
441# Memory Technology Devices (MTD)
442#
443CONFIG_MTD=y 422CONFIG_MTD=y
444# CONFIG_MTD_DEBUG is not set 423# CONFIG_MTD_DEBUG is not set
445# CONFIG_MTD_CONCAT is not set 424# CONFIG_MTD_CONCAT is not set
@@ -451,12 +430,14 @@ CONFIG_MTD_PARTITIONS=y
451# User Modules And Translation Layers 430# User Modules And Translation Layers
452# 431#
453CONFIG_MTD_CHAR=y 432CONFIG_MTD_CHAR=y
433CONFIG_MTD_BLKDEVS=y
454CONFIG_MTD_BLOCK=y 434CONFIG_MTD_BLOCK=y
455# CONFIG_FTL is not set 435# CONFIG_FTL is not set
456# CONFIG_NFTL is not set 436# CONFIG_NFTL is not set
457# CONFIG_INFTL is not set 437# CONFIG_INFTL is not set
458# CONFIG_RFD_FTL is not set 438# CONFIG_RFD_FTL is not set
459# CONFIG_SSFDC is not set 439# CONFIG_SSFDC is not set
440# CONFIG_MTD_OOPS is not set
460 441
461# 442#
462# RAM/ROM/Flash chip drivers 443# RAM/ROM/Flash chip drivers
@@ -482,7 +463,6 @@ CONFIG_MTD_CFI_UTIL=y
482CONFIG_MTD_RAM=y 463CONFIG_MTD_RAM=y
483# CONFIG_MTD_ROM is not set 464# CONFIG_MTD_ROM is not set
484# CONFIG_MTD_ABSENT is not set 465# CONFIG_MTD_ABSENT is not set
485# CONFIG_MTD_OBSOLETE_CHIPS is not set
486 466
487# 467#
488# Mapping drivers for chip access 468# Mapping drivers for chip access
@@ -505,40 +485,25 @@ CONFIG_MTD_RAM=y
505# CONFIG_MTD_DOC2000 is not set 485# CONFIG_MTD_DOC2000 is not set
506# CONFIG_MTD_DOC2001 is not set 486# CONFIG_MTD_DOC2001 is not set
507# CONFIG_MTD_DOC2001PLUS is not set 487# CONFIG_MTD_DOC2001PLUS is not set
508
509#
510# NAND Flash Device Drivers
511#
512# CONFIG_MTD_NAND is not set 488# CONFIG_MTD_NAND is not set
513
514#
515# OneNAND Flash Device Drivers
516#
517# CONFIG_MTD_ONENAND is not set 489# CONFIG_MTD_ONENAND is not set
518 490
519# 491#
520# Parallel port support 492# UBI - Unsorted block images
521# 493#
494# CONFIG_MTD_UBI is not set
522# CONFIG_PARPORT is not set 495# CONFIG_PARPORT is not set
523 496CONFIG_BLK_DEV=y
524#
525# Plug and Play support
526#
527
528#
529# Block devices
530#
531# CONFIG_BLK_DEV_COW_COMMON is not set 497# CONFIG_BLK_DEV_COW_COMMON is not set
532# CONFIG_BLK_DEV_LOOP is not set 498# CONFIG_BLK_DEV_LOOP is not set
533# CONFIG_BLK_DEV_NBD is not set 499# CONFIG_BLK_DEV_NBD is not set
534# CONFIG_BLK_DEV_RAM is not set 500# CONFIG_BLK_DEV_RAM is not set
535# CONFIG_BLK_DEV_INITRD is not set
536# CONFIG_CDROM_PKTCDVD is not set 501# CONFIG_CDROM_PKTCDVD is not set
537# CONFIG_ATA_OVER_ETH is not set 502# CONFIG_ATA_OVER_ETH is not set
538 503CONFIG_MISC_DEVICES=y
539# 504# CONFIG_EEPROM_93CX6 is not set
540# ATA/ATAPI/MFM/RLL support 505# CONFIG_ENCLOSURE_SERVICES is not set
541# 506CONFIG_HAVE_IDE=y
542# CONFIG_IDE is not set 507# CONFIG_IDE is not set
543 508
544# 509#
@@ -546,104 +511,59 @@ CONFIG_MTD_RAM=y
546# 511#
547# CONFIG_RAID_ATTRS is not set 512# CONFIG_RAID_ATTRS is not set
548# CONFIG_SCSI is not set 513# CONFIG_SCSI is not set
514# CONFIG_SCSI_DMA is not set
549# CONFIG_SCSI_NETLINK is not set 515# CONFIG_SCSI_NETLINK is not set
550
551#
552# Serial ATA (prod) and Parallel ATA (experimental) drivers
553#
554# CONFIG_ATA is not set 516# CONFIG_ATA is not set
555
556#
557# Multi-device support (RAID and LVM)
558#
559# CONFIG_MD is not set 517# CONFIG_MD is not set
560
561#
562# Fusion MPT device support
563#
564# CONFIG_FUSION is not set
565
566#
567# IEEE 1394 (FireWire) support
568#
569
570#
571# I2O device support
572#
573
574#
575# Network device support
576#
577CONFIG_NETDEVICES=y 518CONFIG_NETDEVICES=y
519# CONFIG_NETDEVICES_MULTIQUEUE is not set
578# CONFIG_DUMMY is not set 520# CONFIG_DUMMY is not set
579# CONFIG_BONDING is not set 521# CONFIG_BONDING is not set
522# CONFIG_MACVLAN is not set
580# CONFIG_EQUALIZER is not set 523# CONFIG_EQUALIZER is not set
581# CONFIG_TUN is not set 524# CONFIG_TUN is not set
582 525# CONFIG_VETH is not set
583#
584# PHY device support
585#
586# CONFIG_PHYLIB is not set 526# CONFIG_PHYLIB is not set
587
588#
589# Ethernet (10 or 100Mbit)
590#
591CONFIG_NET_ETHERNET=y 527CONFIG_NET_ETHERNET=y
592# CONFIG_MII is not set 528# CONFIG_MII is not set
529# CONFIG_AX88796 is not set
593# CONFIG_STNIC is not set 530# CONFIG_STNIC is not set
594# CONFIG_SMC91X is not set 531# CONFIG_SMC91X is not set
532# CONFIG_IBM_NEW_EMAC_ZMII is not set
533# CONFIG_IBM_NEW_EMAC_RGMII is not set
534# CONFIG_IBM_NEW_EMAC_TAH is not set
535# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
536# CONFIG_B44 is not set
537CONFIG_NETDEV_1000=y
538# CONFIG_E1000E_ENABLED is not set
539CONFIG_NETDEV_10000=y
595 540
596# 541#
597# Ethernet (1000 Mbit) 542# Wireless LAN
598#
599
600#
601# Ethernet (10000 Mbit)
602#
603
604#
605# Token Ring devices
606#
607
608#
609# Wireless LAN (non-hamradio)
610#
611# CONFIG_NET_RADIO is not set
612
613#
614# Wan interfaces
615# 543#
544# CONFIG_WLAN_PRE80211 is not set
545# CONFIG_WLAN_80211 is not set
616# CONFIG_WAN is not set 546# CONFIG_WAN is not set
617# CONFIG_PPP is not set 547# CONFIG_PPP is not set
618# CONFIG_SLIP is not set 548# CONFIG_SLIP is not set
619# CONFIG_SHAPER is not set
620# CONFIG_NETCONSOLE is not set 549# CONFIG_NETCONSOLE is not set
621# CONFIG_NETPOLL is not set 550# CONFIG_NETPOLL is not set
622# CONFIG_NET_POLL_CONTROLLER is not set 551# CONFIG_NET_POLL_CONTROLLER is not set
623
624#
625# ISDN subsystem
626#
627# CONFIG_ISDN is not set 552# CONFIG_ISDN is not set
628
629#
630# Telephony Support
631#
632CONFIG_PHONE=y 553CONFIG_PHONE=y
633# CONFIG_PHONE_IXJ is not set
634 554
635# 555#
636# Input device support 556# Input device support
637# 557#
638CONFIG_INPUT=y 558CONFIG_INPUT=y
639# CONFIG_INPUT_FF_MEMLESS is not set 559# CONFIG_INPUT_FF_MEMLESS is not set
560# CONFIG_INPUT_POLLDEV is not set
640 561
641# 562#
642# Userland interfaces 563# Userland interfaces
643# 564#
644# CONFIG_INPUT_MOUSEDEV is not set 565# CONFIG_INPUT_MOUSEDEV is not set
645# CONFIG_INPUT_JOYDEV is not set 566# CONFIG_INPUT_JOYDEV is not set
646# CONFIG_INPUT_TSDEV is not set
647# CONFIG_INPUT_EVDEV is not set 567# CONFIG_INPUT_EVDEV is not set
648# CONFIG_INPUT_EVBUG is not set 568# CONFIG_INPUT_EVBUG is not set
649 569
@@ -653,6 +573,7 @@ CONFIG_INPUT=y
653# CONFIG_INPUT_KEYBOARD is not set 573# CONFIG_INPUT_KEYBOARD is not set
654# CONFIG_INPUT_MOUSE is not set 574# CONFIG_INPUT_MOUSE is not set
655# CONFIG_INPUT_JOYSTICK is not set 575# CONFIG_INPUT_JOYSTICK is not set
576# CONFIG_INPUT_TABLET is not set
656# CONFIG_INPUT_TOUCHSCREEN is not set 577# CONFIG_INPUT_TOUCHSCREEN is not set
657# CONFIG_INPUT_MISC is not set 578# CONFIG_INPUT_MISC is not set
658 579
@@ -684,35 +605,11 @@ CONFIG_SERIAL_CORE_CONSOLE=y
684# CONFIG_UNIX98_PTYS is not set 605# CONFIG_UNIX98_PTYS is not set
685CONFIG_LEGACY_PTYS=y 606CONFIG_LEGACY_PTYS=y
686CONFIG_LEGACY_PTY_COUNT=256 607CONFIG_LEGACY_PTY_COUNT=256
687
688#
689# IPMI
690#
691# CONFIG_IPMI_HANDLER is not set 608# CONFIG_IPMI_HANDLER is not set
692
693#
694# Watchdog Cards
695#
696# CONFIG_WATCHDOG is not set
697CONFIG_HW_RANDOM=y 609CONFIG_HW_RANDOM=y
698# CONFIG_GEN_RTC is not set
699# CONFIG_DTLK is not set
700# CONFIG_R3964 is not set 610# CONFIG_R3964 is not set
701
702#
703# Ftape, the floppy tape device driver
704#
705# CONFIG_RAW_DRIVER is not set 611# CONFIG_RAW_DRIVER is not set
706
707#
708# TPM devices
709#
710# CONFIG_TCG_TPM is not set 612# CONFIG_TCG_TPM is not set
711# CONFIG_TELCLOCK is not set
712
713#
714# I2C support
715#
716# CONFIG_I2C is not set 613# CONFIG_I2C is not set
717 614
718# 615#
@@ -720,119 +617,86 @@ CONFIG_HW_RANDOM=y
720# 617#
721# CONFIG_SPI is not set 618# CONFIG_SPI is not set
722# CONFIG_SPI_MASTER is not set 619# CONFIG_SPI_MASTER is not set
620# CONFIG_W1 is not set
621# CONFIG_POWER_SUPPLY is not set
622# CONFIG_HWMON is not set
623CONFIG_THERMAL=y
624# CONFIG_WATCHDOG is not set
723 625
724# 626#
725# Dallas's 1-wire bus 627# Sonics Silicon Backplane
726#
727
728#
729# Hardware Monitoring support
730# 628#
731# CONFIG_HWMON is not set 629CONFIG_SSB_POSSIBLE=y
732# CONFIG_HWMON_VID is not set 630# CONFIG_SSB is not set
733 631
734# 632#
735# Misc devices 633# Multifunction device drivers
736# 634#
635# CONFIG_MFD_SM501 is not set
737 636
738# 637#
739# Multimedia devices 638# Multimedia devices
740# 639#
741# CONFIG_VIDEO_DEV is not set 640# CONFIG_VIDEO_DEV is not set
742CONFIG_VIDEO_V4L2=y 641# CONFIG_DVB_CORE is not set
743 642# CONFIG_DAB is not set
744#
745# Digital Video Broadcasting Devices
746#
747# CONFIG_DVB is not set
748 643
749# 644#
750# Graphics support 645# Graphics support
751# 646#
752CONFIG_FIRMWARE_EDID=y 647# CONFIG_VGASTATE is not set
648# CONFIG_VIDEO_OUTPUT_CONTROL is not set
753# CONFIG_FB is not set 649# CONFIG_FB is not set
754# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 650# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
755 651
756# 652#
757# Sound 653# Display device support
758# 654#
759# CONFIG_SOUND is not set 655# CONFIG_DISPLAY_SUPPORT is not set
760 656
761# 657#
762# USB support 658# Sound
763# 659#
764# CONFIG_USB_ARCH_HAS_HCD is not set 660# CONFIG_SOUND is not set
661CONFIG_HID_SUPPORT=y
662CONFIG_HID=y
663# CONFIG_HID_DEBUG is not set
664# CONFIG_HIDRAW is not set
665CONFIG_USB_SUPPORT=y
666CONFIG_USB_ARCH_HAS_HCD=y
765# CONFIG_USB_ARCH_HAS_OHCI is not set 667# CONFIG_USB_ARCH_HAS_OHCI is not set
766# CONFIG_USB_ARCH_HAS_EHCI is not set 668# CONFIG_USB_ARCH_HAS_EHCI is not set
669# CONFIG_USB is not set
767 670
768# 671#
769# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 672# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
770# 673#
771
772#
773# USB Gadget Support
774#
775# CONFIG_USB_GADGET is not set 674# CONFIG_USB_GADGET is not set
776
777#
778# MMC/SD Card support
779#
780# CONFIG_MMC is not set 675# CONFIG_MMC is not set
781 676# CONFIG_MEMSTICK is not set
782#
783# LED devices
784#
785# CONFIG_NEW_LEDS is not set 677# CONFIG_NEW_LEDS is not set
786
787#
788# LED drivers
789#
790
791#
792# LED Triggers
793#
794
795#
796# InfiniBand support
797#
798
799#
800# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
801#
802
803#
804# Real Time Clock
805#
806# CONFIG_RTC_CLASS is not set 678# CONFIG_RTC_CLASS is not set
807 679
808# 680#
809# DMA Engine support 681# Userspace I/O
810#
811# CONFIG_DMA_ENGINE is not set
812
813#
814# DMA Clients
815#
816
817#
818# DMA Devices
819# 682#
683# CONFIG_UIO is not set
820 684
821# 685#
822# File systems 686# File systems
823# 687#
824# CONFIG_EXT2_FS is not set 688# CONFIG_EXT2_FS is not set
825# CONFIG_EXT3_FS is not set 689# CONFIG_EXT3_FS is not set
690# CONFIG_EXT4DEV_FS is not set
826# CONFIG_REISERFS_FS is not set 691# CONFIG_REISERFS_FS is not set
827# CONFIG_JFS_FS is not set 692# CONFIG_JFS_FS is not set
828# CONFIG_FS_POSIX_ACL is not set 693# CONFIG_FS_POSIX_ACL is not set
829# CONFIG_XFS_FS is not set 694# CONFIG_XFS_FS is not set
695# CONFIG_GFS2_FS is not set
830# CONFIG_OCFS2_FS is not set 696# CONFIG_OCFS2_FS is not set
831# CONFIG_MINIX_FS is not set 697# CONFIG_DNOTIFY is not set
832# CONFIG_ROMFS_FS is not set
833# CONFIG_INOTIFY is not set 698# CONFIG_INOTIFY is not set
834# CONFIG_QUOTA is not set 699# CONFIG_QUOTA is not set
835# CONFIG_DNOTIFY is not set
836# CONFIG_AUTOFS_FS is not set 700# CONFIG_AUTOFS_FS is not set
837# CONFIG_AUTOFS4_FS is not set 701# CONFIG_AUTOFS4_FS is not set
838# CONFIG_FUSE_FS is not set 702# CONFIG_FUSE_FS is not set
@@ -861,7 +725,6 @@ CONFIG_TMPFS=y
861# CONFIG_TMPFS_POSIX_ACL is not set 725# CONFIG_TMPFS_POSIX_ACL is not set
862# CONFIG_HUGETLBFS is not set 726# CONFIG_HUGETLBFS is not set
863# CONFIG_HUGETLB_PAGE is not set 727# CONFIG_HUGETLB_PAGE is not set
864CONFIG_RAMFS=y
865# CONFIG_CONFIGFS_FS is not set 728# CONFIG_CONFIGFS_FS is not set
866 729
867# 730#
@@ -874,26 +737,26 @@ CONFIG_RAMFS=y
874# CONFIG_BEFS_FS is not set 737# CONFIG_BEFS_FS is not set
875# CONFIG_BFS_FS is not set 738# CONFIG_BFS_FS is not set
876# CONFIG_EFS_FS is not set 739# CONFIG_EFS_FS is not set
877# CONFIG_JFFS_FS is not set
878CONFIG_JFFS2_FS=y 740CONFIG_JFFS2_FS=y
879CONFIG_JFFS2_FS_DEBUG=0 741CONFIG_JFFS2_FS_DEBUG=0
880CONFIG_JFFS2_FS_WRITEBUFFER=y 742CONFIG_JFFS2_FS_WRITEBUFFER=y
743# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
881# CONFIG_JFFS2_SUMMARY is not set 744# CONFIG_JFFS2_SUMMARY is not set
882# CONFIG_JFFS2_FS_XATTR is not set 745# CONFIG_JFFS2_FS_XATTR is not set
883# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set 746# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
884CONFIG_JFFS2_ZLIB=y 747CONFIG_JFFS2_ZLIB=y
748# CONFIG_JFFS2_LZO is not set
885CONFIG_JFFS2_RTIME=y 749CONFIG_JFFS2_RTIME=y
886# CONFIG_JFFS2_RUBIN is not set 750# CONFIG_JFFS2_RUBIN is not set
887# CONFIG_CRAMFS is not set 751# CONFIG_CRAMFS is not set
888# CONFIG_VXFS_FS is not set 752# CONFIG_VXFS_FS is not set
753# CONFIG_MINIX_FS is not set
889# CONFIG_HPFS_FS is not set 754# CONFIG_HPFS_FS is not set
890# CONFIG_QNX4FS_FS is not set 755# CONFIG_QNX4FS_FS is not set
756# CONFIG_ROMFS_FS is not set
891# CONFIG_SYSV_FS is not set 757# CONFIG_SYSV_FS is not set
892# CONFIG_UFS_FS is not set 758# CONFIG_UFS_FS is not set
893 759CONFIG_NETWORK_FILESYSTEMS=y
894#
895# Network File Systems
896#
897# CONFIG_NFS_FS is not set 760# CONFIG_NFS_FS is not set
898# CONFIG_NFSD is not set 761# CONFIG_NFSD is not set
899# CONFIG_SMB_FS is not set 762# CONFIG_SMB_FS is not set
@@ -901,55 +764,97 @@ CONFIG_JFFS2_RTIME=y
901# CONFIG_NCP_FS is not set 764# CONFIG_NCP_FS is not set
902# CONFIG_CODA_FS is not set 765# CONFIG_CODA_FS is not set
903# CONFIG_AFS_FS is not set 766# CONFIG_AFS_FS is not set
904# CONFIG_9P_FS is not set
905 767
906# 768#
907# Partition Types 769# Partition Types
908# 770#
909# CONFIG_PARTITION_ADVANCED is not set 771# CONFIG_PARTITION_ADVANCED is not set
910CONFIG_MSDOS_PARTITION=y 772CONFIG_MSDOS_PARTITION=y
911
912#
913# Native Language Support
914#
915# CONFIG_NLS is not set 773# CONFIG_NLS is not set
916 774# CONFIG_DLM is not set
917#
918# Profiling support
919#
920# CONFIG_PROFILING is not set
921 775
922# 776#
923# Kernel hacking 777# Kernel hacking
924# 778#
779CONFIG_TRACE_IRQFLAGS_SUPPORT=y
925# CONFIG_PRINTK_TIME is not set 780# CONFIG_PRINTK_TIME is not set
781CONFIG_ENABLE_WARN_DEPRECATED=y
926CONFIG_ENABLE_MUST_CHECK=y 782CONFIG_ENABLE_MUST_CHECK=y
927# CONFIG_MAGIC_SYSRQ is not set 783# CONFIG_MAGIC_SYSRQ is not set
928# CONFIG_UNUSED_SYMBOLS is not set 784# CONFIG_UNUSED_SYMBOLS is not set
785CONFIG_DEBUG_FS=y
786# CONFIG_HEADERS_CHECK is not set
929# CONFIG_DEBUG_KERNEL is not set 787# CONFIG_DEBUG_KERNEL is not set
930CONFIG_LOG_BUF_SHIFT=14
931# CONFIG_DEBUG_BUGVERBOSE is not set 788# CONFIG_DEBUG_BUGVERBOSE is not set
932# CONFIG_DEBUG_FS is not set 789# CONFIG_SAMPLES is not set
933# CONFIG_SH_STANDARD_BIOS is not set 790# CONFIG_SH_STANDARD_BIOS is not set
934# CONFIG_KGDB is not set 791# CONFIG_EARLY_SCIF_CONSOLE is not set
792# CONFIG_SH_KGDB is not set
935 793
936# 794#
937# Security options 795# Security options
938# 796#
939# CONFIG_KEYS is not set 797# CONFIG_KEYS is not set
940# CONFIG_SECURITY is not set 798# CONFIG_SECURITY is not set
941 799# CONFIG_SECURITY_FILE_CAPABILITIES is not set
942# 800CONFIG_CRYPTO=y
943# Cryptographic options 801# CONFIG_CRYPTO_SEQIV is not set
944# 802# CONFIG_CRYPTO_MANAGER is not set
945# CONFIG_CRYPTO is not set 803# CONFIG_CRYPTO_HMAC is not set
804# CONFIG_CRYPTO_XCBC is not set
805# CONFIG_CRYPTO_NULL is not set
806# CONFIG_CRYPTO_MD4 is not set
807# CONFIG_CRYPTO_MD5 is not set
808# CONFIG_CRYPTO_SHA1 is not set
809# CONFIG_CRYPTO_SHA256 is not set
810# CONFIG_CRYPTO_SHA512 is not set
811# CONFIG_CRYPTO_WP512 is not set
812# CONFIG_CRYPTO_TGR192 is not set
813# CONFIG_CRYPTO_GF128MUL is not set
814# CONFIG_CRYPTO_ECB is not set
815# CONFIG_CRYPTO_CBC is not set
816# CONFIG_CRYPTO_PCBC is not set
817# CONFIG_CRYPTO_LRW is not set
818# CONFIG_CRYPTO_XTS is not set
819# CONFIG_CRYPTO_CTR is not set
820# CONFIG_CRYPTO_GCM is not set
821# CONFIG_CRYPTO_CCM is not set
822# CONFIG_CRYPTO_CRYPTD is not set
823# CONFIG_CRYPTO_DES is not set
824# CONFIG_CRYPTO_FCRYPT is not set
825# CONFIG_CRYPTO_BLOWFISH is not set
826# CONFIG_CRYPTO_TWOFISH is not set
827# CONFIG_CRYPTO_SERPENT is not set
828# CONFIG_CRYPTO_AES is not set
829# CONFIG_CRYPTO_CAST5 is not set
830# CONFIG_CRYPTO_CAST6 is not set
831# CONFIG_CRYPTO_TEA is not set
832# CONFIG_CRYPTO_ARC4 is not set
833# CONFIG_CRYPTO_KHAZAD is not set
834# CONFIG_CRYPTO_ANUBIS is not set
835# CONFIG_CRYPTO_SEED is not set
836# CONFIG_CRYPTO_SALSA20 is not set
837# CONFIG_CRYPTO_DEFLATE is not set
838# CONFIG_CRYPTO_MICHAEL_MIC is not set
839# CONFIG_CRYPTO_CRC32C is not set
840# CONFIG_CRYPTO_CAMELLIA is not set
841# CONFIG_CRYPTO_TEST is not set
842# CONFIG_CRYPTO_AUTHENC is not set
843# CONFIG_CRYPTO_LZO is not set
844CONFIG_CRYPTO_HW=y
946 845
947# 846#
948# Library routines 847# Library routines
949# 848#
849CONFIG_BITREVERSE=y
950# CONFIG_CRC_CCITT is not set 850# CONFIG_CRC_CCITT is not set
951# CONFIG_CRC16 is not set 851# CONFIG_CRC16 is not set
852# CONFIG_CRC_ITU_T is not set
952CONFIG_CRC32=y 853CONFIG_CRC32=y
854# CONFIG_CRC7 is not set
953# CONFIG_LIBCRC32C is not set 855# CONFIG_LIBCRC32C is not set
954CONFIG_ZLIB_INFLATE=y 856CONFIG_ZLIB_INFLATE=y
955CONFIG_ZLIB_DEFLATE=y 857CONFIG_ZLIB_DEFLATE=y
858CONFIG_HAS_IOMEM=y
859CONFIG_HAS_IOPORT=y
860CONFIG_HAS_DMA=y
diff --git a/arch/sh/drivers/dma/dma-sh.c b/arch/sh/drivers/dma/dma-sh.c
index 5c3359756a92..71ff3d6f26e2 100644
--- a/arch/sh/drivers/dma/dma-sh.c
+++ b/arch/sh/drivers/dma/dma-sh.c
@@ -90,7 +90,7 @@ static irqreturn_t dma_tei(int irq, void *dev_id)
90 90
91static int sh_dmac_request_dma(struct dma_channel *chan) 91static int sh_dmac_request_dma(struct dma_channel *chan)
92{ 92{
93 if (unlikely(!chan->flags & DMA_TEI_CAPABLE)) 93 if (unlikely(!(chan->flags & DMA_TEI_CAPABLE)))
94 return 0; 94 return 0;
95 95
96 return request_irq(get_dmte_irq(chan->chan), dma_tei, 96 return request_irq(get_dmte_irq(chan->chan), dma_tei,
diff --git a/arch/sh/drivers/heartbeat.c b/arch/sh/drivers/heartbeat.c
index b76a14f12ce2..ab77b0e0fa0e 100644
--- a/arch/sh/drivers/heartbeat.c
+++ b/arch/sh/drivers/heartbeat.c
@@ -93,7 +93,7 @@ static int heartbeat_drv_probe(struct platform_device *pdev)
93 } 93 }
94 94
95 hd->base = ioremap_nocache(res->start, res->end - res->start + 1); 95 hd->base = ioremap_nocache(res->start, res->end - res->start + 1);
96 if (!unlikely(hd->base)) { 96 if (unlikely(!hd->base)) {
97 dev_err(&pdev->dev, "ioremap failed\n"); 97 dev_err(&pdev->dev, "ioremap failed\n");
98 98
99 if (!pdev->dev.platform_data) 99 if (!pdev->dev.platform_data)
diff --git a/arch/sh/drivers/pci/ops-dreamcast.c b/arch/sh/drivers/pci/ops-dreamcast.c
index 0dac87b19624..e1284fc69361 100644
--- a/arch/sh/drivers/pci/ops-dreamcast.c
+++ b/arch/sh/drivers/pci/ops-dreamcast.c
@@ -83,9 +83,9 @@ static int gapspci_read(struct pci_bus *bus, unsigned int devfn, int where, int
83 return PCIBIOS_DEVICE_NOT_FOUND; 83 return PCIBIOS_DEVICE_NOT_FOUND;
84 84
85 switch (size) { 85 switch (size) {
86 case 1: *val = ctrl_inb(GAPSPCI_BBA_CONFIG+where); break; 86 case 1: *val = inb(GAPSPCI_BBA_CONFIG+where); break;
87 case 2: *val = ctrl_inw(GAPSPCI_BBA_CONFIG+where); break; 87 case 2: *val = inw(GAPSPCI_BBA_CONFIG+where); break;
88 case 4: *val = ctrl_inl(GAPSPCI_BBA_CONFIG+where); break; 88 case 4: *val = inl(GAPSPCI_BBA_CONFIG+where); break;
89 } 89 }
90 90
91 return PCIBIOS_SUCCESSFUL; 91 return PCIBIOS_SUCCESSFUL;
@@ -97,9 +97,9 @@ static int gapspci_write(struct pci_bus *bus, unsigned int devfn, int where, int
97 return PCIBIOS_DEVICE_NOT_FOUND; 97 return PCIBIOS_DEVICE_NOT_FOUND;
98 98
99 switch (size) { 99 switch (size) {
100 case 1: ctrl_outb(( u8)val, GAPSPCI_BBA_CONFIG+where); break; 100 case 1: outb(( u8)val, GAPSPCI_BBA_CONFIG+where); break;
101 case 2: ctrl_outw((u16)val, GAPSPCI_BBA_CONFIG+where); break; 101 case 2: outw((u16)val, GAPSPCI_BBA_CONFIG+where); break;
102 case 4: ctrl_outl((u32)val, GAPSPCI_BBA_CONFIG+where); break; 102 case 4: outl((u32)val, GAPSPCI_BBA_CONFIG+where); break;
103 } 103 }
104 104
105 return PCIBIOS_SUCCESSFUL; 105 return PCIBIOS_SUCCESSFUL;
@@ -127,36 +127,36 @@ int __init gapspci_init(void)
127 */ 127 */
128 128
129 for (i=0; i<16; i++) 129 for (i=0; i<16; i++)
130 idbuf[i] = ctrl_inb(GAPSPCI_REGS+i); 130 idbuf[i] = inb(GAPSPCI_REGS+i);
131 131
132 if (strncmp(idbuf, "GAPSPCI_BRIDGE_2", 16)) 132 if (strncmp(idbuf, "GAPSPCI_BRIDGE_2", 16))
133 return -ENODEV; 133 return -ENODEV;
134 134
135 ctrl_outl(0x5a14a501, GAPSPCI_REGS+0x18); 135 outl(0x5a14a501, GAPSPCI_REGS+0x18);
136 136
137 for (i=0; i<1000000; i++) 137 for (i=0; i<1000000; i++)
138 ; 138 ;
139 139
140 if (ctrl_inl(GAPSPCI_REGS+0x18) != 1) 140 if (inl(GAPSPCI_REGS+0x18) != 1)
141 return -EINVAL; 141 return -EINVAL;
142 142
143 ctrl_outl(0x01000000, GAPSPCI_REGS+0x20); 143 outl(0x01000000, GAPSPCI_REGS+0x20);
144 ctrl_outl(0x01000000, GAPSPCI_REGS+0x24); 144 outl(0x01000000, GAPSPCI_REGS+0x24);
145 145
146 ctrl_outl(GAPSPCI_DMA_BASE, GAPSPCI_REGS+0x28); 146 outl(GAPSPCI_DMA_BASE, GAPSPCI_REGS+0x28);
147 ctrl_outl(GAPSPCI_DMA_BASE+GAPSPCI_DMA_SIZE, GAPSPCI_REGS+0x2c); 147 outl(GAPSPCI_DMA_BASE+GAPSPCI_DMA_SIZE, GAPSPCI_REGS+0x2c);
148 148
149 ctrl_outl(1, GAPSPCI_REGS+0x14); 149 outl(1, GAPSPCI_REGS+0x14);
150 ctrl_outl(1, GAPSPCI_REGS+0x34); 150 outl(1, GAPSPCI_REGS+0x34);
151 151
152 /* Setting Broadband Adapter */ 152 /* Setting Broadband Adapter */
153 ctrl_outw(0xf900, GAPSPCI_BBA_CONFIG+0x06); 153 outw(0xf900, GAPSPCI_BBA_CONFIG+0x06);
154 ctrl_outl(0x00000000, GAPSPCI_BBA_CONFIG+0x30); 154 outl(0x00000000, GAPSPCI_BBA_CONFIG+0x30);
155 ctrl_outb(0x00, GAPSPCI_BBA_CONFIG+0x3c); 155 outb(0x00, GAPSPCI_BBA_CONFIG+0x3c);
156 ctrl_outb(0xf0, GAPSPCI_BBA_CONFIG+0x0d); 156 outb(0xf0, GAPSPCI_BBA_CONFIG+0x0d);
157 ctrl_outw(0x0006, GAPSPCI_BBA_CONFIG+0x04); 157 outw(0x0006, GAPSPCI_BBA_CONFIG+0x04);
158 ctrl_outl(0x00002001, GAPSPCI_BBA_CONFIG+0x10); 158 outl(0x00002001, GAPSPCI_BBA_CONFIG+0x10);
159 ctrl_outl(0x01000000, GAPSPCI_BBA_CONFIG+0x14); 159 outl(0x01000000, GAPSPCI_BBA_CONFIG+0x14);
160 160
161 return 0; 161 return 0;
162} 162}
diff --git a/arch/sh/kernel/cpu/init.c b/arch/sh/kernel/cpu/init.c
index 80a31329ead9..75fb03d35670 100644
--- a/arch/sh/kernel/cpu/init.c
+++ b/arch/sh/kernel/cpu/init.c
@@ -233,7 +233,7 @@ static void __init dsp_init(void)
233 * and cache configuration in detect_cpu_and_cache_system(). 233 * and cache configuration in detect_cpu_and_cache_system().
234 */ 234 */
235 235
236asmlinkage void __cpuinit sh_cpu_init(void) 236asmlinkage void __init sh_cpu_init(void)
237{ 237{
238 current_thread_info()->cpu = hard_smp_processor_id(); 238 current_thread_info()->cpu = hard_smp_processor_id();
239 239
diff --git a/arch/sh/kernel/cpu/sh2/setup-sh7619.c b/arch/sh/kernel/cpu/sh2/setup-sh7619.c
index b230eb278cef..cc530f4d84d6 100644
--- a/arch/sh/kernel/cpu/sh2/setup-sh7619.c
+++ b/arch/sh/kernel/cpu/sh2/setup-sh7619.c
@@ -10,7 +10,7 @@
10#include <linux/platform_device.h> 10#include <linux/platform_device.h>
11#include <linux/init.h> 11#include <linux/init.h>
12#include <linux/serial.h> 12#include <linux/serial.h>
13#include <asm/sci.h> 13#include <linux/serial_sci.h>
14 14
15enum { 15enum {
16 UNUSED = 0, 16 UNUSED = 0,
diff --git a/arch/sh/kernel/cpu/sh2a/clock-sh7203.c b/arch/sh/kernel/cpu/sh2a/clock-sh7203.c
index 3feb95a4fcbc..fb781329848a 100644
--- a/arch/sh/kernel/cpu/sh2a/clock-sh7203.c
+++ b/arch/sh/kernel/cpu/sh2a/clock-sh7203.c
@@ -21,8 +21,8 @@
21#include <asm/freq.h> 21#include <asm/freq.h>
22#include <asm/io.h> 22#include <asm/io.h>
23 23
24const static int pll1rate[]={8,12,16,0}; 24static const int pll1rate[]={8,12,16,0};
25const static int pfc_divisors[]={1,2,3,4,6,8,12}; 25static const int pfc_divisors[]={1,2,3,4,6,8,12};
26#define ifc_divisors pfc_divisors 26#define ifc_divisors pfc_divisors
27 27
28#if (CONFIG_SH_CLK_MD == 0) 28#if (CONFIG_SH_CLK_MD == 0)
diff --git a/arch/sh/kernel/cpu/sh2a/setup-sh7203.c b/arch/sh/kernel/cpu/sh2a/setup-sh7203.c
index db6ef5cecde1..e98dc4450352 100644
--- a/arch/sh/kernel/cpu/sh2a/setup-sh7203.c
+++ b/arch/sh/kernel/cpu/sh2a/setup-sh7203.c
@@ -10,7 +10,7 @@
10#include <linux/platform_device.h> 10#include <linux/platform_device.h>
11#include <linux/init.h> 11#include <linux/init.h>
12#include <linux/serial.h> 12#include <linux/serial.h>
13#include <asm/sci.h> 13#include <linux/serial_sci.h>
14 14
15enum { 15enum {
16 UNUSED = 0, 16 UNUSED = 0,
diff --git a/arch/sh/kernel/cpu/sh2a/setup-sh7206.c b/arch/sh/kernel/cpu/sh2a/setup-sh7206.c
index a564425b905f..e6d4ec445dd8 100644
--- a/arch/sh/kernel/cpu/sh2a/setup-sh7206.c
+++ b/arch/sh/kernel/cpu/sh2a/setup-sh7206.c
@@ -10,7 +10,7 @@
10#include <linux/platform_device.h> 10#include <linux/platform_device.h>
11#include <linux/init.h> 11#include <linux/init.h>
12#include <linux/serial.h> 12#include <linux/serial.h>
13#include <asm/sci.h> 13#include <linux/serial_sci.h>
14 14
15enum { 15enum {
16 UNUSED = 0, 16 UNUSED = 0,
diff --git a/arch/sh/kernel/cpu/sh3/probe.c b/arch/sh/kernel/cpu/sh3/probe.c
index fcc80bb7bee7..10f2a760c5ee 100644
--- a/arch/sh/kernel/cpu/sh3/probe.c
+++ b/arch/sh/kernel/cpu/sh3/probe.c
@@ -94,9 +94,9 @@ int __uses_jump_to_uncached detect_cpu_and_cache_system(void)
94 boot_cpu_data.dcache.way_incr = (1 << 13); 94 boot_cpu_data.dcache.way_incr = (1 << 13);
95 boot_cpu_data.dcache.entry_mask = 0x1ff0; 95 boot_cpu_data.dcache.entry_mask = 0x1ff0;
96 boot_cpu_data.dcache.sets = 512; 96 boot_cpu_data.dcache.sets = 512;
97 ctrl_outl(CCR_CACHE_32KB, CCR3); 97 ctrl_outl(CCR_CACHE_32KB, CCR3_REG);
98#else 98#else
99 ctrl_outl(CCR_CACHE_16KB, CCR3); 99 ctrl_outl(CCR_CACHE_16KB, CCR3_REG);
100#endif 100#endif
101#endif 101#endif
102 } 102 }
diff --git a/arch/sh/kernel/cpu/sh3/setup-sh7705.c b/arch/sh/kernel/cpu/sh3/setup-sh7705.c
index dd0a20a685f7..f581534cb732 100644
--- a/arch/sh/kernel/cpu/sh3/setup-sh7705.c
+++ b/arch/sh/kernel/cpu/sh3/setup-sh7705.c
@@ -12,7 +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/serial.h> 14#include <linux/serial.h>
15#include <asm/sci.h> 15#include <linux/serial_sci.h>
16#include <asm/rtc.h> 16#include <asm/rtc.h>
17 17
18enum { 18enum {
diff --git a/arch/sh/kernel/cpu/sh3/setup-sh770x.c b/arch/sh/kernel/cpu/sh3/setup-sh770x.c
index 969804bb523b..d3733b13ea52 100644
--- a/arch/sh/kernel/cpu/sh3/setup-sh770x.c
+++ b/arch/sh/kernel/cpu/sh3/setup-sh770x.c
@@ -16,7 +16,7 @@
16#include <linux/irq.h> 16#include <linux/irq.h>
17#include <linux/platform_device.h> 17#include <linux/platform_device.h>
18#include <linux/serial.h> 18#include <linux/serial.h>
19#include <asm/sci.h> 19#include <linux/serial_sci.h>
20 20
21enum { 21enum {
22 UNUSED = 0, 22 UNUSED = 0,
@@ -123,15 +123,15 @@ static struct resource rtc_resources[] = {
123 .flags = IORESOURCE_IO, 123 .flags = IORESOURCE_IO,
124 }, 124 },
125 [1] = { 125 [1] = {
126 .start = 20, 126 .start = 21,
127 .flags = IORESOURCE_IRQ, 127 .flags = IORESOURCE_IRQ,
128 }, 128 },
129 [2] = { 129 [2] = {
130 .start = 21, 130 .start = 22,
131 .flags = IORESOURCE_IRQ, 131 .flags = IORESOURCE_IRQ,
132 }, 132 },
133 [3] = { 133 [3] = {
134 .start = 22, 134 .start = 20,
135 .flags = IORESOURCE_IRQ, 135 .flags = IORESOURCE_IRQ,
136 }, 136 },
137}; 137};
diff --git a/arch/sh/kernel/cpu/sh3/setup-sh7710.c b/arch/sh/kernel/cpu/sh3/setup-sh7710.c
index 0cc0e2bf135d..7406c9ad9259 100644
--- a/arch/sh/kernel/cpu/sh3/setup-sh7710.c
+++ b/arch/sh/kernel/cpu/sh3/setup-sh7710.c
@@ -12,7 +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/serial.h> 14#include <linux/serial.h>
15#include <asm/sci.h> 15#include <linux/serial_sci.h>
16#include <asm/rtc.h> 16#include <asm/rtc.h>
17 17
18enum { 18enum {
diff --git a/arch/sh/kernel/cpu/sh3/setup-sh7720.c b/arch/sh/kernel/cpu/sh3/setup-sh7720.c
index 3855ea4c21c8..8028082527c5 100644
--- a/arch/sh/kernel/cpu/sh3/setup-sh7720.c
+++ b/arch/sh/kernel/cpu/sh3/setup-sh7720.c
@@ -16,7 +16,7 @@
16#include <linux/init.h> 16#include <linux/init.h>
17#include <linux/serial.h> 17#include <linux/serial.h>
18#include <linux/io.h> 18#include <linux/io.h>
19#include <asm/sci.h> 19#include <linux/serial_sci.h>
20#include <asm/rtc.h> 20#include <asm/rtc.h>
21 21
22#define INTC_ICR1 0xA4140010UL 22#define INTC_ICR1 0xA4140010UL
diff --git a/arch/sh/kernel/cpu/sh4/setup-sh4-202.c b/arch/sh/kernel/cpu/sh4/setup-sh4-202.c
index dab193293f20..7371abf64f80 100644
--- a/arch/sh/kernel/cpu/sh4/setup-sh4-202.c
+++ b/arch/sh/kernel/cpu/sh4/setup-sh4-202.c
@@ -10,7 +10,7 @@
10#include <linux/platform_device.h> 10#include <linux/platform_device.h>
11#include <linux/init.h> 11#include <linux/init.h>
12#include <linux/serial.h> 12#include <linux/serial.h>
13#include <asm/sci.h> 13#include <linux/serial_sci.h>
14 14
15static struct plat_sci_port sci_platform_data[] = { 15static struct plat_sci_port sci_platform_data[] = {
16 { 16 {
diff --git a/arch/sh/kernel/cpu/sh4/setup-sh7750.c b/arch/sh/kernel/cpu/sh4/setup-sh7750.c
index ae3603aca615..ec884039b914 100644
--- a/arch/sh/kernel/cpu/sh4/setup-sh7750.c
+++ b/arch/sh/kernel/cpu/sh4/setup-sh7750.c
@@ -12,7 +12,7 @@
12#include <linux/init.h> 12#include <linux/init.h>
13#include <linux/serial.h> 13#include <linux/serial.h>
14#include <linux/io.h> 14#include <linux/io.h>
15#include <asm/sci.h> 15#include <linux/serial_sci.h>
16 16
17static struct resource rtc_resources[] = { 17static struct resource rtc_resources[] = {
18 [0] = { 18 [0] = {
diff --git a/arch/sh/kernel/cpu/sh4/setup-sh7760.c b/arch/sh/kernel/cpu/sh4/setup-sh7760.c
index 85f81579b97e..254c5c55ab91 100644
--- a/arch/sh/kernel/cpu/sh4/setup-sh7760.c
+++ b/arch/sh/kernel/cpu/sh4/setup-sh7760.c
@@ -10,7 +10,7 @@
10#include <linux/platform_device.h> 10#include <linux/platform_device.h>
11#include <linux/init.h> 11#include <linux/init.h>
12#include <linux/serial.h> 12#include <linux/serial.h>
13#include <asm/sci.h> 13#include <linux/serial_sci.h>
14 14
15enum { 15enum {
16 UNUSED = 0, 16 UNUSED = 0,
diff --git a/arch/sh/kernel/cpu/sh4/sq.c b/arch/sh/kernel/cpu/sh4/sq.c
index 8250e017bd4e..9561b02ade0e 100644
--- a/arch/sh/kernel/cpu/sh4/sq.c
+++ b/arch/sh/kernel/cpu/sh4/sq.c
@@ -216,7 +216,7 @@ void sq_unmap(unsigned long vaddr)
216 216
217 if (unlikely(!map)) { 217 if (unlikely(!map)) {
218 printk("%s: bad store queue address 0x%08lx\n", 218 printk("%s: bad store queue address 0x%08lx\n",
219 __FUNCTION__, vaddr); 219 __func__, vaddr);
220 return; 220 return;
221 } 221 }
222 222
@@ -233,7 +233,7 @@ void sq_unmap(unsigned long vaddr)
233 vma = remove_vm_area((void *)(map->sq_addr & PAGE_MASK)); 233 vma = remove_vm_area((void *)(map->sq_addr & PAGE_MASK));
234 if (!vma) { 234 if (!vma) {
235 printk(KERN_ERR "%s: bad address 0x%08lx\n", 235 printk(KERN_ERR "%s: bad address 0x%08lx\n",
236 __FUNCTION__, map->sq_addr); 236 __func__, map->sq_addr);
237 return; 237 return;
238 } 238 }
239 } 239 }
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7343.c b/arch/sh/kernel/cpu/sh4a/setup-sh7343.c
index c0a3f079dfdc..6d4f50cd4aaf 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7343.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7343.c
@@ -10,7 +10,7 @@
10#include <linux/platform_device.h> 10#include <linux/platform_device.h>
11#include <linux/init.h> 11#include <linux/init.h>
12#include <linux/serial.h> 12#include <linux/serial.h>
13#include <asm/sci.h> 13#include <linux/serial_sci.h>
14 14
15static struct plat_sci_port sci_platform_data[] = { 15static struct plat_sci_port sci_platform_data[] = {
16 { 16 {
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7366.c b/arch/sh/kernel/cpu/sh4a/setup-sh7366.c
index 967e8b69a2f8..f26b5cdad0d1 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7366.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7366.c
@@ -12,7 +12,7 @@
12#include <linux/platform_device.h> 12#include <linux/platform_device.h>
13#include <linux/init.h> 13#include <linux/init.h>
14#include <linux/serial.h> 14#include <linux/serial.h>
15#include <asm/sci.h> 15#include <linux/serial_sci.h>
16 16
17static struct plat_sci_port sci_platform_data[] = { 17static struct plat_sci_port sci_platform_data[] = {
18 { 18 {
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
index 73c778d40d13..b98b4bc93ec9 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
@@ -10,9 +10,9 @@
10#include <linux/platform_device.h> 10#include <linux/platform_device.h>
11#include <linux/init.h> 11#include <linux/init.h>
12#include <linux/serial.h> 12#include <linux/serial.h>
13#include <linux/serial_sci.h>
13#include <linux/mm.h> 14#include <linux/mm.h>
14#include <asm/mmzone.h> 15#include <asm/mmzone.h>
15#include <asm/sci.h>
16 16
17static struct resource usbf_resources[] = { 17static struct resource usbf_resources[] = {
18 [0] = { 18 [0] = {
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7763.c b/arch/sh/kernel/cpu/sh4a/setup-sh7763.c
index eabd5386812d..07c988dc9de6 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7763.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7763.c
@@ -12,7 +12,7 @@
12#include <linux/init.h> 12#include <linux/init.h>
13#include <linux/serial.h> 13#include <linux/serial.h>
14#include <linux/io.h> 14#include <linux/io.h>
15#include <asm/sci.h> 15#include <linux/serial_sci.h>
16 16
17static struct resource rtc_resources[] = { 17static struct resource rtc_resources[] = {
18 [0] = { 18 [0] = {
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7770.c b/arch/sh/kernel/cpu/sh4a/setup-sh7770.c
index 32f4f59a837b..b9cec48b1808 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7770.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7770.c
@@ -10,7 +10,7 @@
10#include <linux/platform_device.h> 10#include <linux/platform_device.h>
11#include <linux/init.h> 11#include <linux/init.h>
12#include <linux/serial.h> 12#include <linux/serial.h>
13#include <asm/sci.h> 13#include <linux/serial_sci.h>
14 14
15static struct plat_sci_port sci_platform_data[] = { 15static struct plat_sci_port sci_platform_data[] = {
16 { 16 {
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7780.c b/arch/sh/kernel/cpu/sh4a/setup-sh7780.c
index 293004b526ff..18dbbe23fea1 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7780.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7780.c
@@ -11,7 +11,7 @@
11#include <linux/init.h> 11#include <linux/init.h>
12#include <linux/serial.h> 12#include <linux/serial.h>
13#include <linux/io.h> 13#include <linux/io.h>
14#include <asm/sci.h> 14#include <linux/serial_sci.h>
15 15
16static struct resource rtc_resources[] = { 16static struct resource rtc_resources[] = {
17 [0] = { 17 [0] = {
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7785.c b/arch/sh/kernel/cpu/sh4a/setup-sh7785.c
index 74b60e96cdf4..621e7329ec63 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7785.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7785.c
@@ -10,10 +10,10 @@
10#include <linux/platform_device.h> 10#include <linux/platform_device.h>
11#include <linux/init.h> 11#include <linux/init.h>
12#include <linux/serial.h> 12#include <linux/serial.h>
13#include <linux/serial_sci.h>
13#include <linux/io.h> 14#include <linux/io.h>
14#include <linux/mm.h> 15#include <linux/mm.h>
15#include <asm/mmzone.h> 16#include <asm/mmzone.h>
16#include <asm/sci.h>
17 17
18static struct plat_sci_port sci_platform_data[] = { 18static struct plat_sci_port sci_platform_data[] = {
19 { 19 {
diff --git a/arch/sh/kernel/cpu/sh4a/setup-shx3.c b/arch/sh/kernel/cpu/sh4a/setup-shx3.c
index 4dc958b6b314..bd35f32534b9 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-shx3.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-shx3.c
@@ -10,9 +10,9 @@
10#include <linux/platform_device.h> 10#include <linux/platform_device.h>
11#include <linux/init.h> 11#include <linux/init.h>
12#include <linux/serial.h> 12#include <linux/serial.h>
13#include <linux/serial_sci.h>
13#include <linux/io.h> 14#include <linux/io.h>
14#include <asm/mmzone.h> 15#include <asm/mmzone.h>
15#include <asm/sci.h>
16 16
17static struct plat_sci_port sci_platform_data[] = { 17static struct plat_sci_port sci_platform_data[] = {
18 { 18 {
diff --git a/arch/sh/kernel/cpu/sh5/unwind.c b/arch/sh/kernel/cpu/sh5/unwind.c
index 119c20afd4e5..b205b25eaf45 100644
--- a/arch/sh/kernel/cpu/sh5/unwind.c
+++ b/arch/sh/kernel/cpu/sh5/unwind.c
@@ -149,7 +149,7 @@ static int lookup_prev_stack_frame(unsigned long fp, unsigned long pc,
149 if (dest >= 63) { 149 if (dest >= 63) {
150 printk(KERN_NOTICE "%s: Invalid dest reg %d " 150 printk(KERN_NOTICE "%s: Invalid dest reg %d "
151 "specified in movi handler. Failed " 151 "specified in movi handler. Failed "
152 "opcode was 0x%lx: ", __FUNCTION__, 152 "opcode was 0x%lx: ", __func__,
153 dest, op); 153 dest, op);
154 154
155 continue; 155 continue;
diff --git a/arch/sh/kernel/io_trapped.c b/arch/sh/kernel/io_trapped.c
index 86a665d92201..39cd7f3aec7b 100644
--- a/arch/sh/kernel/io_trapped.c
+++ b/arch/sh/kernel/io_trapped.c
@@ -32,7 +32,7 @@ EXPORT_SYMBOL_GPL(trapped_mem);
32#endif 32#endif
33static DEFINE_SPINLOCK(trapped_lock); 33static DEFINE_SPINLOCK(trapped_lock);
34 34
35int __init register_trapped_io(struct trapped_io *tiop) 35int register_trapped_io(struct trapped_io *tiop)
36{ 36{
37 struct resource *res; 37 struct resource *res;
38 unsigned long len = 0, flags = 0; 38 unsigned long len = 0, flags = 0;
diff --git a/arch/sh/kernel/sh_ksyms_32.c b/arch/sh/kernel/sh_ksyms_32.c
index e1a6de9088b5..d80de3903271 100644
--- a/arch/sh/kernel/sh_ksyms_32.c
+++ b/arch/sh/kernel/sh_ksyms_32.c
@@ -111,9 +111,9 @@ DECLARE_EXPORT(__movmem_i4_even);
111DECLARE_EXPORT(__movmem_i4_odd); 111DECLARE_EXPORT(__movmem_i4_odd);
112DECLARE_EXPORT(__movmemSI12_i4); 112DECLARE_EXPORT(__movmemSI12_i4);
113 113
114#if (__GNUC_MINOR__ == 2 || defined(__GNUC_STM_RELEASE__)) 114#if (__GNUC_MINOR__ >= 2 || defined(__GNUC_STM_RELEASE__))
115/* 115/*
116 * GCC 4.2 emits these for division, as do GCC 4.1.x versions of the ST 116 * GCC >= 4.2 emits these for division, as do GCC 4.1.x versions of the ST
117 * compiler which include backported patches. 117 * compiler which include backported patches.
118 */ 118 */
119DECLARE_EXPORT(__sdivsi3_i4i); 119DECLARE_EXPORT(__sdivsi3_i4i);
@@ -146,5 +146,6 @@ EXPORT_SYMBOL(csum_partial_copy_generic);
146EXPORT_SYMBOL(csum_ipv6_magic); 146EXPORT_SYMBOL(csum_ipv6_magic);
147#endif 147#endif
148EXPORT_SYMBOL(clear_page); 148EXPORT_SYMBOL(clear_page);
149EXPORT_SYMBOL(copy_page);
149EXPORT_SYMBOL(__clear_user); 150EXPORT_SYMBOL(__clear_user);
150EXPORT_SYMBOL(_ebss); 151EXPORT_SYMBOL(_ebss);
diff --git a/arch/sh/kernel/sh_ksyms_64.c b/arch/sh/kernel/sh_ksyms_64.c
index 8004c38d3d37..dd38a683de65 100644
--- a/arch/sh/kernel/sh_ksyms_64.c
+++ b/arch/sh/kernel/sh_ksyms_64.c
@@ -42,6 +42,7 @@ EXPORT_SYMBOL(__down_trylock);
42EXPORT_SYMBOL(__up); 42EXPORT_SYMBOL(__up);
43EXPORT_SYMBOL(__put_user_asm_l); 43EXPORT_SYMBOL(__put_user_asm_l);
44EXPORT_SYMBOL(__get_user_asm_l); 44EXPORT_SYMBOL(__get_user_asm_l);
45EXPORT_SYMBOL(copy_page);
45EXPORT_SYMBOL(__copy_user); 46EXPORT_SYMBOL(__copy_user);
46EXPORT_SYMBOL(memcpy); 47EXPORT_SYMBOL(memcpy);
47EXPORT_SYMBOL(__udelay); 48EXPORT_SYMBOL(__udelay);
diff --git a/arch/sh/kernel/timers/timer-cmt.c b/arch/sh/kernel/timers/timer-cmt.c
index 71312324b5de..d20c8c375881 100644
--- a/arch/sh/kernel/timers/timer-cmt.c
+++ b/arch/sh/kernel/timers/timer-cmt.c
@@ -77,7 +77,7 @@ static unsigned long cmt_timer_get_offset(void)
77 count -= LATCH; 77 count -= LATCH;
78 } else { 78 } else {
79 printk("%s (): hardware timer problem?\n", 79 printk("%s (): hardware timer problem?\n",
80 __FUNCTION__); 80 __func__);
81 } 81 }
82 } 82 }
83 } else 83 } else
diff --git a/arch/sh/kernel/timers/timer-mtu2.c b/arch/sh/kernel/timers/timer-mtu2.c
index ade9d6eb29f9..fe453c01f9c9 100644
--- a/arch/sh/kernel/timers/timer-mtu2.c
+++ b/arch/sh/kernel/timers/timer-mtu2.c
@@ -76,7 +76,7 @@ static unsigned long mtu2_timer_get_offset(void)
76 count -= LATCH; 76 count -= LATCH;
77 } else { 77 } else {
78 printk("%s (): hardware timer problem?\n", 78 printk("%s (): hardware timer problem?\n",
79 __FUNCTION__); 79 __func__);
80 } 80 }
81 } 81 }
82 } else 82 } else
diff --git a/arch/sh/kernel/topology.c b/arch/sh/kernel/topology.c
index 9b5844a1bdaa..0838942b7083 100644
--- a/arch/sh/kernel/topology.c
+++ b/arch/sh/kernel/topology.c
@@ -29,7 +29,7 @@ static int __init topology_init(void)
29 ret = register_cpu(&per_cpu(cpu_devices, i), i); 29 ret = register_cpu(&per_cpu(cpu_devices, i), i);
30 if (unlikely(ret)) 30 if (unlikely(ret))
31 printk(KERN_WARNING "%s: register_cpu %d failed (%d)\n", 31 printk(KERN_WARNING "%s: register_cpu %d failed (%d)\n",
32 __FUNCTION__, i, ret); 32 __func__, i, ret);
33 } 33 }
34 34
35#if defined(CONFIG_NUMA) && !defined(CONFIG_SMP) 35#if defined(CONFIG_NUMA) && !defined(CONFIG_SMP)
diff --git a/arch/sh/kernel/traps_64.c b/arch/sh/kernel/traps_64.c
index a55ac81d795b..1b58a7499087 100644
--- a/arch/sh/kernel/traps_64.c
+++ b/arch/sh/kernel/traps_64.c
@@ -238,7 +238,7 @@ DO_ERROR(12, SIGILL, "reserved instruction", reserved_inst, current)
238/* Called with interrupts disabled */ 238/* Called with interrupts disabled */
239asmlinkage void do_exception_error(unsigned long ex, struct pt_regs *regs) 239asmlinkage void do_exception_error(unsigned long ex, struct pt_regs *regs)
240{ 240{
241 show_excp_regs(__FUNCTION__, -1, -1, regs); 241 show_excp_regs(__func__, -1, -1, regs);
242 die_if_kernel("exception", regs, ex); 242 die_if_kernel("exception", regs, ex);
243} 243}
244 244
diff --git a/arch/sh/lib64/c-checksum.c b/arch/sh/lib64/c-checksum.c
index 5dfbd8b5e558..5c284e0cff9c 100644
--- a/arch/sh/lib64/c-checksum.c
+++ b/arch/sh/lib64/c-checksum.c
@@ -207,7 +207,7 @@ __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
207 result = (result & 0xffffffff) + (result >> 32); 207 result = (result & 0xffffffff) + (result >> 32);
208 208
209 pr_debug("%s saddr %x daddr %x len %x proto %x sum %x result %08Lx\n", 209 pr_debug("%s saddr %x daddr %x len %x proto %x sum %x result %08Lx\n",
210 __FUNCTION__, saddr, daddr, len, proto, sum, result); 210 __func__, saddr, daddr, len, proto, sum, result);
211 211
212 return (__wsum)result; 212 return (__wsum)result;
213} 213}
diff --git a/arch/sh/lib64/udelay.c b/arch/sh/lib64/udelay.c
index 23c7d17fb9f7..d76bd801194f 100644
--- a/arch/sh/lib64/udelay.c
+++ b/arch/sh/lib64/udelay.c
@@ -21,7 +21,7 @@
21 * a 1GHz box, that's about 2 seconds. 21 * a 1GHz box, that's about 2 seconds.
22 */ 22 */
23 23
24void __delay(int loops) 24void __delay(unsigned long loops)
25{ 25{
26 long long dummy; 26 long long dummy;
27 __asm__ __volatile__("gettr tr0, %1\n\t" 27 __asm__ __volatile__("gettr tr0, %1\n\t"
@@ -33,24 +33,17 @@ void __delay(int loops)
33 :"0"(loops)); 33 :"0"(loops));
34} 34}
35 35
36void __udelay(unsigned long long usecs, unsigned long lpj) 36inline void __const_udelay(unsigned long xloops)
37{ 37{
38 usecs *= (((unsigned long long) HZ << 32) / 1000000) * lpj; 38 __delay(xloops * (HZ * cpu_data[raw_smp_processor_id()].loops_per_jiffy));
39 __delay((long long) usecs >> 32);
40} 39}
41 40
42void __ndelay(unsigned long long nsecs, unsigned long lpj) 41void __udelay(unsigned long usecs)
43{ 42{
44 nsecs *= (((unsigned long long) HZ << 32) / 1000000000) * lpj; 43 __const_udelay(usecs * 0x000010c6); /* 2**32 / 1000000 */
45 __delay((long long) nsecs >> 32);
46} 44}
47 45
48void udelay(unsigned long usecs) 46void __ndelay(unsigned long nsecs)
49{ 47{
50 __udelay(usecs, cpu_data[raw_smp_processor_id()].loops_per_jiffy); 48 __const_udelay(nsecs * 0x00000005);
51}
52
53void ndelay(unsigned long nsecs)
54{
55 __ndelay(nsecs, cpu_data[raw_smp_processor_id()].loops_per_jiffy);
56} 49}
diff --git a/arch/sh/mm/Kconfig b/arch/sh/mm/Kconfig
index f549b8cd2501..5fd218430b19 100644
--- a/arch/sh/mm/Kconfig
+++ b/arch/sh/mm/Kconfig
@@ -59,7 +59,7 @@ config 32BIT
59 59
60config PMB 60config PMB
61 bool "Support 32-bit physical addressing through PMB" 61 bool "Support 32-bit physical addressing through PMB"
62 depends on MMU && (CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7785) 62 depends on MMU && EXPERIMENTAL && (CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7785)
63 select 32BIT 63 select 32BIT
64 default y 64 default y
65 help 65 help
diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c
index e2ed6dd252b9..53dde0607362 100644
--- a/arch/sh/mm/init.c
+++ b/arch/sh/mm/init.c
@@ -328,7 +328,7 @@ int arch_add_memory(int nid, u64 start, u64 size)
328 /* We only have ZONE_NORMAL, so this is easy.. */ 328 /* We only have ZONE_NORMAL, so this is easy.. */
329 ret = __add_pages(pgdat->node_zones + ZONE_NORMAL, start_pfn, nr_pages); 329 ret = __add_pages(pgdat->node_zones + ZONE_NORMAL, start_pfn, nr_pages);
330 if (unlikely(ret)) 330 if (unlikely(ret))
331 printk("%s: Failed, __add_pages() == %d\n", __FUNCTION__, ret); 331 printk("%s: Failed, __add_pages() == %d\n", __func__, ret);
332 332
333 return ret; 333 return ret;
334} 334}
diff --git a/arch/sh/mm/ioremap_32.c b/arch/sh/mm/ioremap_32.c
index 0c7b7e33abdc..882a32ebc6b7 100644
--- a/arch/sh/mm/ioremap_32.c
+++ b/arch/sh/mm/ioremap_32.c
@@ -141,7 +141,7 @@ void __iounmap(void __iomem *addr)
141 141
142 p = remove_vm_area((void *)(vaddr & PAGE_MASK)); 142 p = remove_vm_area((void *)(vaddr & PAGE_MASK));
143 if (!p) { 143 if (!p) {
144 printk(KERN_ERR "%s: bad address %p\n", __FUNCTION__, addr); 144 printk(KERN_ERR "%s: bad address %p\n", __func__, addr);
145 return; 145 return;
146 } 146 }
147 147
diff --git a/arch/sh/mm/ioremap_64.c b/arch/sh/mm/ioremap_64.c
index e27d16519235..cea224c3e49b 100644
--- a/arch/sh/mm/ioremap_64.c
+++ b/arch/sh/mm/ioremap_64.c
@@ -178,7 +178,7 @@ static unsigned long shmedia_alloc_io(unsigned long phys, unsigned long size,
178 } else { 178 } else {
179 if (!printed_full) { 179 if (!printed_full) {
180 printk("%s: done with statics, switching to kmalloc\n", 180 printk("%s: done with statics, switching to kmalloc\n",
181 __FUNCTION__); 181 __func__);
182 printed_full = 1; 182 printed_full = 1;
183 } 183 }
184 tlen = strlen(name); 184 tlen = strlen(name);
@@ -352,7 +352,7 @@ void onchip_unmap(unsigned long vaddr)
352 res = shmedia_find_resource(&shmedia_iomap, vaddr); 352 res = shmedia_find_resource(&shmedia_iomap, vaddr);
353 if (!res) { 353 if (!res) {
354 printk(KERN_ERR "%s: Failed to free 0x%08lx\n", 354 printk(KERN_ERR "%s: Failed to free 0x%08lx\n",
355 __FUNCTION__, vaddr); 355 __func__, vaddr);
356 return; 356 return;
357 } 357 }
358 358
diff --git a/arch/sh/mm/pg-sh7705.c b/arch/sh/mm/pg-sh7705.c
index a4b015f95a3a..7f885b7f8aff 100644
--- a/arch/sh/mm/pg-sh7705.c
+++ b/arch/sh/mm/pg-sh7705.c
@@ -14,6 +14,7 @@
14#include <linux/mman.h> 14#include <linux/mman.h>
15#include <linux/mm.h> 15#include <linux/mm.h>
16#include <linux/threads.h> 16#include <linux/threads.h>
17#include <linux/fs.h>
17#include <asm/addrspace.h> 18#include <asm/addrspace.h>
18#include <asm/page.h> 19#include <asm/page.h>
19#include <asm/pgtable.h> 20#include <asm/pgtable.h>
diff --git a/arch/sh/mm/tlbflush_64.c b/arch/sh/mm/tlbflush_64.c
index 2a98c9ec88ff..7876997ba19a 100644
--- a/arch/sh/mm/tlbflush_64.c
+++ b/arch/sh/mm/tlbflush_64.c
@@ -131,7 +131,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long writeaccess,
131#ifdef DEBUG_FAULT 131#ifdef DEBUG_FAULT
132 print_task(tsk); 132 print_task(tsk);
133 printk("%s:%d fault, address is 0x%08x PC %016Lx textaccess %d writeaccess %d\n", 133 printk("%s:%d fault, address is 0x%08x PC %016Lx textaccess %d writeaccess %d\n",
134 __FUNCTION__,__LINE__, 134 __func__, __LINE__,
135 address,regs->pc,textaccess,writeaccess); 135 address,regs->pc,textaccess,writeaccess);
136 show_regs(regs); 136 show_regs(regs);
137#endif 137#endif
@@ -145,7 +145,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long writeaccess,
145#ifdef DEBUG_FAULT 145#ifdef DEBUG_FAULT
146 print_task(tsk); 146 print_task(tsk);
147 printk("%s:%d fault, address is 0x%08x PC %016Lx textaccess %d writeaccess %d\n", 147 printk("%s:%d fault, address is 0x%08x PC %016Lx textaccess %d writeaccess %d\n",
148 __FUNCTION__,__LINE__, 148 __func__, __LINE__,
149 address,regs->pc,textaccess,writeaccess); 149 address,regs->pc,textaccess,writeaccess);
150 show_regs(regs); 150 show_regs(regs);
151 151
@@ -157,7 +157,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long writeaccess,
157#ifdef DEBUG_FAULT 157#ifdef DEBUG_FAULT
158 print_task(tsk); 158 print_task(tsk);
159 printk("%s:%d fault, address is 0x%08x PC %016Lx textaccess %d writeaccess %d\n", 159 printk("%s:%d fault, address is 0x%08x PC %016Lx textaccess %d writeaccess %d\n",
160 __FUNCTION__,__LINE__, 160 __func__, __LINE__,
161 address,regs->pc,textaccess,writeaccess); 161 address,regs->pc,textaccess,writeaccess);
162 show_regs(regs); 162 show_regs(regs);
163#endif 163#endif
diff --git a/arch/sh/tools/mach-types b/arch/sh/tools/mach-types
index 67997af25c0c..d63b93da952d 100644
--- a/arch/sh/tools/mach-types
+++ b/arch/sh/tools/mach-types
@@ -38,7 +38,6 @@ R7780MP SH_R7780MP
38R7785RP SH_R7785RP 38R7785RP SH_R7785RP
39TITAN SH_TITAN 39TITAN SH_TITAN
40SHMIN SH_SHMIN 40SHMIN SH_SHMIN
417710VOIPGW SH_7710VOIPGW
42LBOXRE2 SH_LBOX_RE2 41LBOXRE2 SH_LBOX_RE2
43X3PROTO SH_X3PROTO 42X3PROTO SH_X3PROTO
44MAGICPANELR2 SH_MAGIC_PANEL_R2 43MAGICPANELR2 SH_MAGIC_PANEL_R2
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-04 01:03:55 -0500