diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2012-03-30 16:04:51 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2012-04-18 07:53:10 -0400 |
commit | 122dbe7e58c7d064a17eefd33205227e6bce85ca (patch) | |
tree | 99a7ece2870dc22cd58ec6897a921266b4f587c5 /drivers/pinctrl | |
parent | eb181c3533e8e5b3eaa96d3e8ed1cf5d9a408076 (diff) |
pinctrl: mark const init data with __initconst instead of __initdata
As long as there is no other non-const variable marked __initdata in the
same compilation unit it doesn't hurt. If there were one however
compilation would fail with
error: $variablename causes a section type conflict
because a section containing const variables is marked read only and so
cannot contain non-const variables.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl')
-rw-r--r-- | drivers/pinctrl/pinctrl-coh901.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pinctrl/pinctrl-coh901.c b/drivers/pinctrl/pinctrl-coh901.c index 0797eba3e33a..55697a5d7482 100644 --- a/drivers/pinctrl/pinctrl-coh901.c +++ b/drivers/pinctrl/pinctrl-coh901.c | |||
@@ -174,7 +174,7 @@ struct u300_gpio_confdata { | |||
174 | 174 | ||
175 | 175 | ||
176 | /* Initial configuration */ | 176 | /* Initial configuration */ |
177 | static const struct __initdata u300_gpio_confdata | 177 | static const struct __initconst u300_gpio_confdata |
178 | bs335_gpio_config[BS335_GPIO_NUM_PORTS][U300_GPIO_PINS_PER_PORT] = { | 178 | bs335_gpio_config[BS335_GPIO_NUM_PORTS][U300_GPIO_PINS_PER_PORT] = { |
179 | /* Port 0, pins 0-7 */ | 179 | /* Port 0, pins 0-7 */ |
180 | { | 180 | { |
@@ -255,7 +255,7 @@ bs335_gpio_config[BS335_GPIO_NUM_PORTS][U300_GPIO_PINS_PER_PORT] = { | |||
255 | } | 255 | } |
256 | }; | 256 | }; |
257 | 257 | ||
258 | static const struct __initdata u300_gpio_confdata | 258 | static const struct __initconst u300_gpio_confdata |
259 | bs365_gpio_config[BS365_GPIO_NUM_PORTS][U300_GPIO_PINS_PER_PORT] = { | 259 | bs365_gpio_config[BS365_GPIO_NUM_PORTS][U300_GPIO_PINS_PER_PORT] = { |
260 | /* Port 0, pins 0-7 */ | 260 | /* Port 0, pins 0-7 */ |
261 | { | 261 | { |