d2819f80d4
Conflicts: arch/arm/mach-spear3xx/Makefile arch/arm/mach-spear3xx/clock.c arch/arm/mach-spear3xx/include/mach/generic.h arch/arm/mach-spear6xx/clock.c arch/arm/plat-spear/Makefile drivers/pinctrl/core.c This resolves some annoying merge conflicts. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
15 lines
308 B
Makefile
15 lines
308 B
Makefile
#
|
|
# Makefile for SPEAr3XX machine series
|
|
#
|
|
|
|
# common files
|
|
obj-$(CONFIG_ARCH_SPEAR3XX) += spear3xx.o
|
|
|
|
# spear300 specific files
|
|
obj-$(CONFIG_MACH_SPEAR300) += spear300.o
|
|
|
|
# spear310 specific files
|
|
obj-$(CONFIG_MACH_SPEAR310) += spear310.o
|
|
|
|
# spear320 specific files
|
|
obj-$(CONFIG_MACH_SPEAR320) += spear320.o
|