diff options
| author | Olof Johansson <olof@lixom.net> | 2012-10-02 01:07:32 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-10-02 01:07:32 +0400 |
| commit | 17a505edb09495510ac8998450980472c412455b (patch) | |
| tree | 07f3a9e512f67cffae1dde071c8247821dd17e60 /include/linux | |
| parent | d9a807461fc8cc0d6ba589ea0730d139122af012 (diff) | |
| parent | b10dcdcac43b2b5adf800a19f782fef38ada75a1 (diff) | |
| download | linux-17a505edb09495510ac8998450980472c412455b.tar.xz | |
Merge branch 'next/fixes-non-critical' into HEAD
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/atmel_tc.h | 2 | ||||
| -rw-r--r-- | include/linux/mod_devicetable.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/atmel_tc.h b/include/linux/atmel_tc.h index 1d14b1dc1aee..89a931babecf 100644 --- a/include/linux/atmel_tc.h +++ b/include/linux/atmel_tc.h @@ -63,7 +63,7 @@ struct atmel_tc { struct platform_device *pdev; struct resource *iomem; void __iomem *regs; - struct atmel_tcb_config *tcb_config; + const struct atmel_tcb_config *tcb_config; int irq[3]; struct clk *clk[3]; struct list_head node; diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h index 70c6a359b2f4..fed3def62818 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 |