summaryrefslogtreecommitdiff
path: root/target/linux/bcm53xx
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2016-06-14 12:55:41 +0200
committerRafał Miłecki <zajec5@gmail.com>2016-06-20 08:00:14 +0200
commitcf6d9d97fbaa7d85b0f972bdc7ad710e96125fd2 (patch)
tree153c28441b69a3909b9e5e8f8f641fd73a764fed /target/linux/bcm53xx
parent1aca2912145f0a4539698580e5e6195b4fc3d5c5 (diff)
downloadmtk-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/bcm53xx')
-rw-r--r--target/linux/bcm53xx/config-4.48
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/bcm53xx/config-4.4 b/target/linux/bcm53xx/config-4.4
index 6347861..5611cfe 100644
--- a/target/linux/bcm53xx/config-4.4
+++ b/target/linux/bcm53xx/config-4.4
@@ -54,10 +54,10 @@ CONFIG_ARM_THUMB=y
CONFIG_ARM_VIRT_EXT=y
CONFIG_ATAGS=y
CONFIG_AUTO_ZRELADDR=y
-CONFIG_B53=y
-# CONFIG_B53_MMAP_DRIVER is not set
-# CONFIG_B53_PHY_DRIVER is not set
-CONFIG_B53_SRAB_DRIVER=y
+CONFIG_SWCONFIG_B53=y
+# CONFIG_SWCONFIG_B53_MMAP_DRIVER is not set
+# CONFIG_SWCONFIG_B53_PHY_DRIVER is not set
+CONFIG_SWCONFIG_B53_SRAB_DRIVER=y
CONFIG_BCM47XX_NVRAM=y
CONFIG_BCM47XX_SPROM=y
CONFIG_BCM47XX_WDT=y