--- trivial-2.5-bk/drivers/net/irda/sa1100_ir.c.orig	2002-12-06 13:56:35.000000000 +1100
+++ trivial-2.5-bk/drivers/net/irda/sa1100_ir.c	2002-12-06 13:56:35.000000000 +1100
@@ -189,8 +189,7 @@
 		break;
 
 	case 4000000:
-		save_flags(flags);
-		cli();
+		local_irq_save(flags);
 
 		si->hscr0 = 0;
 
@@ -210,7 +209,7 @@
 		sa1100_irda_rx_alloc(si);
 		sa1100_irda_rx_dma_start(si);
 
-		restore_flags(flags);
+		local_irq_restore(flags);
 
 		break;