X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fatheros%2Fpatches-3.10%2F120-spiflash.patch;fp=target%2Flinux%2Fatheros%2Fpatches-3.10%2F120-spiflash.patch;h=e91fd41d4222eb6df234174b8b4d555fa4276403;hb=66c64834f84c8b498cf55e1d1fc2b0fb14fefdab;hp=7876de18fb5727a819561c02490ff68e6144a7dd;hpb=90ca9a582dcbdc6dd4f8f7f6ab015c0fe99ce1e8;p=openwrt%2Fstaging%2Fmkresin.git

diff --git a/target/linux/atheros/patches-3.10/120-spiflash.patch b/target/linux/atheros/patches-3.10/120-spiflash.patch
index 7876de18fb..e91fd41d42 100644
--- a/target/linux/atheros/patches-3.10/120-spiflash.patch
+++ b/target/linux/atheros/patches-3.10/120-spiflash.patch
@@ -23,7 +23,7 @@
  
 --- /dev/null
 +++ b/drivers/mtd/devices/ar2315.c
-@@ -0,0 +1,515 @@
+@@ -0,0 +1,514 @@
 +
 +/*
 + * MTD driver for the SPI Flash Memory support on Atheros AR2315
@@ -52,8 +52,7 @@
 +#include <linux/sched.h>
 +#include <linux/root_dev.h>
 +#include <linux/delay.h>
-+#include <asm/delay.h>
-+#include <asm/io.h>
++#include <linux/io.h>
 +
 +#include <ar2315_spiflash.h>
 +#include <ar231x_platform.h>