diff options
Diffstat (limited to 'include/linux/mod_devicetable.h')
-rw-r--r-- | include/linux/mod_devicetable.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h index 6955045199b0..fed3def62818 100644 --- a/include/linux/mod_devicetable.h +++ b/include/linux/mod_devicetable.h | |||
@@ -232,7 +232,7 @@ struct of_device_id | |||
232 | char type[32]; | 232 | char type[32]; |
233 | char compatible[128]; | 233 | char compatible[128]; |
234 | #ifdef __KERNEL__ | 234 | #ifdef __KERNEL__ |
235 | void *data; | 235 | const void *data; |
236 | #else | 236 | #else |
237 | kernel_ulong_t data; | 237 | kernel_ulong_t data; |
238 | #endif | 238 | #endif |
@@ -600,4 +600,12 @@ struct x86_cpu_id { | |||
600 | #define X86_MODEL_ANY 0 | 600 | #define X86_MODEL_ANY 0 |
601 | #define X86_FEATURE_ANY 0 /* Same as FPU, you can't test for that */ | 601 | #define X86_FEATURE_ANY 0 /* Same as FPU, you can't test for that */ |
602 | 602 | ||
603 | #define IPACK_ANY_FORMAT 0xff | ||
604 | #define IPACK_ANY_ID (~0) | ||
605 | struct ipack_device_id { | ||
606 | __u8 format; /* Format version or IPACK_ANY_ID */ | ||
607 | __u32 vendor; /* Vendor ID or IPACK_ANY_ID */ | ||
608 | __u32 device; /* Device ID or IPACK_ANY_ID */ | ||
609 | }; | ||
610 | |||
603 | #endif /* LINUX_MOD_DEVICETABLE_H */ | 611 | #endif /* LINUX_MOD_DEVICETABLE_H */ |