Permalink
Browse files

Merge commit 'android-4.2.2_r1' into HEAD

Conflicts:
	BoardConfig.mk
	audio/audio_hw.c
	device.mk
	gps.conf
	init.tuna.rc
	liblight/Android.mk
	liblight/lights.c
	overlay/frameworks/base/core/res/res/values/config.xml
	overlay/frameworks/base/core/res/res/xml/storage_list.xml
	overlay/packages/apps/Settings/res/values/bools.xml
	power/power_tuna.c

Change-Id: Iaeea99e1b6aefd6b38544715f82f28d5801c4854
  • Loading branch information...
Gergely Szell (sethyx)
Gergely Szell (sethyx) committed Mar 2, 2013
2 parents b87e222 + 619da12 commit d9ac8835ea53bbbc44714882f07c71cea8b14950
Showing with 2 additions and 0 deletions.
  1. +2 −0 init.tuna.rc
View
@@ -111,6 +111,8 @@ on fs
chmod 0660 /sys/class/sec/gps/GPS_PWR_EN/value
chown root system /sys/class/sec/gps/GPS_nRST/value
chmod 0660 /sys/class/sec/gps/GPS_nRST/value
+ chown system system /proc/mcspi1_cs3_ctrl
+ chmod 0600 /proc/mcspi1_cs3_ctrl
# ril control auto-suspend
chmod 0660 /sys/bus/usb/devices/usb1/power/control

0 comments on commit d9ac883

Please sign in to comment.