ar71xx: add v4.14 support

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

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-rb922.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-rb922.c
index 2f54d029f67898ab1b6ab5d8838d9515c11e719f..10cbdd56b61a83f57c067d740778e2b59858203d 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-rb922.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-rb922.c
@@ -13,7 +13,11 @@
 #include <linux/platform_device.h>
 #include <linux/ath9k_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/mtd/partitions.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/flash.h>
@@ -108,7 +112,7 @@ static struct at803x_platform_data rb922gs_at803x_data = {
 static struct mdio_board_info rb922gs_mdio0_info[] = {
        {
                .bus_id = "ag71xx-mdio.0",
-               .phy_addr = RB922_PHY_ADDR,
+               .mdio_addr = RB922_PHY_ADDR,
                .platform_data = &rb922gs_at803x_data,
        },
 };