diff options
| author | Palmer Dabbelt <palmerdabbelt@google.com> | 2021-02-23 03:18:58 +0100 |
|---|---|---|
| committer | Palmer Dabbelt <palmerdabbelt@google.com> | 2021-02-23 03:38:47 +0100 |
| commit | e134d426e1a3b854cb6b62fad818677e58b087d5 (patch) | |
| tree | e2307e6c8b829e415a76a52b1814308198a76132 /drivers/soc/Makefile | |
| parent | riscv: Disable KSAN_SANITIZE for vDSO (diff) | |
| download | linux-e134d426e1a3b854cb6b62fad818677e58b087d5.tar.xz linux-e134d426e1a3b854cb6b62fad818677e58b087d5.zip | |
soc: canaan: Sort the Makefile alphabetically
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>
Diffstat (limited to 'drivers/soc/Makefile')
| -rw-r--r-- | drivers/soc/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
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/ |