diff -Naur MCS9865_Linux-26316/mcs9865.c MCS9865_Linux-26364/mcs9865.c
--- MCS9865_Linux-26316/mcs9865.c	2009-11-28 14:38:08.000000000 -0600
+++ MCS9865_Linux-26364/mcs9865.c	2011-06-22 11:19:18.000000000 -0500
@@ -495,7 +495,7 @@
 #endif
 {
 	struct uart_9865_port *up = &serial9865_ports[port->line];
-	struct circ_buf *xmit = &up->port.info->xmit;
+	struct circ_buf *xmit = &up->port.state->xmit;
 	u32	length=0,len2end;
 	int tail,head;
 
@@ -608,7 +608,7 @@
 	if (status & UART_MSR_DCTS)
 		uart_handle_cts_change(&up->port, status & UART_MSR_CTS);
 
-	wake_up_interruptible(&up->port.info->delta_msr_wait);
+	wake_up_interruptible(&up->port.state->port.delta_msr_wait);
 	DEBUG("In %s -------------------- END\n",__FUNCTION__);
 }
 
@@ -619,7 +619,7 @@
 static _INLINE_ void receive_chars(struct uart_9865_port *up, u8 *status, struct pt_regs *regs)
 #endif
 {
-	struct tty_struct *tty = up->port.info->port.tty;
+	struct tty_struct *tty = up->port.state->port.tty;
 	u8 ch,lsr = *status;
 	int max_count = 256;
 	unsigned int flag;
@@ -705,7 +705,7 @@
 //Helper function used in ISR to send the data to the UART
 static _INLINE_ void transmit_chars(struct uart_9865_port *up)
 {
-	struct circ_buf *xmit = &up->port.info->xmit;
+	struct circ_buf *xmit = &up->port.state->xmit;
 	int count;
 
 	DEBUG("In %s ---------------------------------------START\n",__FUNCTION__);
@@ -750,7 +750,7 @@
 //Helper function to stop the characters transmission in DMA mode
 static void transmit_chars_dma_stop_done(struct uart_9865_port * up)
 {
-		struct circ_buf *xmit = &up->port.info->xmit;
+		struct circ_buf *xmit = &up->port.state->xmit;
 		long int transferred;
 		DEBUG("In %s ---------------------------------------START\n",__FUNCTION__);
 		//UPDATING THE TRANSMIT FIFO WITH THE AMOUNT OF DATA TRANSFERRED
@@ -766,7 +766,7 @@
 //Helper function to do the necessary action upon the successful completion of data transfer in DMA mode
 static int transmit_chars_dma_done(struct uart_9865_port * up)
 {
-	struct circ_buf *xmit = &(up->port.info->xmit);
+	struct circ_buf *xmit = &(up->port.state->xmit);
 	int length,tobe_transferred,transferred,len2end;
 
 	DEBUG("In %s ---------------------------------------START\n",__FUNCTION__);
@@ -849,7 +849,7 @@
 //Helper function to do the necessary action upon the successful completion of data receive in DMA mode
 static void receive_chars_dma_done(struct uart_9865_port * up, int iirg)
 {
-	struct tty_struct *tty = up->port.info->port.tty;
+	struct tty_struct *tty = up->port.state->port.tty;
 	int i,rxdma_done=0;
 	u16 received_bytes;
 	u32 need2recv;
@@ -954,7 +954,7 @@
 #endif
 {
 	u8 status = serial_in(up, UART_LSR);
-	struct tty_struct *tty=up->port.info->port.tty;	
+	struct tty_struct *tty=up->port.state->port.tty;	
 
 	DEBUG("In %s ---------------------------------------START\n",__FUNCTION__);
 	DEBUG("UART_LSR = %x...", status);