diff options
| author | Olof Johansson <olof@lixom.net> | 2014-07-13 08:41:09 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-07-13 08:41:09 +0400 |
| commit | e1adcba9c8f6453b1aefababce6810a6866a557c (patch) | |
| tree | 48024d5b0df2639f587be14cf5401c48a5062a71 /arch/arm/mach-ux500/timer.c | |
| parent | db6d842b8443ebac7b7b37264f992ce49dfb5208 (diff) | |
| parent | 823e7546c4a2bd4c8edce6d8dc8544fd79287c55 (diff) | |
| download | linux-e1adcba9c8f6453b1aefababce6810a6866a557c.tar.xz | |
Merge tag 'ux500-core-for-v3.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/cleanup
Merge "Ux500 core changes for v3.17 take 1" from Linus Walleij:
Some minor cleanups to the Ux500 core. DT-only probe path and
some constification from static code analysis.
* tag 'ux500-core-for-v3.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
ARM: ux500: remove pointless cache setup complexity
ARM: ux500: storage class should be before const qualifier
ARM: ux500: Staticize ab8505_regulators
ARM: ux500: Staticize local symbols in cpu-db8500.c
ARM: ux500: Staticise ux500_soc_attr
+ Linux 3.16-rc4
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-ux500/timer.c')
| -rw-r--r-- | arch/arm/mach-ux500/timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/timer.c b/arch/arm/mach-ux500/timer.c index 87efda0aa348..ff28d8ad1ed7 100644 --- a/arch/arm/mach-ux500/timer.c +++ b/arch/arm/mach-ux500/timer.c @@ -16,7 +16,7 @@ #include "db8500-regs.h" #include "id.h" -const static struct of_device_id prcmu_timer_of_match[] __initconst = { +static const struct of_device_id prcmu_timer_of_match[] __initconst = { { .compatible = "stericsson,db8500-prcmu-timer-4", }, { }, }; |