kernel: ssb/bcma: update to version from wireless-testing tag master-2012-07-02

SVN-Revision: 32580
This commit is contained in:
Hauke Mehrtens
2012-07-02 23:12:58 +00:00
parent b2e2de794e
commit bd9fa13c73
11 changed files with 703 additions and 214 deletions

View File

@@ -971,7 +971,7 @@
+MODULE_DESCRIPTION("BCM47XX NAND flash driver");
--- a/include/linux/bcma/bcma_driver_chipcommon.h
+++ b/include/linux/bcma/bcma_driver_chipcommon.h
@@ -400,6 +400,7 @@ struct bcma_chipcommon_pmu {
@@ -422,6 +422,7 @@ struct bcma_chipcommon_pmu {
enum bcma_flash_type {
BCMA_PFLASH,
BCMA_SFLASH,
@@ -979,7 +979,7 @@
};
struct bcma_pflash {
@@ -416,6 +417,14 @@ struct bcma_sflash {
@@ -438,6 +439,14 @@ struct bcma_sflash {
};
#endif /* CONFIG_BCMA_SFLASH */
@@ -994,7 +994,7 @@
struct bcma_serial_port {
void *regs;
unsigned long clockspeed;
@@ -441,6 +450,9 @@ struct bcma_drv_cc {
@@ -463,6 +472,9 @@ struct bcma_drv_cc {
#ifdef CONFIG_BCMA_SFLASH
struct bcma_sflash sflash;
#endif /* CONFIG_BCMA_SFLASH */
@@ -1004,7 +1004,7 @@
};
int nr_serial_ports;
@@ -505,4 +517,13 @@ int bcma_sflash_write(struct bcma_drv_cc
@@ -528,4 +540,13 @@ int bcma_sflash_write(struct bcma_drv_cc
int bcma_sflash_erase(struct bcma_drv_cc *cc, u32 offset);
#endif /* CONFIG_BCMA_SFLASH */