diff options
| author | mattis fjallstrom <mattis@acm.org> | 2015-06-11 09:11:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@ip-172-31-25-77.us-west-1.compute.internal> | 2015-04-16 10:08:13 +0000 |
| commit | 92f32a18e02cdf53eacae1ec077b3b0281396ed7 (patch) | |
| tree | 4416d3a2b457377829b93ae482e814d940ac3dc0 | |
| parent | 264727df3709c279eef05f501fdf592227fe6e01 (diff) | |
| parent | 4327a86ff9a7e6af17d12dcc6c762911f2d3f155 (diff) | |
| download | olio-linux-3.10-92f32a18e02cdf53eacae1ec077b3b0281396ed7.tar.xz olio-linux-3.10-92f32a18e02cdf53eacae1ec077b3b0281396ed7.zip | |
Merge "Making HCI uart a module" into android-3.10-bringup
| -rw-r--r-- | arch/arm/configs/omap3_h1_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/omap3_h1_defconfig b/arch/arm/configs/omap3_h1_defconfig index b28833d6827..7ecf2b83edb 100644 --- a/arch/arm/configs/omap3_h1_defconfig +++ b/arch/arm/configs/omap3_h1_defconfig @@ -918,7 +918,7 @@ CONFIG_BT_RFCOMM_TTY=y # Bluetooth device drivers # # CONFIG_BT_HCIBTUSB is not set -CONFIG_BT_HCIUART=y +CONFIG_BT_HCIUART=m CONFIG_BT_HCIUART_H4=y # CONFIG_BT_HCIUART_BCSP is not set # CONFIG_BT_HCIUART_ATH3K is not set |