aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-08-30 00:44:33 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-08-30 00:44:33 -0400
commit8bc2bee26bc7ba77eb1ffc3e3282002d9893cf09 (patch)
treee7c85eca8d55007b0a467b99820820cd40ef4963 /include/linux
parent826509f8110049663799bc20f2b5b6170e2f78ca (diff)
parent8913ca1c9ccb5eb6471afd419159729eef6e2730 (diff)
Merge HEAD from master.kernel.org:/pub/scm/linux/kernel/git/paulus/ppc64-2.6
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/mod_devicetable.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
index 97bbccdbcca3..47da39ba3f03 100644
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@ -1,6 +1,6 @@
1/* 1/*
2 * Device tables which are exported to userspace via 2 * Device tables which are exported to userspace via
3 * scripts/table2alias.c. You must keep that file in sync with this 3 * scripts/mod/file2alias.c. You must keep that file in sync with this
4 * header. 4 * header.
5 */ 5 */
6 6
@@ -190,6 +190,11 @@ struct of_device_id
190#endif 190#endif
191}; 191};
192 192
193/* VIO */
194struct vio_device_id {
195 char type[32];
196 char compat[32];
197};
193 198
194/* PCMCIA */ 199/* PCMCIA */
195 200