diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2020-01-10 11:45:39 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2020-01-10 11:45:39 +1100 |
| commit | 47e83f79c2539ed99fe7728f4d9ee685769b5854 (patch) | |
| tree | 6298ac693f569e892dbf6b8e04fb12c923589bdf /arch | |
| parent | 835b50bd304f8c16024ace70b673089aab40f378 (diff) | |
| parent | 5c34ba27cbbbfa61e6491309451d7bfc91507cac (diff) | |
Merge remote-tracking branch 'drm-intel/for-linux-next'
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-u300/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-u300/core.c b/arch/arm/mach-u300/core.c index a79fa3b0c8ed..a1694d977ec9 100644 --- a/arch/arm/mach-u300/core.c +++ b/arch/arm/mach-u300/core.c @@ -201,7 +201,7 @@ static unsigned long pin_highz_conf[] = { }; /* Pin control settings */ -static struct pinctrl_map __initdata u300_pinmux_map[] = { +static const struct pinctrl_map u300_pinmux_map[] = { /* anonymous maps for chip power and EMIFs */ PIN_MAP_MUX_GROUP_HOG_DEFAULT("pinctrl-u300", NULL, "power"), PIN_MAP_MUX_GROUP_HOG_DEFAULT("pinctrl-u300", NULL, "emif0"), |