ixp4xx: sync 2.6.33 patches against 2.6.33.6

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22248 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/ixp4xx/patches-2.6.33/010-ixp43x_pci_fixup.patch b/target/linux/ixp4xx/patches-2.6.33/010-ixp43x_pci_fixup.patch
deleted file mode 100644 (file)
index 35af7f4..0000000
--- a/target/linux/ixp4xx/patches-2.6.33/010-ixp43x_pci_fixup.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/arch/arm/mach-ixp4xx/include/mach/hardware.h
-+++ b/arch/arm/mach-ixp4xx/include/mach/hardware.h
-@@ -18,7 +18,7 @@
- #define __ASM_ARCH_HARDWARE_H__
- 
- #define PCIBIOS_MIN_IO                0x00001000
--#define PCIBIOS_MIN_MEM               (cpu_is_ixp43x() ? 0x40000000 : 0x48000000)
-+#define PCIBIOS_MIN_MEM               0x48000000
- 
- /*
-  * We override the standard dma-mask routines for bouncing.

diff --git a/target/linux/ixp4xx/patches-2.6.33/401-avila_pci_dev.patch b/target/linux/ixp4xx/patches-2.6.33/401-avila_pci_dev.patch
index 3e5087f..80f4de7 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.33/401-avila_pci_dev.patch
+++ b/target/linux/ixp4xx/patches-2.6.33/401-avila_pci_dev.patch
@@ -1,11 +1,11 @@
---- a/arch/arm/mach-ixp4xx/include/mach/avila.h
-+++ b/arch/arm/mach-ixp4xx/include/mach/avila.h
-@@ -25,7 +25,7 @@
- /*
-  * AVILA PCI IRQs
-  */
--#define AVILA_PCI_MAX_DEV     4
-+#define AVILA_PCI_MAX_DEV     6
- #define LOFT_PCI_MAX_DEV    6
- #define AVILA_PCI_IRQ_LINES   4
+--- a/arch/arm/mach-ixp4xx/avila-pci.c
++++ b/arch/arm/mach-ixp4xx/avila-pci.c
+@@ -27,7 +27,7 @@
+ #include <mach/hardware.h>
+ #include <asm/mach-types.h>
+ 
+-#define AVILA_MAX_DEV 4
++#define AVILA_MAX_DEV 6
+ #define LOFT_MAX_DEV  6
+ #define IRQ_LINES     4