diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-03-12 07:22:22 -0500 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-03-12 07:22:28 -0500 |
| commit | cfe08bba1e0017d94a8f738a195d3a2b479327e3 (patch) | |
| tree | 4546939fd9fbddc978b6eaa0299b03177e9e643b /arch/arm/plat-s5p/dev-uart.c | |
| parent | 58bff947e2d164c7e5cbf7f485e4b3d4884befeb (diff) | |
| parent | abb0052289e58140d933b29491f59e4be0a19727 (diff) | |
Merge branch 'x86/apic' into x86/irq
Reason: Update to latest genirq code conflicts with pending apic
changes
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/arm/plat-s5p/dev-uart.c')
| -rw-r--r-- | arch/arm/plat-s5p/dev-uart.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/plat-s5p/dev-uart.c b/arch/arm/plat-s5p/dev-uart.c index 6a7342886171..afaf87fdb93e 100644 --- a/arch/arm/plat-s5p/dev-uart.c +++ b/arch/arm/plat-s5p/dev-uart.c | |||
| @@ -28,7 +28,7 @@ | |||
| 28 | static struct resource s5p_uart0_resource[] = { | 28 | static struct resource s5p_uart0_resource[] = { |
| 29 | [0] = { | 29 | [0] = { |
| 30 | .start = S5P_PA_UART0, | 30 | .start = S5P_PA_UART0, |
| 31 | .end = S5P_PA_UART0 + S5P_SZ_UART, | 31 | .end = S5P_PA_UART0 + S5P_SZ_UART - 1, |
| 32 | .flags = IORESOURCE_MEM, | 32 | .flags = IORESOURCE_MEM, |
| 33 | }, | 33 | }, |
| 34 | [1] = { | 34 | [1] = { |
| @@ -51,7 +51,7 @@ static struct resource s5p_uart0_resource[] = { | |||
| 51 | static struct resource s5p_uart1_resource[] = { | 51 | static struct resource s5p_uart1_resource[] = { |
| 52 | [0] = { | 52 | [0] = { |
| 53 | .start = S5P_PA_UART1, | 53 | .start = S5P_PA_UART1, |
| 54 | .end = S5P_PA_UART1 + S5P_SZ_UART, | 54 | .end = S5P_PA_UART1 + S5P_SZ_UART - 1, |
| 55 | .flags = IORESOURCE_MEM, | 55 | .flags = IORESOURCE_MEM, |
| 56 | }, | 56 | }, |
| 57 | [1] = { | 57 | [1] = { |
| @@ -74,7 +74,7 @@ static struct resource s5p_uart1_resource[] = { | |||
| 74 | static struct resource s5p_uart2_resource[] = { | 74 | static struct resource s5p_uart2_resource[] = { |
| 75 | [0] = { | 75 | [0] = { |
| 76 | .start = S5P_PA_UART2, | 76 | .start = S5P_PA_UART2, |
| 77 | .end = S5P_PA_UART2 + S5P_SZ_UART, | 77 | .end = S5P_PA_UART2 + S5P_SZ_UART - 1, |
| 78 | .flags = IORESOURCE_MEM, | 78 | .flags = IORESOURCE_MEM, |
| 79 | }, | 79 | }, |
| 80 | [1] = { | 80 | [1] = { |
| @@ -98,7 +98,7 @@ static struct resource s5p_uart3_resource[] = { | |||
| 98 | #if CONFIG_SERIAL_SAMSUNG_UARTS > 3 | 98 | #if CONFIG_SERIAL_SAMSUNG_UARTS > 3 |
| 99 | [0] = { | 99 | [0] = { |
| 100 | .start = S5P_PA_UART3, | 100 | .start = S5P_PA_UART3, |
| 101 | .end = S5P_PA_UART3 + S5P_SZ_UART, | 101 | .end = S5P_PA_UART3 + S5P_SZ_UART - 1, |
| 102 | .flags = IORESOURCE_MEM, | 102 | .flags = IORESOURCE_MEM, |
| 103 | }, | 103 | }, |
| 104 | [1] = { | 104 | [1] = { |
| @@ -123,7 +123,7 @@ static struct resource s5p_uart4_resource[] = { | |||
| 123 | #if CONFIG_SERIAL_SAMSUNG_UARTS > 4 | 123 | #if CONFIG_SERIAL_SAMSUNG_UARTS > 4 |
| 124 | [0] = { | 124 | [0] = { |
| 125 | .start = S5P_PA_UART4, | 125 | .start = S5P_PA_UART4, |
| 126 | .end = S5P_PA_UART4 + S5P_SZ_UART, | 126 | .end = S5P_PA_UART4 + S5P_SZ_UART - 1, |
| 127 | .flags = IORESOURCE_MEM, | 127 | .flags = IORESOURCE_MEM, |
| 128 | }, | 128 | }, |
| 129 | [1] = { | 129 | [1] = { |
| @@ -148,7 +148,7 @@ static struct resource s5p_uart5_resource[] = { | |||
| 148 | #if CONFIG_SERIAL_SAMSUNG_UARTS > 5 | 148 | #if CONFIG_SERIAL_SAMSUNG_UARTS > 5 |
| 149 | [0] = { | 149 | [0] = { |
| 150 | .start = S5P_PA_UART5, | 150 | .start = S5P_PA_UART5, |
| 151 | .end = S5P_PA_UART5 + S5P_SZ_UART, | 151 | .end = S5P_PA_UART5 + S5P_SZ_UART - 1, |
| 152 | .flags = IORESOURCE_MEM, | 152 | .flags = IORESOURCE_MEM, |
| 153 | }, | 153 | }, |
| 154 | [1] = { | 154 | [1] = { |