alsa.conf: load /etc/asound.conf or /usr/etc/asound.conf not both

Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/src/conf/alsa.conf b/src/conf/alsa.conf
index aea1fe24f73ca591e1d34557601b2ecc259df2bf..a04173a0b3938387421046812d0d6b4d8337b302 100644 (file)
--- a/src/conf/alsa.conf
+++ b/src/conf/alsa.conf
@@ -9,9 +9,8 @@
                func load
                files [
                        "/usr/etc/alsa/conf.d"
-                       "/usr/etc/asound.conf"
                        "/etc/alsa/conf.d"
-                       "/etc/asound.conf"
+                       "/etc/asound.conf|||/usr/etc/asound.conf"
                        "~/.asoundrc"
                        {
                                @func concat