summaryrefslogtreecommitdiffstats
path: root/arch/c6x
diff options
context:
space:
mode:
authorStephen Boyd <sboyd@codeaurora.org>2015-09-15 16:09:22 -0700
committerMark Salter <msalter@redhat.com>2015-09-16 09:51:04 -0400
commitca3060d39ae7a0964f8c123a4833029981e86476 (patch)
treeea19c4b6b6bac46367205bab63ad95330efcaabc /arch/c6x
parent6ff33f3902c3b1c5d0db6b1e2c70b6d76fba357f (diff)
downloadlinux-stable-ca3060d39ae7a0964f8c123a4833029981e86476.tar.gz
linux-stable-ca3060d39ae7a0964f8c123a4833029981e86476.tar.bz2
linux-stable-ca3060d39ae7a0964f8c123a4833029981e86476.zip
c6x: Use generic clkdev.h header
The c6x clkdev.h header is the same as the asm-generic header, so just use the asm-generic one. Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> Signed-off-by: Mark Salter <msalter@redhat.com>
Diffstat (limited to 'arch/c6x')
-rw-r--r--arch/c6x/include/asm/Kbuild1
-rw-r--r--arch/c6x/include/asm/clkdev.h22
2 files changed, 1 insertions, 22 deletions
diff --git a/arch/c6x/include/asm/Kbuild b/arch/c6x/include/asm/Kbuild
index f17c4dc6050c..a9bc2c5106d2 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 */