diff --git a/[refs] b/[refs]
index afbb06bd51f4..2f2b7a1f722f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: be7ee9b2f5ef11448f79c2ff7f47eb21b7c008b4
+refs/heads/master: 6d57348d7d65ba6f2f42a24b0c7527e0f7470a84
diff --git a/trunk/drivers/edac/i82875p_edac.c b/trunk/drivers/edac/i82875p_edac.c
index 009c08fe5d69..1991f94af753 100644
--- a/trunk/drivers/edac/i82875p_edac.c
+++ b/trunk/drivers/edac/i82875p_edac.c
@@ -159,7 +159,7 @@ enum i82875p_chips {
 
 struct i82875p_pvt {
 	struct pci_dev *ovrfl_pdev;
-	void *ovrfl_window;
+	void __iomem *ovrfl_window;
 };