git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'slub/lockless' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg...
[pandora-kernel.git]
/
arch
/
arm
/
include
/
asm
/
clkdev.h
diff --git
a/arch/arm/include/asm/clkdev.h
b/arch/arm/include/asm/clkdev.h
index
765d332
..
80751c1
100644
(file)
--- a/
arch/arm/include/asm/clkdev.h
+++ b/
arch/arm/include/asm/clkdev.h
@@
-14,7
+14,12
@@
#include <linux/slab.h>
+#ifdef CONFIG_HAVE_MACH_CLKDEV
#include <mach/clkdev.h>
+#else
+#define __clk_get(clk) ({ 1; })
+#define __clk_put(clk) do { } while (0)
+#endif
static inline struct clk_lookup_alloc *__clkdev_alloc(size_t size)
{