diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/bluetooth/btmrvl_drv.h | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/bluetooth/btmrvl_drv.h')
| -rw-r--r-- | drivers/bluetooth/btmrvl_drv.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/bluetooth/btmrvl_drv.h b/drivers/bluetooth/btmrvl_drv.h index 411c7a77082d..204727586ee9 100644 --- a/drivers/bluetooth/btmrvl_drv.h +++ b/drivers/bluetooth/btmrvl_drv.h | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | 21 | ||
| 22 | #include <linux/kthread.h> | 22 | #include <linux/kthread.h> |
| 23 | #include <linux/bitops.h> | 23 | #include <linux/bitops.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | #include <net/bluetooth/bluetooth.h> | 25 | #include <net/bluetooth/bluetooth.h> |
| 25 | 26 | ||
| 26 | #define BTM_HEADER_LEN 4 | 27 | #define BTM_HEADER_LEN 4 |
| @@ -131,6 +132,7 @@ void btmrvl_check_evtpkt(struct btmrvl_private *priv, struct sk_buff *skb); | |||
| 131 | int btmrvl_process_event(struct btmrvl_private *priv, struct sk_buff *skb); | 132 | int btmrvl_process_event(struct btmrvl_private *priv, struct sk_buff *skb); |
| 132 | 133 | ||
| 133 | int btmrvl_send_module_cfg_cmd(struct btmrvl_private *priv, int subcmd); | 134 | int btmrvl_send_module_cfg_cmd(struct btmrvl_private *priv, int subcmd); |
| 135 | int btmrvl_enable_ps(struct btmrvl_private *priv); | ||
| 134 | int btmrvl_prepare_command(struct btmrvl_private *priv); | 136 | int btmrvl_prepare_command(struct btmrvl_private *priv); |
| 135 | 137 | ||
| 136 | #ifdef CONFIG_DEBUG_FS | 138 | #ifdef CONFIG_DEBUG_FS |