4 files changed, 12 insertions, 24 deletions
diff --git a/include/asm-arm/arch-sa1100/assabet.h b/include/asm-arm/arch-sa1100/assabet.h
index f9df2064573d..35754657b1e3 100644
--- a/include/asm-arm/arch-sa1100/assabet.h
+++ b/include/asm-arm/arch-sa1100/assabet.h
@@ -62,7 +62,7 @@ extern unsigned long SCR_value;
 #ifdef CONFIG_SA1100_ASSABET
 extern void ASSABET_BCR_frob(unsigned int mask, unsigned int set);
 #else
-#define ASSABET_BCR_frob(x)	do { } while (0)
+#define ASSABET_BCR_frob(x,y)	do { } while (0)
 #endif
 
 #define ASSABET_BCR_set(x)	ASSABET_BCR_frob((x), (x))
diff --git a/include/asm-arm/io.h b/include/asm-arm/io.h
index 4782df468d45..3c63a8cf4cb9 100644
--- a/include/asm-arm/io.h
+++ b/include/asm-arm/io.h
@@ -31,9 +31,9 @@
  * Generic IO read/write.  These perform native-endian accesses.  Note
  * that some architectures will want to re-define __raw_{read,write}w.
  */
-extern void __raw_writesb(unsigned int addr, void *data, int bytelen);
-extern void __raw_writesw(unsigned int addr, void *data, int wordlen);
-extern void __raw_writesl(unsigned int addr, void *data, int longlen);
+extern void __raw_writesb(unsigned int addr, const void *data, int bytelen);
+extern void __raw_writesw(unsigned int addr, const void *data, int wordlen);
+extern void __raw_writesl(unsigned int addr, const void *data, int longlen);
 
 extern void __raw_readsb(unsigned int addr, void *data, int bytelen);
 extern void __raw_readsw(unsigned int addr, void *data, int wordlen);
diff --git a/include/asm-arm/mmu.h b/include/asm-arm/mmu.h
index 784ff2708dc5..9b8d3d781a1e 100644
--- a/include/asm-arm/mmu.h
+++ b/include/asm-arm/mmu.h
@@ -1,7 +1,9 @@
 #ifndef __ARM_MMU_H
 #define __ARM_MMU_H
 
-/* The ARM doesn't have a mmu context */
+/*
+ * The ARM doesn't have a mmu context
+ */
 typedef struct { } mm_context_t;
 
 #endif
diff --git a/include/asm-arm/pci.h b/include/asm-arm/pci.h
index 935f73ad7e2c..041bbaddd971 100644
--- a/include/asm-arm/pci.h
+++ b/include/asm-arm/pci.h
@@ -2,7 +2,7 @@
 #define ASMARM_PCI_H
 
 #ifdef __KERNEL__
-
+#include <linux/config.h>
 #include <linux/mm.h> /* bah! */
 
 #include <asm/arch/hardware.h>
@@ -142,18 +142,9 @@ pci_map_sg(struct pci_dev *hwdev, struct scatterlist *sg, int nents, int directi
 
 	for (i = 0; i < nents; i++, sg++) {
 		char *virt;
-		if (sg->address && sg->page)
-			BUG();
-		else if (!sg->address && !sg->page)
-			BUG();
-
-		if (sg->address) {
-			sg->dma_address = virt_to_bus(sg->address);
-			virt = sg->address;
-		} else {
-			sg->dma_address = page_to_bus(sg->page) + sg->offset;
-			virt = page_address(sg->page) + sg->offset;
-		}
+
+		sg->dma_address = page_to_bus(sg->page) + sg->offset;
+		virt = page_address(sg->page) + sg->offset;
 		consistent_sync(virt, sg->length, direction);
 	}
 
@@ -197,12 +188,7 @@ pci_dma_sync_sg(struct pci_dev *hwdev, struct scatterlist *sg, int nelems, int d
 	int i;
 
 	for (i = 0; i < nelems; i++, sg++) {
-		char *virt;
-
-		if (sg->address)
-			virt = sg->address;
-		else
-			virt = page_address(sg->page) + sg->offset;
+		char *virt = page_address(sg->page) + sg->offset;
 		consistent_sync(virt, sg->length, direction);
 	}
 }