add MTK-combo-module

[firefly-linux-kernel-4.4.55.git] / net / bluetooth / hci_core.c

diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
old mode 100644 (file)
new mode 100755 (executable)
index 3b39198..ca8e80e
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -1530,6 +1530,7 @@ int hci_register_dev(struct hci_dev *hdev)
 
        hci_register_sysfs(hdev);
 
+#if !defined(CONFIG_MT6620)
        hdev->rfkill = rfkill_alloc(hdev->name, &hdev->dev,
                                RFKILL_TYPE_BLUETOOTH, &hci_rfkill_ops, hdev);
        if (hdev->rfkill) {
@@ -1542,6 +1543,7 @@ int hci_register_dev(struct hci_dev *hdev)
        set_bit(HCI_AUTO_OFF, &hdev->flags);
        set_bit(HCI_SETUP, &hdev->flags);
        queue_work(hdev->workqueue, &hdev->power_on);
+#endif
 
        hci_notify(hdev, HCI_DEV_REG);