diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-07-19 18:10:44 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-19 18:10:44 +0200 |
| commit | c8f85523e70f8202ff49858bacd72fa65245f382 (patch) | |
| tree | d0dbb5f5662094e90ecdef0b486000368d8f6e7d /arch/arm/include | |
| parent | ARM: set vga memory base at run-time (diff) | |
| parent | ARM: Consolidate the clkdev header files (diff) | |
| download | linux-c8f85523e70f8202ff49858bacd72fa65245f382.tar.xz linux-c8f85523e70f8202ff49858bacd72fa65245f382.zip | |
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 @@ #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) { |