diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-04-19 12:39:40 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-04-19 12:39:40 +0000 |
| commit | f58dcb59c6621a9c587e3ce9705c88de6239b47e (patch) | |
| tree | 21d994e1e42ab31d89c6977a3bb2027a09129ba1 /target/linux/brcm47xx/patches-3.6/750-bgmac.patch | |
| parent | f03960723a9af29b7e6468212f336b28083050b5 (diff) | |
| download | mtk-20170518-f58dcb59c6621a9c587e3ce9705c88de6239b47e.zip mtk-20170518-f58dcb59c6621a9c587e3ce9705c88de6239b47e.tar.gz mtk-20170518-f58dcb59c6621a9c587e3ce9705c88de6239b47e.tar.bz2 | |
kernel: backport SSB/BCMA changes in preparation for a compat-wireless update
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 36367
Diffstat (limited to 'target/linux/brcm47xx/patches-3.6/750-bgmac.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.6/750-bgmac.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/brcm47xx/patches-3.6/750-bgmac.patch b/target/linux/brcm47xx/patches-3.6/750-bgmac.patch index b8fd0ba..989a3f2 100644 --- a/target/linux/brcm47xx/patches-3.6/750-bgmac.patch +++ b/target/linux/brcm47xx/patches-3.6/750-bgmac.patch @@ -43,7 +43,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> --- a/drivers/bcma/driver_chipcommon_pmu.c +++ b/drivers/bcma/driver_chipcommon_pmu.c -@@ -264,7 +264,7 @@ static u32 bcma_pmu_pll_clock_bcm4706(st +@@ -280,7 +280,7 @@ static u32 bcma_pmu_pll_clock_bcm4706(st } /* query bus clock frequency for PMU-enabled chipcommon */ @@ -52,7 +52,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> { struct bcma_bus *bus = cc->core->bus; -@@ -293,6 +293,7 @@ static u32 bcma_pmu_get_bus_clock(struct +@@ -309,6 +309,7 @@ static u32 bcma_pmu_get_bus_clock(struct } return BCMA_CC_PMU_HT_CLOCK; } @@ -1969,7 +1969,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> +#endif /* _BGMAC_H */ --- a/include/linux/bcma/bcma_driver_chipcommon.h +++ b/include/linux/bcma/bcma_driver_chipcommon.h -@@ -624,4 +624,6 @@ int bcma_nflash_erase(struct bcma_drv_cc +@@ -627,4 +627,6 @@ int bcma_nflash_erase(struct bcma_drv_cc int bcma_nflash_commit(struct bcma_drv_cc *cc, u32 offset, u32 len, const u8 *buf); #endif |