ixp4xx: sync 2.6.33 patches against 2.6.33.6
SVN-Revision: 22248
This commit is contained in:
parent
9a4ca45096
commit
472585ce4a
|
@ -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.
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in New Issue