remove #ifdef __macppc__ due to a misunderstanding:

 - the wskbd/wsmouse is not phantom, but actually is pre-paired keyboard/mice
   talking wskbd/wsmouse to the os
this permits the bluetooth device to attach as wskbd/wsmouse using bluetooth
 keyboards for ddb> and in general if you have paired them in an os that
 supports flipping the funny bluetooth device into full bluetooth mode
ok drahn@

2 files changed, 2 insertions, 25 deletions

diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c
index 355e3b15d87..7f946ce33b3 100644
--- a/sys/dev/usb/ugen.c
+++ b/sys/dev/usb/ugen.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ugen.c,v 1.52 2007/10/20 22:44:01 fgsch Exp $ */
+/*	$OpenBSD: ugen.c,v 1.53 2008/06/14 02:40:23 todd Exp $ */
 /*	$NetBSD: ugen.c,v 1.63 2002/11/26 18:49:48 christos Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/ugen.c,v 1.26 1999/11/17 22:33:41 n_hibma Exp $	*/
 
@@ -157,17 +157,6 @@ ugen_match(struct device *parent, void *match, void *aux)
 		return (uaa->matchlvl);
 #endif
 	if (uaa->usegeneric) {
-#ifdef __macppc__
-		/*
-		 * Some Apple laptops have USB phantom devices which match
-		 * the ADB devices.  We want to ignore them to avoid
-		 * confusing users, as the real hardware underneath is adb
-		 * and has already attached.
-		 */
-		if (uaa->vendor == USB_VENDOR_APPLE &&
-		    uaa->product == USB_PRODUCT_APPLE_ADB)
-			return (UMATCH_NONE);
-#endif
 		return (UMATCH_GENERIC);
 	} else
 		return (UMATCH_NONE);
diff --git a/sys/dev/usb/uhidev.c b/sys/dev/usb/uhidev.c
index 85d65d895f2..6057b47c8b4 100644
--- a/sys/dev/usb/uhidev.c
+++ b/sys/dev/usb/uhidev.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uhidev.c,v 1.31 2007/11/12 04:18:09 deraadt Exp $	*/
+/*	$OpenBSD: uhidev.c,v 1.32 2008/06/14 02:40:23 todd Exp $	*/
 /*	$NetBSD: uhidev.c,v 1.14 2003/03/11 16:44:00 augustss Exp $	*/
 
 /*
@@ -113,18 +113,6 @@ uhidev_match(struct device *parent, void *match, void *aux)
 	if (uaa->matchlvl)
 		return (uaa->matchlvl);
 
-#ifdef __macppc__
-	/*
-	 * Some Apple laptops have USB phantom devices which match
-	 * the ADB devices.  We want to ignore them to avoid
-	 * confusing users, as the real hardware underneath is adb
-	 * and has already attached.
-	 */
-	if (uaa->vendor == USB_VENDOR_APPLE &&
-	    uaa->product == USB_PRODUCT_APPLE_ADB)
-		return (UMATCH_NONE);
-#endif
-
 	return (UMATCH_IFACECLASS_GENERIC);
 }