From e6f4883929fa4ebd702e5f91e7cfc5c7ec16dce9 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Fri, 13 Mar 2015 03:01:50 +0000
Subject: atheros: v3.18: cleanup includes

Remove odd and add missed includes.

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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44730 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/linux/atheros/patches-3.18/100-board.patch | 49 +++++++----------------
 1 file changed, 14 insertions(+), 35 deletions(-)

(limited to 'target/linux/atheros/patches-3.18/100-board.patch')

diff --git a/target/linux/atheros/patches-3.18/100-board.patch b/target/linux/atheros/patches-3.18/100-board.patch
index 643014f688..14ba5c3ef0 100644
--- a/target/linux/atheros/patches-3.18/100-board.patch
+++ b/target/linux/atheros/patches-3.18/100-board.patch
@@ -77,7 +77,7 @@
 +obj-$(CONFIG_SOC_AR2315) += ar2315.o
 --- /dev/null
 +++ b/arch/mips/ath25/board.c
-@@ -0,0 +1,244 @@
+@@ -0,0 +1,235 @@
 +/*
 + * This file is subject to the terms and conditions of the GNU General Public
 + * License.  See the file "COPYING" in the main directory of this archive
@@ -89,17 +89,8 @@
 + * Copyright (C) 2006-2009 Felix Fietkau <nbd@openwrt.org>
 + */
 +
-+#include <generated/autoconf.h>
 +#include <linux/init.h>
-+#include <linux/module.h>
-+#include <linux/types.h>
-+#include <linux/string.h>
-+#include <linux/platform_device.h>
-+#include <linux/kernel.h>
-+#include <linux/random.h>
-+#include <linux/etherdevice.h>
-+#include <linux/irq.h>
-+#include <linux/io.h>
++#include <linux/interrupt.h>
 +#include <asm/irq_cpu.h>
 +#include <asm/reboot.h>
 +#include <asm/bootinfo.h>
@@ -1102,7 +1093,7 @@
 +#endif /* __ASM_MACH_ATH25_AR2315_REGS_H */
 --- /dev/null
 +++ b/arch/mips/ath25/ar5312_regs.h
-@@ -0,0 +1,225 @@
+@@ -0,0 +1,223 @@
 +/*
 + * This file is subject to the terms and conditions of the GNU General Public
 + * License.  See the file "COPYING" in the main directory of this archive
@@ -1116,8 +1107,6 @@
 +#ifndef __ASM_MACH_ATH25_AR5312_REGS_H
 +#define __ASM_MACH_ATH25_AR5312_REGS_H
 +
-+#include <asm/addrspace.h>
-+
 +/*
 + * IRQs
 + */
@@ -1330,7 +1319,7 @@
 +#endif	/* __ASM_MACH_ATH25_AR5312_REGS_H */
 --- /dev/null
 +++ b/arch/mips/ath25/ar5312.c
-@@ -0,0 +1,401 @@
+@@ -0,0 +1,396 @@
 +/*
 + * This file is subject to the terms and conditions of the GNU General Public
 + * License.  See the file "COPYING" in the main directory of this archive
@@ -1347,22 +1336,17 @@
 + * Platform devices for Atheros SoCs
 + */
 +
-+#include <generated/autoconf.h>
 +#include <linux/init.h>
-+#include <linux/module.h>
-+#include <linux/types.h>
-+#include <linux/string.h>
-+#include <linux/mtd/physmap.h>
-+#include <linux/platform_device.h>
 +#include <linux/kernel.h>
 +#include <linux/bitops.h>
 +#include <linux/irqdomain.h>
++#include <linux/interrupt.h>
++#include <linux/platform_device.h>
++#include <linux/mtd/physmap.h>
 +#include <linux/reboot.h>
 +#include <asm/bootinfo.h>
 +#include <asm/reboot.h>
 +#include <asm/time.h>
-+#include <linux/irq.h>
-+#include <linux/io.h>
 +
 +#include <ath25_platform.h>
 +
@@ -1734,7 +1718,7 @@
 +}
 --- /dev/null
 +++ b/arch/mips/ath25/ar2315.c
-@@ -0,0 +1,312 @@
+@@ -0,0 +1,307 @@
 +/*
 + * This file is subject to the terms and conditions of the GNU General Public
 + * License.  See the file "COPYING" in the main directory of this archive
@@ -1751,21 +1735,16 @@
 + * Platform devices for Atheros SoCs
 + */
 +
-+#include <generated/autoconf.h>
 +#include <linux/init.h>
-+#include <linux/module.h>
-+#include <linux/types.h>
-+#include <linux/string.h>
-+#include <linux/platform_device.h>
 +#include <linux/kernel.h>
 +#include <linux/bitops.h>
 +#include <linux/irqdomain.h>
++#include <linux/interrupt.h>
++#include <linux/platform_device.h>
 +#include <linux/reboot.h>
 +#include <asm/bootinfo.h>
 +#include <asm/reboot.h>
 +#include <asm/time.h>
-+#include <linux/irq.h>
-+#include <linux/io.h>
 +
 +#include <ath25_platform.h>
 +
@@ -2127,10 +2106,12 @@
 +#endif
 --- /dev/null
 +++ b/arch/mips/ath25/devices.h
-@@ -0,0 +1,41 @@
+@@ -0,0 +1,43 @@
 +#ifndef __ATH25_DEVICES_H
 +#define __ATH25_DEVICES_H
 +
++#include <linux/cpu.h>
++
 +#define ATH25_REG_MS(_val, _field)	(((_val) & _field##_M) >> _field##_S)
 +
 +#define ATH25_IRQ_CPU_CLOCK	(MIPS_CPU_IRQ_BASE + 7) /* C0_CAUSE: 0x8000 */
@@ -2171,11 +2152,9 @@
 +#endif
 --- /dev/null
 +++ b/arch/mips/ath25/devices.c
-@@ -0,0 +1,127 @@
+@@ -0,0 +1,125 @@
 +#include <linux/kernel.h>
 +#include <linux/init.h>
-+#include <linux/serial.h>
-+#include <linux/serial_core.h>
 +#include <linux/serial_8250.h>
 +#include <linux/platform_device.h>
 +#include <asm/bootinfo.h>
-- 
cgit v1.2.3