diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-12 13:00:16 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-12 13:00:16 -0800 |
| commit | 75777c1855e10c010c9c3a21611d95dd9be01ab1 (patch) | |
| tree | 9272331ff0709629cc8a1dcbf9dbd856c0fc345a /arch/c6x | |
| parent | c3ce79d6a89e25fe0db1851b1b72e6d0dffc8a66 (diff) | |
| parent | ca3060d39ae7a0964f8c123a4833029981e86476 (diff) | |
| download | linux-75777c1855e10c010c9c3a21611d95dd9be01ab1.tar.gz linux-75777c1855e10c010c9c3a21611d95dd9be01ab1.tar.xz | |
Merge branch 'for-linux-next' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming
Pull tiny c6x update from Mark Salter.
* 'for-linux-next' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming:
c6x: Use generic clkdev.h header
Diffstat (limited to 'arch/c6x')
| -rw-r--r-- | arch/c6x/include/asm/Kbuild | 1 | ||||
| -rw-r--r-- | arch/c6x/include/asm/clkdev.h | 22 |
2 files changed, 1 insertions, 22 deletions
diff --git a/arch/c6x/include/asm/Kbuild b/arch/c6x/include/asm/Kbuild index 945544ec603e..64465e7e2245 100644 --- a/arch/c6x/include/asm/Kbuild +++ b/arch/c6x/include/asm/Kbuild @@ -4,6 +4,7 @@ generic-y += auxvec.h generic-y += barrier.h generic-y += bitsperlong.h generic-y += bugs.h +generic-y += clkdev.h generic-y += cputime.h generic-y += current.h generic-y += device.h diff --git a/arch/c6x/include/asm/clkdev.h b/arch/c6x/include/asm/clkdev.h deleted file mode 100644 index 76a070b1c2e5..000000000000 --- a/arch/c6x/include/asm/clkdev.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef _ASM_CLKDEV_H -#define _ASM_CLKDEV_H - -#include <linux/slab.h> - -struct clk; - -static inline int __clk_get(struct clk *clk) -{ - return 1; -} - -static inline void __clk_put(struct clk *clk) -{ -} - -static inline struct clk_lookup_alloc *__clkdev_alloc(size_t size) -{ - return kzalloc(size, GFP_KERNEL); -} - -#endif /* _ASM_CLKDEV_H */ |