Merge master.kernel.org:/home/rmk/linux-2.6-arm

2005-11-21 19:00:05 -08:00
parent 49bd96c2ca 9b73fcf85f
commit 66b5920f61
6 changed files with 8 additions and 4 deletions
@@ -64,7 +64,7 @@ void __writel(u32 val, void __iomem *addr);
 #define writew(v,b)		__writew(v,b)
 #define writel(v,b)		__writel(v,b)

-#define __arch_ioremap(cookie,sz,c,a)	((void __iomem *)(cookie))
+#define __arch_ioremap(cookie,sz,c)	((void __iomem *)(cookie))
 #define __arch_iounmap(cookie)		do { } while (0)

 extern void insb(unsigned int port, void *buf, int sz);
@@ -47,6 +47,7 @@
 * Queue Manager
 */
 #define IXP4XX_QMGR_BASE_PHYS		(0x60000000)
+#define IXP4XX_QMGR_REGION_SIZE		(0x00004000)

 /*
 * Expansion BUS Configuration registers
@@ -17,6 +17,8 @@
 #ifndef __ASM_ARM_NUMNODES_H
 #define __ASM_ARM_NUMNODES_H

+#include <asm/memory.h>
+
 #ifndef NODES_SHIFT
 # define NODES_SHIFT	2	/* Normally, Max 4 Nodes */
 #endif