diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-07-19 12:10:44 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-19 12:10:44 -0400 |
| commit | c8f85523e70f8202ff49858bacd72fa65245f382 (patch) | |
| tree | d0dbb5f5662094e90ecdef0b486000368d8f6e7d /arch/arm/include | |
| parent | cc22b4c18540e5e8bf55c7d124044f9317527d3c (diff) | |
| parent | aa3831cf9d29cfeaebd8c2169378b74111364487 (diff) | |
Merge branch 'cross-platform/clkdev' into next/cross-platform
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/clkdev.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/include/asm/clkdev.h b/arch/arm/include/asm/clkdev.h index 765d33222369..80751c15c300 100644 --- a/arch/arm/include/asm/clkdev.h +++ b/arch/arm/include/asm/clkdev.h | |||
| @@ -14,7 +14,12 @@ | |||
| 14 | 14 | ||
| 15 | #include <linux/slab.h> | 15 | #include <linux/slab.h> |
| 16 | 16 | ||
| 17 | #ifdef CONFIG_HAVE_MACH_CLKDEV | ||
| 17 | #include <mach/clkdev.h> | 18 | #include <mach/clkdev.h> |
| 19 | #else | ||
| 20 | #define __clk_get(clk) ({ 1; }) | ||
| 21 | #define __clk_put(clk) do { } while (0) | ||
| 22 | #endif | ||
| 18 | 23 | ||
| 19 | static inline struct clk_lookup_alloc *__clkdev_alloc(size_t size) | 24 | static inline struct clk_lookup_alloc *__clkdev_alloc(size_t size) |
| 20 | { | 25 | { |