diff --git a/[refs] b/[refs]
index 69134b39162c..6b74cc4c4376 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 490a8d70cdd77d6262c3d5815bc0b1c54a3a63f8
+refs/heads/master: 40413dcb7b273bda681dca38e6ff0bbb3728ef11
diff --git a/trunk/include/linux/mod_devicetable.h b/trunk/include/linux/mod_devicetable.h
index 97b91d1abb43..fde86671f48f 100644
--- a/trunk/include/linux/mod_devicetable.h
+++ b/trunk/include/linux/mod_devicetable.h
@@ -443,6 +443,13 @@ struct dmi_system_id {
 	struct dmi_strmatch matches[4];
 	void *driver_data;
 };
+/*
+ * struct dmi_device_id appears during expansion of
+ * "MODULE_DEVICE_TABLE(dmi, x)". Compiler doesn't look inside it
+ * but this is enough for gcc 3.4.6 to error out:
+ *	error: storage size of '__mod_dmi_device_table' isn't known
+ */
+#define dmi_device_id dmi_system_id
 #endif
 
 #define DMI_MATCH(a, b)	{ a, b }