diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2016-06-14 12:55:41 +0200 |
|---|---|---|
| committer | Rafał Miłecki <zajec5@gmail.com> | 2016-06-20 08:00:14 +0200 |
| commit | cf6d9d97fbaa7d85b0f972bdc7ad710e96125fd2 (patch) | |
| tree | 153c28441b69a3909b9e5e8f8f641fd73a764fed /target/linux/brcm47xx | |
| parent | 1aca2912145f0a4539698580e5e6195b4fc3d5c5 (diff) | |
| download | mtk-20170518-cf6d9d97fbaa7d85b0f972bdc7ad710e96125fd2.zip mtk-20170518-cf6d9d97fbaa7d85b0f972bdc7ad710e96125fd2.tar.gz mtk-20170518-cf6d9d97fbaa7d85b0f972bdc7ad710e96125fd2.tar.bz2 | |
kernel: rename B53 symbols to avoid upstream kernel conflict
In kernel 4.7 there is upstreamed b53 driver using (mostly?) the same
symbols as our b53 does. Change our symbols so both drivers can coexist
in kernel tree.
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Acked-by: Jonas Gorski <jonas.gorski@gmail.com>
Diffstat (limited to 'target/linux/brcm47xx')
| -rw-r--r-- | target/linux/brcm47xx/config-4.1 | 10 | ||||
| -rw-r--r-- | target/linux/brcm47xx/config-4.4 | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/target/linux/brcm47xx/config-4.1 b/target/linux/brcm47xx/config-4.1 index 0b812d5..5cf8550 100644 --- a/target/linux/brcm47xx/config-4.1 +++ b/target/linux/brcm47xx/config-4.1 @@ -12,11 +12,11 @@ CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y -CONFIG_B53=y -# CONFIG_B53_MMAP_DRIVER is not set -CONFIG_B53_PHY_DRIVER=y -CONFIG_B53_PHY_FIXUP=y -# CONFIG_B53_SRAB_DRIVER is not set +CONFIG_SWCONFIG_B53=y +# CONFIG_SWCONFIG_B53_MMAP_DRIVER is not set +CONFIG_SWCONFIG_B53_PHY_DRIVER=y +CONFIG_SWCONFIG_B53_PHY_FIXUP=y +# CONFIG_SWCONFIG_B53_SRAB_DRIVER is not set CONFIG_BCM47XX=y CONFIG_BCM47XX_BCMA=y CONFIG_BCM47XX_SSB=y diff --git a/target/linux/brcm47xx/config-4.4 b/target/linux/brcm47xx/config-4.4 index b72a724..492b12b 100644 --- a/target/linux/brcm47xx/config-4.4 +++ b/target/linux/brcm47xx/config-4.4 @@ -14,11 +14,11 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_ARCH_USE_BUILTIN_BSWAP=y CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y -CONFIG_B53=y -# CONFIG_B53_MMAP_DRIVER is not set -CONFIG_B53_PHY_DRIVER=y -CONFIG_B53_PHY_FIXUP=y -# CONFIG_B53_SRAB_DRIVER is not set +CONFIG_SWCONFIG_B53=y +# CONFIG_SWCONFIG_B53_MMAP_DRIVER is not set +CONFIG_SWCONFIG_B53_PHY_DRIVER=y +CONFIG_SWCONFIG_B53_PHY_FIXUP=y +# CONFIG_SWCONFIG_B53_SRAB_DRIVER is not set CONFIG_BCM47XX=y CONFIG_BCM47XX_BCMA=y CONFIG_BCM47XX_NVRAM=y |