Commit 8b481b01 authored by Arnd Bergmann's avatar Arnd Bergmann

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
parents 7cef9875 3213e674
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
static const char const *bcm_cygnus_dt_compat[] = { static const char * const bcm_cygnus_dt_compat[] __initconst = {
"brcm,cygnus", "brcm,cygnus",
NULL, NULL,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment