diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-31 12:49:26 +1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-31 12:49:26 +1000 |
| commit | ef9f2fa17f3d6973a479a7677a023ee3604a52cb (patch) | |
| tree | 6d4883210974774a4478f32f1306f0467717bb6f /arch/arm/mach-tegra/include | |
| parent | 1f0324caefd39985e9fe052fac97da31694db31e (diff) | |
| parent | b48b5f51568977592f1bfce91c1c6378b0a5a4f5 (diff) | |
| download | blackbird-op-linux-ef9f2fa17f3d6973a479a7677a023ee3604a52cb.tar.gz blackbird-op-linux-ef9f2fa17f3d6973a479a7677a023ee3604a52cb.zip | |
Merge branch 'for-linus' of git://android.git.kernel.org/kernel/tegra
* 'for-linus' of git://android.git.kernel.org/kernel/tegra:
ARM: tegra: clock: Add forward reference to struct clk
ARM: tegra: irq: Rename gic pointers to avoid conflicts
arm/tegra: Fix tegra irq_data conversion
Diffstat (limited to 'arch/arm/mach-tegra/include')
| -rw-r--r-- | arch/arm/mach-tegra/include/mach/clk.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/include/mach/clkdev.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/include/mach/clk.h b/arch/arm/mach-tegra/include/mach/clk.h index d7723955dac7..a217f68ba57c 100644 --- a/arch/arm/mach-tegra/include/mach/clk.h +++ b/arch/arm/mach-tegra/include/mach/clk.h @@ -20,6 +20,8 @@ #ifndef __MACH_CLK_H #define __MACH_CLK_H +struct clk; + void tegra_periph_reset_deassert(struct clk *c); void tegra_periph_reset_assert(struct clk *c); diff --git a/arch/arm/mach-tegra/include/mach/clkdev.h b/arch/arm/mach-tegra/include/mach/clkdev.h index 412f5c63e65a..66cd3f4fc896 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; |
