From b5f35499b127655a2c518fb8476ea94a93bbf100 Mon Sep 17 00:00:00 2001
From: elad <elad@NetBSD.org>
Date: Tue, 6 Feb 2007 14:30:09 +0000
Subject: [PATCH] PR/35552: Yojiro UO: add new devices for rum(4)

Patch applied, thanks!

(needs regen)
---
 sys/dev/usb/if_rum.c | 6 ++++--
 sys/dev/usb/usbdevs  | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/sys/dev/usb/if_rum.c b/sys/dev/usb/if_rum.c
index 4e8a7b5b0329..fb388fc92d13 100644
--- a/sys/dev/usb/if_rum.c
+++ b/sys/dev/usb/if_rum.c
@@ -1,5 +1,5 @@
 /*	$OpenBSD: if_rum.c,v 1.40 2006/09/18 16:20:20 damien Exp $	*/
-/*	$NetBSD: if_rum.c,v 1.3 2006/11/25 21:35:08 christos Exp $	*/
+/*	$NetBSD: if_rum.c,v 1.4 2007/02/06 14:30:09 elad Exp $	*/
 
 /*-
  * Copyright (c) 2005, 2006 Damien Bergamini <damien.bergamini@free.fr>
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_rum.c,v 1.3 2006/11/25 21:35:08 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rum.c,v 1.4 2007/02/06 14:30:09 elad Exp $");
 
 #include "bpfilter.h"
 
@@ -101,9 +101,11 @@ static const struct usb_devno rum_devs[] = {
 	{ USB_VENDOR_GIGASET,		USB_PRODUCT_GIGASET_RT2573 },
 	{ USB_VENDOR_GOODWAY,		USB_PRODUCT_GOODWAY_RT2573 },
 	{ USB_VENDOR_HUAWEI3COM,	USB_PRODUCT_HUAWEI3COM_RT2573 },
+	{ USB_VENDOR_MELCO,		USB_PRODUCT_MELCO_SG54HP },
 	{ USB_VENDOR_MSI,		USB_PRODUCT_MSI_RT2573 },
 	{ USB_VENDOR_MSI,		USB_PRODUCT_MSI_RT2573_2 },
 	{ USB_VENDOR_MSI,		USB_PRODUCT_MSI_RT2573_3 },
+	{ USB_VENDOR_PLANEX2,		USB_PRODUCT_PLANEX2_GWUS54MINI2 },
 	{ USB_VENDOR_PLANEX2,		USB_PRODUCT_PLANEX2_GWUSMM },
 	{ USB_VENDOR_QCOM,		USB_PRODUCT_QCOM_RT2573 },
 	{ USB_VENDOR_QCOM,		USB_PRODUCT_QCOM_RT2573_2 },
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index 86d54ce96439..17426084e3f6 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.455 2007/02/05 14:08:16 gdt Exp $
+$NetBSD: usbdevs,v 1.456 2007/02/06 14:30:09 elad Exp $
 
 /*
  * Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -1348,6 +1348,7 @@ product MELCO KB11		0x0044	WLI-USB-KB11 WLAN
 product MELCO KG54YB		0x005e	WLI-U2-KG54-YB WLAN
 product MELCO KG54		0x0066	WLI-U2-KG54 WLAN
 product MELCO KG54AI		0x0067	WLI-U2-KG54-AI WLAN
+product	MELCO SG54HP		0x00d8	WLI-U2-SG54HP
 
 /* Metricom products */
 product METRICOM RICOCHET_GS	0x0001	Ricochet GS
@@ -1599,6 +1600,7 @@ product PILOTECH CRW600		0x0001	CRW-600 6-in-1 Reader
 
 /* Planex Communications products */
 product PLANEX GW_US11H		0x14ea	GW-US11H WLAN
+product	PLANEX2	GWUS54MINI2	0xab50	GW-US54Mini2
 product PLANEX2 GWUSMM		0xed02	GW-USMM
 
 /* Plantronics products */