diff options
| author | Olof Johansson <olof@lixom.net> | 2014-09-24 10:37:27 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-09-24 10:37:53 -0700 |
| commit | c82eb464879dd0ecbe0c4cb1b80ac4e82b634872 (patch) | |
| tree | 53bc8043bd897081a2d6f499cdfe915b9be9684a /arch/arm/mach-orion5x/ts409-setup.c | |
| parent | 17fa6e4ecf1ccab5e90db7025cfc9d459774cd3f (diff) | |
| parent | 9d06d34bcc62f4cc3679704ac42cff5b44a97c6e (diff) | |
Merge tag 'mvebu-soc-3.18' of git://git.infradead.org/linux-mvebu into next/cleanup
Merge "ARM: mvebu: SoC changes for v3.18" from Jason Cooper:
mvebu SoC changes for v3.18
- orion5x
- remove pr_warning(), use pr_warn()
* tag 'mvebu-soc-3.18' of git://git.infradead.org/linux-mvebu:
ARM: orion5x: Convert pr_warning to pr_warn
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-orion5x/ts409-setup.c')
| -rw-r--r-- | arch/arm/mach-orion5x/ts409-setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-orion5x/ts409-setup.c b/arch/arm/mach-orion5x/ts409-setup.c index 5c079d312015..cf2ab531cabc 100644 --- a/arch/arm/mach-orion5x/ts409-setup.c +++ b/arch/arm/mach-orion5x/ts409-setup.c @@ -302,7 +302,7 @@ static void __init qnap_ts409_init(void) gpio_free(TS409_RTC_GPIO); } if (qnap_ts409_i2c_rtc.irq == 0) - pr_warning("qnap_ts409_init: failed to get RTC IRQ\n"); + pr_warn("qnap_ts409_init: failed to get RTC IRQ\n"); i2c_register_board_info(0, &qnap_ts409_i2c_rtc, 1); platform_device_register(&ts409_leds); |