diff options
| author | Zoltan Herpai <wigyori@uid0.hu> | 2016-10-12 00:56:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-12 00:56:39 +0200 |
| commit | 093184fcc4232f9b7e397e872d18772592c16cd5 (patch) | |
| tree | ec112cdb04541c437183cade6d4cd95e6286e9e9 /target/linux/generic/patches-4.1/025-bcma-from-4.6.patch | |
| parent | 7f0cba3eb9b5ab3a575875593777f269363c4d42 (diff) | |
| parent | a7099373073304de9c0b6aa6d0909b4d079ebe2f (diff) | |
| download | master-187ad058-093184fcc4232f9b7e397e872d18772592c16cd5.tar.gz master-187ad058-093184fcc4232f9b7e397e872d18772592c16cd5.tar.bz2 master-187ad058-093184fcc4232f9b7e397e872d18772592c16cd5.zip | |
Merge pull request #127 from wigyori/legacy-revert
Revert legacy kernels (3.18/4.1) to last known-good release
Diffstat (limited to 'target/linux/generic/patches-4.1/025-bcma-from-4.6.patch')
| -rw-r--r-- | target/linux/generic/patches-4.1/025-bcma-from-4.6.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-4.1/025-bcma-from-4.6.patch b/target/linux/generic/patches-4.1/025-bcma-from-4.6.patch index c0504ac55c..39396f2125 100644 --- a/target/linux/generic/patches-4.1/025-bcma-from-4.6.patch +++ b/target/linux/generic/patches-4.1/025-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 -@@ -200,6 +202,7 @@ struct bcma_host_ops { +@@ -199,6 +201,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 -@@ -44,10 +44,6 @@ int bcma_sprom_get(struct bcma_bus *bus) +@@ -46,10 +46,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); -@@ -59,6 +55,21 @@ void bcma_pmu_init(struct bcma_drv_cc *c +@@ -61,6 +57,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); |