diff options
| author |   Sascha Hauer <s.hauer@pengutronix.de> | 2011-11-22 11:32:39 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-11-22 11:32:39 +0100 |
| commit | 9a2ee7152ca1ccd70c9f68ae1ca8244d2272f743 (patch) | |
| tree | 1ebcd9c9812a0b2857ef9bae39a399c3283dcdb1 /arch/arm/plat-mxc/system.c | |
| parent | Merge branches 'fixes/imx3-build', 'fixes/imx_ioremap' and 'fixes/maintainer-update' into imx-fixes (diff) | |
| parent | ARM: mx5: Fix checkpatch warnings in cpu-imx5.c (diff) | |
| download | linux-dev-9a2ee7152ca1ccd70c9f68ae1ca8244d2272f743.tar.xz linux-dev-9a2ee7152ca1ccd70c9f68ae1ca8244d2272f743.zip | |
Merge branch 'cleanups/assorted' into imx-fixes-for-arnd
Conflicts:
arch/arm/mach-imx/mm-imx3.c
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/plat-mxc/system.c')
| -rw-r--r-- | arch/arm/plat-mxc/system.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/plat-mxc/system.c b/arch/arm/plat-mxc/system.c index 45e1b5f6be44..d65fb31a55ca 100644 --- a/arch/arm/plat-mxc/system.c +++ b/arch/arm/plat-mxc/system.c @@ -29,7 +29,6 @@ #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); |