aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/common
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2009-09-12 12:04:37 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-09-12 12:04:37 +0100
commit87d721ad7a37b7650dd710c88dd5c6a5bf9fe996 (patch)
tree869d633803eb7c429624d3bd16a6117816849763 /arch/arm/common
parentddd559b13f6d2fe3ad68c4b3f5235fd3c2eae4e3 (diff)
parentb7cfda9fc3d7aa60cffab5367f2a72a4a70060cd (diff)
downloadkernel_samsung_crespo-87d721ad7a37b7650dd710c88dd5c6a5bf9fe996.zip
kernel_samsung_crespo-87d721ad7a37b7650dd710c88dd5c6a5bf9fe996.tar.gz
kernel_samsung_crespo-87d721ad7a37b7650dd710c88dd5c6a5bf9fe996.tar.bz2
Merge branch 'master' into devel
Diffstat (limited to 'arch/arm/common')
-rw-r--r--arch/arm/common/clkdev.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/common/clkdev.c b/arch/arm/common/clkdev.c
index f37afd9..aae5bc0 100644
--- a/arch/arm/common/clkdev.c
+++ b/arch/arm/common/clkdev.c
@@ -17,6 +17,7 @@
#include <linux/err.h>
#include <linux/string.h>
#include <linux/mutex.h>
+#include <linux/clk.h>
#include <asm/clkdev.h>
#include <mach/clkdev.h>