diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-04-04 10:06:20 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-04-04 10:06:20 +0200 |
| commit | 3753efa4271d674d9b3cc77a0e405b38711ac505 (patch) | |
| tree | 78bc9232806547269152be5cad92470386a6b76c /arch/arm/mach-imx/Kconfig | |
| parent | 4997646b200006118f0f390d7c5b5eaec9618fed (diff) | |
| parent | 4c65c20f107113b82bf0aae6072fbb2affb6d1f7 (diff) | |
| download | barebox-3753efa4271d674d9b3cc77a0e405b38711ac505.tar.gz barebox-3753efa4271d674d9b3cc77a0e405b38711ac505.tar.xz | |
Merge branch 'for-next/imx-phyflex'
Conflicts:
arch/arm/boards/phytec-phyflex-imx6/board.c
Diffstat (limited to 'arch/arm/mach-imx/Kconfig')
| -rw-r--r-- | arch/arm/mach-imx/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 034a2cdfd7..d40c9447ea 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -209,7 +209,7 @@ config MACH_FREESCALE_MX53_VMX53 module equipped with a Freescale i.MX53 Processor config MACH_PHYTEC_PFLA02 - bool "Phytec phyFLEX-i.MX6 Ouad" + bool "Phytec phyFLEX-i.MX6" select ARCH_IMX6 config MACH_DFI_FS700_M60 |