diff --git a/[refs] b/[refs] index cdc23834b451..9b7cdf94e9e0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3a456784d346961194bd586aabe40011dba278c1 +refs/heads/master: 6147032f9481475b21123d2f4a176bff24385f79 diff --git a/trunk/drivers/bluetooth/btwilink.c b/trunk/drivers/bluetooth/btwilink.c index b5f83b44a0cd..da9cf6a6e8ac 100644 --- a/trunk/drivers/bluetooth/btwilink.c +++ b/trunk/drivers/bluetooth/btwilink.c @@ -291,14 +291,6 @@ static int ti_st_send_frame(struct sk_buff *skb) return 0; } -static void ti_st_destruct(struct hci_dev *hdev) -{ - BT_DBG("%s", hdev->name); - /* do nothing here, since platform remove - * would free the hdev->driver_data - */ -} - static int bt_ti_probe(struct platform_device *pdev) { static struct ti_st *hst; @@ -325,7 +317,6 @@ static int bt_ti_probe(struct platform_device *pdev) hdev->close = ti_st_close; hdev->flush = NULL; hdev->send = ti_st_send_frame; - hdev->destruct = ti_st_destruct; hdev->owner = THIS_MODULE; err = hci_register_dev(hdev);