--- lirc/drivers/lirc_dev/lirc_dev.h_patched33	2010-04-27 18:35:30.723930013 +0200
+++ lirc/drivers/lirc_dev/lirc_dev.h	2010-04-27 20:38:26.003940702 +0200
@@ -30,7 +30,7 @@
 
 struct lirc_buffer {
 	wait_queue_head_t wait_poll;
-	spinlock_t fifo_lock;
+	spinlock_t lock;
 	unsigned int chunk_size;
 	unsigned int size; /* in chunks */
 	/* Using chunks instead of bytes pretends to simplify boundary checking
@@ -52,12 +52,12 @@
 static inline void lirc_buffer_lock(struct lirc_buffer *buf,
 				    unsigned long *flags)
 {
-	spin_lock_irqsave(&buf->fifo_lock, *flags);
+	spin_lock_irqsave(&buf->lock, *flags);
 }
 static inline void lirc_buffer_unlock(struct lirc_buffer *buf,
 				      unsigned long *flags)
 {
-	spin_unlock_irqrestore(&buf->fifo_lock, *flags);
+	spin_unlock_irqrestore(&buf->lock, *flags);
 }
 static inline void _lirc_buffer_clear(struct lirc_buffer *buf)
 {
@@ -76,9 +76,9 @@
 	unsigned long flags;
 
 	if (buf->fifo_initialized) {
-		spin_lock_irqsave(&buf->fifo_lock, flags);
+		spin_lock_irqsave(&buf->lock, flags);
 		kfifo_reset(&buf->fifo);
-		spin_unlock_irqrestore(&buf->fifo_lock, flags);
+		spin_unlock_irqrestore(&buf->lock, flags);
 	}
 #endif
 #else
@@ -96,7 +96,7 @@
 	int ret = 0;
 
 	init_waitqueue_head(&buf->wait_poll);
-	spin_lock_init(&buf->fifo_lock);
+	spin_lock_init(&buf->lock);
 #ifndef LIRC_HAVE_KFIFO
 	_lirc_buffer_clear(buf);
 #endif
@@ -104,7 +104,7 @@
 	buf->size = size;
 #ifdef LIRC_HAVE_KFIFO
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
-	buf->fifo = kfifo_alloc(size*chunk_size, GFP_KERNEL, &buf->fifo_lock);
+	buf->fifo = kfifo_alloc(size*chunk_size, GFP_KERNEL, &buf->lock);
 	if (!buf->fifo)
 		return -ENOMEM;
 #else
@@ -153,9 +153,9 @@
 	int len;
 	unsigned long flags;
 
-	spin_lock_irqsave(&buf->fifo_lock, flags);
+	spin_lock_irqsave(&buf->lock, flags);
 	len = kfifo_len(&buf->fifo);
-	spin_unlock_irqrestore(&buf->fifo_lock, flags);
+	spin_unlock_irqrestore(&buf->lock, flags);
 
 	return len;
 #endif
@@ -239,7 +239,7 @@
 		ret = kfifo_get(buf->fifo, dest, buf->chunk_size);
 #else
 		ret = kfifo_out_locked(&buf->fifo, dest, buf->chunk_size,
-				       &buf->fifo_lock);
+				       &buf->lock);
 #endif
 #else
 	unsigned long flags;
@@ -269,7 +269,7 @@
 	ret = kfifo_put(buf->fifo, orig, buf->chunk_size);
 #else
 	ret = kfifo_in_locked(&buf->fifo, orig, buf->chunk_size,
-			      &buf->fifo_lock);
+			      &buf->lock);
 #endif
 #else
 	unsigned long flags;
@@ -313,7 +313,7 @@
 	ret = kfifo_put(buf->fifo, orig, count * buf->chunk_size);
 #else
 	ret = kfifo_in_locked(&buf->fifo, orig, count * buf->chunk_size,
-			      &buf->fifo_lock);
+			      &buf->lock);
 #endif
 #else
 	unsigned long flags;