summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2013-09-27 13:09:17 -0400
committerJohn W. Linville <linville@tuxdriver.com>2013-09-27 13:11:17 -0400
commit0a878747e18d4d14c5b772dcddddd86bb4c26f8f (patch)
treeb214678a35945e2c84a82192df79472923fdbcba /include
parentf875691640cd3fa67f7ad1d3130ff9fa7fdca042 (diff)
parentc7515d2365a6b8a018950198ebe1f5be793cd4bb (diff)
downloadlinux-stable-0a878747e18d4d14c5b772dcddddd86bb4c26f8f.tar.gz
linux-stable-0a878747e18d4d14c5b772dcddddd86bb4c26f8f.tar.bz2
linux-stable-0a878747e18d4d14c5b772dcddddd86bb4c26f8f.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Also fixed-up a badly indented closing brace... Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/bcma/bcma_driver_pci.h1
-rw-r--r--include/net/bluetooth/hci.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/bcma/bcma_driver_pci.h b/include/linux/bcma/bcma_driver_pci.h
index d66033f418c9..0333e605ea0d 100644
--- a/include/linux/bcma/bcma_driver_pci.h
+++ b/include/linux/bcma/bcma_driver_pci.h
@@ -242,6 +242,7 @@ extern int bcma_core_pci_irq_ctl(struct bcma_drv_pci *pc,
struct bcma_device *core, bool enable);
extern void bcma_core_pci_up(struct bcma_bus *bus);
extern void bcma_core_pci_down(struct bcma_bus *bus);
+extern void bcma_core_pci_power_save(struct bcma_bus *bus, bool up);
extern int bcma_core_pci_pcibios_map_irq(const struct pci_dev *dev);
extern int bcma_core_pci_plat_dev_init(struct pci_dev *dev);
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index aaeaf0938ec0..15f10841e2b5 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -104,6 +104,7 @@ enum {
enum {
HCI_SETUP,
HCI_AUTO_OFF,
+ HCI_RFKILLED,
HCI_MGMT,
HCI_PAIRABLE,
HCI_SERVICE_CACHE,