diff options
| author | Olof Johansson <olof@lixom.net> | 2017-06-18 21:02:46 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-06-18 21:02:46 -0700 |
| commit | f7b22111c7de28c24d939b8db33380c42bd8ed7e (patch) | |
| tree | fe660ff54beaef05cb9f68d2b6039ac767d5269b | |
| parent | da82480d453ef404b1ab0e0c449af2ab8282791b (diff) | |
| parent | 231ce279e6e37960f8c61d99f86e4937733ed96b (diff) | |
| download | lwn-f7b22111c7de28c24d939b8db33380c42bd8ed7e.tar.gz lwn-f7b22111c7de28c24d939b8db33380c42bd8ed7e.zip | |
Merge tag 'davinci-for-v4.13/soc-2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/soc
A patch to fix warnings resulting from DT conversion
of VPIF driver.
* tag 'davinci-for-v4.13/soc-2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
ARM: davinci: fix const warnings
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | arch/arm/mach-davinci/board-dm646x-evm.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-davinci/pdata-quirks.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c index cb176826d1cb..055e947a6a39 100644 --- a/arch/arm/mach-davinci/board-dm646x-evm.c +++ b/arch/arm/mach-davinci/board-dm646x-evm.c @@ -641,7 +641,7 @@ static struct vpif_subdev_info vpif_capture_sdev_info[] = { }, }; -static const struct vpif_input dm6467_ch0_inputs[] = { +static struct vpif_input dm6467_ch0_inputs[] = { { .input = { .index = 0, @@ -656,7 +656,7 @@ static const struct vpif_input dm6467_ch0_inputs[] = { }, }; -static const struct vpif_input dm6467_ch1_inputs[] = { +static struct vpif_input dm6467_ch1_inputs[] = { { .input = { .index = 0, diff --git a/arch/arm/mach-davinci/pdata-quirks.c b/arch/arm/mach-davinci/pdata-quirks.c index 329f5402ad1d..4858b1cdf31b 100644 --- a/arch/arm/mach-davinci/pdata-quirks.c +++ b/arch/arm/mach-davinci/pdata-quirks.c @@ -33,7 +33,7 @@ static struct tvp514x_platform_data tvp5146_pdata = { #define TVP514X_STD_ALL (V4L2_STD_NTSC | V4L2_STD_PAL) -static const struct vpif_input da850_ch0_inputs[] = { +static struct vpif_input da850_ch0_inputs[] = { { .input = { .index = 0, @@ -48,7 +48,7 @@ static const struct vpif_input da850_ch0_inputs[] = { }, }; -static const struct vpif_input da850_ch1_inputs[] = { +static struct vpif_input da850_ch1_inputs[] = { { .input = { .index = 0, |