summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2006-07-01 10:33:27 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2006-07-01 10:33:27 +0000
commit7a36da0c175184fa46b57035d4fe75aea4c27004 (patch)
tree5e487020d475f9fc41c272f18663117d64e34fe9 /sys/dev
parent3d85c36540028a38d34afb75674fd5b4f0a8c10d (diff)
Regen
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/usb/usbdevs.h6
-rw-r--r--sys/dev/usb/usbdevs_data.h12
2 files changed, 14 insertions, 4 deletions
diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index 3702c2febd8..d892c1e3d30 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/* $OpenBSD: usbdevs.h,v 1.208 2006/06/27 09:19:58 jsg Exp $ */
+/* $OpenBSD: usbdevs.h,v 1.209 2006/07/01 10:33:26 miod Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * OpenBSD: usbdevs,v 1.204 2006/06/27 09:19:09 jsg Exp
+ * OpenBSD: usbdevs,v 1.205 2006/07/01 10:33:12 miod Exp
*/
/* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
@@ -761,7 +761,9 @@
/* Canon, Inc. products */
#define USB_PRODUCT_CANON_N656U 0x2206 /* CANOSCAN N656U */
+#define USB_PRODUCT_CANON_N1220U 0x2207 /* CANOSCAN N1220U */
#define USB_PRODUCT_CANON_N670U 0x220d /* CANOSCAN N670U */
+#define USB_PRODUCT_CANON_N1240U 0x220e /* CANOSCAN N1240U */
#define USB_PRODUCT_CANON_S10 0x3041 /* PowerShot S10 */
#define USB_PRODUCT_CANON_S20 0x3043 /* PowerShot S20 */
#define USB_PRODUCT_CANON_S100_US 0x3045 /* PowerShot S100 */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 06d772ec27a..f920c6c792d 100644
--- a/sys/dev/usb/usbdevs_data.h
+++ b/sys/dev/usb/usbdevs_data.h
@@ -1,10 +1,10 @@
-/* $OpenBSD: usbdevs_data.h,v 1.208 2006/06/27 09:19:58 jsg Exp $ */
+/* $OpenBSD: usbdevs_data.h,v 1.209 2006/07/01 10:33:26 miod Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * OpenBSD: usbdevs,v 1.204 2006/06/27 09:19:09 jsg Exp
+ * OpenBSD: usbdevs,v 1.205 2006/07/01 10:33:12 miod Exp
*/
/* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
@@ -683,10 +683,18 @@ const struct usb_known_product usb_known_products[] = {
"CANOSCAN N656U",
},
{
+ USB_VENDOR_CANON, USB_PRODUCT_CANON_N1220U,
+ "CANOSCAN N1220U",
+ },
+ {
USB_VENDOR_CANON, USB_PRODUCT_CANON_N670U,
"CANOSCAN N670U",
},
{
+ USB_VENDOR_CANON, USB_PRODUCT_CANON_N1240U,
+ "CANOSCAN N1240U",
+ },
+ {
USB_VENDOR_CANON, USB_PRODUCT_CANON_S10,
"PowerShot S10",
},