aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/config-3.18
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/generic/config-3.18
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/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 c2fedc53a8..3ed9a28df0 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