summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--share/man/man4/uscanner.41
-rw-r--r--sys/dev/usb/usbdevs1
-rw-r--r--sys/dev/usb/uscanner.c1
3 files changed, 3 insertions, 0 deletions
diff --git a/share/man/man4/uscanner.4 b/share/man/man4/uscanner.4
index 6b80861..11a52fa 100644
--- a/share/man/man4/uscanner.4
+++ b/share/man/man4/uscanner.4
@@ -61,6 +61,7 @@ Supported are:
.It Epson Perfection 610
.It Epson Perfection 636U / 636Photo
.It Epson Perfection 1200U / 1200Photo
+.It Epson Perfection 1260 / 1260Photo
.It Epson Expression 1600
.It Hewlett Packard Photosmart S20
.It Hewlett Packard Scanjet 2200C
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index c795ca7..6bb3860 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 3b7a8cd..98e2177 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 */
OpenPOWER on IntegriCloud