diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-02 23:31:07 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-02 23:31:07 +0000 |
| commit | 64ed28a87a0c075e91c1c5b0fe7d225a6cc6ae39 (patch) | |
| tree | a434977a6caa9b41cc0daaf71dbd76ac8693aba6 /arch/arm/mach-shmobile/include/mach/clkdev.h | |
| parent | b93a4afcff7be859e30cad2a305731516057d6cf (diff) | |
| parent | 17ccb834d517c66c09123c24ba8553c5b14e0f78 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'arch/arm/mach-shmobile/include/mach/clkdev.h')
| -rw-r--r-- | arch/arm/mach-shmobile/include/mach/clkdev.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/include/mach/clkdev.h b/arch/arm/mach-shmobile/include/mach/clkdev.h new file mode 100644 index 00000000000..36d0163a857 --- /dev/null +++ b/arch/arm/mach-shmobile/include/mach/clkdev.h @@ -0,0 +1,7 @@ +#ifndef __ASM_MACH_CLKDEV_H +#define __ASM_MACH_CLKDEV_H + +int __clk_get(struct clk *clk); +void __clk_put(struct clk *clk); + +#endif /* __ASM_MACH_CLKDEV_H */ |