diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-13 10:00:22 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-13 10:00:22 -0500 |
| commit | 4de3a8e101150feaefa1139611a50ff37467f33e (patch) | |
| tree | daada742542518b02d7db7c5d32e715eaa5f166d /arch/arm/mach-tegra/board.h | |
| parent | 294064f58953f9964e5945424b09c51800330a83 (diff) | |
| parent | 099469502f62fbe0d7e4f0b83a2f22538367f734 (diff) | |
Merge branch 'master' into fixes
Diffstat (limited to 'arch/arm/mach-tegra/board.h')
| -rw-r--r-- | arch/arm/mach-tegra/board.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/board.h b/arch/arm/mach-tegra/board.h index 1d14df7eb7de..75d1543d77c0 100644 --- a/arch/arm/mach-tegra/board.h +++ b/arch/arm/mach-tegra/board.h | |||
| @@ -25,10 +25,11 @@ | |||
| 25 | 25 | ||
| 26 | void tegra_assert_system_reset(char mode, const char *cmd); | 26 | void tegra_assert_system_reset(char mode, const char *cmd); |
| 27 | 27 | ||
| 28 | void __init tegra_init_early(void); | 28 | void __init tegra20_init_early(void); |
| 29 | void __init tegra30_init_early(void); | ||
| 29 | void __init tegra_map_common_io(void); | 30 | void __init tegra_map_common_io(void); |
| 30 | void __init tegra_init_irq(void); | 31 | void __init tegra_init_irq(void); |
| 31 | void __init tegra_init_clock(void); | 32 | void __init tegra_dt_init_irq(void); |
| 32 | int __init tegra_pcie_init(bool init_port0, bool init_port1); | 33 | int __init tegra_pcie_init(bool init_port0, bool init_port1); |
| 33 | 34 | ||
| 34 | extern struct sys_timer tegra_timer; | 35 | extern struct sys_timer tegra_timer; |