branch Attitude Adjustment

git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@33625 3c298f89-4303-0410-b956-a3cf2f4a3e73

3 files changed, 68 insertions, 0 deletions

diff --git a/target/linux/iop32x/patches-3.3/001-ARM-Fix-missing-linux-types.h-inclusion-in-asm-hardw.patch b/target/linux/iop32x/patches-3.3/001-ARM-Fix-missing-linux-types.h-inclusion-in-asm-hardw.patch
new file mode 100644
index 000000000..a03eff74c
--- /dev/null
+++ b/target/linux/iop32x/patches-3.3/001-ARM-Fix-missing-linux-types.h-inclusion-in-asm-hardw.patch
@@ -0,0 +1,33 @@
+From 15e9b9b9ed268fa91e52c44d621f3d0296162d15 Mon Sep 17 00:00:00 2001
+From: David Howells <dhowells@redhat.com>
+Date: Fri, 23 Mar 2012 15:37:34 +0000
+Subject: [PATCH] ARM: Fix missing linux/types.h #inclusion in asm/hardware/iop3xx.h
+
+arch/arm/include/asm/hardware/iop3xx.h needs to include linux/types.h to avoid
+the following errors:
+
+In file included from arch/arm/plat-iop/restart.c:10:0:
+/data/fs/linux-2.6-fscache/arch/arm/include/asm/hardware/iop3xx.h:239:1: error: unknown type name 'u32'
+/data/fs/linux-2.6-fscache/arch/arm/include/asm/hardware/iop3xx.h: In function 'read_tmr0':
+/data/fs/linux-2.6-fscache/arch/arm/include/asm/hardware/iop3xx.h:241:2: error: unknown type name 'u32'
+/data/fs/linux-2.6-fscache/arch/arm/include/asm/hardware/iop3xx.h: At top level:
+/data/fs/linux-2.6-fscache/arch/arm/include/asm/hardware/iop3xx.h:246:31: error: unknown type name 'u32'
+...
+
+Signed-off-by: David Howells <dhowells@redhat.com>
+---
+ arch/arm/include/asm/hardware/iop3xx.h |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+--- a/arch/arm/include/asm/hardware/iop3xx.h
++++ b/arch/arm/include/asm/hardware/iop3xx.h
+@@ -231,6 +231,9 @@ extern int iop3xx_get_init_atu(void);
+ 
+ 
+ #ifndef __ASSEMBLY__
++
++#include <linux/types.h>
++
+ void iop3xx_map_io(void);
+ void iop_init_cp6_handler(void);
+ void iop_init_time(unsigned long tickrate);
diff --git a/target/linux/iop32x/patches-3.3/002-Disintegrate-asm-system.h-for-ARM.patch b/target/linux/iop32x/patches-3.3/002-Disintegrate-asm-system.h-for-ARM.patch
new file mode 100644
index 000000000..b91e9a27e
--- /dev/null
+++ b/target/linux/iop32x/patches-3.3/002-Disintegrate-asm-system.h-for-ARM.patch
@@ -0,0 +1,24 @@
+From 9f97da78bf018206fb623cd351d454af2f105fe0 Mon Sep 17 00:00:00 2001
+From: David Howells <dhowells@redhat.com>
+Date: Wed, 28 Mar 2012 18:30:01 +0100
+Subject: [PATCH] Disintegrate asm/system.h for ARM
+
+Disintegrate asm/system.h for ARM.
+
+Signed-off-by: David Howells <dhowells@redhat.com>
+cc: Russell King <linux@arm.linux.org.uk>
+cc: linux-arm-kernel@lists.infradead.org
+---
+ arch/arm/plat-iop/restart.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+--- a/arch/arm/plat-iop/restart.c
++++ b/arch/arm/plat-iop/restart.c
+@@ -8,6 +8,7 @@
+  * published by the Free Software Foundation.
+  */
+ #include <asm/hardware/iop3xx.h>
++#include <asm/system.h>
+ #include <mach/hardware.h>
+ 
+ void iop3xx_restart(char mode, const char *cmd)
diff --git a/target/linux/iop32x/patches-3.3/003-plat-iop-fix-section-mismatch.patch b/target/linux/iop32x/patches-3.3/003-plat-iop-fix-section-mismatch.patch
new file mode 100644
index 000000000..ab8025dd9
--- /dev/null
+++ b/target/linux/iop32x/patches-3.3/003-plat-iop-fix-section-mismatch.patch
@@ -0,0 +1,11 @@
+--- a/arch/arm/plat-iop/pci.c
++++ b/arch/arm/plat-iop/pci.c
+@@ -221,7 +221,7 @@ int iop3xx_pci_setup(int nr, struct pci_
+ 	return 1;
+ }
+ 
+-struct pci_bus *iop3xx_pci_scan_bus(int nr, struct pci_sys_data *sys)
++struct pci_bus * __devinit iop3xx_pci_scan_bus(int nr, struct pci_sys_data *sys)
+ {
+ 	return pci_scan_root_bus(NULL, sys->busnr, &iop3xx_ops, sys,
+ 				 &sys->resources);