diff options
| author | Olof Johansson <olof@lixom.net> | 2011-11-09 08:59:35 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2011-11-09 08:59:35 -0800 |
| commit | c30c8f9f167cb9b40ca9e755c0d32087a2d415ff (patch) | |
| tree | d10c7ac7dc73f0325ba4c7a2fc00fe84dbee4596 /arch/arm/mach-at91/at91sam9261_devices.c | |
| parent | 45ff6fa1adf81f72e4815f0a993a644467b7b185 (diff) | |
| parent | dd0b3825495a2e7a8cd6cf0ec077618c008ac7c4 (diff) | |
| download | blackbird-obmc-linux-c30c8f9f167cb9b40ca9e755c0d32087a2d415ff.tar.gz blackbird-obmc-linux-c30c8f9f167cb9b40ca9e755c0d32087a2d415ff.zip | |
Merge branch 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes
Diffstat (limited to 'arch/arm/mach-at91/at91sam9261_devices.c')
| -rw-r--r-- | arch/arm/mach-at91/at91sam9261_devices.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-at91/at91sam9261_devices.c b/arch/arm/mach-at91/at91sam9261_devices.c index 3b70b3897d95..ae78f4d03b73 100644 --- a/arch/arm/mach-at91/at91sam9261_devices.c +++ b/arch/arm/mach-at91/at91sam9261_devices.c @@ -816,8 +816,8 @@ void __init at91_add_device_ssc(unsigned id, unsigned pins) {} #if defined(CONFIG_SERIAL_ATMEL) static struct resource dbgu_resources[] = { [0] = { - .start = AT91_VA_BASE_SYS + AT91_DBGU, - .end = AT91_VA_BASE_SYS + AT91_DBGU + SZ_512 - 1, + .start = AT91_BASE_SYS + AT91_DBGU, + .end = AT91_BASE_SYS + AT91_DBGU + SZ_512 - 1, .flags = IORESOURCE_MEM, }, [1] = { @@ -830,7 +830,6 @@ static struct resource dbgu_resources[] = { static struct atmel_uart_data dbgu_data = { .use_dma_tx = 0, .use_dma_rx = 0, /* DBGU not capable of receive DMA */ - .regs = (void __iomem *)(AT91_VA_BASE_SYS + AT91_DBGU), }; static u64 dbgu_dmamask = DMA_BIT_MASK(32); |
