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/generic/files/drivers/net/phy/b53/Makefile | |
parent | 1aca2912145f0a4539698580e5e6195b4fc3d5c5 (diff) | |
download | upstream-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/files/drivers/net/phy/b53/Makefile')
-rw-r--r-- | target/linux/generic/files/drivers/net/phy/b53/Makefile | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/target/linux/generic/files/drivers/net/phy/b53/Makefile b/target/linux/generic/files/drivers/net/phy/b53/Makefile index 7cc39c7628..13ff366448 100644 --- a/target/linux/generic/files/drivers/net/phy/b53/Makefile +++ b/target/linux/generic/files/drivers/net/phy/b53/Makefile @@ -1,10 +1,10 @@ -obj-$(CONFIG_B53) += b53_common.o +obj-$(CONFIG_SWCONFIG_B53) += b53_common.o -obj-$(CONFIG_B53_PHY_FIXUP) += b53_phy_fixup.o +obj-$(CONFIG_SWCONFIG_B53_PHY_FIXUP) += b53_phy_fixup.o -obj-$(CONFIG_B53_MMAP_DRIVER) += b53_mmap.o -obj-$(CONFIG_B53_SRAB_DRIVER) += b53_srab.o -obj-$(CONFIG_B53_PHY_DRIVER) += b53_mdio.o -obj-$(CONFIG_B53_SPI_DRIVER) += b53_spi.o +obj-$(CONFIG_SWCONFIG_B53_MMAP_DRIVER) += b53_mmap.o +obj-$(CONFIG_SWCONFIG_B53_SRAB_DRIVER) += b53_srab.o +obj-$(CONFIG_SWCONFIG_B53_PHY_DRIVER) += b53_mdio.o +obj-$(CONFIG_SWCONFIG_B53_SPI_DRIVER) += b53_spi.o -ccflags-y += -Werror +ccflags-y += -Werror |