Merge branch '3.2-without-smb2' of git://git.samba.org/sfrench/cifs-2.6

[pandora-kernel.git] / arch / arm / plat-s5p / dev-uart.c

diff --git a/arch/arm/plat-s5p/dev-uart.c b/arch/arm/plat-s5p/dev-uart.c
index afaf87f..c9308db 100644 (file)
--- a/arch/arm/plat-s5p/dev-uart.c
+++ b/arch/arm/plat-s5p/dev-uart.c
@@ -32,20 +32,10 @@ static struct resource s5p_uart0_resource[] = {
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
-               .start  = IRQ_S5P_UART_RX0,
-               .end    = IRQ_S5P_UART_RX0,
+               .start  = IRQ_UART0,
+               .end    = IRQ_UART0,
                .flags  = IORESOURCE_IRQ,
        },
-       [2] = {
-               .start  = IRQ_S5P_UART_TX0,
-               .end    = IRQ_S5P_UART_TX0,
-               .flags  = IORESOURCE_IRQ,
-       },
-       [3] = {
-               .start  = IRQ_S5P_UART_ERR0,
-               .end    = IRQ_S5P_UART_ERR0,
-               .flags  = IORESOURCE_IRQ,
-       }
 };
 
 static struct resource s5p_uart1_resource[] = {
@@ -55,18 +45,8 @@ static struct resource s5p_uart1_resource[] = {
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
-               .start  = IRQ_S5P_UART_RX1,
-               .end    = IRQ_S5P_UART_RX1,
-               .flags  = IORESOURCE_IRQ,
-       },
-       [2] = {
-               .start  = IRQ_S5P_UART_TX1,
-               .end    = IRQ_S5P_UART_TX1,
-               .flags  = IORESOURCE_IRQ,
-       },
-       [3] = {
-               .start  = IRQ_S5P_UART_ERR1,
-               .end    = IRQ_S5P_UART_ERR1,
+               .start  = IRQ_UART1,
+               .end    = IRQ_UART1,
                .flags  = IORESOURCE_IRQ,
        },
 };
@@ -78,18 +58,8 @@ static struct resource s5p_uart2_resource[] = {
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
-               .start  = IRQ_S5P_UART_RX2,
-               .end    = IRQ_S5P_UART_RX2,
-               .flags  = IORESOURCE_IRQ,
-       },
-       [2] = {
-               .start  = IRQ_S5P_UART_TX2,
-               .end    = IRQ_S5P_UART_TX2,
-               .flags  = IORESOURCE_IRQ,
-       },
-       [3] = {
-               .start  = IRQ_S5P_UART_ERR2,
-               .end    = IRQ_S5P_UART_ERR2,
+               .start  = IRQ_UART2,
+               .end    = IRQ_UART2,
                .flags  = IORESOURCE_IRQ,
        },
 };
@@ -102,18 +72,8 @@ static struct resource s5p_uart3_resource[] = {
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
-               .start  = IRQ_S5P_UART_RX3,
-               .end    = IRQ_S5P_UART_RX3,
-               .flags  = IORESOURCE_IRQ,
-       },
-       [2] = {
-               .start  = IRQ_S5P_UART_TX3,
-               .end    = IRQ_S5P_UART_TX3,
-               .flags  = IORESOURCE_IRQ,
-       },
-       [3] = {
-               .start  = IRQ_S5P_UART_ERR3,
-               .end    = IRQ_S5P_UART_ERR3,
+               .start  = IRQ_UART3,
+               .end    = IRQ_UART3,
                .flags  = IORESOURCE_IRQ,
        },
 #endif
@@ -127,18 +87,8 @@ static struct resource s5p_uart4_resource[] = {
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
-               .start  = IRQ_S5P_UART_RX4,
-               .end    = IRQ_S5P_UART_RX4,
-               .flags  = IORESOURCE_IRQ,
-       },
-       [2] = {
-               .start  = IRQ_S5P_UART_TX4,
-               .end    = IRQ_S5P_UART_TX4,
-               .flags  = IORESOURCE_IRQ,
-       },
-       [3] = {
-               .start  = IRQ_S5P_UART_ERR4,
-               .end    = IRQ_S5P_UART_ERR4,
+               .start  = IRQ_UART4,
+               .end    = IRQ_UART4,
                .flags  = IORESOURCE_IRQ,
        },
 #endif
@@ -152,18 +102,8 @@ static struct resource s5p_uart5_resource[] = {
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
-               .start  = IRQ_S5P_UART_RX5,
-               .end    = IRQ_S5P_UART_RX5,
-               .flags  = IORESOURCE_IRQ,
-       },
-       [2] = {
-               .start  = IRQ_S5P_UART_TX5,
-               .end    = IRQ_S5P_UART_TX5,
-               .flags  = IORESOURCE_IRQ,
-       },
-       [3] = {
-               .start  = IRQ_S5P_UART_ERR5,
-               .end    = IRQ_S5P_UART_ERR5,
+               .start  = IRQ_UART5,
+               .end    = IRQ_UART5,
                .flags  = IORESOURCE_IRQ,
        },
 #endif