aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/sunxi
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2016-07-04 20:01:45 +0200
committerZoltan HERPAI <wigyori@uid0.hu>2016-07-04 20:01:45 +0200
commitb64a4f66e852a2466def61d07895e689d3bec1af (patch)
treef0c716a0a268e8a3a5acc13db8d914ac2be108b3 /target/linux/sunxi
parent84394136eea546727ffc6ecdca1af9d558180436 (diff)
downloadmaster-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/sunxi')
-rw-r--r--target/linux/sunxi/config-4.410
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/sunxi/config-4.4 b/target/linux/sunxi/config-4.4
index 74b009a0a2..e97538de9c 100644
--- a/target/linux/sunxi/config-4.4
+++ b/target/linux/sunxi/config-4.4
@@ -57,11 +57,11 @@ CONFIG_AUDIT=y
CONFIG_AUDIT_GENERIC=y
CONFIG_AUTO_ZRELADDR=y
CONFIG_AXP20X_POWER=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_BACKLIGHT_CLASS_DEVICE=y
CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_BACKLIGHT_PWM=y