aboutsummaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorJosef Karthauser <joe@FreeBSD.org>2003-01-20 00:41:30 +0000
committerJosef Karthauser <joe@FreeBSD.org>2003-01-20 00:41:30 +0000
commit6ee4bee25a694d4ede281cd0ad98e1d5737f2379 (patch)
treeaee991c0e7dc50778de81e438c63b4bbe22f05e5 /sys/dev
parentcb202dffb97c4ce2d5061f206dee6f4a5da7fb36 (diff)
downloadsrc-6ee4bee25a694d4ede281cd0ad98e1d5737f2379.tar.gz
src-6ee4bee25a694d4ede281cd0ad98e1d5737f2379.zip
Support for the "Seiko Epson Perfection 1260 scanner".
Submitted by: Michael Lestinsky <michael@lestinsky.de> MFC After: 3 days
Notes
Notes: svn path=/head/; revision=109544
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/usb/usbdevs1
-rw-r--r--sys/dev/usb/uscanner.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index c795ca7750de..6bb3860c8b57 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -595,6 +595,7 @@ product EPSON 1240 0x010b Perfection 1240U / 1240Photo scanner
product EPSON 640U 0x010c Perfection 640U scanner
product EPSON 1650 0x0110 Perfection 1650 scanner
product EPSON GT9700F 0x0112 GT-9700F scanner
+product EPSON 1260 0x011d Perfection 1260 scanner
/* e-TEK Labs products */
product ETEK 1COM 0x8007 Serial port
diff --git a/sys/dev/usb/uscanner.c b/sys/dev/usb/uscanner.c
index 3b7a8cdbb549..98e2177e87da 100644
--- a/sys/dev/usb/uscanner.c
+++ b/sys/dev/usb/uscanner.c
@@ -181,6 +181,7 @@ static const struct uscan_info uscanner_devs[] = {
{{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1640 }, 0 },
{{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_640U }, 0 },
{{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1650 }, 0 },
+ {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1260 }, 0 },
{{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_GT9700F }, USC_KEEP_OPEN },
/* UMAX */