Hi,
Here's a patch against 2.3.99-pre9-3 that changes the usb-serial driver's
Makefile to allow the removal of the huge #ifdef around the individual
usb-serial drivers (thanks to Johannes for pointing this out.)
Thanks,
greg k-h
greg@(kroah|wirex).com
diff -Naur -X dontdiff linux-2.3.99-pre9-3/drivers/usb/serial/Makefile
linux-2.3.99-pre9-3-greg/drivers/usb/serial/Makefile
--- linux-2.3.99-pre9-3/drivers/usb/serial/Makefile Thu May 4 11:35:13 2000
+++ linux-2.3.99-pre9-3-greg/drivers/usb/serial/Makefile Mon May 22 07:13:39
+2000
@@ -4,8 +4,26 @@
O_TARGET := usb-serial.o
M_OBJS := usb-serial.o
-O_OBJS := usbserial.o visor.o whiteheat.o ftdi_sio.o keyspan_pda.o omninet.o
digi_acceleport.o
+O_OBJS := usbserial.o
MOD_LIST_NAME := USB_SERIAL_MODULES
+ifeq ($(CONFIG_USB_SERIAL_VISOR),y)
+ O_OBJS += visor.o
+endif
+ifeq ($(CONFIG_USB_SERIAL_WHITEHEAT),y)
+ O_OBJS += whiteheat.o
+endif
+ifeq ($(CONFIG_USB_SERIAL_FTDI_SIO),y)
+ O_OBJS += ftdi_sio.o
+endif
+ifeq ($(CONFIG_USB_SERIAL_KEYSPAN_PDA),y)
+ O_OBJS += keyspan_pda.o
+endif
+ifeq ($(CONFIG_USB_SERIAL_OMNINET),y)
+ O_OBJS += omninet.o
+endif
+ifeq ($(CONFIG_USB_SERIAL_DIGI_ACCELEPORT),y)
+ O_OBJS += digi_acceleport.o
+endif
+
include $(TOPDIR)/Rules.make
-
diff -Naur -X dontdiff linux-2.3.99-pre9-3/drivers/usb/serial/digi_acceleport.c
linux-2.3.99-pre9-3-greg/drivers/usb/serial/digi_acceleport.c
--- linux-2.3.99-pre9-3/drivers/usb/serial/digi_acceleport.c Mon May 22 07:15:41
2000
+++ linux-2.3.99-pre9-3-greg/drivers/usb/serial/digi_acceleport.c Mon May 22
+06:57:13 2000
@@ -47,9 +47,6 @@
*/
#include <linux/config.h>
-
-#ifdef CONFIG_USB_SERIAL_DIGI_ACCELEPORT
-
#include <linux/kernel.h>
#include <linux/sched.h>
#include <linux/signal.h>
@@ -1276,4 +1273,3 @@
}
-#endif /* CONFIG_USB_SERIAL_DIGI_ACCELEPORT */
diff -Naur -X dontdiff linux-2.3.99-pre9-3/drivers/usb/serial/ftdi_sio.c
linux-2.3.99-pre9-3-greg/drivers/usb/serial/ftdi_sio.c
--- linux-2.3.99-pre9-3/drivers/usb/serial/ftdi_sio.c Fri May 5 13:41:30 2000
+++ linux-2.3.99-pre9-3-greg/drivers/usb/serial/ftdi_sio.c Mon May 22 06:57:01
+2000
@@ -32,9 +32,6 @@
#include <linux/config.h>
-
-#ifdef CONFIG_USB_SERIAL_FTDI_SIO
-
#include <linux/kernel.h>
#include <linux/sched.h>
#include <linux/signal.h>
@@ -722,7 +719,4 @@
dbg("ftdi_sio_ioctl returning 0");
return 0;
} /* ftdi_sio_ioctl */
-
-#endif /* CONFIG_USB_SERIAL_FTDI_SIO */
-
diff -Naur -X dontdiff linux-2.3.99-pre9-3/drivers/usb/serial/keyspan_pda.c
linux-2.3.99-pre9-3-greg/drivers/usb/serial/keyspan_pda.c
--- linux-2.3.99-pre9-3/drivers/usb/serial/keyspan_pda.c Fri May 5 13:41:30
2000
+++ linux-2.3.99-pre9-3-greg/drivers/usb/serial/keyspan_pda.c Mon May 22 06:57:29
+2000
@@ -18,9 +18,6 @@
#include <linux/config.h>
-
-#ifdef CONFIG_USB_SERIAL_KEYSPAN_PDA
-
#include <linux/kernel.h>
#include <linux/sched.h>
#include <linux/signal.h>
@@ -700,4 +697,3 @@
shutdown: keyspan_pda_shutdown,
};
-#endif /* CONFIG_USB_SERIAL_KEYSPAN_PDA */
diff -Naur -X dontdiff linux-2.3.99-pre9-3/drivers/usb/serial/omninet.c
linux-2.3.99-pre9-3-greg/drivers/usb/serial/omninet.c
--- linux-2.3.99-pre9-3/drivers/usb/serial/omninet.c Fri May 5 13:41:30 2000
+++ linux-2.3.99-pre9-3-greg/drivers/usb/serial/omninet.c Mon May 22 06:57:46
+2000
@@ -13,9 +13,6 @@
*/
#include <linux/config.h>
-
-#ifdef CONFIG_USB_SERIAL_OMNINET
-
#include <linux/kernel.h>
#include <linux/sched.h>
#include <linux/signal.h>
@@ -335,7 +332,4 @@
return;
}
-
-#endif /* CONFIG_USB_SERIAL_OMNINET */
-
diff -Naur -X dontdiff linux-2.3.99-pre9-3/drivers/usb/serial/usbserial.c
linux-2.3.99-pre9-3-greg/drivers/usb/serial/usbserial.c
--- linux-2.3.99-pre9-3/drivers/usb/serial/usbserial.c Fri May 5 13:41:30 2000
+++ linux-2.3.99-pre9-3-greg/drivers/usb/serial/usbserial.c Mon May 22 07:25:54
+2000
@@ -14,6 +14,10 @@
*
* See Documentation/usb/usb-serial.txt for more information on using this driver
*
+ * (05/22/2000) gkh
+ * Changed the makefile, enabling the big CONFIG_USB_SERIAL_SOMTHING to be
+ * removed from the individual device source files.
+ *
* (05/03/2000) gkh
* Added the Digi Acceleport driver from Al Borchers and Peter Berger.
*
diff -Naur -X dontdiff linux-2.3.99-pre9-3/drivers/usb/serial/visor.c
linux-2.3.99-pre9-3-greg/drivers/usb/serial/visor.c
--- linux-2.3.99-pre9-3/drivers/usb/serial/visor.c Fri May 5 13:41:30 2000
+++ linux-2.3.99-pre9-3-greg/drivers/usb/serial/visor.c Mon May 22 06:56:43 2000
@@ -20,9 +20,6 @@
*/
#include <linux/config.h>
-
-#ifdef CONFIG_USB_SERIAL_VISOR
-
#include <linux/kernel.h>
#include <linux/sched.h>
#include <linux/signal.h>
@@ -206,8 +203,4 @@
/* continue on with initialization */
return (0);
}
-
-
-#endif /* CONFIG_USB_SERIAL_VISOR*/
-
diff -Naur -X dontdiff linux-2.3.99-pre9-3/drivers/usb/serial/whiteheat.c
linux-2.3.99-pre9-3-greg/drivers/usb/serial/whiteheat.c
--- linux-2.3.99-pre9-3/drivers/usb/serial/whiteheat.c Fri May 5 13:41:30 2000
+++ linux-2.3.99-pre9-3-greg/drivers/usb/serial/whiteheat.c Mon May 22 06:57:59
+2000
@@ -21,9 +21,6 @@
*/
#include <linux/config.h>
-
-#ifdef CONFIG_USB_SERIAL_WHITEHEAT
-
#include <linux/kernel.h>
#include <linux/sched.h>
#include <linux/signal.h>
@@ -406,7 +403,4 @@
return;
}
-
-#endif /* CONFIG_USB_SERIAL_WHITEHEAT */
-
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
