diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2016-06-14 12:55:41 +0200 |
|---|---|---|
| committer | Rafał Miłecki <zajec5@gmail.com> | 2016-06-20 08:00:14 +0200 |
| commit | cf6d9d97fbaa7d85b0f972bdc7ad710e96125fd2 (patch) | |
| tree | 153c28441b69a3909b9e5e8f8f641fd73a764fed /target/linux/brcm63xx | |
| parent | 1aca2912145f0a4539698580e5e6195b4fc3d5c5 (diff) | |
| download | master-31e0f0ae-cf6d9d97fbaa7d85b0f972bdc7ad710e96125fd2.tar.gz master-31e0f0ae-cf6d9d97fbaa7d85b0f972bdc7ad710e96125fd2.tar.bz2 master-31e0f0ae-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/brcm63xx')
| -rw-r--r-- | target/linux/brcm63xx/config-4.4 | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/brcm63xx/config-4.4 b/target/linux/brcm63xx/config-4.4 index a0ec048855..99022b1b46 100644 --- a/target/linux/brcm63xx/config-4.4 +++ b/target/linux/brcm63xx/config-4.4 @@ -13,12 +13,12 @@ CONFIG_ARCH_SUPPORTS_UPROBES=y CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_ARCH_USE_BUILTIN_BSWAP=y CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y -CONFIG_B53=y -CONFIG_B53_MMAP_DRIVER=y -CONFIG_B53_PHY_DRIVER=y -CONFIG_B53_PHY_FIXUP=y -CONFIG_B53_SPI_DRIVER=y -# CONFIG_B53_SRAB_DRIVER is not set +CONFIG_SWCONFIG_B53=y +CONFIG_SWCONFIG_B53_MMAP_DRIVER=y +CONFIG_SWCONFIG_B53_PHY_DRIVER=y +CONFIG_SWCONFIG_B53_PHY_FIXUP=y +CONFIG_SWCONFIG_B53_SPI_DRIVER=y +# CONFIG_SWCONFIG_B53_SRAB_DRIVER is not set CONFIG_BCM6345_EXT_IRQ=y CONFIG_BCM6345_PERIPH_IRQ=y CONFIG_BCM63XX=y |