diff options
| author | Olof Johansson <olof@lixom.net> | 2014-07-12 18:49:48 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-07-12 18:49:48 +0200 |
| commit | ab70e7e7e5acafaaf7105c752b25b46a618951e9 (patch) | |
| tree | ba9e3d7f40b35cb0407042e7d829a0f469b509b9 /arch/arm/mach-pxa/generic.c | |
| parent | Merge tag 'mmp-for-v3.17' of https://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | ARM: pxa: fix typo 'CONFIG_SPI_PXA2XX_MASTER' (diff) | |
| download | linux-ab70e7e7e5acafaaf7105c752b25b46a618951e9.tar.xz linux-ab70e7e7e5acafaaf7105c752b25b46a618951e9.zip | |
Merge tag 'pxa-for-v3.17-2' of https://git.kernel.org/pub/scm/linux/kernel/git/hzhuang1/linux into next/cleanup
Merge "pxa for v3.17 v2" from Haojian Zhuang:
* tag 'pxa-for-v3.17-2' of https://git.kernel.org/pub/scm/linux/kernel/git/hzhuang1/linux:
ARM: pxa: fix typo 'CONFIG_SPI_PXA2XX_MASTER'
ARM: pxa: call debug_ll_io_init for earlyprintk
ARM: pxa: correct errata number for PXA270
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-pxa/generic.c')
| -rw-r--r-- | arch/arm/mach-pxa/generic.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/generic.c b/arch/arm/mach-pxa/generic.c index 42254175fcf4..94f49c23ca02 100644 --- a/arch/arm/mach-pxa/generic.c +++ b/arch/arm/mach-pxa/generic.c @@ -93,5 +93,6 @@ static struct map_desc common_io_desc[] __initdata = { void __init pxa_map_io(void) { + debug_ll_io_init(); iotable_init(ARRAY_AND_SIZE(common_io_desc)); } |