diff -urN RC14-rc2-git8-ray_cs/arch/arm/kernel/module.c RC14-rc2-git8-arm-delta/arch/arm/kernel/module.c
--- RC14-rc2-git8-ray_cs/arch/arm/kernel/module.c	2005-06-17 15:48:29.000000000 -0400
+++ RC14-rc2-git8-arm-delta/arch/arm/kernel/module.c	2005-09-30 07:34:33.000000000 -0400
@@ -11,6 +11,7 @@
  */
 #include <linux/config.h>
 #include <linux/module.h>
+#include <linux/moduleloader.h>
 #include <linux/kernel.h>
 #include <linux/elf.h>
 #include <linux/vmalloc.h>
diff -urN RC14-rc2-git8-ray_cs/arch/arm/mm/consistent.c RC14-rc2-git8-arm-delta/arch/arm/mm/consistent.c
--- RC14-rc2-git8-ray_cs/arch/arm/mm/consistent.c	2005-06-17 15:48:29.000000000 -0400
+++ RC14-rc2-git8-arm-delta/arch/arm/mm/consistent.c	2005-09-30 07:34:33.000000000 -0400
@@ -75,7 +75,7 @@
 };
 
 static struct vm_region *
-vm_region_alloc(struct vm_region *head, size_t size, int gfp)
+vm_region_alloc(struct vm_region *head, size_t size, unsigned int gfp)
 {
 	unsigned long addr = head->vm_start, end = head->vm_end - size;
 	unsigned long flags;
@@ -133,8 +133,8 @@
 #endif
 
 static void *
-__dma_alloc(struct device *dev, size_t size, dma_addr_t *handle, int gfp,
-	    pgprot_t prot)
+__dma_alloc(struct device *dev, size_t size, dma_addr_t *handle,
+	    unsigned int gfp, pgprot_t prot)
 {
 	struct page *page;
 	struct vm_region *c;
diff -urN RC14-rc2-git8-ray_cs/drivers/pcmcia/sa1111_generic.c RC14-rc2-git8-arm-delta/drivers/pcmcia/sa1111_generic.c
--- RC14-rc2-git8-ray_cs/drivers/pcmcia/sa1111_generic.c	2005-09-05 07:05:15.000000000 -0400
+++ RC14-rc2-git8-arm-delta/drivers/pcmcia/sa1111_generic.c	2005-09-30 07:34:33.000000000 -0400
@@ -122,7 +122,7 @@
 
 static int pcmcia_probe(struct sa1111_dev *dev)
 {
-	char *base;
+	void __iomem *base;
 
 	if (!request_mem_region(dev->res.start, 512,
 				SA1111_DRIVER_NAME(dev)))