diff options
author | Kalle Viironen <kalle.viironen@digia.com> | 2014-02-21 12:08:34 +0200 |
---|---|---|
committer | Kalle Viironen <kalle.viironen@digia.com> | 2014-02-21 12:08:39 +0200 |
commit | a68e1ea9b2904f7c69330e534da877cf19376219 (patch) | |
tree | b3b6b17eea9ae44206226cc7d47f42841883020f /recipes/alsa/alsa-state/emulator/asound.conf | |
parent | 48f7d2b6ef3939417a1bf291a82fa36660b213e6 (diff) | |
parent | ee2541cf756ddada9bd008b148267e2836d42450 (diff) | |
download | meta-boot2qt-QtEE_v2.0.0.tar.gz |
Merge branch 'stable' into releaseQtEE_v2.0.0
* stable: (34 commits)
udev: disable udev-cache also for beagleboard
busybox: use ifplugd to enable hotplug networking
Move libgl workaround to libsdl
imx53: change to correct GPU driver package
emulator: don't build mesa with llvm anymore
Fix emulator hdd image building
emulator: alsa config to allow multiple source to play audio
hunspell: use multple checksums for hunspell srcs
Changes to init script
Add script to initialize yocto build env
Add missing copyright headers
Update copyright year to 2014
adb: use modprobe to load dependency modules
udev: disable udev-cache on beaglebone
Add support for BeagleBone Black
Recipe for hunspell
upgrade emulator components
gpu-viv-bin-mx6q: remove dependency to mesa
rpi: disable bbappend from meta-raspberrypi
Install all kernel modules
...
Change-Id: I7adca9894ee35092d546babb1926edbf06300feb
Diffstat (limited to 'recipes/alsa/alsa-state/emulator/asound.conf')
-rw-r--r-- | recipes/alsa/alsa-state/emulator/asound.conf | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/recipes/alsa/alsa-state/emulator/asound.conf b/recipes/alsa/alsa-state/emulator/asound.conf new file mode 100644 index 0000000..edd2e82 --- /dev/null +++ b/recipes/alsa/alsa-state/emulator/asound.conf | |||
@@ -0,0 +1,4 @@ | |||
1 | pcm.!default { | ||
2 | type plug | ||
3 | slave.pcm "dmix" | ||
4 | } | ||