diff options
author | John Crispin <john@phrozen.org> | 2018-08-09 15:59:41 +0200 |
---|---|---|
committer | John Crispin <john@phrozen.org> | 2018-08-22 08:09:00 +0200 |
commit | 318e19ba6755105bb6cc19937d8fff26cbd2cc6f (patch) | |
tree | 2f7c96140932a2770fb767141c7d1e93d29127b0 /target/linux/ar71xx/files/arch/mips/ath79/mach-rb91x.c | |
parent | e5f56c07d7fab9a6f2201f4100b593349b8ef67d (diff) | |
download | upstream-318e19ba6755105bb6cc19937d8fff26cbd2cc6f.tar.gz upstream-318e19ba6755105bb6cc19937d8fff26cbd2cc6f.tar.bz2 upstream-318e19ba6755105bb6cc19937d8fff26cbd2cc6f.zip |
ar71xx: add v4.14 support
adds v4.14 patches for testing but leaves v4.9 as default for now.
Signed-off-by: John Crispin <john@phrozen.org>
Diffstat (limited to 'target/linux/ar71xx/files/arch/mips/ath79/mach-rb91x.c')
-rw-r--r-- | target/linux/ar71xx/files/arch/mips/ath79/mach-rb91x.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-rb91x.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-rb91x.c index 691566fa82..985ef72d78 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/mach-rb91x.c +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-rb91x.c @@ -15,7 +15,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/74x164.h> @@ -227,7 +231,7 @@ static struct at803x_platform_data rb91x_at803x_data = { static struct mdio_board_info rb91x_mdio0_info[] = { { .bus_id = "ag71xx-mdio.0", - .phy_addr = 0, + .mdio_addr = 0, .platform_data = &rb91x_at803x_data, }, }; |