diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-01-04 00:16:34 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-01-04 00:16:34 +0400 |
| commit | 57adc1fcbae2c13104ce291b40f23e40a414fa87 (patch) | |
| tree | a22d95cd3a96cbd515cd24fb0833739576c5e92f /include/net/bluetooth/bluetooth.h | |
| parent | faa85aa24286a9e14ae7cc797352350c3ac39986 (diff) | |
| parent | dc0d633e35643662f27a0b1c531da3cd6b204b9c (diff) | |
| download | linux-57adc1fcbae2c13104ce291b40f23e40a414fa87.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
drivers/net/wireless/b43/dma.c
drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
Diffstat (limited to 'include/net/bluetooth/bluetooth.h')
| -rw-r--r-- | include/net/bluetooth/bluetooth.h | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h index 980e59f37d4f..abaad6ed9b83 100644 --- a/include/net/bluetooth/bluetooth.h +++ b/include/net/bluetooth/bluetooth.h @@ -250,32 +250,10 @@ extern void bt_sysfs_cleanup(void); extern struct dentry *bt_debugfs; -#ifdef CONFIG_BT_L2CAP int l2cap_init(void); void l2cap_exit(void); -#else -static inline int l2cap_init(void) -{ - return 0; -} - -static inline void l2cap_exit(void) -{ -} -#endif -#ifdef CONFIG_BT_SCO int sco_init(void); void sco_exit(void); -#else -static inline int sco_init(void) -{ - return 0; -} - -static inline void sco_exit(void) -{ -} -#endif #endif /* __BLUETOOTH_H */ |