PERFORCE change 107428 for review

[Alexander Leidinger]

http://perforce.freebsd.org/chv.cgi?CH=107428

Change 107428 by netchild at netchild_magellan on 2006/10/07 16:54:18

	IFC

Affected files ...

.. //depot/projects/linuxolator/src/sys/boot/i386/pxeldr/pxeboot.8#2 integrate
.. //depot/projects/linuxolator/src/sys/dev/usb/usbdevs#2 integrate
.. //depot/projects/linuxolator/src/sys/dev/usb/uscanner.c#2 integrate

Differences ...

==== //depot/projects/linuxolator/src/sys/boot/i386/pxeldr/pxeboot.8#2 (text+ko) ====

@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/sys/boot/i386/pxeldr/pxeboot.8,v 1.7 2002/12/12 17:25:59 ru Exp $
+.\" $FreeBSD: src/sys/boot/i386/pxeldr/pxeboot.8,v 1.8 2006/10/07 10:39:34 pav Exp $
 .\"
 .\" Note: The date here should be updated whenever a non-trivial
 .\" change is made to the manual page.
@@ -103,7 +103,7 @@
 .Pp
 For further information on Intel's PXE specifications and Wired for
 Management (WfM) systems, see
-.Li http://developer.intel.com/ial/wfm/ .
+.Li http://www.intel.com/design/archives/wfm/ .
 .Sh SEE ALSO
 .Xr loader 8
 .Sh HISTORY

==== //depot/projects/linuxolator/src/sys/dev/usb/usbdevs#2 (text+ko) ====

@@ -1,4 +1,4 @@
-$FreeBSD: src/sys/dev/usb/usbdevs,v 1.264 2006/08/06 12:01:42 bms Exp $
+$FreeBSD: src/sys/dev/usb/usbdevs,v 1.265 2006/10/07 16:00:58 flz Exp $
 /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */
 
 /*-
@@ -890,6 +890,8 @@
 product EPSON 1670		0x011f	Perfection 1670 scanner
 product EPSON 1270		0x0120	Perfection 1270 scanner
 product EPSON 2480		0x0121  Perfection 2480 scanner
+product EPSON 3590		0x0122	Perfection 3590 scanner
+product EPSON 4990		0x012a	Perfection 4990 Photo scanner
 product EPSON 3500		0x080e	CX-3500/3600/3650 MFP
 product EPSON RX425		0x080f	Stylus Photo RX425 scanner
 

==== //depot/projects/linuxolator/src/sys/dev/usb/uscanner.c#2 (text+ko) ====

@@ -5,7 +5,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/uscanner.c,v 1.74 2006/09/07 00:06:42 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/uscanner.c,v 1.75 2006/10/07 16:00:58 flz Exp $");
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -214,6 +214,8 @@
  {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_GT9300UF }, 0 },
  {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_2480 }, 0 },
  {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_3500 }, USC_KEEP_OPEN },
+ {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_3590 }, 0 },
+ {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_4990 }, 0 },
 
   /* UMAX */
  {{ USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA1220U }, 0 },