Merge "manta: Change video dev permissions for hdmi"
diff --git a/dumpstate/dumpstate.c b/dumpstate/dumpstate.c
index 6db6ab9..e2a4bcd 100644
--- a/dumpstate/dumpstate.c
+++ b/dumpstate/dumpstate.c
@@ -19,5 +19,5 @@
void dumpstate_board()
{
dump_file("manta power", "/d/manta-power");
- dump_file("bq24191 charger", "/d/bq24191");
+ dump_file("smb347 charger regs", "/d/smb347-regs");
};
diff --git a/init.manta.rc b/init.manta.rc
index 0079d65..fae0349 100755
--- a/init.manta.rc
+++ b/init.manta.rc
@@ -42,8 +42,20 @@
service sdcard /system/bin/sdcard /data/media 1023 1023
class late_start
+service p2p_supplicant /system/bin/wpa_supplicant \
+ -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf -N \
+ -ip2p0 -Dnl80211 -c/data/misc/wifi/p2p_supplicant.conf -e/data/misc/wifi/entropy.bin -puse_p2p_group_interface=1
+ # we will start as root and wpa_supplicant will switch to user wifi
+ # after setting up the capabilities required for WEXT
+ # user wifi
+ # group wifi inet keystore
+ class main
+ socket wpa_wlan0 dgram 660 wifi wifi
+ disabled
+ oneshot
+
service wpa_supplicant /system/bin/wpa_supplicant \
- -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf -e/data/misc/wifi/entropy.bin
+ -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf -e/data/misc/wifi/entropy.bin
# we will start as root and wpa_supplicant will switch to user wifi
# after setting up the capabilities required for WEXT
# user wifi
@@ -58,11 +70,26 @@
disabled
oneshot
+service dhcpcd_p2p /system/bin/dhcpcd -aABKL
+ class main
+ disabled
+ oneshot
+
+service dhcpcd_eth0 /system/bin/dhcpcd -ABKL
+ class main
+ disabled
+ oneshot
+
service iprenew_wlan0 /system/bin/dhcpcd -n
class main
disabled
oneshot
+service iprenew_p2p /system/bin/dhcpcd -n
+ class main
+ disabled
+ oneshot
+
service battery_charger /charger
class charger
diff --git a/kernel b/kernel
index f45e74f..accec28 100644
--- a/kernel
+++ b/kernel
Binary files differ
