diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-09-04 09:07:35 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-09-04 09:07:35 -0400 |
| commit | 3fbb96d275989c604b343b9e39aeea50386756e9 (patch) | |
| tree | 6a066ece039f798f7d5a6b44453fc889e0e1cf8a /drivers/pinctrl/pinctrl-imx23.c | |
| parent | 63487589bf96bfd3fb7d5531f2d966f29ffe397d (diff) | |
| parent | 863e99a8c1ea2b0391491904297f57a0f6a1fdd6 (diff) | |
Merge branch 'cleanup/io-pci' into next/cleanup
The io-pci series has gained a merge to resolve a nontrivial
conflict.
* cleanup/io-pci:
ARM: Fix ioremap() of address zero
Also includes an update to Linux 3.6-rc3
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/pinctrl/pinctrl-imx23.c')
| -rw-r--r-- | drivers/pinctrl/pinctrl-imx23.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pinctrl/pinctrl-imx23.c b/drivers/pinctrl/pinctrl-imx23.c index 75d3eff94296..3674d877ed7c 100644 --- a/drivers/pinctrl/pinctrl-imx23.c +++ b/drivers/pinctrl/pinctrl-imx23.c | |||
| @@ -292,7 +292,7 @@ static int __init imx23_pinctrl_init(void) | |||
| 292 | { | 292 | { |
| 293 | return platform_driver_register(&imx23_pinctrl_driver); | 293 | return platform_driver_register(&imx23_pinctrl_driver); |
| 294 | } | 294 | } |
| 295 | arch_initcall(imx23_pinctrl_init); | 295 | postcore_initcall(imx23_pinctrl_init); |
| 296 | 296 | ||
| 297 | static void __exit imx23_pinctrl_exit(void) | 297 | static void __exit imx23_pinctrl_exit(void) |
| 298 | { | 298 | { |