summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrepo sync2009-06-29 22:06:14 -0500
committerrepo sync2009-06-29 22:09:06 -0500
commit60a4cd5e348ae263d209a7f64510826825848208 (patch)
treed3beeb9ae9744817c3067a50eed6c2e11fa56e6d /init/devices.c
parent24f3a2fe8f4b63497654a774af11615cd70b4c2b (diff)
parentabb0855010a918747a199367d99b5ca5ade105e2 (diff)
downloadplatform-system-core-60a4cd5e348ae263d209a7f64510826825848208.tar.gz
platform-system-core-60a4cd5e348ae263d209a7f64510826825848208.tar.xz
platform-system-core-60a4cd5e348ae263d209a7f64510826825848208.zip
resolved conflicts for merge of abb08550 to master
Diffstat (limited to 'init/devices.c')
-rw-r--r--init/devices.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/init/devices.c b/init/devices.c
index 9b341d6be..e76d35476 100644
--- a/init/devices.c
+++ b/init/devices.c
@@ -140,7 +140,8 @@ static struct perms_ devperms[] = {
140 { "/dev/qmi2", 0640, AID_RADIO, AID_RADIO, 0 }, 140 { "/dev/qmi2", 0640, AID_RADIO, AID_RADIO, 0 },
141 /* CDMA radio interface MUX */ 141 /* CDMA radio interface MUX */
142 { "/dev/ts0710mux", 0640, AID_RADIO, AID_RADIO, 1 }, 142 { "/dev/ts0710mux", 0640, AID_RADIO, AID_RADIO, 1 },
143 { "/dev/tun", 0640, AID_VPN , AID_VPN, 0 }, 143 { "/dev/ppp", 0660, AID_RADIO, AID_VPN, 0 },
144 { "/dev/tun", 0640, AID_VPN, AID_VPN, 0 },
144 { NULL, 0, 0, 0, 0 }, 145 { NULL, 0, 0, 0, 0 },
145}; 146};
146 147