diff options
| author | Olof Johansson <olof@lixom.net> | 2013-04-28 15:15:05 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-04-28 15:15:05 -0700 |
| commit | 6604269dd262623ec79af3f349c8b93743f8014b (patch) | |
| tree | 6a825a26603242878a3065bbb10ffb3e4fc116c5 | |
| parent | ea7113f70d6f91dee0d7afd8580c8cac06b6d222 (diff) | |
| parent | 3d5a96582303e28c48699f3faaf920ef7d43e6f2 (diff) | |
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
| -rw-r--r-- | include/linux/clocksource.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h index ac33184b14f..192d6d1771e 100644 --- a/include/linux/clocksource.h +++ b/include/linux/clocksource.h @@ -346,7 +346,7 @@ extern void clocksource_of_init(void); static inline void clocksource_of_init(void) {} #define CLOCKSOURCE_OF_DECLARE(name, compat, fn) \ static const struct of_device_id __clksrc_of_table_##name \ - __unused __section(__clksrc_of_table) \ + __attribute__((unused)) \ = { .compatible = compat, \ .data = (fn == (clocksource_of_init_fn)NULL) ? fn : fn } #endif |