summaryrefslogtreecommitdiff
path: root/arch/arm/plat-samsung/include/plat/clock.h
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-07-21 18:34:00 +0400
committerArnd Bergmann <arnd@arndb.de>2011-07-21 18:34:00 +0400
commit1e09939bad24df95ddeeeca4fbec64fa94b66def (patch)
tree8a4661ed8c4619db28863353858e0171171b7d8a /arch/arm/plat-samsung/include/plat/clock.h
parent4d09a938861ef16248334d57ae250e109b0004ae (diff)
parente8de616e39ccea3b8d3cf7e68f16d216f183c4bf (diff)
downloadlinux-1e09939bad24df95ddeeeca4fbec64fa94b66def.tar.xz
Merge branch 'next-samsung-devel' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/devel
Diffstat (limited to 'arch/arm/plat-samsung/include/plat/clock.h')
-rw-r--r--arch/arm/plat-samsung/include/plat/clock.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/plat-samsung/include/plat/clock.h b/arch/arm/plat-samsung/include/plat/clock.h
index 983c578b8276..87d5b38a86fb 100644
--- a/arch/arm/plat-samsung/include/plat/clock.h
+++ b/arch/arm/plat-samsung/include/plat/clock.h
@@ -10,6 +10,7 @@
*/
#include <linux/spinlock.h>
+#include <linux/clkdev.h>
struct clk;
@@ -40,6 +41,7 @@ struct clk {
struct module *owner;
struct clk *parent;
const char *name;
+ const char *devname;
int id;
int usage;
unsigned long rate;
@@ -47,6 +49,7 @@ struct clk {
struct clk_ops *ops;
int (*enable)(struct clk *, int enable);
+ struct clk_lookup lookup;
#if defined(CONFIG_PM_DEBUG) && defined(CONFIG_DEBUG_FS)
struct dentry *dent; /* For visible tree hierarchy */
#endif