diff options
| author | Álvaro Fernández Rojas <noltari@gmail.com> | 2020-08-06 16:12:21 +0200 |
|---|---|---|
| committer | Álvaro Fernández Rojas <noltari@gmail.com> | 2020-08-06 23:06:12 +0200 |
| commit | f41a40001af80ff73415e3617655b1fc85c8171f (patch) | |
| tree | 508a1c6c040b84927a45e68106381305ce215dd4 /target/linux/bcm63xx/patches-5.4/207-MIPS-BCM63XX-move-device-registration-code-into-its-.patch | |
| parent | 9fb1d4ce8a9134ee4cae6e8191c8ba902b7ee192 (diff) | |
| download | upstream-f41a40001af80ff73415e3617655b1fc85c8171f.tar.gz upstream-f41a40001af80ff73415e3617655b1fc85c8171f.tar.bz2 upstream-f41a40001af80ff73415e3617655b1fc85c8171f.zip | |
bcm63xx: switch to upstream endif comments patch
This allows better context for board patches and we no longer need a
downstream patch for that.
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/bcm63xx/patches-5.4/207-MIPS-BCM63XX-move-device-registration-code-into-its-.patch')
| -rw-r--r-- | target/linux/bcm63xx/patches-5.4/207-MIPS-BCM63XX-move-device-registration-code-into-its-.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/target/linux/bcm63xx/patches-5.4/207-MIPS-BCM63XX-move-device-registration-code-into-its-.patch b/target/linux/bcm63xx/patches-5.4/207-MIPS-BCM63XX-move-device-registration-code-into-its-.patch index 652eb6c9bf..f39c9a8122 100644 --- a/target/linux/bcm63xx/patches-5.4/207-MIPS-BCM63XX-move-device-registration-code-into-its-.patch +++ b/target/linux/bcm63xx/patches-5.4/207-MIPS-BCM63XX-move-device-registration-code-into-its-.patch @@ -61,7 +61,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> /* * known 3368 boards */ -@@ -695,52 +683,6 @@ static const struct board_info __initcon +@@ -692,52 +680,6 @@ static const struct board_info __initcon }; /* @@ -100,7 +100,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> - return -EINVAL; - } -} --#endif +-#endif /* CONFIG_SSB_PCIHOST */ - -/* - * return board name for /proc/cpuinfo @@ -114,7 +114,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> * early init callback, read nvram data from flash and checksum it */ void __init board_prom_init(void) -@@ -785,137 +727,15 @@ void __init board_prom_init(void) +@@ -782,137 +724,15 @@ void __init board_prom_init(void) if (strncmp(board_name, bcm963xx_boards[i]->name, 16)) continue; /* copy, board desc array is marked initdata */ @@ -144,8 +144,8 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> - bcm63xx_pci_enabled = 1; - if (BCMCPU_IS_6348()) - val |= GPIO_MODE_6348_G2_PCI; - } --#endif +- } +-#endif /* CONFIG_PCI */ - - if (board.has_pccard) { - if (BCMCPU_IS_6348()) @@ -235,8 +235,8 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> - if (ssb_arch_register_fallback_sprom( - &bcm63xx_get_fallback_sprom) < 0) - pr_err("failed to register fallback SPROM\n"); -- } --#endif + } +-#endif /* CONFIG_SSB_PCIHOST */ - - bcm63xx_spi_register(); - |