diff --git a/[refs] b/[refs]
index e71547940128..55cbaec1c233 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d15b51be6f3a04762522c8ee9ac6a3a02752c0ed
+refs/heads/master: 479ea1e90c2b052de793a80ecc5eceab480f44ff
diff --git a/trunk/arch/xtensa/include/asm/pci.h b/trunk/arch/xtensa/include/asm/pci.h
index 66410acf18b4..f3f0cf3439ad 100644
--- a/trunk/arch/xtensa/include/asm/pci.h
+++ b/trunk/arch/xtensa/include/asm/pci.h
@@ -56,13 +56,7 @@ struct pci_dev;
 
 #define PCI_DMA_BUS_IS_PHYS	(1)
 
-/* pci_unmap_{page,single} is a no-op, so */
-#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)
-#define DECLARE_PCI_UNMAP_LEN(LEN_NAME)
-#define pci_unmap_addr(PTR, ADDR_NAME)		(0)
-#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL)	do { } while (0)
-#define pci_ubnmap_len(PTR, LEN_NAME)		(0)
-#define pci_unmap_len_set(PTR, LEN_NAME, VAL)	do { } while (0)
+#include <linux/pci-dma.h>
 
 /* Map a range of PCI memory or I/O space for a device into user space */
 int pci_mmap_page_range(struct pci_dev *pdev, struct vm_area_struct *vma,