summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2017-08-16 11:22:20 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2017-08-16 11:22:20 +1000
commitfa5d4f2ea25e39b183cc67483f304c53786c2251 (patch)
treed3c8d5ced391341b71ab36f55c795bb43f60ad1d /arch/arm
parent69b7f97e157c60594903f564d49d36a7f786d470 (diff)
parent64954e344257b7660839151b3f30bd1bacb6eb38 (diff)
Merge remote-tracking branch 'input/next'
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-pxa/raumfeld.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/raumfeld.c b/arch/arm/mach-pxa/raumfeld.c
index e2c97728b3c6..9d662fed03ec 100644
--- a/arch/arm/mach-pxa/raumfeld.c
+++ b/arch/arm/mach-pxa/raumfeld.c
@@ -377,7 +377,7 @@ static struct gpiod_lookup_table raumfeld_rotary_gpios_table = {
},
};
-static struct property_entry raumfeld_rotary_properties[] = {
+static const struct property_entry raumfeld_rotary_properties[] __initconst = {
PROPERTY_ENTRY_INTEGER("rotary-encoder,steps-per-period", u32, 24),
PROPERTY_ENTRY_INTEGER("linux,axis", u32, REL_X),
PROPERTY_ENTRY_INTEGER("rotary-encoder,relative_axis", u32, 1),