diff --git a/debian/changelog b/debian/changelog index 8b1086127..15a585008 100644 --- a/debian/changelog +++ b/debian/changelog @@ -37,6 +37,8 @@ linux (3.11~rc7-1~exp2) UNRELEASED; urgency=low - media: Disable VIDEO_BWQCAM, VIDEO_CQCAM, VIDEO_W9966 - SCSI: Disable SCSI_IMM, SCSI_PPA - [x86] net/ethernet: Disable ATP + * bluetooth: Disable BT_HCIBTUART; the serial_cs and hci_uart drivers + should be used instead -- Ben Hutchings Sun, 01 Sep 2013 18:45:47 +0100 diff --git a/debian/config/alpha/config b/debian/config/alpha/config index 6fceaf759..4d74b4cc9 100644 --- a/debian/config/alpha/config +++ b/debian/config/alpha/config @@ -150,7 +150,6 @@ CONFIG_BT_HCIBFUSB=m CONFIG_BT_HCIDTL1=m CONFIG_BT_HCIBT3C=m CONFIG_BT_HCIBLUECARD=m -CONFIG_BT_HCIBTUART=m CONFIG_BT_HCIVHCI=m ## diff --git a/debian/config/config b/debian/config/config index 6d7b00e3e..b19a9c89d 100644 --- a/debian/config/config +++ b/debian/config/config @@ -282,6 +282,7 @@ CONFIG_BT_HCIBTSDIO=m CONFIG_BT_HCIUART_ATH3K=y CONFIG_BT_HCIUART_LL=y CONFIG_BT_HCIUART_3WIRE=y +# CONFIG_BT_HCIBTUART is not set CONFIG_BT_MRVL=m CONFIG_BT_MRVL_SDIO=m CONFIG_BT_ATH3K=m diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index d251b068f..5733eabc7 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -259,7 +259,6 @@ CONFIG_BT_HCIBFUSB=m CONFIG_BT_HCIDTL1=m CONFIG_BT_HCIBT3C=m CONFIG_BT_HCIBLUECARD=m -CONFIG_BT_HCIBTUART=m CONFIG_BT_HCIVHCI=m ## diff --git a/debian/config/powerpc/config b/debian/config/powerpc/config index 2a9611109..ce59fba0d 100644 --- a/debian/config/powerpc/config +++ b/debian/config/powerpc/config @@ -156,7 +156,6 @@ CONFIG_BT_HCIBFUSB=m CONFIG_BT_HCIDTL1=m CONFIG_BT_HCIBT3C=m CONFIG_BT_HCIBLUECARD=m -CONFIG_BT_HCIBTUART=m CONFIG_BT_HCIVHCI=m ##