From: John Crispin <john@openwrt.org>
Date: Tue, 24 Jun 2014 18:13:31 +0000 (+0000)
Subject: atheros[ar2315-spiflash]: make spiflash header local
X-Git-Tag: reboot~6819
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=cce27e3b95a994c30fb2f21d1fb0827cdf767414;p=oweals%2Fopenwrt.git

atheros[ar2315-spiflash]: make spiflash header local

We do not need global access to it, so move it from arch include to the
mtd subdir.

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>

SVN-Revision: 41321
---

diff --git a/target/linux/atheros/patches-3.10/120-spiflash.patch b/target/linux/atheros/patches-3.10/120-spiflash.patch
index 8630a3a2d1..a07fa52f1a 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,540 @@
+@@ -0,0 +1,539 @@
 +
 +/*
 + * MTD driver for the SPI Flash Memory support on Atheros AR2315
@@ -54,9 +54,8 @@
 +#include <linux/delay.h>
 +#include <linux/io.h>
 +
-+#include <ar2315_spiflash.h>
-+#include <ar231x_platform.h>
 +#include <ar231x.h>
++#include "ar2315_spiflash.h"
 +
 +
 +#define SPIFLASH "spiflash: "
@@ -565,10 +564,10 @@
 +MODULE_DESCRIPTION("MTD driver for SPI Flash on Atheros SOC");
 +
 --- /dev/null
-+++ b/arch/mips/include/asm/mach-ar231x/ar2315_spiflash.h
++++ b/drivers/mtd/devices/ar2315_spiflash.h
 @@ -0,0 +1,116 @@
 +/*
-+ * SPI Flash Memory support header file.
++ * Atheros AR2315 SPI Flash Memory support header file.
 + *
 + * Copyright (c) 2005, Atheros Communications Inc.
 + * Copyright (C) 2006 FON Technology, SL.