diff --git a/[refs] b/[refs]
index aa24de81d093..21b0d08c072d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4ad9b208cf1d03c8c3c1e0063ee6eea88833118f
+refs/heads/master: c1c7438dbbd03442ff86066843485db7fadd67bd
diff --git a/trunk/arch/mips/include/asm/pci/bridge.h b/trunk/arch/mips/include/asm/pci/bridge.h
index 5f4b9d4e4114..f1f508e4f971 100644
--- a/trunk/arch/mips/include/asm/pci/bridge.h
+++ b/trunk/arch/mips/include/asm/pci/bridge.h
@@ -839,7 +839,7 @@ struct bridge_controller {
 	nasid_t			nasid;
 	unsigned int		widget_id;
 	unsigned int 		irq_cpu;
-	dma64_addr_t		baddr;
+	u64			baddr;
 	unsigned int		pci_int[8];
 };