aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.18
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/generic/patches-3.18
parent1aca2912145f0a4539698580e5e6195b4fc3d5c5 (diff)
downloadupstream-cf6d9d97fbaa7d85b0f972bdc7ad710e96125fd2.tar.gz
upstream-cf6d9d97fbaa7d85b0f972bdc7ad710e96125fd2.tar.bz2
upstream-cf6d9d97fbaa7d85b0f972bdc7ad710e96125fd2.zip
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/generic/patches-3.18')
-rw-r--r--target/linux/generic/patches-3.18/730-phy_b53.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/generic/patches-3.18/730-phy_b53.patch b/target/linux/generic/patches-3.18/730-phy_b53.patch
index c2dfcfa501..03fc369c9d 100644
--- a/target/linux/generic/patches-3.18/730-phy_b53.patch
+++ b/target/linux/generic/patches-3.18/730-phy_b53.patch
@@ -15,7 +15,7 @@
obj-$(CONFIG_RTL8367B_PHY) += rtl8367b.o
obj-$(CONFIG_LSI_ET1011C_PHY) += et1011c.o
obj-$(CONFIG_PSB6970_PHY) += psb6970.o
-+obj-$(CONFIG_B53) += b53/
++obj-$(CONFIG_SWCONFIG_B53) += b53/
obj-$(CONFIG_FIXED_PHY) += fixed.o
obj-$(CONFIG_MDIO_BITBANG) += mdio-bitbang.o
obj-$(CONFIG_MDIO_GPIO) += mdio-gpio.o