diff options
| author | Olof Johansson <olof@lixom.net> | 2013-12-26 11:02:19 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-12-26 11:02:25 -0800 |
| commit | d578759ed8a6babd9c9aecd4211b3aa5a8e4a27b (patch) | |
| tree | c56d17ab42d6e919be1cbbeb151ce31a13c7cc83 /arch/arm/mach-tegra/tegra.c | |
| parent | 92fa35e93074d025a9fd6b1b65cd00b83beef268 (diff) | |
| parent | 7e1161f8af73f0077aa80c1af671d272ed14f37a (diff) | |
| download | op-kernel-dev-d578759ed8a6babd9c9aecd4211b3aa5a8e4a27b.zip op-kernel-dev-d578759ed8a6babd9c9aecd4211b3aa5a8e4a27b.tar.gz | |
Merge tag 'tegra-for-3.14-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/soc
From Stephen Warren:
ARM: tegra: SoC-specific core code changes
This branch contains various miscellaneous changes to code in the
mach-tegra/ directory. It is baased on v3.13-rc1, and shouldn't conflict
with anything else.
* tag 'tegra-for-3.14-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
ARM: tegra: select PINCTRL_TEGRA124 for Tegra124 SoC
ARM: tegra: use section-sized static mappings for LPAE too
ARM: tegra: don't hard-code DEBUG_LL baud rate
ARM: tegra: fix DEBUG_LL combined with LPAE
ARM: tegra: switch FUSE clock on before usage
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-tegra/tegra.c')
| -rw-r--r-- | arch/arm/mach-tegra/tegra.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-tegra/tegra.c b/arch/arm/mach-tegra/tegra.c index 7336817..ea14d38 100644 --- a/arch/arm/mach-tegra/tegra.c +++ b/arch/arm/mach-tegra/tegra.c @@ -60,15 +60,13 @@ * kernel is loaded. The data is declared here rather than debug-macro.S so * that multiple inclusions of debug-macro.S point at the same data. */ -u32 tegra_uart_config[4] = { +u32 tegra_uart_config[3] = { /* Debug UART initialization required */ 1, /* Debug UART physical address */ 0, /* Debug UART virtual address */ 0, - /* Scratch space for debug macro */ - 0, }; static void __init tegra_init_cache(void) |
