diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-09-05 10:00:30 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-09-05 10:00:47 +0300 |
| commit | 95cd2ea7d54b41b0b2828587f108fe270d59eede (patch) | |
| tree | 623675092834a6a92ac1ef28cc5abb930c9a11b0 /arch/arm/mach-shmobile/board-bockw.c | |
| parent | 66c117d7fa2ae429911e60d84bf31a90b2b96189 (diff) | |
| parent | e713c80a4e49d4bed5324d24755e42bf01c87556 (diff) | |
| download | linux-95cd2ea7d54b41b0b2828587f108fe270d59eede.tar.xz | |
Merge branch 'linus' into x86/urgent, to be able to merge a dependent fix
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/mach-shmobile/board-bockw.c')
| -rw-r--r-- | arch/arm/mach-shmobile/board-bockw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/board-bockw.c b/arch/arm/mach-shmobile/board-bockw.c index 25558d1f417f..25a0e7233fe4 100644 --- a/arch/arm/mach-shmobile/board-bockw.c +++ b/arch/arm/mach-shmobile/board-bockw.c @@ -723,7 +723,7 @@ static void __init bockw_init_late(void) ADD_USB_FUNC_DEVICE_IF_POSSIBLE(); } -static const char *bockw_boards_compat_dt[] __initdata = { +static const char *const bockw_boards_compat_dt[] __initconst = { "renesas,bockw", NULL, }; |