kernel: update bcma and ssb to master-2012-10-18 from wireless-testing
* update the flash driver for bcm47xx to use the stubs already in bcma * do some misc enhancements to the flash drivers for bcm47xx SVN-Revision: 33920
This commit is contained in:
@@ -99,7 +99,7 @@
|
||||
void bcma_chipco_serial_init(struct bcma_drv_cc *cc)
|
||||
--- a/include/linux/bcma/bcma_driver_chipcommon.h
|
||||
+++ b/include/linux/bcma/bcma_driver_chipcommon.h
|
||||
@@ -495,6 +495,9 @@ struct bcma_drv_cc {
|
||||
@@ -551,6 +551,9 @@ struct bcma_drv_cc {
|
||||
int nr_serial_ports;
|
||||
struct bcma_serial_port serial_ports[4];
|
||||
#endif /* CONFIG_BCMA_DRIVER_MIPS */
|
||||
@@ -109,7 +109,7 @@
|
||||
};
|
||||
|
||||
/* Register access */
|
||||
@@ -525,13 +528,22 @@ void bcma_chipco_irq_mask(struct bcma_dr
|
||||
@@ -581,13 +584,22 @@ void bcma_chipco_irq_mask(struct bcma_dr
|
||||
|
||||
u32 bcma_chipco_irq_status(struct bcma_drv_cc *cc, u32 mask);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user