diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-03-09 08:30:24 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-03-09 08:30:24 +0100 |
commit | 696bd3833712e2b0f1ce296353a5cfbfb5ef3321 (patch) | |
tree | 9bbe59cf28419ad700a028beaf06301c1de4c092 /arch/arm/boards/Makefile | |
parent | ac1bffb220f6ca82960bf4a2c6f543e953b3b806 (diff) | |
parent | 478fb5c3ddcc1bdc9f05583b42fa2ad8a9ad1a78 (diff) | |
download | barebox-696bd3833712e2b0f1ce296353a5cfbfb5ef3321.tar.gz barebox-696bd3833712e2b0f1ce296353a5cfbfb5ef3321.tar.xz |
Merge branch 'for-next/imx'
Diffstat (limited to 'arch/arm/boards/Makefile')
-rw-r--r-- | arch/arm/boards/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/boards/Makefile b/arch/arm/boards/Makefile index 5b0a6d67bd..edc1bb51e8 100644 --- a/arch/arm/boards/Makefile +++ b/arch/arm/boards/Makefile @@ -64,7 +64,6 @@ obj-$(CONFIG_MACH_MMCCPU) += mmccpu/ obj-$(CONFIG_MACH_MX23EVK) += freescale-mx23-evk/ obj-$(CONFIG_MACH_MX28EVK) += freescale-mx28-evk/ obj-$(CONFIG_MACH_MX31MOBOARD) += mx31moboard/ -obj-$(CONFIG_MACH_MX6Q_ARM2) += freescale-mx6-arm2/ obj-$(CONFIG_MACH_NESO) += guf-neso/ obj-$(CONFIG_MACH_NOMADIK_8815NHK) += nhk8815/ obj-$(CONFIG_MACH_NVIDIA_BEAVER) += nvidia-beaver/ |