Merge HEAD from master.kernel.org:/pub/scm/linux/kernel/git/paulus/ppc64-2.6

2005-08-29 21:44:33 -07:00
parent 826509f811 8913ca1c9c
commit 8bc2bee26b
75 changed files with 206 additions and 575 deletions
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@ -1,6 +1,6 @@
 /*
 * Device tables which are exported to userspace via
- * scripts/table2alias.c.  You must keep that file in sync with this
+ * scripts/mod/file2alias.c.  You must keep that file in sync with this
 * header.
 */

@@ -190,6 +190,11 @@ struct of_device_id
 #endif
 };

+/* VIO */
+struct vio_device_id {
+	char type[32];
+	char compat[32];
+};

 /* PCMCIA */