# This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet 1.659 -> 1.660 # drivers/usb/serial/io_edgeport.c 1.27 -> 1.28 # drivers/usb/class/cdc-acm.c 1.17 -> 1.18 # drivers/usb/serial/keyspan.c 1.27 -> 1.28 # drivers/usb/class/bluetty.c 1.22 -> 1.23 # drivers/usb/serial/safe_serial.c 1.2 -> 1.3 # drivers/usb/serial/ftdi_sio.c 1.28 -> 1.29 # drivers/usb/serial/ipaq.c 1.9 -> 1.10 # drivers/usb/serial/visor.c 1.31 -> 1.32 # drivers/usb/serial/omninet.c 1.18 -> 1.19 # drivers/usb/serial/whiteheat.c 1.17 -> 1.18 # drivers/usb/serial/usbserial.c 1.31 -> 1.32 # drivers/usb/serial/empeg.c 1.23 -> 1.24 # drivers/usb/serial/pl2303.c 1.16 -> 1.17 # drivers/usb/usb-skeleton.c 1.12 -> 1.13 # drivers/usb/serial/digi_acceleport.c 1.19 -> 1.20 # drivers/usb/serial/ir-usb.c 1.13 -> 1.14 # drivers/usb/serial/kl5kusb105.c 1.6 -> 1.7 # drivers/usb/serial/belkin_sa.c 1.20 -> 1.21 # drivers/usb/serial/keyspan_pda.c 1.16 -> 1.17 # drivers/usb/serial/mct_u232.c 1.22 -> 1.23 # drivers/usb/serial/cyberjack.c 1.13 -> 1.14 # # The following is the BitKeeper ChangeSet Log # -------------------------------------------- # 02/05/23 greg@kroah.com 1.660 # USB driver #include cleanups # # Removed lots of unneeded #includes from the tty style drivers. # -------------------------------------------- # diff -Nru a/drivers/usb/class/bluetty.c b/drivers/usb/class/bluetty.c --- a/drivers/usb/class/bluetty.c Thu May 23 10:13:53 2002 +++ b/drivers/usb/class/bluetty.c Thu May 23 10:13:53 2002 @@ -104,17 +104,14 @@ #include -#include -#include #include -#include #include #include -#include #include #include #include #include +#include #define DEBUG #include diff -Nru a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c --- a/drivers/usb/class/cdc-acm.c Thu May 23 10:13:53 2002 +++ b/drivers/usb/class/cdc-acm.c Thu May 23 10:13:53 2002 @@ -43,18 +43,15 @@ */ #include -#include -#include #include -#include #include #include -#include #include #include #include #include #include +#include #undef DEBUG #include #include diff -Nru a/drivers/usb/serial/belkin_sa.c b/drivers/usb/serial/belkin_sa.c --- a/drivers/usb/serial/belkin_sa.c Thu May 23 10:13:54 2002 +++ b/drivers/usb/serial/belkin_sa.c Thu May 23 10:13:54 2002 @@ -65,18 +65,15 @@ #include #include -#include -#include #include -#include #include #include -#include #include #include #include #include #include +#include #include #ifdef CONFIG_USB_SERIAL_DEBUG diff -Nru a/drivers/usb/serial/cyberjack.c b/drivers/usb/serial/cyberjack.c --- a/drivers/usb/serial/cyberjack.c Thu May 23 10:13:54 2002 +++ b/drivers/usb/serial/cyberjack.c Thu May 23 10:13:54 2002 @@ -25,18 +25,15 @@ #include #include -#include -#include #include -#include #include #include -#include #include #include #include #include #include +#include #include #ifdef CONFIG_USB_SERIAL_DEBUG diff -Nru a/drivers/usb/serial/digi_acceleport.c b/drivers/usb/serial/digi_acceleport.c --- a/drivers/usb/serial/digi_acceleport.c Thu May 23 10:13:53 2002 +++ b/drivers/usb/serial/digi_acceleport.c Thu May 23 10:13:53 2002 @@ -235,19 +235,16 @@ #include #include -#include -#include #include -#include #include #include -#include #include #include #include #include #include #include +#include #include #ifdef CONFIG_USB_SERIAL_DEBUG diff -Nru a/drivers/usb/serial/empeg.c b/drivers/usb/serial/empeg.c --- a/drivers/usb/serial/empeg.c Thu May 23 10:13:53 2002 +++ b/drivers/usb/serial/empeg.c Thu May 23 10:13:53 2002 @@ -53,18 +53,15 @@ #include #include -#include -#include #include -#include #include #include -#include #include #include #include #include #include +#include #include #ifdef CONFIG_USB_SERIAL_DEBUG diff -Nru a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c --- a/drivers/usb/serial/ftdi_sio.c Thu May 23 10:13:53 2002 +++ b/drivers/usb/serial/ftdi_sio.c Thu May 23 10:13:53 2002 @@ -93,18 +93,15 @@ #include #include -#include -#include #include -#include #include #include -#include #include #include #include #include #include +#include #include #ifdef CONFIG_USB_SERIAL_DEBUG static int debug = 1; diff -Nru a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c --- a/drivers/usb/serial/io_edgeport.c Thu May 23 10:13:53 2002 +++ b/drivers/usb/serial/io_edgeport.c Thu May 23 10:13:53 2002 @@ -242,13 +242,10 @@ #include #include -#include -#include +#include #include -#include #include #include -#include #include #include #include @@ -256,7 +253,7 @@ #include #include #include -#include +#include #include #ifdef CONFIG_USB_SERIAL_DEBUG diff -Nru a/drivers/usb/serial/ipaq.c b/drivers/usb/serial/ipaq.c --- a/drivers/usb/serial/ipaq.c Thu May 23 10:13:53 2002 +++ b/drivers/usb/serial/ipaq.c Thu May 23 10:13:53 2002 @@ -34,18 +34,15 @@ #include #include -#include -#include #include -#include #include #include -#include #include #include #include #include #include +#include #include #ifdef CONFIG_USB_SERIAL_DEBUG diff -Nru a/drivers/usb/serial/ir-usb.c b/drivers/usb/serial/ir-usb.c --- a/drivers/usb/serial/ir-usb.c Thu May 23 10:13:53 2002 +++ b/drivers/usb/serial/ir-usb.c Thu May 23 10:13:53 2002 @@ -48,18 +48,15 @@ #include #include -#include -#include #include -#include #include #include -#include #include #include #include #include #include +#include #include #ifdef CONFIG_USB_SERIAL_DEBUG diff -Nru a/drivers/usb/serial/keyspan.c b/drivers/usb/serial/keyspan.c --- a/drivers/usb/serial/keyspan.c Thu May 23 10:13:53 2002 +++ b/drivers/usb/serial/keyspan.c Thu May 23 10:13:53 2002 @@ -76,18 +76,16 @@ #include #include -#include -#include +#include #include -#include #include #include -#include #include #include #include #include #include +#include #include #ifdef CONFIG_USB_SERIAL_DEBUG diff -Nru a/drivers/usb/serial/keyspan_pda.c b/drivers/usb/serial/keyspan_pda.c --- a/drivers/usb/serial/keyspan_pda.c Thu May 23 10:13:54 2002 +++ b/drivers/usb/serial/keyspan_pda.c Thu May 23 10:13:54 2002 @@ -68,19 +68,16 @@ #include #include -#include -#include #include -#include #include #include -#include #include #include #include #include #include #include +#include #include #ifdef CONFIG_USB_SERIAL_DEBUG diff -Nru a/drivers/usb/serial/kl5kusb105.c b/drivers/usb/serial/kl5kusb105.c --- a/drivers/usb/serial/kl5kusb105.c Thu May 23 10:13:53 2002 +++ b/drivers/usb/serial/kl5kusb105.c Thu May 23 10:13:53 2002 @@ -47,16 +47,14 @@ #include #include -#include -#include #include -#include #include #include #include #include #include #include +#include #include #ifdef CONFIG_USB_SERIAL_DEBUG diff -Nru a/drivers/usb/serial/mct_u232.c b/drivers/usb/serial/mct_u232.c --- a/drivers/usb/serial/mct_u232.c Thu May 23 10:13:54 2002 +++ b/drivers/usb/serial/mct_u232.c Thu May 23 10:13:54 2002 @@ -61,18 +61,15 @@ #include #include -#include -#include #include -#include #include #include -#include #include #include #include #include #include +#include #include #ifdef CONFIG_USB_SERIAL_DEBUG diff -Nru a/drivers/usb/serial/omninet.c b/drivers/usb/serial/omninet.c --- a/drivers/usb/serial/omninet.c Thu May 23 10:13:53 2002 +++ b/drivers/usb/serial/omninet.c Thu May 23 10:13:53 2002 @@ -37,18 +37,15 @@ #include #include -#include -#include #include -#include #include #include -#include #include #include #include #include #include +#include #include #ifdef CONFIG_USB_SERIAL_DEBUG diff -Nru a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c --- a/drivers/usb/serial/pl2303.c Thu May 23 10:13:53 2002 +++ b/drivers/usb/serial/pl2303.c Thu May 23 10:13:53 2002 @@ -36,19 +36,16 @@ #include #include -#include -#include #include -#include #include #include -#include #include #include #include #include #include #include +#include #include #ifdef CONFIG_USB_SERIAL_DEBUG diff -Nru a/drivers/usb/serial/safe_serial.c b/drivers/usb/serial/safe_serial.c --- a/drivers/usb/serial/safe_serial.c Thu May 23 10:13:53 2002 +++ b/drivers/usb/serial/safe_serial.c Thu May 23 10:13:53 2002 @@ -62,18 +62,15 @@ #include #include -#include -#include #include -#include #include #include -#include #include #include #include #include #include +#include #include diff -Nru a/drivers/usb/serial/usbserial.c b/drivers/usb/serial/usbserial.c --- a/drivers/usb/serial/usbserial.c Thu May 23 10:13:53 2002 +++ b/drivers/usb/serial/usbserial.c Thu May 23 10:13:53 2002 @@ -308,13 +308,9 @@ #include #include -#include -#include #include -#include #include #include -#include #include #include #include @@ -322,6 +318,7 @@ #include #include #include +#include #include #ifdef MODULE diff -Nru a/drivers/usb/serial/visor.c b/drivers/usb/serial/visor.c --- a/drivers/usb/serial/visor.c Thu May 23 10:13:53 2002 +++ b/drivers/usb/serial/visor.c Thu May 23 10:13:53 2002 @@ -133,18 +133,15 @@ #include #include -#include -#include #include -#include #include #include -#include #include #include #include #include #include +#include #include #ifdef CONFIG_USB_SERIAL_DEBUG diff -Nru a/drivers/usb/serial/whiteheat.c b/drivers/usb/serial/whiteheat.c --- a/drivers/usb/serial/whiteheat.c Thu May 23 10:13:53 2002 +++ b/drivers/usb/serial/whiteheat.c Thu May 23 10:13:53 2002 @@ -61,18 +61,15 @@ #include #include -#include -#include #include -#include #include #include -#include #include #include #include #include #include +#include #include #ifdef CONFIG_USB_SERIAL_DEBUG diff -Nru a/drivers/usb/usb-skeleton.c b/drivers/usb/usb-skeleton.c --- a/drivers/usb/usb-skeleton.c Thu May 23 10:13:53 2002 +++ b/drivers/usb/usb-skeleton.c Thu May 23 10:13:53 2002 @@ -37,18 +37,14 @@ #include #include -#include -#include #include -#include #include #include -#include #include #include -#include #include #include +#include #include #ifdef CONFIG_USB_DEBUG