*** usbdevs	2009-04-15 05:14:26.000000000 +0200
--- usbdevs.hpc	2009-05-03 17:58:53.000000000 +0200
***************
*** 1,4 ****
! $FreeBSD: src/sys/dev/usb/usbdevs,v 1.328.2.26.2.1 2009/04/15 03:14:26 kensmith Exp $
  /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */
  
  /*-
--- 1,4 ----
! $FreeBSD: src/sys/dev/usb/usbdevs,v 1.328.2.26 2009/03/23 04:06:21 thompsa Exp $
  /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */
  
  /*-
***************
*** 624,629 ****
--- 624,630 ----
  vendor LINKSYS3		0x1915	Linksys
  vendor QUALCOMMINC	0x19d2	Qualcomm, Incorporated
  vendor STELERA		0x1a8d	Stelera Wireless
+ vendor MPMAN		0x1cae	MpMan
  vendor DRESDENELEKTRONIK 0x1cf1 dresden elektronik
  vendor DLINK		0x2001	D-Link
  vendor PLANEX2		0x2019	Planex Communications
***************
*** 663,668 ****
--- 664,673 ----
   * List of known products.  Grouped by vendor.
   */
  
+ /* MpMan products */
+ product MPMAN MPF400_1		0x36d0  MPF400 Music Player 1Go
+ product MPMAN MPF400_2		0x25a8  MPF400 Music Player 2Go
+ 
  /* 3Com products */
  product 3COM HOMECONN		0x009d	HomeConnect Camera
  product 3COM 3CREB96		0x00a0	Bluetooth USB Adapter
*** umass.c	2009-04-15 05:14:26.000000000 +0200
--- umass.c.hpc	2009-05-03 17:58:33.000000000 +0200
***************
*** 24,30 ****
   * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   *
!  *	$FreeBSD: src/sys/dev/usb/umass.c,v 1.160.2.7.2.1 2009/04/15 03:14:26 kensmith Exp $
   *	$NetBSD: umass.c,v 1.28 2000/04/02 23:46:53 augustss Exp $
   */
  
--- 24,30 ----
   * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   *
!  *	$FreeBSD: src/sys/dev/usb/umass.c,v 1.160.2.7 2009/03/23 18:13:18 thompsa Exp $
   *	$NetBSD: umass.c,v 1.28 2000/04/02 23:46:53 augustss Exp $
   */
  
***************
*** 332,337 ****
--- 332,341 ----
  };
  
  static struct umass_devdescr_t umass_devdescrs[] = {
+   	{ USB_VENDOR_MPMAN, PID_WILDCARD,  RID_WILDCARD,
+ 	  UMASS_PROTO_SCSI | UMASS_PROTO_BBB,
+ 	  NO_SYNCHRONIZE_CACHE
+ 	},
  	{ USB_VENDOR_ADDONICS2, USB_PRODUCT_ADDONICS2_CABLE_205, RID_WILDCARD,
  	  UMASS_PROTO_SCSI | UMASS_PROTO_BBB,
  	  NO_QUIRKS