diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 13:56:44 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 13:56:44 +0100 |
| commit | 4045407fd7740642b18bc802e8bab064e79a61e5 (patch) | |
| tree | 9412a38886bfad562bc5897c6e4c23bb88703204 /arch/arm/plat-mxc/system.c | |
| parent | Merge branch 'restart-cleanup' into restart (diff) | |
| parent | Merge branch 'for-russell' of git://hansjkoch.de/git/linux-tcc into HEAD (diff) | |
| download | linux-4045407fd7740642b18bc802e8bab064e79a61e5.tar.xz linux-4045407fd7740642b18bc802e8bab064e79a61e5.zip | |
Merge branch 'restart-cleanup' into restart
Conflicts:
arch/arm/kernel/setup.c
Diffstat (limited to 'arch/arm/plat-mxc/system.c')
| -rw-r--r-- | arch/arm/plat-mxc/system.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/plat-mxc/system.c b/arch/arm/plat-mxc/system.c index b1cfc6a49715..7e5c76ea4466 100644 --- a/arch/arm/plat-mxc/system.c +++ b/arch/arm/plat-mxc/system.c @@ -21,6 +21,7 @@ #include <linux/io.h> #include <linux/err.h> #include <linux/delay.h> +#include <linux/module.h> #include <mach/hardware.h> #include <mach/common.h> @@ -28,8 +29,8 @@ #include <asm/system.h> #include <asm/mach-types.h> -void (*imx_idle)(void) = NULL; void __iomem *(*imx_ioremap)(unsigned long, size_t, unsigned int) = NULL; +EXPORT_SYMBOL_GPL(imx_ioremap); static void __iomem *wdog_base; |