ar71xx: merge dev-ar9{13,34}x-wmac into dev-ar9xxx-wmac

[openwrt/openwrt.git] / target / linux / ar71xx / files / arch / mips / ar71xx / mach-wzr-hp-g300nh.c

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wzr-hp-g300nh.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wzr-hp-g300nh.c
index 83935377a688e3c75a6a85667f77b7e989627528..383d87b5f4b42fd8e5a9ea51244d20cfbf7b26e9 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wzr-hp-g300nh.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wzr-hp-g300nh.c
@@ -20,7 +20,7 @@
 
 #include "machtype.h"
 #include "devices.h"
-#include "dev-ar913x-wmac.h"
+#include "dev-ar9xxx-wmac.h"
 #include "dev-gpio-buttons.h"
 #include "dev-leds-gpio.h"
 #include "dev-usb.h"
@@ -93,8 +93,8 @@ static struct mtd_partition wzrhpg300nh_flash_partitions[] = {
 static struct ar91xx_flash_platform_data wzrhpg300nh_flash_data = {
        .width          = 2,
 #ifdef CONFIG_MTD_PARTITIONS
-        .parts          = wzrhpg300nh_flash_partitions,
-        .nr_parts       = ARRAY_SIZE(wzrhpg300nh_flash_partitions),
+       .parts          = wzrhpg300nh_flash_partitions,
+       .nr_parts       = ARRAY_SIZE(wzrhpg300nh_flash_partitions),
 #endif
 };
 
@@ -213,8 +213,8 @@ static struct platform_device wzrhpg300nh_74hc153_device = {
 };
 
 static struct rtl8366s_platform_data wzrhpg300nh_rtl8366s_data = {
-       .gpio_sda        = WZRHPG300NH_GPIO_RTL8366_SDA,
-       .gpio_sck        = WZRHPG300NH_GPIO_RTL8366_SCK,
+       .gpio_sda       = WZRHPG300NH_GPIO_RTL8366_SDA,
+       .gpio_sck       = WZRHPG300NH_GPIO_RTL8366_SCK,
 };
 
 static struct platform_device wzrhpg300nh_rtl8366s_device = {
@@ -247,18 +247,18 @@ static void __init wzrhpg300nh_setup(void)
        ar71xx_add_device_eth(1);
 
        ar71xx_add_device_usb();
-       ar913x_add_device_wmac(eeprom, NULL);
+       ar9xxx_add_device_wmac(eeprom, NULL);
 
        platform_device_register(&wzrhpg300nh_74hc153_device);
        platform_device_register(&wzrhpg300nh_flash_device);
        platform_device_register(&wzrhpg300nh_rtl8366s_device);
 
        ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(wzrhpg300nh_leds_gpio),
-                                   wzrhpg300nh_leds_gpio);
+                                       wzrhpg300nh_leds_gpio);
 
        ar71xx_add_device_gpio_buttons(-1, WZRHPG300NH_BUTTONS_POLL_INTERVAL,
-                                      ARRAY_SIZE(wzrhpg300nh_gpio_buttons),
-                                      wzrhpg300nh_gpio_buttons);
+                                       ARRAY_SIZE(wzrhpg300nh_gpio_buttons),
+                                       wzrhpg300nh_gpio_buttons);
 
 }