diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-24 15:32:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-24 15:32:01 -0700 |
| commit | f647a27417d2adc43d8c96d3d6f837422fbc076e (patch) | |
| tree | 3cac5147575ba4cbd63cb8fa226b95e7886e1d7c /arch/arm/mach-ixp4xx/common.c | |
| parent | 75043cb5b386e5a01fd03b88f647dd992de02f97 (diff) | |
| parent | 2966207c7e5945947c4db3a48aa4fa819807c5be (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/mach-ixp4xx/common.c')
| -rw-r--r-- | arch/arm/mach-ixp4xx/common.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c index 267ba02d77d..f39e8408488 100644 --- a/arch/arm/mach-ixp4xx/common.c +++ b/arch/arm/mach-ixp4xx/common.c @@ -141,7 +141,15 @@ static struct map_desc ixp4xx_io_desc[] __initdata = { .physical = IXP4XX_PCI_CFG_BASE_PHYS, .length = IXP4XX_PCI_CFG_REGION_SIZE, .type = MT_DEVICE + }, +#ifdef CONFIG_DEBUG_LL + { /* Debug UART mapping */ + .virtual = IXP4XX_DEBUG_UART_BASE_VIRT, + .physical = IXP4XX_DEBUG_UART_BASE_PHYS, + .length = IXP4XX_DEBUG_UART_REGION_SIZE, + .type = MT_DEVICE } +#endif }; void __init ixp4xx_map_io(void) |