diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-09-26 00:09:49 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-09-26 00:09:49 +0200 |
| commit | ddfe53d1cbfcb214f7ea58f13e811937dc74663e (patch) | |
| tree | bc0991ed90b02c2aea3f73b3202f33f7389aed07 /arch/arm/mach-omap2/mux.c | |
| parent | 2b3a47d7a0cda3b35d95a4935d502ff5abab2c4d (diff) | |
| parent | 3d0cb73e9c85e60206ea9d5191bc0b9a0c4c8a99 (diff) | |
Merge tag 'cleanup-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup
Pull "Clean-up for omaps for v3.18 merge window" from Tony Lindgren:
- Remove unused pieces of the legacy DMA API as we're moving to
dmaengine API
- Search and replace to standardize on pr_warn instead of pr_warning
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
* tag 'cleanup-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
arm: mach-omap2: Convert pr_warning to pr_warn
ARM: OMAP: Remove unused pieces of legacy DMA API
Diffstat (limited to 'arch/arm/mach-omap2/mux.c')
| -rw-r--r-- | arch/arm/mach-omap2/mux.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c index ac8a249779f..78064b0d4db 100644 --- a/arch/arm/mach-omap2/mux.c +++ b/arch/arm/mach-omap2/mux.c @@ -814,7 +814,7 @@ int __init omap_mux_late_init(void) "hwmod_io", omap_mux_late_init); if (ret) - pr_warning("mux: Failed to setup hwmod io irq %d\n", ret); + pr_warn("mux: Failed to setup hwmod io irq %d\n", ret); return 0; } |