diff options
| author | Olof Johansson <olof@lixom.net> | 2012-10-01 14:07:32 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-10-01 14:07:32 -0700 |
| commit | 17a505edb09495510ac8998450980472c412455b (patch) | |
| tree | 07f3a9e512f67cffae1dde071c8247821dd17e60 /include/linux/mod_devicetable.h | |
| parent | d9a807461fc8cc0d6ba589ea0730d139122af012 (diff) | |
| parent | b10dcdcac43b2b5adf800a19f782fef38ada75a1 (diff) | |
Merge branch 'next/fixes-non-critical' into HEAD
Diffstat (limited to 'include/linux/mod_devicetable.h')
| -rw-r--r-- | include/linux/mod_devicetable.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h index 70c6a359b2f..fed3def6281 100644 --- a/include/linux/mod_devicetable.h +++ b/include/linux/mod_devicetable.h @@ -232,7 +232,7 @@ struct of_device_id char type[32]; char compatible[128]; #ifdef __KERNEL__ - void *data; + const void *data; #else kernel_ulong_t data; #endif |