Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 75777c18 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents c3ce79d6 ca3060d3

arch/c6x/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -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

arch/c6x/include/asm/clkdev.h

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
#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 */