wireguard-tools: add tunlink option for hostroute

[openwrt/staging/chunkeey.git] / target / linux / ar71xx / files / arch / mips / ath79 / mach-wndr4300.c

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-wndr4300.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-wndr4300.c
index 2a00a0ed961faf8c0e538c04f2b2455db190b6db..339216da1bbf7bef8d5bd7170d13bdcdde92a213 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-wndr4300.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-wndr4300.c
@@ -9,6 +9,7 @@
  *  by the Free Software Foundation.
  */
 
+#include <linux/version.h>
 #include <linux/pci.h>
 #include <linux/phy.h>
 #include <linux/gpio.h>
@@ -16,7 +17,11 @@
 #include <linux/ath9k_platform.h>
 #include <linux/ar8216_platform.h>
 #include <linux/mtd/mtd.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,14,0)
 #include <linux/mtd/nand.h>
+#else
+#include <linux/mtd/rawnand.h>
+#endif
 #include <linux/platform/ar934x_nfc.h>
 
 #include <asm/mach-ath79/ar71xx_regs.h>
@@ -102,7 +107,7 @@ static struct gpio_led wndr4300_leds_gpio[] __initdata = {
 
 static struct gpio_keys_button wndr4300_gpio_keys[] __initdata = {
        {
-               .desc           = "Reset button",
+               .desc           = "reset",
                .type           = EV_KEY,
                .code           = KEY_RESTART,
                .debounce_interval = WNDR4300_KEYS_DEBOUNCE_INTERVAL,
@@ -110,7 +115,7 @@ static struct gpio_keys_button wndr4300_gpio_keys[] __initdata = {
                .active_low     = 1,
        },
        {
-               .desc           = "WPS button",
+               .desc           = "wps",
                .type           = EV_KEY,
                .code           = KEY_WPS_BUTTON,
                .debounce_interval = WNDR4300_KEYS_DEBOUNCE_INTERVAL,
@@ -118,7 +123,7 @@ static struct gpio_keys_button wndr4300_gpio_keys[] __initdata = {
                .active_low     = 1,
        },
        {
-               .desc           = "Wireless button",
+               .desc           = "rfkill",
                .type           = EV_KEY,
                .code           = KEY_RFKILL,
                .debounce_interval = WNDR4300_KEYS_DEBOUNCE_INTERVAL,
@@ -158,7 +163,7 @@ static struct ar8327_platform_data wndr4300_ar8327_data = {
 static struct mdio_board_info wndr4300_mdio0_info[] = {
        {
                .bus_id = "ag71xx-mdio.0",
-               .phy_addr = 0,
+               .mdio_addr = 0,
                .platform_data = &wndr4300_ar8327_data,
        },
 };