diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 16:54:27 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 16:54:27 +0200 |
| commit | 3afeb0a046af159f0ff97a20cf6ebc44d0d2bd64 (patch) | |
| tree | 49bbe7b27f8571c7716e9cbc7fbbe462ea82077a /arch/arm/mach-tegra/fuse.h | |
| parent | d93bea007ab3d77b796eb99fb4ff4eeb013e0dfa (diff) | |
| parent | 38be85de698ef3f2755ee0eabf520530757860aa (diff) | |
| download | olio-linux-3.10-3afeb0a046af159f0ff97a20cf6ebc44d0d2bd64.tar.xz olio-linux-3.10-3afeb0a046af159f0ff97a20cf6ebc44d0d2bd64.zip | |
Merge branch 'tegra/soc' into next/multiplatform
This is a dependency for the tegra multiplatform series.
Conflicts:
drivers/clocksource/tegra20_timer.c
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-tegra/fuse.h')
| -rw-r--r-- | arch/arm/mach-tegra/fuse.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/fuse.h b/arch/arm/mach-tegra/fuse.h index da78434678c..aacc00d0598 100644 --- a/arch/arm/mach-tegra/fuse.h +++ b/arch/arm/mach-tegra/fuse.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2010 Google, Inc. + * Copyright (c) 2013, NVIDIA CORPORATION. All rights reserved. * * Author: * Colin Cross <ccross@android.com> @@ -66,4 +67,10 @@ void tegra30_init_speedo_data(void); static inline void tegra30_init_speedo_data(void) {} #endif +#ifdef CONFIG_ARCH_TEGRA_114_SOC +void tegra114_init_speedo_data(void); +#else +static inline void tegra114_init_speedo_data(void) {} +#endif + #endif |