summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Queru2009-03-17 19:15:47 -0500
committerJean-Baptiste Queru2009-03-18 11:29:29 -0500
commit83b65486beffc7c86f24c428fbb7b50bbbe189f9 (patch)
treeab343e30dd96348d35b0957453fbf6b7b0bac56d /init/devices.c
parent4a4c9f6f98055918f1ebff06b3cc1ed622c058fe (diff)
parente037fd7e193ecccbb5c0888e49f6d58c224bc11d (diff)
downloadplatform-system-core-83b65486beffc7c86f24c428fbb7b50bbbe189f9.tar.gz
platform-system-core-83b65486beffc7c86f24c428fbb7b50bbbe189f9.tar.xz
platform-system-core-83b65486beffc7c86f24c428fbb7b50bbbe189f9.zip
Merge commit 'remotes/korg/cupcake' into merge
Conflicts: init/devices.c libpixelflinger/Android.mk
Diffstat (limited to 'init/devices.c')
-rw-r--r--init/devices.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/init/devices.c b/init/devices.c
index efe3ad033..e0b1f1f33 100644
--- a/init/devices.c
+++ b/init/devices.c
@@ -123,14 +123,13 @@ static struct perms_ devperms[] = {
123 { "/dev/msm_pcm_ctl", 0660, AID_SYSTEM, AID_AUDIO, 1 }, 123 { "/dev/msm_pcm_ctl", 0660, AID_SYSTEM, AID_AUDIO, 1 },
124 { "/dev/msm_snd", 0660, AID_SYSTEM, AID_AUDIO, 1 }, 124 { "/dev/msm_snd", 0660, AID_SYSTEM, AID_AUDIO, 1 },
125 { "/dev/msm_mp3", 0660, AID_SYSTEM, AID_AUDIO, 1 }, 125 { "/dev/msm_mp3", 0660, AID_SYSTEM, AID_AUDIO, 1 },
126 { "/dev/msm_snd", 0660, AID_SYSTEM, AID_AUDIO, 1 }, 126 { "/dev/msm_audpre", 0660, AID_SYSTEM, AID_AUDIO, 0 },
127 { "/dev/htc-acoustic", 0660, AID_SYSTEM, AID_AUDIO, 0 },
127 { "/dev/smd0", 0640, AID_RADIO, AID_RADIO, 0 }, 128 { "/dev/smd0", 0640, AID_RADIO, AID_RADIO, 0 },
128 { "/dev/qmi", 0640, AID_RADIO, AID_RADIO, 0 }, 129 { "/dev/qmi", 0640, AID_RADIO, AID_RADIO, 0 },
129 { "/dev/qmi0", 0640, AID_RADIO, AID_RADIO, 0 }, 130 { "/dev/qmi0", 0640, AID_RADIO, AID_RADIO, 0 },
130 { "/dev/qmi1", 0640, AID_RADIO, AID_RADIO, 0 }, 131 { "/dev/qmi1", 0640, AID_RADIO, AID_RADIO, 0 },
131 { "/dev/qmi2", 0640, AID_RADIO, AID_RADIO, 0 }, 132 { "/dev/qmi2", 0640, AID_RADIO, AID_RADIO, 0 },
132 { "/dev/htc-acoustic", 0640, AID_RADIO, AID_RADIO, 0 },
133 { "/dev/snd/", 0664, AID_SYSTEM, AID_AUDIO, 1 },
134 { NULL, 0, 0, 0, 0 }, 133 { NULL, 0, 0, 0, 0 },
135}; 134};
136 135