diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2019-04-16 15:56:46 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2019-04-16 15:56:46 +0200 |
| commit | 1c09099188501fd9185b58e79f7c46a15301582c (patch) | |
| tree | 79f6972398ca649c4c79689d79c32aeea46fa352 /drivers/clocksource/arm_arch_timer.c | |
| parent | 07d7e12091f4ab869cc6a4bb276399057e73b0b3 (diff) | |
| parent | 4d86c9f73c5a9a7c3c0661e922509c2c51801671 (diff) | |
Merge tag 'timers-v5.1-rc6' of https://git.linaro.org/people/daniel.lezcano/linux into timers/urgent
Pull clockevent/clocksource fixes from Daniel Lezcano:
- Fix TIMER_OF missing option dependency for npcm (Arnd Bergmann)
- Remove a pointless macro call for arm_arch_timer (Yangtao Li)
- Fix wrong compatible string for oxnas (Neil Armstrong)
- Fix compilation warning by removing a dead function on omap (Nathan Chancellor)
Diffstat (limited to 'drivers/clocksource/arm_arch_timer.c')
| -rw-r--r-- | drivers/clocksource/arm_arch_timer.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index aa4ec53281ce..ea373cfbcecb 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -9,7 +9,7 @@ * published by the Free Software Foundation. */ -#define pr_fmt(fmt) "arm_arch_timer: " fmt +#define pr_fmt(fmt) "arch_timer: " fmt #include <linux/init.h> #include <linux/kernel.h> @@ -33,9 +33,6 @@ #include <clocksource/arm_arch_timer.h> -#undef pr_fmt -#define pr_fmt(fmt) "arch_timer: " fmt - #define CNTTIDR 0x08 #define CNTTIDR_VIRT(n) (BIT(1) << ((n) * 4)) |