From 18e975fc5ef68a89875c77974570884b9214a009 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 20 Jul 2009 17:34:17 +0200
Subject: merged

---
 src/daemon/default.pa.in | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'src/daemon/default.pa.in')

diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in
index 02ac8e57..00c000eb 100755
--- a/src/daemon/default.pa.in
+++ b/src/daemon/default.pa.in
@@ -49,18 +49,18 @@ load-module module-augment-properties
 #load-module module-pipe-sink
 
 ### Automatically load driver modules depending on the hardware available
-.ifexists module-hal-detect@PA_SOEXT@
-load-module module-hal-detect
+.ifexists module-udev-detect@PA_SOEXT@
+load-module module-udev-detect
 .else
 ### Alternatively use the static hardware detection module (for systems that
-### lack HAL support)
+### lack udev support)
 load-module module-detect
 .endif
 
 ### Automatically load driver modules for Bluetooth hardware
-#.ifexists module-bluetooth-discover@PA_SOEXT@
-#load-module module-bluetooth-discover
-#.endif
+.ifexists module-bluetooth-discover@PA_SOEXT@
+load-module module-bluetooth-discover
+.endif
 
 ### Load several protocols
 .ifexists module-esound-protocol-unix@PA_SOEXT@
@@ -100,6 +100,9 @@ load-module module-rescue-streams
 ### Make sure we always have a sink around, even if it is a null sink.
 load-module module-always-sink
 
+### Honour intended role device property
+load-module module-intended-roles
+
 ### Automatically suspend sinks/sources that become idle for too long
 load-module module-suspend-on-idle
 
-- 
cgit