diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-02-03 09:55:41 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-02-03 09:55:41 +0100 |
| commit | 4a53361beb278b110d1b73ca71398ecb7de54fed (patch) | |
| tree | e69ce171a23c07571278605c415e5d90e088e205 /arch/arm/mach-imx/external-nand-boot.c | |
| parent | c224cd316197132321869d859048f89da49c0162 (diff) | |
| parent | f986b957354949eca175d8190d79a4506ad6be62 (diff) | |
| download | barebox-4a53361beb278b110d1b73ca71398ecb7de54fed.tar.gz barebox-4a53361beb278b110d1b73ca71398ecb7de54fed.tar.xz | |
Merge branch 'for-next/iomem'
Conflicts:
arch/arm/mach-imx/external-nand-boot.c
Diffstat (limited to 'arch/arm/mach-imx/external-nand-boot.c')
| -rw-r--r-- | arch/arm/mach-imx/external-nand-boot.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/external-nand-boot.c b/arch/arm/mach-imx/external-nand-boot.c index fe933aa3a9..24b978287e 100644 --- a/arch/arm/mach-imx/external-nand-boot.c +++ b/arch/arm/mach-imx/external-nand-boot.c @@ -32,7 +32,7 @@ __section(.text_bare_init_##name) \ name -static void __bare_init noinline imx_nandboot_wait_op_done(void *regs) +static void __bare_init noinline imx_nandboot_wait_op_done(void __iomem *regs) { u32 r; |