soc: canaan: Sort the Makefile alphabetically
authorPalmer Dabbelt <palmerdabbelt@google.com>
Tue, 23 Feb 2021 02:18:58 +0000 (18:18 -0800)
committerPalmer Dabbelt <palmerdabbelt@google.com>
Tue, 23 Feb 2021 02:38:47 +0000 (18:38 -0800)
The rest of these are alphabetically sorted, and leaving it this way
causes a merge conflict.

Reviewed-by: Damien Le Moal <damien.lemoal@wdc.com>
Signed-off-by: Palmer Dabbelt <palmerdabbelt@google.com>
drivers/soc/Makefile

index fa70712..34b2364 100644 (file)
@@ -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/