diff options
author | Ingo Molnar <mingo@elte.hu> | 2011-02-16 13:31:51 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-02-16 13:31:55 +0100 |
commit | 48fa4b8ecf683f5e411303553da9e186e8b8406e (patch) | |
tree | 76cec4aa8cca18a44b1bd6e5be68c462a0e66d5f /arch/arm/mach-tegra/include/mach/clkdev.h | |
parent | d95f412200652694e63e64bfd49f0ae274a54479 (diff) | |
parent | 85e2efbb1db9a18d218006706d6e4fbeb0216213 (diff) |
Merge commit 'v2.6.38-rc5' into sched/core
Merge reason: Pick up upstream fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/mach-tegra/include/mach/clkdev.h')
-rw-r--r-- | arch/arm/mach-tegra/include/mach/clkdev.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/include/mach/clkdev.h b/arch/arm/mach-tegra/include/mach/clkdev.h index 412f5c63e65..66cd3f4fc89 100644 --- a/arch/arm/mach-tegra/include/mach/clkdev.h +++ b/arch/arm/mach-tegra/include/mach/clkdev.h @@ -20,6 +20,8 @@ #ifndef __MACH_CLKDEV_H #define __MACH_CLKDEV_H +struct clk; + static inline int __clk_get(struct clk *clk) { return 1; |