From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S262956AbUEKSHK (ORCPT ); Tue, 11 May 2004 14:07:10 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S262960AbUEKSHK (ORCPT ); Tue, 11 May 2004 14:07:10 -0400 Received: from outmx018.isp.belgacom.be ([195.238.2.117]:32931 "EHLO outmx018.isp.belgacom.be") by vger.kernel.org with ESMTP id S262956AbUEKSG4 (ORCPT ); Tue, 11 May 2004 14:06:56 -0400 Subject: RE: [PATCH 2.6.6-mm1] bluetooth definition redundancy v2 From: FabF To: linux-kernel Content-Type: multipart/mixed; boundary="=-9+yd5s4spO4VLbYf0+HV" Message-Id: <1084385658.11568.14.camel@bluerhyme.real3> Mime-Version: 1.0 X-Mailer: Ximian Evolution 1.4.6 Date: Wed, 12 May 2004 20:14:19 +0200 X-RAVMilter-Version: 8.4.3(snapshot 20030212) (outmx018.isp.belgacom.be) Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org --=-9+yd5s4spO4VLbYf0+HV Content-Type: text/plain Content-Transfer-Encoding: 7bit Oops, bluetooth sock had its own debug feature.So here's a 3 to 1 patch. Regards, FabF --=-9+yd5s4spO4VLbYf0+HV Content-Disposition: attachment; filename=bluetooth2.diff Content-Type: text/x-patch; name=bluetooth2.diff; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit diff -Naur orig/include/net/bluetooth/hci_core.h edited/include/net/bluetooth/hci_core.h --- orig/include/net/bluetooth/hci_core.h 2004-05-10 04:32:37.000000000 +0200 +++ edited/include/net/bluetooth/hci_core.h 2004-05-12 20:11:12.709651384 +0200 @@ -32,6 +32,11 @@ #include #include +#ifndef CONFIG_BT_HCI_CORE_DEBUG +#undef BT_DBG +#define BT_DBG( A... ) +#endif + /* HCI upper protocols */ #define HCI_PROTO_L2CAP 0 #define HCI_PROTO_SCO 1 diff -Naur orig/net/bluetooth/hci_conn.c edited/net/bluetooth/hci_conn.c --- orig/net/bluetooth/hci_conn.c 2004-05-10 04:33:21.000000000 +0200 +++ edited/net/bluetooth/hci_conn.c 2004-05-12 18:55:00.000000000 +0200 @@ -52,11 +52,6 @@ #include #include -#ifndef CONFIG_BT_HCI_CORE_DEBUG -#undef BT_DBG -#define BT_DBG( A... ) -#endif - void hci_acl_connect(struct hci_conn *conn) { struct hci_dev *hdev = conn->hdev; diff -Naur orig/net/bluetooth/hci_core.c edited/net/bluetooth/hci_core.c --- orig/net/bluetooth/hci_core.c 2004-05-10 04:32:26.000000000 +0200 +++ edited/net/bluetooth/hci_core.c 2004-05-12 18:55:08.000000000 +0200 @@ -53,11 +53,6 @@ #include #include -#ifndef CONFIG_BT_HCI_CORE_DEBUG -#undef BT_DBG -#define BT_DBG( A... ) -#endif - static void hci_cmd_task(unsigned long arg); static void hci_rx_task(unsigned long arg); static void hci_tx_task(unsigned long arg); diff -Naur orig/net/bluetooth/hci_sysfs.c edited/net/bluetooth/hci_sysfs.c --- orig/net/bluetooth/hci_sysfs.c 2004-05-10 04:33:04.000000000 +0200 +++ edited/net/bluetooth/hci_sysfs.c 2004-05-12 18:59:45.000000000 +0200 @@ -5,11 +5,6 @@ #include #include -#ifndef CONFIG_BT_HCI_CORE_DEBUG -#undef BT_DBG -#define BT_DBG( A... ) -#endif - static ssize_t show_name(struct class_device *cdev, char *buf) { struct hci_dev *hdev = class_get_devdata(cdev); --=-9+yd5s4spO4VLbYf0+HV--