Эх сурвалжийг харах

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
Arnd Bergmann 10 жил өмнө
parent
commit
8b481b01db

+ 1 - 1
arch/arm/mach-bcm/bcm_cygnus.c

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