Pull extend-notify-die into release branch

[linux-2.6-omap-h63xx.git] / include / net / bluetooth / hci_core.h

diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 7f933f30207830333996a9d872acbbef536e636d..bb9f81dc8723c5522daffd6d6184f3df675d0321 100644 (file)
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -25,7 +25,6 @@
 #ifndef __HCI_CORE_H
 #define __HCI_CORE_H
 
-#include <linux/proc_fs.h>
 #include <net/bluetooth/hci.h>
 
 /* HCI upper protocols */
@@ -34,8 +33,6 @@
 
 #define HCI_INIT_TIMEOUT (HZ * 10)
 
-extern struct proc_dir_entry *proc_bt_hci;
-
 /* HCI Core structures */
 
 struct inquiry_data {
@@ -44,7 +41,7 @@ struct inquiry_data {
        __u8            pscan_period_mode;
        __u8            pscan_mode;
        __u8            dev_class[3];
-       __u16           clock_offset;
+       __le16          clock_offset;
        __s8            rssi;
 };
 
@@ -126,10 +123,6 @@ struct hci_dev {
 
        atomic_t                promisc;
 
-#ifdef CONFIG_PROC_FS
-       struct proc_dir_entry   *proc;
-#endif
-
        struct class_device     class_dev;
 
        struct module           *owner;