diff options
| author | David S. Miller <davem@davemloft.net> | 2011-08-22 14:47:43 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-08-22 14:47:43 -0700 |
| commit | 7ae9ed8d3221c9f7dd4bc2773ff58797487d5ed8 (patch) | |
| tree | fc9e9d8c0497767880d5fc9fe40f9bf454a522bd /drivers/bcma/bcma_private.h | |
| parent | 0dfe178239453547d4297a4583ee7847948a481b (diff) | |
| parent | b38d355eaa223e420d0c45ff7a3279ea811552c5 (diff) | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
Diffstat (limited to 'drivers/bcma/bcma_private.h')
| -rw-r--r-- | drivers/bcma/bcma_private.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/drivers/bcma/bcma_private.h b/drivers/bcma/bcma_private.h index e02ff21835c..30a3085d335 100644 --- a/drivers/bcma/bcma_private.h +++ b/drivers/bcma/bcma_private.h @@ -15,13 +15,29 @@ struct bcma_bus; /* main.c */ int bcma_bus_register(struct bcma_bus *bus); void bcma_bus_unregister(struct bcma_bus *bus); +int __init bcma_bus_early_register(struct bcma_bus *bus, + struct bcma_device *core_cc, + struct bcma_device *core_mips); /* scan.c */ int bcma_bus_scan(struct bcma_bus *bus); +int __init bcma_bus_scan_early(struct bcma_bus *bus, + struct bcma_device_id *match, + struct bcma_device *core); +void bcma_init_bus(struct bcma_bus *bus); /* sprom.c */ int bcma_sprom_get(struct bcma_bus *bus); +/* driver_chipcommon.c */ +#ifdef CONFIG_BCMA_DRIVER_MIPS +void bcma_chipco_serial_init(struct bcma_drv_cc *cc); +#endif /* CONFIG_BCMA_DRIVER_MIPS */ + +/* driver_chipcommon_pmu.c */ +u32 bcma_pmu_alp_clock(struct bcma_drv_cc *cc); +u32 bcma_pmu_get_clockcpu(struct bcma_drv_cc *cc); + #ifdef CONFIG_BCMA_HOST_PCI /* host_pci.c */ extern int __init bcma_host_pci_init(void); |