Merge tag 'locks-v4.1-1' of git://git.samba.org/jlayton/linux

[karo-tx-linux.git] / arch / arm / mach-pxa / em-x270.c

diff --git a/arch/arm/mach-pxa/em-x270.c b/arch/arm/mach-pxa/em-x270.c
index 6915a9f6b3a32b11370841095c81627231ff55c6..51531ecffca85783fa7cbd1ab608f9f52daa3846 100644 (file)
--- a/arch/arm/mach-pxa/em-x270.c
+++ b/arch/arm/mach-pxa/em-x270.c
@@ -378,7 +378,7 @@ static void __init em_x270_init_nand(void)
 
        err = gpio_request(GPIO11_NAND_CS, "NAND CS");
        if (err) {
-               pr_warning("EM-X270: failed to request NAND CS gpio\n");
+               pr_warn("EM-X270: failed to request NAND CS gpio\n");
                return;
        }
 
@@ -386,7 +386,7 @@ static void __init em_x270_init_nand(void)
 
        err = gpio_request(nand_rb, "NAND R/B");
        if (err) {
-               pr_warning("EM-X270: failed to request NAND R/B gpio\n");
+               pr_warn("EM-X270: failed to request NAND R/B gpio\n");
                gpio_free(GPIO11_NAND_CS);
                return;
        }