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/538-board_bcm963269bhr.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/538-board_bcm963269bhr.patch')
| -rw-r--r-- | target/linux/bcm63xx/patches-5.4/538-board_bcm963269bhr.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/bcm63xx/patches-5.4/538-board_bcm963269bhr.patch b/target/linux/bcm63xx/patches-5.4/538-board_bcm963269bhr.patch index d5af2f0d1c..de4bff8b9d 100644 --- a/target/linux/bcm63xx/patches-5.4/538-board_bcm963269bhr.patch +++ b/target/linux/bcm63xx/patches-5.4/538-board_bcm963269bhr.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1554,6 +1554,50 @@ static struct board_info __initdata boar +@@ -1552,6 +1552,50 @@ static struct board_info __initdata boar #endif /* CONFIG_BCM63XX_CPU_6368 */ /* @@ -51,17 +51,17 @@ * all boards */ static const struct board_info __initconst *bcm963xx_boards[] = { -@@ -1634,6 +1678,9 @@ static const struct board_info __initcon +@@ -1629,6 +1673,9 @@ static const struct board_info __initcon &board_96368mvwg, &board_96368mvngr, - #endif + #endif /* CONFIG_BCM63XX_CPU_6368 */ +#ifdef CONFIG_BCM63XX_CPU_63268 + &board_963269bhr, -+#endif ++#endif /* CONFIG_BCM63XX_CPU_63268 */ }; static struct of_device_id const bcm963xx_boards_dt[] = { -@@ -1721,6 +1768,7 @@ static struct of_device_id const bcm963x +@@ -1716,6 +1763,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, #endif #ifdef CONFIG_BCM63XX_CPU_63268 |