aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/sunxi/config-4.4
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/sunxi/config-4.4
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/sunxi/config-4.4')
-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 568bcb74b4..b05446c6d2 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