[PATCH 2.6] IrDA header move

[Jean Tourrilhes]

	Hi Dave,

	The attached shell script+patch move some IrDA driver headers
around.
	I've always been annoyed that some IrDA driver headers are not
together with the IrDA drivers (like for any other Linux driver), but
instead they are part of the main IrDA stack. Moreover, some driver
headers are in the IrDA driver directory, so it's not even
consistent. This patch fixes that.
	The patch also remove two obsolete driver headers. When the
corresponding drivers were remove from the kernel a few months ago,
their headers were left behind. This is clearly a consequence of their
illogical location.

	The patch comes as a shell script and a patch. You just need
to run the script in the linux directory, and apply the patch. Jeff
told me that this solution was better because BK can keep track of
file move. If you don't like that, I can send you the massive patch.
	Would you mind that to push that to Linus ?

	Thanks in advance...

	Jean

-------------------------------------------------------------------
#!/bin/sh

# Remove obsolete driver header
rm include/net/irda/smc-ircc.h
rm include/net/irda/toshoboe.h

# Move current driver headers with their friends
mv include/net/irda/ali-ircc.h drivers/net/irda/
mv include/net/irda/au1000_ircc.h drivers/net/irda/
mv include/net/irda/irda-usb.h drivers/net/irda/
mv include/net/irda/irport.h drivers/net/irda/
mv include/net/irda/nsc-ircc.h drivers/net/irda/
mv include/net/irda/vlsi_ir.h drivers/net/irda/
mv include/net/irda/w83977af.h drivers/net/irda/
mv include/net/irda/w83977af_ir.h drivers/net/irda/
-------------------------------------------------------------------
diff -u -p linux/drivers/net/irda/ali-ircc.d1.c linux/drivers/net/irda/ali-ircc.c
--- linux/drivers/net/irda/ali-ircc.d1.c	Thu Apr  8 15:50:46 2004
+++ linux/drivers/net/irda/ali-ircc.c	Thu Apr  8 15:51:32 2004
@@ -44,7 +44,7 @@
 #include <net/irda/irda.h>
 #include <net/irda/irda_device.h>
 
-#include <net/irda/ali-ircc.h>
+#include "ali-ircc.h"
 
 #define CHIP_IO_EXTENT 8
 #define BROKEN_DONGLE_ID
diff -u -p linux/drivers/net/irda/au1k_ir.d1.c linux/drivers/net/irda/au1k_ir.c
--- linux/drivers/net/irda/au1k_ir.d1.c	Thu Apr  8 15:51:52 2004
+++ linux/drivers/net/irda/au1k_ir.c	Thu Apr  8 15:52:10 2004
@@ -52,7 +52,7 @@
 #include <net/irda/irmod.h>
 #include <net/irda/wrapper.h>
 #include <net/irda/irda_device.h>
-#include "net/irda/au1000_ircc.h"
+#include "au1000_ircc.h"
 
 static int au1k_irda_net_init(struct net_device *);
 static int au1k_irda_start(struct net_device *);
diff -u -p linux/drivers/net/irda/irda-usb.d1.c linux/drivers/net/irda/irda-usb.c
--- linux/drivers/net/irda/irda-usb.d1.c	Thu Apr  8 15:52:24 2004
+++ linux/drivers/net/irda/irda-usb.c	Thu Apr  8 15:52:41 2004
@@ -62,7 +62,7 @@
 #include <linux/rtnetlink.h>
 #include <linux/usb.h>
 
-#include <net/irda/irda-usb.h>
+#include "irda-usb.h"
 
 /*------------------------------------------------------------------*/
 
diff -u -p linux/drivers/net/irda/irport.d1.c linux/drivers/net/irda/irport.c
--- linux/drivers/net/irda/irport.d1.c	Thu Apr  8 15:52:55 2004
+++ linux/drivers/net/irda/irport.c	Thu Apr  8 15:53:12 2004
@@ -58,7 +58,7 @@
 
 #include <net/irda/irda.h>
 #include <net/irda/wrapper.h>
-#include <net/irda/irport.h>
+#include "irport.h"
 
 #define IO_EXTENT 8
 
diff -u -p linux/drivers/net/irda/nsc-ircc.d1.c linux/drivers/net/irda/nsc-ircc.c
--- linux/drivers/net/irda/nsc-ircc.d1.c	Thu Apr  8 15:53:27 2004
+++ linux/drivers/net/irda/nsc-ircc.c	Thu Apr  8 15:53:48 2004
@@ -63,7 +63,7 @@
 #include <net/irda/irda.h>
 #include <net/irda/irda_device.h>
 
-#include <net/irda/nsc-ircc.h>
+#include "nsc-ircc.h"
 
 #define CHIP_IO_EXTENT 8
 #define BROKEN_DONGLE_ID
diff -u -p linux/drivers/net/irda/vlsi_ir.d1.c linux/drivers/net/irda/vlsi_ir.c
--- linux/drivers/net/irda/vlsi_ir.d1.c	Thu Apr  8 15:54:04 2004
+++ linux/drivers/net/irda/vlsi_ir.c	Thu Apr  8 15:54:20 2004
@@ -54,7 +54,7 @@ MODULE_LICENSE("GPL");
 #include <net/irda/wrapper.h>
 #include <net/irda/crc.h>
 
-#include <net/irda/vlsi_ir.h>
+#include "vlsi_ir.h"
 
 /********************************************************/
 
diff -u -p linux/drivers/net/irda/w83977af_ir.d1.c linux/drivers/net/irda/w83977af_ir.c
--- linux/drivers/net/irda/w83977af_ir.d1.c	Thu Apr  8 15:54:37 2004
+++ linux/drivers/net/irda/w83977af_ir.c	Thu Apr  8 15:55:03 2004
@@ -58,8 +58,8 @@
 #include <net/irda/irda.h>
 #include <net/irda/wrapper.h>
 #include <net/irda/irda_device.h>
-#include <net/irda/w83977af.h>
-#include <net/irda/w83977af_ir.h>
+#include "w83977af.h"
+#include "w83977af_ir.h"
 
 #ifdef  CONFIG_ARCH_NETWINDER            /* Adjust to NetWinder differences */
 #undef  CONFIG_NETWINDER_TX_DMA_PROBLEMS /* Not needed */
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/