--- zzzz-none-000/linux-2.6.19.2/drivers/serial/ioc4_serial.c	2007-01-10 19:10:37.000000000 +0000
+++ davinci-8020-5505/linux-2.6.19.2/drivers/serial/ioc4_serial.c	2007-01-11 07:38:19.000000000 +0000
@@ -921,7 +921,7 @@
 {
 	struct ioc4_port *port = (struct ioc4_port *)arg;
 	struct hooks *hooks = port->ip_hooks;
-	unsigned long flags;
+	unsigned int flags;
 
 	spin_lock_irqsave(&port->ip_lock, flags);
 
@@ -1834,7 +1834,7 @@
 	struct ioc4_port *port = (struct ioc4_port *)arg;
 	struct hooks *hooks = port->ip_hooks;
 	unsigned int rx_high_rd_aborted = 0;
-	unsigned long flags;
+	unsigned int flags;
 	struct uart_port *the_port;
 	int loop_counter;