diff options
| author | Olof Johansson <olof@lixom.net> | 2013-02-09 17:52:44 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-02-09 17:53:02 -0800 |
| commit | f58cf70ed954c179825cd0c51f5f64cd1ed74ed3 (patch) | |
| tree | f46e6fd10e45bd7d4e25c6ba93f145e281b9f557 /arch/arm/mach-tegra/board.h | |
| parent | e2efc25ac21ff3c8ead9670dffba40926aa54ad7 (diff) | |
| parent | 1d7e5c2c815dda6eb7a0e41a6b27ea61cd927f99 (diff) | |
| download | talos-op-linux-f58cf70ed954c179825cd0c51f5f64cd1ed74ed3.tar.gz talos-op-linux-f58cf70ed954c179825cd0c51f5f64cd1ed74ed3.zip | |
Merge branch 'tegra/t114' into next/soc
Add a couple of fixes sent via email (via Stephen/Hiroshi).
* tegra/t114:
ARM: tegra: sort Kconfig selects for Tegra114
ARM: tegra: enable ARCH_REQUIRE_GPIOLIB for Tegra114
ARM: tegra: Fix build error w/ ARCH_TEGRA_114_SOC w/o ARCH_TEGRA_3x_SOC
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-tegra/board.h')
| -rw-r--r-- | arch/arm/mach-tegra/board.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/board.h b/arch/arm/mach-tegra/board.h index da8f5a3c4240..86851c81a350 100644 --- a/arch/arm/mach-tegra/board.h +++ b/arch/arm/mach-tegra/board.h @@ -1,6 +1,7 @@ /* * arch/arm/mach-tegra/board.h * + * Copyright (c) 2013 NVIDIA Corporation. All rights reserved. * Copyright (C) 2010 Google, Inc. * * Author: @@ -27,6 +28,7 @@ void tegra_assert_system_reset(char mode, const char *cmd); void __init tegra20_init_early(void); void __init tegra30_init_early(void); +void __init tegra114_init_early(void); void __init tegra_map_common_io(void); void __init tegra_init_irq(void); void __init tegra_dt_init_irq(void); |
