diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2013-03-15 22:57:45 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-03-15 22:57:45 +0100 |
| commit | b0d62d977674d178ac9bc0acaa3cb5cdd166035d (patch) | |
| tree | 6e8f7b99b9ecdb8869acc12a5e5af29d08f57e31 /include/linux | |
| parent | Merge branch 'next/cleanup-s5p' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup (diff) | |
| parent | ARM: smp_twd: convert to use CLKSRC_OF init (diff) | |
Merge tag 'clksrc-cleanup-for-3.10' of git://sources.calxeda.com/kernel/linux into next/cleanup
From Rob Herring <robherring2@gmail.com>:
- Add device_node ptr to clocksource init functions
- Add CLKSRC_OF support to twd_smp timer
* tag 'clksrc-cleanup-for-3.10' of git://sources.calxeda.com/kernel/linux:
ARM: smp_twd: convert to use CLKSRC_OF init
clocksource: tegra20: use the device_node pointer passed to init
clocksource: pass DT node pointer to init functions
clocksource: add empty version of clocksource_of_init
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/clocksource.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h index 27cfda427dd9..08ed5e19d8c6 100644 --- a/include/linux/clocksource.h +++ b/include/linux/clocksource.h @@ -340,6 +340,7 @@ extern void clocksource_of_init(void); __used __section(__clksrc_of_table) \ = { .compatible = compat, .data = fn }; #else +static inline void clocksource_of_init(void) {} #define CLOCKSOURCE_OF_DECLARE(name, compat, fn) #endif |