diff options
| author | Scott Williams <scwilliams@nvidia.com> | 2012-02-02 18:55:00 -0800 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2012-03-23 21:39:09 -0700 |
| commit | 6bf338a2670880958058f50d2c01d50cc915581e (patch) | |
| tree | aba5bc2f627f74c9e58ce773e8bd3d481952ac46 /arch/arm/mach-tegra/board.h | |
| parent | d292ad167943dc556f079db21a29c44976f20d73 (diff) | |
ARM: tegra: Clean up CACHE_L2X0 conditionals and includes
Change-Id: I9862e73f264c757f97aaad03f3373fb1d3e95462
Signed-off-by: Scott Williams <scwilliams@nvidia.com>
Reviewed-on: http://git-master/r/79138
Reviewed-by: Rohan Somvanshi <rsomvanshi@nvidia.com>
Tested-by: Rohan Somvanshi <rsomvanshi@nvidia.com>
Rebase-Id: Rdc37802af0eec642a65fa1ac272dc2c8a3361590
Diffstat (limited to 'arch/arm/mach-tegra/board.h')
| -rw-r--r-- | arch/arm/mach-tegra/board.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/board.h b/arch/arm/mach-tegra/board.h index 4d310101344d..ba1b8f73cd5c 100644 --- a/arch/arm/mach-tegra/board.h +++ b/arch/arm/mach-tegra/board.h @@ -2,7 +2,7 @@ * arch/arm/mach-tegra/board.h * * Copyright (C) 2010 Google, Inc. - * Copyright (C) 2011 NVIDIA Corporation. + * Copyright (C) 2011-2012 NVIDIA Corporation. * * Author: * Colin Cross <ccross@google.com> @@ -79,7 +79,13 @@ void __init tegra_init_irq(void); void __init tegra_dt_init_irq(void); void __init tegra_reserve(unsigned long carveout_size, unsigned long fb_size, unsigned long fb2_size); +/* FIXME: The following needs to move common.h when arm_soc_desc is + introduced in a future version of the kernel */ +#ifdef CONFIG_CACHE_L2X0 void tegra_init_cache(bool init); +#else +static inline void tegra_init_cache(bool init) {} +#endif void __init tegra_release_bootloader_fb(void); void __init tegra_protected_aperture_init(unsigned long aperture); int __init tegra_init_board_info(void); |