Merge branches 'acpi-soc', 'acpi-misc', 'acpi-pci' and 'device-properties'

[deliverable/linux.git] / arch / arm / mach-imx / mach-mx31lite.c

diff --git a/arch/arm/mach-imx/mach-mx31lite.c b/arch/arm/mach-imx/mach-mx31lite.c
index 57eac6f45fab015021830fdd07f7a791b7c90cc2..4822a1738de491e420b1150c6683e7673200610f 100644 (file)
--- a/arch/arm/mach-imx/mach-mx31lite.c
+++ b/arch/arm/mach-imx/mach-mx31lite.c
@@ -270,7 +270,7 @@ static void __init mx31lite_init(void)
        /* SMSC9117 IRQ pin */
        ret = gpio_request(IOMUX_TO_GPIO(MX31_PIN_SFS6), "sms9117-irq");
        if (ret)
-               pr_warning("could not get LAN irq gpio\n");
+               pr_warn("could not get LAN irq gpio\n");
        else {
                gpio_direction_input(IOMUX_TO_GPIO(MX31_PIN_SFS6));
                smsc911x_resources[1].start =