Messages in this thread Patch in this message | | | Subject | [PATCH] soc: canaan: Sort the Makefile alphabetically | Date | Mon, 22 Feb 2021 18:18:58 -0800 | From | Palmer Dabbelt <> |
| |
From: Palmer Dabbelt <palmerdabbelt@google.com>
The rest of these are alphabetically sorted, and leaving it this way causes a merge conflict.
Signed-off-by: Palmer Dabbelt <palmerdabbelt@google.com>
---
I missed this when reviewing these patches, but happened across it when test merging from Linus' tree. It goes back a way so I'm hesitant to rebase this one out just for cleanliness, but if I have to go back that far before sending the merge window PR I'll squash it in. --- drivers/soc/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/soc/Makefile b/drivers/soc/Makefile index fa7071246546..34b23645be14 100644 --- a/drivers/soc/Makefile +++ b/drivers/soc/Makefile @@ -7,6 +7,7 @@ obj-$(CONFIG_ARCH_ACTIONS) += actions/ obj-y += aspeed/ obj-$(CONFIG_ARCH_AT91) += atmel/ obj-y += bcm/ +obj-$(CONFIG_SOC_CANAAN) += canaan/ obj-$(CONFIG_ARCH_DOVE) += dove/ obj-$(CONFIG_MACH_DOVE) += dove/ obj-y += fsl/ @@ -29,4 +30,3 @@ obj-$(CONFIG_ARCH_U8500) += ux500/ obj-$(CONFIG_PLAT_VERSATILE) += versatile/ obj-y += xilinx/ obj-$(CONFIG_ARCH_ZX) += zte/ -obj-$(CONFIG_SOC_CANAAN) += canaan/ -- 2.30.0.617.g56c4b15f3c-goog
| |