summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-bcmring/include
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-07-19 18:10:44 +0200
committerArnd Bergmann <arnd@arndb.de>2011-07-19 18:10:44 +0200
commitc8f85523e70f8202ff49858bacd72fa65245f382 (patch)
treed0dbb5f5662094e90ecdef0b486000368d8f6e7d /arch/arm/mach-bcmring/include
parentARM: set vga memory base at run-time (diff)
parentARM: Consolidate the clkdev header files (diff)
downloadlinux-c8f85523e70f8202ff49858bacd72fa65245f382.tar.xz
linux-c8f85523e70f8202ff49858bacd72fa65245f382.zip
Merge branch 'cross-platform/clkdev' into next/cross-platform
Diffstat (limited to 'arch/arm/mach-bcmring/include')
-rw-r--r--arch/arm/mach-bcmring/include/mach/clkdev.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/arm/mach-bcmring/include/mach/clkdev.h b/arch/arm/mach-bcmring/include/mach/clkdev.h
deleted file mode 100644
index 04b37a89801c..000000000000
--- a/arch/arm/mach-bcmring/include/mach/clkdev.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef __ASM_MACH_CLKDEV_H
-#define __ASM_MACH_CLKDEV_H
-
-#define __clk_get(clk) ({ 1; })
-#define __clk_put(clk) do { } while (0)
-
-#endif