On Mon, 22 Feb 2021 18:31:43 PST (-0800), Damien Le Moal wrote:
On 2021/02/23 11:19, Palmer Dabbelt wrote:
From: Palmer Dabbelt <palmerdabb...@google.com>
The rest of these are alphabetically sorted, and leaving it this way
causes a merge conflict.
Signed-off-by: Palmer Dabbelt <palmerdabb...@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/
Yes. Should have sent that... Thanks.
Reviewed-by: Damien Le Moal <damien.lem...@wdc.com>
No problem, it's on for-next.
