- add and enable bluetooth

ok miod@ otto@

2 files changed, 15 insertions, 2 deletions

diff --git a/sys/arch/loongson/conf/GENERIC b/sys/arch/loongson/conf/GENERIC
index 3946cf5142f..575823e1780 100644
--- a/sys/arch/loongson/conf/GENERIC
+++ b/sys/arch/loongson/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.19 2010/03/02 20:54:51 miod Exp $
+#	$OpenBSD: GENERIC,v 1.20 2010/03/03 13:33:27 jasper Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -158,6 +158,18 @@ video*		at uvideo?
 udl*		at uhub?
 wsdisplay*	at udl?
 
+# Bluetooth controllers
+ubt*	at uhub?		# USB Bluetooth
+bthub*	at ubt?
+
+bthidev*	at bthub?		# Bluetooth HID support
+btkbd*	at bthidev?
+btms*	at bthidev?
+wskbd*	at btkbd? mux 1
+wsmouse*	at btms? mux 0
+btsco*	at bthub?		# Bluetooth audio support
+audio*	at btsco?
+
 # NICs
 ral*		at pci?
 re*		at pci?
diff --git a/sys/arch/loongson/conf/files.loongson b/sys/arch/loongson/conf/files.loongson
index 30313fe333b..0efef75c2bb 100644
--- a/sys/arch/loongson/conf/files.loongson
+++ b/sys/arch/loongson/conf/files.loongson
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.loongson,v 1.9 2010/02/28 22:32:50 miod Exp $
+#	$OpenBSD: files.loongson,v 1.10 2010/03/03 13:33:27 jasper Exp $
 
 # Standard stanzas config(8) can't run without
 maxpartitions 16
@@ -38,6 +38,7 @@ include	"dev/mii/files.mii"
 include	"dev/pci/files.pci"
 include	"dev/pckbc/files.pckbc"
 include	"dev/usb/files.usb"
+include "dev/bluetooth/files.bluetooth"
 include "dev/rasops/files.rasops"
 include "dev/wscons/files.wscons"
 include "dev/wsfont/files.wsfont"