[src/netbsd-1-6]: src/sys/dev/usb Pullup revisions 1.35-1.37 (requested by tr...

[jmc <jmc%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d81d8fff1760
branches:  netbsd-1-6
changeset: 529912:d81d8fff1760
user:      jmc <jmc%NetBSD.org@localhost>
date:      Sun Jan 26 09:14:59 2003 +0000

description:
Pullup revisions 1.35-1.37 (requested by tron in ticket #1074)
 Add Epson 1660.  From kerm/19767, Neil Short.
 Add Epson Perfection 1260 scanner.

diffstat:

 sys/dev/usb/uscanner.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (29 lines):

diff -r 81f2697ee6a0 -r d81d8fff1760 sys/dev/usb/uscanner.c
--- a/sys/dev/usb/uscanner.c    Sun Jan 26 09:14:25 2003 +0000
+++ b/sys/dev/usb/uscanner.c    Sun Jan 26 09:14:59 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uscanner.c,v 1.28 2002/05/12 08:04:41 simonb Exp $     */
+/*     $NetBSD: uscanner.c,v 1.28.4.1 2003/01/26 09:14:59 jmc Exp $    */
 
 /*
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uscanner.c,v 1.28 2002/05/12 08:04:41 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uscanner.c,v 1.28.4.1 2003/01/26 09:14:59 jmc Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -178,8 +178,10 @@
  {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_610 }, 0 },
  {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1200 }, 0 },
  {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1240 }, 0 },
+ {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1260 }, 0 },
  {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1600 }, 0 },
  {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1640 }, 0 },
+ {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1660 }, 0 },
  {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_640U }, 0 },
  {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1650 }, 0 },
  {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_GT9700F }, USC_KEEP_OPEN },