commit 68b88de455deb57dcdd4620b2b87e0e3753f2502
author Dima Zavin <dima@android.com> Thu Oct 15 02:43:51 2009 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Oct 15 02:43:51 2009 -0700
tree c2e018cad286280144413090a94f4f924f8176ef
parent 62f39c105af8789fd9308fa6a5b91f0963a7c59b
parent 68221b91b13b174c9bc14c43f2d88bada0fa9546

am 68221b91: am 8234aa37: init: Add qdsp6 video encoder, q6venc, device owned by system.audio

Merge commit '68221b91b13b174c9bc14c43f2d88bada0fa9546' into eclair-mr2-plus-aosp

* commit '68221b91b13b174c9bc14c43f2d88bada0fa9546':
  init: Add qdsp6 video encoder, q6venc, device owned by system.audio

init/devices.c

diff --git a/init/devices.c b/init/devices.c
index 8f2f4ef..b18aedc 100644
--- a/init/devices.c
+++ b/init/devices.c
@@ -146,6 +146,7 @@
     { "/dev/msm_audio_ctl", 0660,   AID_SYSTEM,     AID_AUDIO,      0 },
     { "/dev/htc-acoustic",  0660,   AID_SYSTEM,     AID_AUDIO,      0 },
     { "/dev/vdec",          0660,   AID_SYSTEM,     AID_AUDIO,      0 },
+    { "/dev/q6venc",        0660,   AID_SYSTEM,     AID_AUDIO,      0 },
     { "/dev/snd/dsp",       0660,   AID_SYSTEM,     AID_AUDIO,      0 },
     { "/dev/snd/dsp1",      0660,   AID_SYSTEM,     AID_AUDIO,      0 },
     { "/dev/snd/mixer",     0660,   AID_SYSTEM,     AID_AUDIO,      0 },