diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-09-03 02:26:33 -0400 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-09-03 02:26:33 -0400 |
| commit | c50e86ce7c2961a41f2f7aa6e4fd6c99229ba205 (patch) | |
| tree | 4ea36009719bd8fc523239fe1bdccb90f0dce3ae /arch/arm/mach-tegra/board.h | |
| parent | 14d33d384693eb6083396199de516fdef320f7af (diff) | |
| parent | 4cbe5a555fa58a79b6ecbb6c531b8bab0650778d (diff) | |
Merge tag 'v3.6-rc4'
Merge 3.6-rc4 to get latest OMAP and device tree fixes.
Diffstat (limited to 'arch/arm/mach-tegra/board.h')
| -rw-r--r-- | arch/arm/mach-tegra/board.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/board.h b/arch/arm/mach-tegra/board.h index 65014968fc6c..f88e5143c767 100644 --- a/arch/arm/mach-tegra/board.h +++ b/arch/arm/mach-tegra/board.h | |||
| @@ -46,5 +46,14 @@ int __init tegra_powergate_debugfs_init(void); | |||
| 46 | static inline int tegra_powergate_debugfs_init(void) { return 0; } | 46 | static inline int tegra_powergate_debugfs_init(void) { return 0; } |
| 47 | #endif | 47 | #endif |
| 48 | 48 | ||
| 49 | int __init harmony_regulator_init(void); | ||
| 50 | #ifdef CONFIG_TEGRA_PCI | ||
| 51 | int __init harmony_pcie_init(void); | ||
| 52 | #else | ||
| 53 | static inline int harmony_pcie_init(void) { return 0; } | ||
| 54 | #endif | ||
| 55 | |||
| 56 | void __init tegra_paz00_wifikill_init(void); | ||
| 57 | |||
| 49 | extern struct sys_timer tegra_timer; | 58 | extern struct sys_timer tegra_timer; |
| 50 | #endif | 59 | #endif |