summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Guthrie <cguthrie@mandriva.org>2011-03-03 09:37:16 +0000
committerColin Guthrie <cguthrie@mandriva.org>2011-03-03 09:37:29 +0000
commita8cd9d288006c317d087bad9c4e0d2f399110184 (patch)
treeed37e801cce2c60ba4e96ca866678a75cb4b7b12
parent2ee4ec507cd4105fcddeaf706749524ddeb1ebf5 (diff)
conf: Make system.pa use udev-detect and not hal-detect.
Also fix a left over reference to HAL in default.pa
-rwxr-xr-xsrc/daemon/default.pa.in2
-rwxr-xr-xsrc/daemon/system.pa.in6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in
index 15e253f0..1768c317 100755
--- a/src/daemon/default.pa.in
+++ b/src/daemon/default.pa.in
@@ -39,7 +39,7 @@ load-module module-card-restore
load-module module-augment-properties
### Load audio drivers statically (it's probably better to not load
-### these drivers manually, but instead use module-hal-detect --
+### these drivers manually, but instead use module-udev-detect --
### see below -- for doing this automatically)
#load-module module-alsa-sink
#load-module module-alsa-source device=hw:1,0
diff --git a/src/daemon/system.pa.in b/src/daemon/system.pa.in
index 27e42815..4b1227f9 100755
--- a/src/daemon/system.pa.in
+++ b/src/daemon/system.pa.in
@@ -20,11 +20,11 @@
# mode.
### 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