]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Merge with git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
authorAdrian Bunk <bunk@r063144.stusta.swh.mhn.de>
Mon, 20 Mar 2006 17:30:36 +0000 (18:30 +0100)
committerAdrian Bunk <bunk@r063144.stusta.swh.mhn.de>
Mon, 20 Mar 2006 17:30:36 +0000 (18:30 +0100)
drivers/char/Makefile
drivers/char/ip2/Makefile [new file with mode: 0644]
drivers/char/ip2/ip2base.c [moved from drivers/char/ip2.c with 95% similarity]
drivers/char/ip2/ip2main.c [moved from drivers/char/ip2main.c with 99% similarity]

index 503dd901d406bad8e432ce267642926ce325e9c3..090d154098bb726bcdf2ae34489bf927bc8484fa 100644 (file)
@@ -31,7 +31,7 @@ obj-$(CONFIG_MOXA_INTELLIO)   += moxa.o
 obj-$(CONFIG_A2232)            += ser_a2232.o generic_serial.o
 obj-$(CONFIG_ATARI_DSP56K)     += dsp56k.o
 obj-$(CONFIG_MOXA_SMARTIO)     += mxser.o
-obj-$(CONFIG_COMPUTONE)                += ip2.o ip2main.o
+obj-$(CONFIG_COMPUTONE)                += ip2/
 obj-$(CONFIG_RISCOM8)          += riscom8.o
 obj-$(CONFIG_ISI)              += isicom.o
 obj-$(CONFIG_SYNCLINK)         += synclink.o
diff --git a/drivers/char/ip2/Makefile b/drivers/char/ip2/Makefile
new file mode 100644 (file)
index 0000000..6bfe254
--- /dev/null
@@ -0,0 +1,8 @@
+#
+# Makefile for the Computone IntelliPort Plus Driver
+#
+
+obj-$(CONFIG_COMPUTONE)         += ip2.o ip2main.o
+
+ip2-objs                       := ip2base.o
+
similarity index 95%
rename from drivers/char/ip2.c
rename to drivers/char/ip2/ip2base.c
index 7cadfc6ef35283bce433a7204960b70de43b622e..435ccfc74958c03232f20fe0168abd2c65443f0b 100644 (file)
 #define __initdata
 #endif
 
-#include "./ip2/ip2types.h"            
-#include "./ip2/fip_firm.h"            // the meat
+#include "ip2types.h"          
+#include "fip_firm.h"          // the meat
 
 int
 ip2_loadmain(int *, int  *, unsigned char *, int ); // ref into ip2main.c
 
 /* Note: Add compiled in defaults to these arrays, not to the structure
-       in ip2/ip2.h any longer.  That structure WILL get overridden
+       in ip2.h any longer.  That structure WILL get overridden
        by these values, or command line values, or insmod values!!!  =mhw=
 */
 static int io[IP2_MAX_BOARDS]= { 0, 0, 0, 0 };
similarity index 99%
rename from drivers/char/ip2main.c
rename to drivers/char/ip2/ip2main.c
index 48fcfba37bfaafd5d0a44a772d8e0182225c07c7..03db1cb3fa95c1ec8460b84a1a3a527c96841025 100644 (file)
@@ -35,7 +35,7 @@
 // Clean up potential NULL pointer dereferences
 // Clean up devfs registration
 // Add kernel command line parsing for io and irq
-//     Compile defaults for io and irq are now set in ip2.c not ip2/ip2.h!
+//     Compile defaults for io and irq are now set in ip2.c not ip2.h!
 // Reworked poll_only hack for explicit parameter setting
 //     You must now EXPLICITLY set poll_only = 1 or set all irqs to 0
 // Merged ip2_loadmain and old_ip2_init
 
 #include <asm/uaccess.h>
 
-#include "./ip2/ip2types.h"
-#include "./ip2/ip2trace.h"
-#include "./ip2/ip2ioctl.h"
-#include "./ip2/ip2.h"
-#include "./ip2/i2ellis.h"
-#include "./ip2/i2lib.h"
+#include "ip2types.h"
+#include "ip2trace.h"
+#include "ip2ioctl.h"
+#include "ip2.h"
+#include "i2ellis.h"
+#include "i2lib.h"
 
 /*****************
  * /proc/ip2mem  *
@@ -282,9 +282,9 @@ static int tracewrap;
 /* Code */
 /********/
 
-#include "./ip2/i2ellis.c"    /* Extremely low-level interface services */
-#include "./ip2/i2cmd.c"      /* Standard loadware command definitions */
-#include "./ip2/i2lib.c"      /* High level interface services */
+#include "i2ellis.c"    /* Extremely low-level interface services */
+#include "i2cmd.c"      /* Standard loadware command definitions */
+#include "i2lib.c"      /* High level interface services */
 
 /* Configuration area for modprobe */