summary refs log tree commit diff
path: root/arch/arm/mach-imx/mach-imx50.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2014-05-21 14:35:04 -0700
committerOlof Johansson <olof@lixom.net>2014-05-21 14:35:04 -0700
commit16ae66cc33c4ee3a0b3d3bb5d444aefa18134b37 (patch)
tree199913211021e2998a3fc0eb0eba1a08e7842178 /arch/arm/mach-imx/mach-imx50.c
parent96c2ac4cc5beb9c1e3798cb40cf74af093ec60b4 (diff)
parent324da938cb7eb103a925817f9aacdcc1f0e22576 (diff)
downloadlinux-16ae66cc33c4ee3a0b3d3bb5d444aefa18134b37.tar.gz
Merge tag 'sunxi-core-for-3.16' of https://github.com/mripard/linux into next/soc
Merge "Allwinner SoCs core additions for 3.16" from Maxime Ripard:

Refactor the Kconfig options to have one Kconfig option per machine.

* tag 'sunxi-core-for-3.16' of https://github.com/mripard/linux:
  ARM: sunxi: select MFD_SUN6I_PRCM when sun6i arch support is enabled
  ARM: sunxi: Split the various SoCs support in Kconfig

Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-imx/mach-imx50.c')
0 files changed, 0 insertions, 0 deletions