diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2016-07-04 20:01:45 +0200 |
|---|---|---|
| committer | Zoltan HERPAI <wigyori@uid0.hu> | 2016-07-04 20:01:45 +0200 |
| commit | b64a4f66e852a2466def61d07895e689d3bec1af (patch) | |
| tree | f0c716a0a268e8a3a5acc13db8d914ac2be108b3 /target/linux/generic/patches-4.1 | |
| parent | 84394136eea546727ffc6ecdca1af9d558180436 (diff) | |
| download | master-187ad058-b64a4f66e852a2466def61d07895e689d3bec1af.tar.gz master-187ad058-b64a4f66e852a2466def61d07895e689d3bec1af.tar.bz2 master-187ad058-b64a4f66e852a2466def61d07895e689d3bec1af.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-4.1')
| -rw-r--r-- | target/linux/generic/patches-4.1/730-phy_b53.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/generic/patches-4.1/730-phy_b53.patch b/target/linux/generic/patches-4.1/730-phy_b53.patch index bdcfba6e86..ff166890d4 100644 --- a/target/linux/generic/patches-4.1/730-phy_b53.patch +++ b/target/linux/generic/patches-4.1/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_phy.o obj-$(CONFIG_MDIO_BITBANG) += mdio-bitbang.o obj-$(CONFIG_MDIO_GPIO) += mdio-gpio.o |