From b18e92b1d0380dfa43d0bbc244f288645c2fa84e Mon Sep 17 00:00:00 2001 From: wdc Date: Wed, 7 Dec 2011 10:13:53 +0800 Subject: [PATCH] bluetooth: enable config for android4.0 --- arch/arm/configs/rk29_a22_defconfig | 17 ++++------------- arch/arm/configs/rk29_phonesdk_defconfig | 19 +++---------------- arch/arm/configs/rk29_td8801_v2_defconfig | 19 +++---------------- 3 files changed, 10 insertions(+), 45 deletions(-) mode change 100644 => 100755 arch/arm/configs/rk29_a22_defconfig mode change 100644 => 100755 arch/arm/configs/rk29_td8801_v2_defconfig diff --git a/arch/arm/configs/rk29_a22_defconfig b/arch/arm/configs/rk29_a22_defconfig old mode 100644 new mode 100755 index f1b222290e23..b9e656a313bb --- a/arch/arm/configs/rk29_a22_defconfig +++ b/arch/arm/configs/rk29_a22_defconfig @@ -597,21 +597,12 @@ CONFIG_BT_L2CAP=y CONFIG_BT_SCO=y CONFIG_BT_RFCOMM=y CONFIG_BT_RFCOMM_TTY=y -# CONFIG_BT_BNEP is not set - -# -# Bluetooth device drivers -# -# CONFIG_BT_HCIBTSDIO is not set +CONFIG_BT_BNEP=y +CONFIG_BT_HIDP=y CONFIG_BT_HCIUART=y CONFIG_BT_HCIUART_H4=y -# CONFIG_BT_HCIUART_BCSP is not set -# CONFIG_BT_HCIUART_ATH3K is not set -# CONFIG_BT_HCIUART_LL is not set -# CONFIG_BT_HCIVHCI is not set -# CONFIG_BT_MRVL is not set CONFIG_BT_HCIBCM4325=y -# CONFIG_IDBLOCK is not set +CONFIG_IDBLOCK=y CONFIG_WIFI_MAC=y # CONFIG_AF_RXRPC is not set CONFIG_FIB_RULES=y @@ -1688,7 +1679,7 @@ CONFIG_SND_RK29_SOC=y CONFIG_SND_SOC_I2C_AND_SPI=y # CONFIG_SND_SOC_ALL_CODECS is not set # CONFIG_SOUND_PRIME is not set -# CONFIG_HID_SUPPORT is not set +CONFIG_HID_SUPPORT = y CONFIG_USB_SUPPORT=y CONFIG_USB_ARCH_HAS_HCD=y # CONFIG_USB_ARCH_HAS_OHCI is not set diff --git a/arch/arm/configs/rk29_phonesdk_defconfig b/arch/arm/configs/rk29_phonesdk_defconfig index 5a094da7cbaf..093edf254d38 100755 --- a/arch/arm/configs/rk29_phonesdk_defconfig +++ b/arch/arm/configs/rk29_phonesdk_defconfig @@ -476,23 +476,10 @@ CONFIG_BT_L2CAP=y CONFIG_BT_SCO=y CONFIG_BT_RFCOMM=y CONFIG_BT_RFCOMM_TTY=y -# CONFIG_BT_BNEP is not set -# CONFIG_BT_HIDP is not set - -# -# Bluetooth device drivers -# -# CONFIG_BT_HCIBTUSB is not set -# CONFIG_BT_HCIBTSDIO is not set +CONFIG_BT_BNEP=y +CONFIG_BT_HIDP=y CONFIG_BT_HCIUART=y CONFIG_BT_HCIUART_H4=y -# CONFIG_BT_HCIUART_BCSP is not set -# CONFIG_BT_HCIUART_LL is not set -# CONFIG_BT_HCIBCM203X is not set -# CONFIG_BT_HCIBPA10X is not set -# CONFIG_BT_HCIBFUSB is not set -# CONFIG_BT_HCIVHCI is not set -# CONFIG_BT_MRVL is not set CONFIG_BT_HCIBCM4325=y CONFIG_IDBLOCK=y # CONFIG_WIFI_MAC is not set @@ -1439,7 +1426,7 @@ CONFIG_SND_SOC_I2C_AND_SPI=y # CONFIG_SND_SOC_ALL_CODECS is not set CONFIG_SND_SOC_WM8994=y # CONFIG_SOUND_PRIME is not set -# CONFIG_HID_SUPPORT is not set +CONFIG_HID_SUPPORT = y CONFIG_USB_SUPPORT=y CONFIG_USB_ARCH_HAS_HCD=y # CONFIG_USB_ARCH_HAS_OHCI is not set diff --git a/arch/arm/configs/rk29_td8801_v2_defconfig b/arch/arm/configs/rk29_td8801_v2_defconfig old mode 100644 new mode 100755 index 7323305b4441..4c9b0242d81e --- a/arch/arm/configs/rk29_td8801_v2_defconfig +++ b/arch/arm/configs/rk29_td8801_v2_defconfig @@ -582,23 +582,10 @@ CONFIG_BT_L2CAP=y CONFIG_BT_SCO=y CONFIG_BT_RFCOMM=y CONFIG_BT_RFCOMM_TTY=y -# CONFIG_BT_BNEP is not set -# CONFIG_BT_HIDP is not set - -# -# Bluetooth device drivers -# -# CONFIG_BT_HCIBTUSB is not set -# CONFIG_BT_HCIBTSDIO is not set +CONFIG_BT_BNEP=y +CONFIG_BT_HIDP=y CONFIG_BT_HCIUART=y CONFIG_BT_HCIUART_H4=y -# CONFIG_BT_HCIUART_BCSP is not set -# CONFIG_BT_HCIUART_LL is not set -# CONFIG_BT_HCIBCM203X is not set -# CONFIG_BT_HCIBPA10X is not set -# CONFIG_BT_HCIBFUSB is not set -# CONFIG_BT_HCIVHCI is not set -# CONFIG_BT_MRVL is not set CONFIG_BT_HCIBCM4325=y CONFIG_IDBLOCK=y # CONFIG_WIFI_MAC is not set @@ -1545,7 +1532,7 @@ CONFIG_SND_SOC_I2C_AND_SPI=y # CONFIG_SND_SOC_ALL_CODECS is not set CONFIG_SND_SOC_WM8994=y # CONFIG_SOUND_PRIME is not set -# CONFIG_HID_SUPPORT is not set +CONFIG_HID_SUPPORT = y CONFIG_USB_SUPPORT=y CONFIG_USB_ARCH_HAS_HCD=y # CONFIG_USB_ARCH_HAS_OHCI is not set -- 2.34.1