Merge remote branch 'cm/cm-11.0'
diff --git a/audio/silence.wav b/audio/silence.wav
deleted file mode 100644
index 5fe31d2..0000000
--- a/audio/silence.wav
+++ /dev/null
Binary files differ
diff --git a/common.mk b/common.mk
index a8d8072..1a87d7b 100644
--- a/common.mk
+++ b/common.mk
@@ -37,8 +37,7 @@
# Audio
PRODUCT_COPY_FILES += \
$(COMMON_PATH)/configs/audio_effects.conf:system/etc/audio_effects.conf \
- $(COMMON_PATH)/configs/audio_policy.conf:system/etc/audio_policy.conf \
- $(COMMON_PATH)/audio/silence.wav:system/etc/sound/silence.wav
+ $(COMMON_PATH)/configs/audio_policy.conf:system/etc/audio_policy.conf
# Camera FW
PRODUCT_COPY_FILES += \
diff --git a/rootdir/init.smdk4x12.rc b/rootdir/init.smdk4x12.rc
index aa6e570..d3e34bb 100755
--- a/rootdir/init.smdk4x12.rc
+++ b/rootdir/init.smdk4x12.rc
@@ -39,6 +39,10 @@
chown radio system /efs
chmod 0771 /efs
+# exfat module
+ insmod /system/lib/modules/exfat_core.ko
+ insmod /system/lib/modules/exfat_fs.ko
+
on post-fs-data
# we will remap this as /mnt/sdcard with the sdcard fuse tool
mkdir /data/media 0775 media_rw media_rw
@@ -500,10 +504,3 @@
service macloader /system/bin/macloader
class main
oneshot
-
-# Workaround for broken incall audio
-service bootsnd /system/bin/tinyplay /system/etc/sound/silence.wav -D 0 -d 0 -p 880
- class late_start
- user root
- group audio
- oneshot