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
This commit is contained in:
Arnd Bergmann 2015-04-14 00:47:11 +02:00
commit 8b481b01db

View File

@ -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,
};