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/mach-bcmring | |
| parent | cc22b4c18540e5e8bf55c7d124044f9317527d3c (diff) | |
| parent | aa3831cf9d29cfeaebd8c2169378b74111364487 (diff) | |
Merge branch 'cross-platform/clkdev' into next/cross-platform
Diffstat (limited to 'arch/arm/mach-bcmring')
| -rw-r--r-- | arch/arm/mach-bcmring/include/mach/clkdev.h | 7 |
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 @@ | |||
| 1 | #ifndef __ASM_MACH_CLKDEV_H | ||
| 2 | #define __ASM_MACH_CLKDEV_H | ||
| 3 | |||
| 4 | #define __clk_get(clk) ({ 1; }) | ||
| 5 | #define __clk_put(clk) do { } while (0) | ||
| 6 | |||
| 7 | #endif | ||