diff options
| author | Russell King | 2010-10-04 23:23:26 +0200 |
|---|---|---|
| committer | Russell King | 2010-10-04 23:23:30 +0200 |
| commit | a9fda02bfc91a281cd812ae15dabe6bfb9574f90 (patch) | |
| tree | d7be703f341870f15f87a59a63976f650078b4d6 /arch/arm/Makefile | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tglx/l... (diff) | |
| parent | ARM: add a vma entry for the user accessible vector page (diff) | |
| download | kernel-qcow2-linux-a9fda02bfc91a281cd812ae15dabe6bfb9574f90.tar.gz kernel-qcow2-linux-a9fda02bfc91a281cd812ae15dabe6bfb9574f90.tar.xz kernel-qcow2-linux-a9fda02bfc91a281cd812ae15dabe6bfb9574f90.zip | |
Merge branch 'for_rmk' of git://git.linaro.org/kernel/linux-linaro-next into devel-stable
Diffstat (limited to 'arch/arm/Makefile')
| -rw-r--r-- | arch/arm/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 4e0b6c8d7ed3..502255905c4e 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -247,13 +247,14 @@ ifeq ($(FASTFPE),$(wildcard $(FASTFPE))) FASTFPE_OBJ :=$(FASTFPE)/ endif -# If we have a machine-specific directory, then include it in the build. -core-y += arch/arm/kernel/ arch/arm/mm/ arch/arm/common/ -core-y += $(machdirs) $(platdirs) core-$(CONFIG_FPE_NWFPE) += arch/arm/nwfpe/ core-$(CONFIG_FPE_FASTFPE) += $(FASTFPE_OBJ) core-$(CONFIG_VFP) += arch/arm/vfp/ +# If we have a machine-specific directory, then include it in the build. +core-y += arch/arm/kernel/ arch/arm/mm/ arch/arm/common/ +core-y += $(machdirs) $(platdirs) + drivers-$(CONFIG_OPROFILE) += arch/arm/oprofile/ libs-y := arch/arm/lib/ $(libs-y) |