kernel: update 3.18 to 3.18.14

[openwrt.git] / target / linux / ar71xx / patches-3.18 / 501-MIPS-ath79-add-mac-argument-to-ath79_register_wmac.patch

diff --git a/target/linux/ar71xx/patches-3.18/501-MIPS-ath79-add-mac-argument-to-ath79_register_wmac.patch b/target/linux/ar71xx/patches-3.18/501-MIPS-ath79-add-mac-argument-to-ath79_register_wmac.patch
index d9b8682..b41c733 100644 (file)
--- a/target/linux/ar71xx/patches-3.18/501-MIPS-ath79-add-mac-argument-to-ath79_register_wmac.patch
+++ b/target/linux/ar71xx/patches-3.18/501-MIPS-ath79-add-mac-argument-to-ath79_register_wmac.patch
@@ -48,7 +48,7 @@
  #endif /* _ATH79_DEV_WMAC_H */
 --- a/arch/mips/ath79/mach-ap81.c
 +++ b/arch/mips/ath79/mach-ap81.c
-@@ -98,7 +98,7 @@ static void __init ap81_setup(void)
+@@ -92,7 +92,7 @@ static void __init ap81_setup(void)
                                        ap81_gpio_keys);
        ath79_register_spi(&ap81_spi_data, ap81_spi_info,
                           ARRAY_SIZE(ap81_spi_info));
@@ -59,7 +59,7 @@
  
 --- a/arch/mips/ath79/mach-db120.c
 +++ b/arch/mips/ath79/mach-db120.c
-@@ -134,7 +134,7 @@ static void __init db120_setup(void)
+@@ -128,7 +128,7 @@ static void __init db120_setup(void)
        ath79_register_spi(&db120_spi_data, db120_spi_info,
                           ARRAY_SIZE(db120_spi_info));
        ath79_register_usb();
@@ -70,7 +70,7 @@
  
 --- a/arch/mips/ath79/mach-ap121.c
 +++ b/arch/mips/ath79/mach-ap121.c
-@@ -91,7 +91,7 @@ static void __init ap121_setup(void)
+@@ -85,7 +85,7 @@ static void __init ap121_setup(void)
        ath79_register_spi(&ap121_spi_data, ap121_spi_info,
                           ARRAY_SIZE(ap121_spi_info));
        ath79_register_usb();