Merge HEAD from master.kernel.org:/pub/scm/linux/kernel/git/paulus/ppc64-2.6
This commit is contained in:
commit
8bc2bee26b
75 changed files with 206 additions and 575 deletions
|
|
@ -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 */
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue