diff options
| author | Zoltan Herpai <wigyori@uid0.hu> | 2016-08-24 16:31:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-24 16:31:47 +0200 |
| commit | 166656b1bde4dd4272a631512f226276c3a81d26 (patch) | |
| tree | 6275373cf98ad4f7c44817325bb48bd6e7fd0ef1 /target/linux/generic/patches-3.18/032-bcma-from-4.6.patch | |
| parent | 7885f022b978ee84eda5559a98dc683bbf0c8f00 (diff) | |
| parent | 83767cf94f909f5932540da7641a12b7dfa71d85 (diff) | |
| download | master-187ad058-166656b1bde4dd4272a631512f226276c3a81d26.tar.gz master-187ad058-166656b1bde4dd4272a631512f226276c3a81d26.tar.bz2 master-187ad058-166656b1bde4dd4272a631512f226276c3a81d26.zip | |
Merge pull request #69 from wigyori/master
Bump legacy 3.18 and 4.1 kernels to latest
Diffstat (limited to 'target/linux/generic/patches-3.18/032-bcma-from-4.6.patch')
| -rw-r--r-- | target/linux/generic/patches-3.18/032-bcma-from-4.6.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-3.18/032-bcma-from-4.6.patch b/target/linux/generic/patches-3.18/032-bcma-from-4.6.patch index 9df6e2594c..85eeaad4d3 100644 --- a/target/linux/generic/patches-3.18/032-bcma-from-4.6.patch +++ b/target/linux/generic/patches-3.18/032-bcma-from-4.6.patch @@ -359,7 +359,7 @@ #define BCMA_CORE_ARM_CA7 0x847 #define BCMA_CORE_SYS_MEM 0x849 #define BCMA_CORE_DEFAULT 0xFFF -@@ -199,6 +201,7 @@ struct bcma_host_ops { +@@ -200,6 +202,7 @@ struct bcma_host_ops { #define BCMA_PKG_ID_BCM4707 1 #define BCMA_PKG_ID_BCM4708 2 #define BCMA_PKG_ID_BCM4709 0 @@ -470,7 +470,7 @@ extern u32 bcma_chipco_get_alp_clock(struct bcma_drv_cc *cc); --- a/drivers/bcma/bcma_private.h +++ b/drivers/bcma/bcma_private.h -@@ -46,10 +46,6 @@ int bcma_sprom_get(struct bcma_bus *bus) +@@ -44,10 +44,6 @@ int bcma_sprom_get(struct bcma_bus *bus) void bcma_core_chipcommon_early_init(struct bcma_drv_cc *cc); void bcma_core_chipcommon_init(struct bcma_drv_cc *cc); void bcma_chipco_bcm4331_ext_pa_lines_ctl(struct bcma_drv_cc *cc, bool enable); @@ -481,7 +481,7 @@ /* driver_chipcommon_b.c */ int bcma_core_chipcommon_b_init(struct bcma_drv_cc_b *ccb); -@@ -61,6 +57,21 @@ void bcma_pmu_init(struct bcma_drv_cc *c +@@ -59,6 +55,21 @@ void bcma_pmu_init(struct bcma_drv_cc *c u32 bcma_pmu_get_alp_clock(struct bcma_drv_cc *cc); u32 bcma_pmu_get_cpu_clock(struct bcma_drv_cc *cc); |