aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/config-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/config-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/config-3.18')
-rw-r--r--target/linux/generic/config-3.184
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/config-3.18 b/target/linux/generic/config-3.18
index 9185255db0..a2c81c2b29 100644
--- a/target/linux/generic/config-3.18
+++ b/target/linux/generic/config-3.18
@@ -330,8 +330,8 @@ CONFIG_ATM_CLIP_NO_ICMP=y
# CONFIG_B43 is not set
# CONFIG_B43LEGACY is not set
# CONFIG_B44 is not set
-# CONFIG_B53 is not set
-# CONFIG_B53_SPI_DRIVER is not set
+# CONFIG_SWCONFIG_B53 is not set
+# CONFIG_SWCONFIG_B53_SPI_DRIVER is not set
# CONFIG_BACKLIGHT_BD6107 is not set
# CONFIG_BACKLIGHT_GPIO is not set
# CONFIG_BACKLIGHT_LCD_SUPPORT is not set