diff -Naur linux-2.6.11-rc4-mm1-lirc/drivers/char/lirc/lirc_atiusb.c linux-2.6.11-rc4-mm1-lircdiff/drivers/char/lirc/lirc_atiusb.c
--- linux-2.6.11-rc4-mm1-lirc/drivers/char/lirc/lirc_atiusb.c	2005-02-25 20:26:48.081606232 -0800
+++ linux-2.6.11-rc4-mm1-lircdiff/drivers/char/lirc/lirc_atiusb.c	2005-02-25 20:55:26.352389368 -0800
@@ -57,7 +57,7 @@
 
 #include "linux/lirc.h"
 #include "linux/kcompat.h"
-#include "drivers/lirc_dev/lirc_dev.h"
+#include "lirc_dev.h"
 
 #define DRIVER_VERSION		"0.4"
 #define DRIVER_AUTHOR		"Paul Miller <pmiller9@users.sourceforge.net>"
diff -Naur linux-2.6.11-rc4-mm1-lirc/drivers/char/lirc/lirc_bt829.c linux-2.6.11-rc4-mm1-lircdiff/drivers/char/lirc/lirc_bt829.c
--- linux-2.6.11-rc4-mm1-lirc/drivers/char/lirc/lirc_bt829.c	2005-02-25 20:26:48.084605776 -0800
+++ linux-2.6.11-rc4-mm1-lircdiff/drivers/char/lirc/lirc_bt829.c	2005-02-25 20:55:39.333415952 -0800
@@ -33,7 +33,7 @@
 #include <linux/delay.h>
 
 #include "linux/kcompat.h"
-#include "drivers/lirc_dev/lirc_dev.h"
+#include "lirc_dev.h"
 
 static int poll_main(void);
 static int atir_init_start(void);
diff -Naur linux-2.6.11-rc4-mm1-lirc/drivers/char/lirc/lirc_gpio.c linux-2.6.11-rc4-mm1-lircdiff/drivers/char/lirc/lirc_gpio.c
--- linux-2.6.11-rc4-mm1-lirc/drivers/char/lirc/lirc_gpio.c	2005-02-25 20:26:48.254579936 -0800
+++ linux-2.6.11-rc4-mm1-lircdiff/drivers/char/lirc/lirc_gpio.c	2005-02-25 21:21:39.097295800 -0800
@@ -62,7 +62,7 @@
 #endif
 
 #include "linux/kcompat.h"
-#include "drivers/lirc_dev/lirc_dev.h"
+#include "lirc_dev.h"
 
 /* insmod parameters */
 static int debug = 0;
diff -Naur linux-2.6.11-rc4-mm1-lirc/drivers/char/lirc/lirc_i2c.c linux-2.6.11-rc4-mm1-lircdiff/drivers/char/lirc/lirc_i2c.c
--- linux-2.6.11-rc4-mm1-lirc/drivers/char/lirc/lirc_i2c.c	2005-02-25 20:26:48.257579480 -0800
+++ linux-2.6.11-rc4-mm1-lircdiff/drivers/char/lirc/lirc_i2c.c	2005-02-25 21:15:44.636182080 -0800
@@ -55,7 +55,7 @@
 #include <asm/semaphore.h>
 
 #include "linux/kcompat.h"
-#include "drivers/lirc_dev/lirc_dev.h"
+#include "lirc_dev.h"
 
 struct IR {
 	struct lirc_plugin l;
diff -Naur linux-2.6.11-rc4-mm1-lirc/drivers/char/lirc/lirc_igorplugusb.c linux-2.6.11-rc4-mm1-lircdiff/drivers/char/lirc/lirc_igorplugusb.c
--- linux-2.6.11-rc4-mm1-lirc/drivers/char/lirc/lirc_igorplugusb.c	2005-02-25 20:26:50.572227600 -0800
+++ linux-2.6.11-rc4-mm1-lircdiff/drivers/char/lirc/lirc_igorplugusb.c	2005-02-25 21:16:01.457624832 -0800
@@ -61,7 +61,7 @@
 #include <linux/time.h>
 #include "linux/kcompat.h"
 #include "linux/lirc.h"
-#include "drivers/lirc_dev/lirc_dev.h"
+#include "lirc_dev.h"
 
 #if !defined(KERNEL_2_5)
 #        define USB_CTRL_GET_TIMEOUT    5
diff -Naur linux-2.6.11-rc4-mm1-lirc/drivers/char/lirc/lirc_imon.c linux-2.6.11-rc4-mm1-lircdiff/drivers/char/lirc/lirc_imon.c
--- linux-2.6.11-rc4-mm1-lirc/drivers/char/lirc/lirc_imon.c	2005-02-25 20:26:50.575227144 -0800
+++ linux-2.6.11-rc4-mm1-lircdiff/drivers/char/lirc/lirc_imon.c	2005-02-25 21:16:15.383507776 -0800
@@ -55,7 +55,7 @@
 
 #include "linux/lirc.h"
 #include "linux/kcompat.h"
-#include "drivers/lirc_dev/lirc_dev.h"
+#include "lirc_dev.h"
 
 
 #define MOD_AUTHOR	"Venky Raju <dev@venky.ws>"
diff -Naur linux-2.6.11-rc4-mm1-lirc/drivers/char/lirc/lirc_it87.c linux-2.6.11-rc4-mm1-lircdiff/drivers/char/lirc/lirc_it87.c
--- linux-2.6.11-rc4-mm1-lirc/drivers/char/lirc/lirc_it87.c	2005-02-25 20:26:50.589225016 -0800
+++ linux-2.6.11-rc4-mm1-lircdiff/drivers/char/lirc/lirc_it87.c	2005-02-25 21:16:46.330803072 -0800
@@ -63,7 +63,7 @@
 #include <linux/timer.h>
 
 #include "linux/lirc.h"
-#include "drivers/lirc_dev/lirc_dev.h"
+#include "lirc_dev.h"
 #include "linux/kcompat.h"
 
 #include "lirc_it87.h"
diff -Naur linux-2.6.11-rc4-mm1-lirc/drivers/char/lirc/lirc_mceusb.c linux-2.6.11-rc4-mm1-lircdiff/drivers/char/lirc/lirc_mceusb.c
--- linux-2.6.11-rc4-mm1-lirc/drivers/char/lirc/lirc_mceusb.c	2005-02-25 20:26:50.593224408 -0800
+++ linux-2.6.11-rc4-mm1-lircdiff/drivers/char/lirc/lirc_mceusb.c	2005-02-25 21:17:29.667214936 -0800
@@ -116,7 +116,7 @@
 
 #include "linux/kcompat.h"
 #include "linux/lirc.h"
-#include "drivers/lirc_dev/lirc_dev.h"
+#include "lirc_dev.h"
 
 /* Use our own dbg macro */
 #define dprintk(fmt, args...)                             \
diff -Naur linux-2.6.11-rc4-mm1-lirc/drivers/char/lirc/lirc_parallel.c linux-2.6.11-rc4-mm1-lircdiff/drivers/char/lirc/lirc_parallel.c
--- linux-2.6.11-rc4-mm1-lirc/drivers/char/lirc/lirc_parallel.c	2005-02-25 20:26:50.595224104 -0800
+++ linux-2.6.11-rc4-mm1-lircdiff/drivers/char/lirc/lirc_parallel.c	2005-02-25 21:17:43.489113688 -0800
@@ -71,7 +71,7 @@
 
 #include "linux/lirc.h"
 #include "linux/kcompat.h"
-#include "drivers/lirc_dev/lirc_dev.h"
+#include "lirc_dev.h"
 
 #include "lirc_parallel.h"
 
diff -Naur linux-2.6.11-rc4-mm1-lirc/drivers/char/lirc/lirc_sasem.c linux-2.6.11-rc4-mm1-lircdiff/drivers/char/lirc/lirc_sasem.c
--- linux-2.6.11-rc4-mm1-lirc/drivers/char/lirc/lirc_sasem.c	2005-02-25 20:26:50.651215592 -0800
+++ linux-2.6.11-rc4-mm1-lircdiff/drivers/char/lirc/lirc_sasem.c	2005-02-25 21:19:22.840010056 -0800
@@ -60,7 +60,7 @@
 
 #include "linux/kcompat.h"
 #include "linux/lirc.h"
-#include "drivers/lirc_dev/lirc_dev.h"
+#include "lirc_dev.h"
 
 static int debug = 0;
 
diff -Naur linux-2.6.11-rc4-mm1-lirc/drivers/char/lirc/lirc_serial.c linux-2.6.11-rc4-mm1-lircdiff/drivers/char/lirc/lirc_serial.c
--- linux-2.6.11-rc4-mm1-lirc/drivers/char/lirc/lirc_serial.c	2005-02-25 20:26:50.669212856 -0800
+++ linux-2.6.11-rc4-mm1-lircdiff/drivers/char/lirc/lirc_serial.c	2005-02-25 21:20:05.257561608 -0800
@@ -98,7 +98,7 @@
 
 #include "linux/lirc.h"
 #include "linux/kcompat.h"
-#include "drivers/lirc_dev/lirc_dev.h"
+#include "lirc_dev.h"
 
 #if defined(LIRC_SERIAL_SOFTCARRIER) && !defined(LIRC_SERIAL_TRANSMITTER)
 #warning "Software carrier only affects transmitting"
diff -Naur linux-2.6.11-rc4-mm1-lirc/drivers/char/lirc/lirc_sir.c linux-2.6.11-rc4-mm1-lircdiff/drivers/char/lirc/lirc_sir.c
--- linux-2.6.11-rc4-mm1-lirc/drivers/char/lirc/lirc_sir.c	2005-02-25 20:26:50.671212552 -0800
+++ linux-2.6.11-rc4-mm1-lircdiff/drivers/char/lirc/lirc_sir.c	2005-02-25 21:20:34.004191456 -0800
@@ -90,7 +90,7 @@
 #include <linux/timer.h>
 
 #include "linux/lirc.h"
-#include "drivers/lirc_dev/lirc_dev.h"
+#include "lirc_dev.h"
 #include "linux/kcompat.h"
 
 /* SECTION: Definitions */
diff -Naur linux-2.6.11-rc4-mm1-lirc/drivers/char/lirc/lirc_streamzap.c linux-2.6.11-rc4-mm1-lircdiff/drivers/char/lirc/lirc_streamzap.c
--- linux-2.6.11-rc4-mm1-lirc/drivers/char/lirc/lirc_streamzap.c	2005-02-25 20:26:50.674212096 -0800
+++ linux-2.6.11-rc4-mm1-lircdiff/drivers/char/lirc/lirc_streamzap.c	2005-02-25 21:20:49.041905376 -0800
@@ -51,7 +51,7 @@
 
 #include "linux/lirc.h"
 #include "linux/kcompat.h"
-#include "drivers/lirc_dev/lirc_dev.h"
+#include "lirc_dev.h"
 
 #define DRIVER_VERSION	"$Revision: 1.4 $"
 #define DRIVER_NAME	"lirc_streamzap"
diff -Naur linux-2.6.11-rc4-mm1-lirc/include/linux/kcompat.h linux-2.6.11-rc4-mm1-lircdiff/include/linux/kcompat.h
--- linux-2.6.11-rc4-mm1-lirc/include/linux/kcompat.h	2005-02-25 20:26:47.994619456 -0800
+++ linux-2.6.11-rc4-mm1-lircdiff/include/linux/kcompat.h	2005-02-25 20:44:04.840994848 -0800
@@ -1,5 +1,6 @@
 /*      $Id: kcompat.h,v 5.11 2005/02/19 15:12:58 lirc Exp $      */
-
+#define IRCTL_DEV_MAJOR 61
+#define DEV_LIRC "lirc"
 #ifndef _KCOMPAT_H
 #define _KCOMPAT_H