diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-04-14 00:47:11 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-04-14 00:47:11 +0200 |
| commit | 8b481b01db016bdfefa0ccdfb3ab4abc90db73a3 (patch) | |
| tree | e8ec83ea02d2afe89ad032644a112c9ad332d188 /arch | |
| parent | 7cef9875f304d10fff18c2625ebd8a5bd748ce8b (diff) | |
| parent | 3213e674ca42c95b84ed040eab3d5722f41412ae (diff) | |
| download | linux-8b481b01db016bdfefa0ccdfb3ab4abc90db73a3.tar.gz linux-8b481b01db016bdfefa0ccdfb3ab4abc90db73a3.tar.bz2 linux-8b481b01db016bdfefa0ccdfb3ab4abc90db73a3.zip | |
Merge tag 'arm-soc/for-4.1/soc' of http://github.com/broadcom/stblinux into next/soc
Pull "Trivial change to fix a const declaration for the Cygnus SoC" from Florian Fainelli:
* tag 'arm-soc/for-4.1/soc' of http://github.com/broadcom/stblinux:
ARM: cygnus: fix const declaration bcm_cygnus_dt_compat
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-bcm/bcm_cygnus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-bcm/bcm_cygnus.c b/arch/arm/mach-bcm/bcm_cygnus.c index 30dc58be51b8..7ae894c7849b 100644 --- a/arch/arm/mach-bcm/bcm_cygnus.c +++ b/arch/arm/mach-bcm/bcm_cygnus.c @@ -13,7 +13,7 @@ #include <asm/mach/arch.h> -static const char const *bcm_cygnus_dt_compat[] = { +static const char * const bcm_cygnus_dt_compat[] __initconst = { "brcm,cygnus", NULL, }; |