Merge branch 'omap7xx-fortony-rc3' of git://robotfuzz.com/linwizard-kernel into omap7xx

1 files changed, 3 insertions, 10 deletions

diff --git a/arch/arm/mach-omap1/serial.c b/arch/arm/mach-omap1/serial.c
index d496e50fec40..ed07af109f00 100644
--- a/arch/arm/mach-omap1/serial.c
+++ b/arch/arm/mach-omap1/serial.c
@@ -110,18 +110,11 @@ void __init omap_serial_init(void)
 {
         int i;
 
-        if (cpu_is_omap730()) {
+        if (cpu_is_omap7xx()) {
                 serial_platform_data[0].regshift = 0;
                 serial_platform_data[1].regshift = 0;
-                serial_platform_data[0].irq = INT_730_UART_MODEM_1;
-                serial_platform_data[1].irq = INT_730_UART_MODEM_IRDA_2;
-        }
-
-        if (cpu_is_omap850()) {
-                serial_platform_data[0].regshift = 0;
-                serial_platform_data[1].regshift = 0;
-                serial_platform_data[0].irq = INT_850_UART_MODEM_1;
-                serial_platform_data[1].irq = INT_850_UART_MODEM_IRDA_2;
+                serial_platform_data[0].irq = INT_7XX_UART_MODEM_1;
+                serial_platform_data[1].irq = INT_7XX_UART_MODEM_IRDA_2;
         }
 
         if (cpu_is_omap15xx()) {