libmraa: sync with upstream (SHA1: d336e9f)
am: b33fe8d1c1
Change-Id: I408cb1b3d3b2f0ef06919cce03bbe1644abe2943
diff --git a/peripheral/audio/generic/audio_hal.c b/peripheral/audio/generic/audio_hal.c
index 7e8a9bc..e44b4de 100644
--- a/peripheral/audio/generic/audio_hal.c
+++ b/peripheral/audio/generic/audio_hal.c
@@ -72,11 +72,6 @@
#define DEFAULT_INPUT_BUFFER_SIZE_MS 20
-// stereo channel count
-#define FCC_2 2
-// fixed channel count of 8 limitation (for data processing in AudioFlinger)
-#define FCC_8 8
-
struct audio_device {
struct audio_hw_device hw_device;
diff --git a/peripheral/bluetooth/bcm43340/bt_bcm43340.rc b/peripheral/bluetooth/bcm43340/bt_bcm43340.rc
index 62c9f09..bdc1f42 100644
--- a/peripheral/bluetooth/bcm43340/bt_bcm43340.rc
+++ b/peripheral/bluetooth/bcm43340/bt_bcm43340.rc
@@ -16,16 +16,3 @@
chown bluetooth net_bt_stack /sys/class/rfkill/rfkill0/state
chown bluetooth net_bt_stack /sys/class/rfkill/rfkill0/type
-########################################################
-
-service dhcpcd_bt-pan /system/bin/dhcpcd -ABKL
- class main
- group bluetooth wifi system dhcp
- disabled
- oneshot
-
-service iprenew_bt-pan /system/bin/dhcpcd -n
- group bluetooth system dhcp
- disabled
- oneshot
-
