--- zzzz-none-000/linux-2.6.28.10/include/linux/dma-mapping.h	2009-05-02 18:54:43.000000000 +0000
+++ puma5-6360-529/linux-2.6.28.10/include/linux/dma-mapping.h	2009-12-18 15:54:10.000000000 +0000
@@ -4,6 +4,10 @@
 #include <linux/device.h>
 #include <linux/err.h>
 
+#ifdef CONFIG_ARCH_PUMA5
+extern void consistent_sync(void *kaddr, size_t size, int rw);
+#endif /*--- #ifdef CONFIG_ARCH_PUMA5 ---*/
+
 /* These definitions mirror those in pci.h, so they can be used
  * interchangeably with their PCI_ counterparts */
 enum dma_data_direction {
@@ -110,20 +114,20 @@
 
 #ifndef ARCH_HAS_DMA_DECLARE_COHERENT_MEMORY
 static inline int
-dma_declare_coherent_memory(struct device *dev, dma_addr_t bus_addr,
-			    dma_addr_t device_addr, size_t size, int flags)
+dma_declare_coherent_memory(struct device *dev __attribute__ ((unused)), dma_addr_t bus_addr __attribute__ ((unused)),
+			    dma_addr_t device_addr __attribute__ ((unused)), size_t size __attribute__ ((unused)), int flags __attribute__ ((unused)))
 {
 	return 0;
 }
 
 static inline void
-dma_release_declared_memory(struct device *dev)
+dma_release_declared_memory(struct device *dev __attribute__ ((unused)))
 {
 }
 
 static inline void *
-dma_mark_declared_memory_occupied(struct device *dev,
-				  dma_addr_t device_addr, size_t size)
+dma_mark_declared_memory_occupied(struct device *dev __attribute__ ((unused)),
+				  dma_addr_t device_addr __attribute__ ((unused)), size_t size __attribute__ ((unused)))
 {
 	return ERR_PTR(-EBUSY);
 }
@@ -146,14 +150,14 @@
 					int flags);
 extern void dmam_release_declared_memory(struct device *dev);
 #else /* ARCH_HAS_DMA_DECLARE_COHERENT_MEMORY */
-static inline int dmam_declare_coherent_memory(struct device *dev,
-				dma_addr_t bus_addr, dma_addr_t device_addr,
-				size_t size, gfp_t gfp)
+static inline int dmam_declare_coherent_memory(struct device *dev __attribute__ ((unused)),
+				dma_addr_t bus_addr __attribute__ ((unused)), dma_addr_t device_addr __attribute__ ((unused)),
+				size_t size __attribute__ ((unused)), gfp_t gfp __attribute__ ((unused)))
 {
 	return 0;
 }
 
-static inline void dmam_release_declared_memory(struct device *dev)
+static inline void dmam_release_declared_memory(struct device *dev __attribute__ ((unused)))
 {
 }
 #endif /* ARCH_HAS_DMA_DECLARE_COHERENT_MEMORY */