Merge tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[karo-tx-linux.git] / arch / arm / mach-omap2 / id.c

diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index 7335eb2bf3fa2b6c2897c41ed87c6b6195c0112d..2dc62a25f2c3fc7897e0e20e18ccf086a74da161 100644 (file)
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -627,7 +627,7 @@ void __init omap2_set_globals_tap(u32 class, void __iomem *tap)
 
 #ifdef CONFIG_SOC_BUS
 
-static const char const *omap_types[] = {
+static const char * const omap_types[] = {
        [OMAP2_DEVICE_TYPE_TEST]        = "TST",
        [OMAP2_DEVICE_TYPE_EMU]         = "EMU",
        [OMAP2_DEVICE_TYPE_SEC]         = "HS",