diff --git a/[refs] b/[refs]
index 95b9f628455d..a583eb4cecf9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d66b3fe436a296f102e8944247972fc0c17ddf26
+refs/heads/master: fbe01f51a8260c1f0a66e8730c4fd2c5160ecb91
diff --git a/trunk/arch/arm/include/asm/device.h b/trunk/arch/arm/include/asm/device.h
index 9f390ce335cb..b5c9f5b1f6a3 100644
--- a/trunk/arch/arm/include/asm/device.h
+++ b/trunk/arch/arm/include/asm/device.h
@@ -12,7 +12,12 @@ struct dev_archdata {
 #endif
 };
 
+struct omap_device;
+
 struct pdev_archdata {
+#ifdef CONFIG_ARCH_OMAP
+	struct omap_device *od;
+#endif
 };
 
 #endif