diff options
| author | David S. Miller <davem@davemloft.net> | 2011-07-15 08:51:13 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-15 08:51:13 -0700 |
| commit | 25009a1ae1171eda6bff44b7e44eb0e076713811 (patch) | |
| tree | 182491960c3f837d12880a2f94369c8ebd8d1fcd /drivers/net/wireless/b43/bus.h | |
| parent | 6864ddb2d3089739d29418a1ff52adb2fbf9c0ca (diff) | |
| parent | 95a943c162d74b20d869917bdf5df11293c35b63 (diff) | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/b43/bus.h')
| -rw-r--r-- | drivers/net/wireless/b43/bus.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/wireless/b43/bus.h b/drivers/net/wireless/b43/bus.h index 79a5ab4270c..184c9565927 100644 --- a/drivers/net/wireless/b43/bus.h +++ b/drivers/net/wireless/b43/bus.h @@ -2,12 +2,16 @@ #define B43_BUS_H_ enum b43_bus_type { +#ifdef CONFIG_B43_BCMA + B43_BUS_BCMA, +#endif B43_BUS_SSB, }; struct b43_bus_dev { enum b43_bus_type bus_type; union { + struct bcma_device *bdev; struct ssb_device *sdev; }; @@ -57,6 +61,10 @@ static inline bool b43_bus_host_is_sdio(struct b43_bus_dev *dev) dev->sdev->bus->bustype == SSB_BUSTYPE_SDIO); } +struct b43_bus_dev *b43_bus_dev_bcma_init(struct bcma_device *core); struct b43_bus_dev *b43_bus_dev_ssb_init(struct ssb_device *sdev); +void *b43_bus_get_wldev(struct b43_bus_dev *dev); +void b43_bus_set_wldev(struct b43_bus_dev *dev, void *data); + #endif /* B43_BUS_H_ */ |