From 267842cc0b45bdd245ef9190dfc52d92633488c9 Mon Sep 17 00:00:00 2001 From: Prashant Gaikwad Date: Fri, 11 Jan 2013 13:16:21 +0530 Subject: [PATCH] --- yaml --- r: 355539 b: refs/heads/master c: 89572c77cdffdf24f8fec50d3e38db6a18c04dbe h: refs/heads/master i: 355537: e32babfc8552f472ab532fd9ebe38f50f9ddc1bd 355535: 13974a840f35ffcdb0545b0066db1d2247bcbb07 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-tegra/clock.c | 2 +- trunk/arch/arm/mach-tegra/cpuidle-tegra30.c | 2 +- trunk/arch/arm/mach-tegra/hotplug.c | 2 +- trunk/arch/arm/mach-tegra/platsmp.c | 2 +- trunk/arch/arm/mach-tegra/pm.c | 2 +- trunk/arch/arm/mach-tegra/tegra20_clocks.c | 2 +- trunk/arch/arm/mach-tegra/tegra20_clocks_data.c | 2 +- trunk/arch/arm/mach-tegra/tegra30_clocks.c | 2 +- trunk/arch/arm/mach-tegra/tegra30_clocks_data.c | 2 +- .../tegra_cpu_car.h => include/linux/clk/tegra.h} | 6 +++--- 11 files changed, 13 insertions(+), 13 deletions(-) rename trunk/{arch/arm/mach-tegra/tegra_cpu_car.h => include/linux/clk/tegra.h} (96%) diff --git a/[refs] b/[refs] index 1ce9c95ebf80..bd08340e0547 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c7736edf1b1734455c186deec53a0aa7f8fa87ea +refs/heads/master: 89572c77cdffdf24f8fec50d3e38db6a18c04dbe diff --git a/trunk/arch/arm/mach-tegra/clock.c b/trunk/arch/arm/mach-tegra/clock.c index 867bf8bf5561..8c0ff061f8cf 100644 --- a/trunk/arch/arm/mach-tegra/clock.c +++ b/trunk/arch/arm/mach-tegra/clock.c @@ -26,10 +26,10 @@ #include #include #include +#include #include "board.h" #include "clock.h" -#include "tegra_cpu_car.h" /* Global data of Tegra CPU CAR ops */ struct tegra_cpu_car_ops *tegra_cpu_car_ops; diff --git a/trunk/arch/arm/mach-tegra/cpuidle-tegra30.c b/trunk/arch/arm/mach-tegra/cpuidle-tegra30.c index 82530bd9b8c2..8b50cf4ddd6f 100644 --- a/trunk/arch/arm/mach-tegra/cpuidle-tegra30.c +++ b/trunk/arch/arm/mach-tegra/cpuidle-tegra30.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include @@ -32,7 +33,6 @@ #include "pm.h" #include "sleep.h" -#include "tegra_cpu_car.h" #ifdef CONFIG_PM_SLEEP static int tegra30_idle_lp2(struct cpuidle_device *dev, diff --git a/trunk/arch/arm/mach-tegra/hotplug.c b/trunk/arch/arm/mach-tegra/hotplug.c index 6a27de4001ee..a599f6e36dea 100644 --- a/trunk/arch/arm/mach-tegra/hotplug.c +++ b/trunk/arch/arm/mach-tegra/hotplug.c @@ -10,12 +10,12 @@ */ #include #include +#include #include #include #include "sleep.h" -#include "tegra_cpu_car.h" static void (*tegra_hotplug_shutdown)(void); diff --git a/trunk/arch/arm/mach-tegra/platsmp.c b/trunk/arch/arm/mach-tegra/platsmp.c index 68670304d9bc..3ec7fc487857 100644 --- a/trunk/arch/arm/mach-tegra/platsmp.c +++ b/trunk/arch/arm/mach-tegra/platsmp.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include @@ -30,7 +31,6 @@ #include "fuse.h" #include "flowctrl.h" #include "reset.h" -#include "tegra_cpu_car.h" #include "common.h" #include "iomap.h" diff --git a/trunk/arch/arm/mach-tegra/pm.c b/trunk/arch/arm/mach-tegra/pm.c index 498d70b33775..abfe9b93cc0c 100644 --- a/trunk/arch/arm/mach-tegra/pm.c +++ b/trunk/arch/arm/mach-tegra/pm.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include @@ -36,7 +37,6 @@ #include "reset.h" #include "flowctrl.h" #include "sleep.h" -#include "tegra_cpu_car.h" #define TEGRA_POWER_CPU_PWRREQ_OE (1 << 16) /* CPU pwr req enable */ diff --git a/trunk/arch/arm/mach-tegra/tegra20_clocks.c b/trunk/arch/arm/mach-tegra/tegra20_clocks.c index 4eb6bc81a87b..1a80ff65e5fc 100644 --- a/trunk/arch/arm/mach-tegra/tegra20_clocks.c +++ b/trunk/arch/arm/mach-tegra/tegra20_clocks.c @@ -26,12 +26,12 @@ #include #include #include +#include #include "clock.h" #include "fuse.h" #include "iomap.h" #include "tegra2_emc.h" -#include "tegra_cpu_car.h" #define RST_DEVICES 0x004 #define RST_DEVICES_SET 0x300 diff --git a/trunk/arch/arm/mach-tegra/tegra20_clocks_data.c b/trunk/arch/arm/mach-tegra/tegra20_clocks_data.c index a23a0734e352..022cdaef7ca5 100644 --- a/trunk/arch/arm/mach-tegra/tegra20_clocks_data.c +++ b/trunk/arch/arm/mach-tegra/tegra20_clocks_data.c @@ -26,12 +26,12 @@ #include #include #include +#include #include "clock.h" #include "fuse.h" #include "tegra2_emc.h" #include "tegra20_clocks.h" -#include "tegra_cpu_car.h" /* Clock definitions */ diff --git a/trunk/arch/arm/mach-tegra/tegra30_clocks.c b/trunk/arch/arm/mach-tegra/tegra30_clocks.c index d7147779f8ea..4330787fe5cb 100644 --- a/trunk/arch/arm/mach-tegra/tegra30_clocks.c +++ b/trunk/arch/arm/mach-tegra/tegra30_clocks.c @@ -28,6 +28,7 @@ #include #include #include +#include #include @@ -36,7 +37,6 @@ #include "clock.h" #include "fuse.h" #include "iomap.h" -#include "tegra_cpu_car.h" #define USE_PLL_LOCK_BITS 0 diff --git a/trunk/arch/arm/mach-tegra/tegra30_clocks_data.c b/trunk/arch/arm/mach-tegra/tegra30_clocks_data.c index 741d264d5ecb..9bfaa490cff6 100644 --- a/trunk/arch/arm/mach-tegra/tegra30_clocks_data.c +++ b/trunk/arch/arm/mach-tegra/tegra30_clocks_data.c @@ -28,11 +28,11 @@ #include #include #include +#include #include "clock.h" #include "fuse.h" #include "tegra30_clocks.h" -#include "tegra_cpu_car.h" #define DEFINE_CLK_TEGRA(_name, _rate, _ops, _flags, \ _parent_names, _parents, _parent) \ diff --git a/trunk/arch/arm/mach-tegra/tegra_cpu_car.h b/trunk/include/linux/clk/tegra.h similarity index 96% rename from trunk/arch/arm/mach-tegra/tegra_cpu_car.h rename to trunk/include/linux/clk/tegra.h index 9764d31032b7..0977f2a24757 100644 --- a/trunk/arch/arm/mach-tegra/tegra_cpu_car.h +++ b/trunk/include/linux/clk/tegra.h @@ -14,8 +14,8 @@ * along with this program. If not, see . */ -#ifndef __MACH_TEGRA_CPU_CAR_H -#define __MACH_TEGRA_CPU_CAR_H +#ifndef __LINUX_CLK_TEGRA_H_ +#define __LINUX_CLK_TEGRA_H_ /* * Tegra CPU clock and reset control ops @@ -121,4 +121,4 @@ static inline void tegra_cpu_clock_resume(void) void tegra20_cpu_car_ops_init(void); void tegra30_cpu_car_ops_init(void); -#endif /* __MACH_TEGRA_CPU_CAR_H */ +#endif /* __LINUX_CLK_TEGRA_H_ */