hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'clksrc/cleanup' into next/multiplatform 

Merge in the clksrc/cleanup branch to avoid a silly merge conflict. For
some reason two versions of the same patch were merged in two
branches. Resolve this here to avoid merge conflicts down the road,
since it can be confusing to tell which version is the one to keep.

* clksrc/cleanup:
  clocksource: make CLOCKSOURCE_OF_DECLARE type safe

Signed-off-by: Olof Johansson <olof@lixom.net>

Conflicts:
	include/linux/clocksource.h
This commit is contained in:
Olof Johansson 2013-04-28 15:15:05 -07:00
parent ea7113f70d 3d5a965823
commit 6604269dd2
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/clocksource.h
View File

@ -346,7 +346,7 @@ extern void clocksource_of_init(void);
static inline void clocksource_of_init(void) {} static inline void clocksource_of_init(void) {}
#define CLOCKSOURCE_OF_DECLARE(name, compat, fn) \ #define CLOCKSOURCE_OF_DECLARE(name, compat, fn) \
static const struct of_device_id __clksrc_of_table_##name \ static const struct of_device_id __clksrc_of_table_##name \
__unused __section(__clksrc_of_table) \ __attribute__((unused)) \
= { .compatible = compat, \ = { .compatible = compat, \
.data = (fn == (clocksource_of_init_fn)NULL) ? fn : fn } .data = (fn == (clocksource_of_init_fn)NULL) ? fn : fn }
#endif #endif