# 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.587 -> 1.588 # drivers/usb/auerswald.c 1.4 -> 1.5 # MAINTAINERS 1.79 -> 1.80 # CREDITS 1.53 -> 1.54 # Documentation/usb/auerswald.txt 1.1 -> 1.2 # Documentation/Configure.help 1.120 -> 1.121 # # The following is the BitKeeper ChangeSet Log # -------------------------------------------- # 02/08/20 greg@kroah.com 1.588 # USB: documentation updates # # Configure.help update for missing entries, # MAINTAINERS update for tidus # email change for Wolfgang Muees # -------------------------------------------- # diff -Nru a/CREDITS b/CREDITS --- a/CREDITS Wed Aug 21 11:47:32 2002 +++ b/CREDITS Wed Aug 21 11:47:32 2002 @@ -2165,7 +2165,7 @@ S: South Australia N. Wolfgang Muees -E: wmues@nexgo.de +E: wolfgang@iksw-muees.de D: Auerswald USB driver N: Ian A. Murdock diff -Nru a/Documentation/Configure.help b/Documentation/Configure.help --- a/Documentation/Configure.help Wed Aug 21 11:47:32 2002 +++ b/Documentation/Configure.help Wed Aug 21 11:47:32 2002 @@ -14234,6 +14234,11 @@ Say Y here to include additional code to support the Sandisk SDDR-09 SmartMedia reader in the USB Mass Storage driver. +SanDisk SDDR-55 SmartMedia support +CONFIG_USB_STORAGE_SDDR55 + Say Y here to include additional code to support the Sandisk SDDR-55 + SmartMedia reader in the USB Mass Storage driver. + USB Diamond Rio500 support CONFIG_USB_RIO500 Say Y here if you want to connect a USB Rio500 mp3 player to your @@ -14243,7 +14248,17 @@ This code is also available as a module ( = code which can be inserted in and removed from the running kernel whenever you want). The module will be called rio500.o. If you want to compile it as - a module, say M here and read . + a module, say M here and read . + +USB Auerswald ISDN device support +CONFIG_USB_AUERSWALD + Say Y here if you want to connect an Auerswald USB ISDN Device + to your computer's USB port. + + This code is also available as a module ( = code which can be + inserted in and removed from the running kernel whenever you want). + The module will be called auerswald.o. If you want to compile it as + a module, say M here and read CONFIG_USB_TIGL If you own a Texas Instruments graphing calculator and use a diff -Nru a/Documentation/usb/auerswald.txt b/Documentation/usb/auerswald.txt --- a/Documentation/usb/auerswald.txt Wed Aug 21 11:47:32 2002 +++ b/Documentation/usb/auerswald.txt Wed Aug 21 11:47:32 2002 @@ -27,4 +27,4 @@ ============ - Connection to ISDN4LINUX (the hisax interface) -The maintainer of this driver is wmues@nexgo.de +The maintainer of this driver is wolfgang@iksw-muees.de diff -Nru a/MAINTAINERS b/MAINTAINERS --- a/MAINTAINERS Wed Aug 21 11:47:32 2002 +++ b/MAINTAINERS Wed Aug 21 11:47:32 2002 @@ -1574,6 +1574,13 @@ M: s.doyon@videotron.ca S: Maintained +TIEMAN VOYAGER USB BRAILLE DISPLAY DRIVER +P: Stephane Dalton +M: sdalton@videotron.ca +P: Stéphane Doyon +M: s.doyon@videotron.ca +S: Maintained + TLAN NETWORK DRIVER P: Samuel Chessman M: chessman@tux.org @@ -1661,7 +1668,7 @@ USB AUERSWALD DRIVER P: Wolfgang Muees -M: wmues@nexgo.de +M: wolfgang@iksw-muees.de L: linux-usb-users@lists.sourceforge.net L: linux-usb-devel@lists.sourceforge.net S: Maintained diff -Nru a/drivers/usb/auerswald.c b/drivers/usb/auerswald.c --- a/drivers/usb/auerswald.c Wed Aug 21 11:47:32 2002 +++ b/drivers/usb/auerswald.c Wed Aug 21 11:47:32 2002 @@ -2,7 +2,7 @@ /* * auerswald.c -- Auerswald PBX/System Telephone usb driver. * - * Copyright (C) 2001 Wolfgang Mües (wmues@nexgo.de) + * Copyright (C) 2001 Wolfgang Mües (wolfgang@iksw-muees.de) * * Very much code of this driver is borrowed from dabusb.c (Deti Fliegl) * and from the USB Skeleton driver (Greg Kroah-Hartman). Thank you. @@ -50,7 +50,7 @@ /*-------------------------------------------------------------------*/ /* Version Information */ #define DRIVER_VERSION "0.9.11" -#define DRIVER_AUTHOR "Wolfgang Mües " +#define DRIVER_AUTHOR "Wolfgang Mües " #define DRIVER_DESC "Auerswald PBX/System Telephone usb driver" /*-------------------------------------------------------------------*/