diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-08-17 02:42:59 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-08-29 23:31:56 -0400 |
| commit | fb120da678c517f72d4b39932062c2191827b331 (patch) | |
| tree | 0ae6b9d42e0c66293c3cc567f2f8279ca2e89cde /include | |
| parent | 71d276d751ff5ddba28312aecefb174b20a5b970 (diff) | |
[PATCH] Make MODULE_DEVICE_TABLE work for vio devices
Make MODULE_DEVICE_TABLE work for vio devices.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-ppc64/vio.h | 6 | ||||
| -rw-r--r-- | include/linux/mod_devicetable.h | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/include/asm-ppc64/vio.h b/include/asm-ppc64/vio.h index 85420bb37d58..03f1b95f433b 100644 --- a/include/asm-ppc64/vio.h +++ b/include/asm-ppc64/vio.h | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/errno.h> | 19 | #include <linux/errno.h> |
| 20 | #include <linux/device.h> | 20 | #include <linux/device.h> |
| 21 | #include <linux/dma-mapping.h> | 21 | #include <linux/dma-mapping.h> |
| 22 | #include <linux/mod_devicetable.h> | ||
| 22 | 23 | ||
| 23 | #include <asm/hvcall.h> | 24 | #include <asm/hvcall.h> |
| 24 | #include <asm/scatterlist.h> | 25 | #include <asm/scatterlist.h> |
| @@ -52,11 +53,6 @@ struct vio_dev { | |||
| 52 | struct device dev; | 53 | struct device dev; |
| 53 | }; | 54 | }; |
| 54 | 55 | ||
| 55 | struct vio_device_id { | ||
| 56 | char *type; | ||
| 57 | char *compat; | ||
| 58 | }; | ||
| 59 | |||
| 60 | struct vio_driver { | 56 | struct vio_driver { |
| 61 | struct list_head node; | 57 | struct list_head node; |
| 62 | char *name; | 58 | char *name; |
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 */ | ||
| 194 | struct vio_device_id { | ||
| 195 | char type[32]; | ||
| 196 | char compat[32]; | ||
| 197 | }; | ||
| 193 | 198 | ||
| 194 | /* PCMCIA */ | 199 | /* PCMCIA */ |
| 195 | 200 | ||
