aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-at91/board-rm9200dk.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-11-30 21:40:59 -0800
committerOlof Johansson <olof@lixom.net>2012-11-30 21:40:59 -0800
commit8556650dd3370a927217f16444aac5cc0c71e61b (patch)
treea392b07b5d72a6522d3d5f1561b8fe2b64ca8021 /arch/arm/mach-at91/board-rm9200dk.c
parentfbac7d7d6c1f873c89d88ca6ab8a2891ac837796 (diff)
parent2ab7c84815cffd5fe4946a472fc67fefa8ac3c29 (diff)
Merge tag 'omap-for-v3.8/cleanup-headers-iommu-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/headers
From Tony Lindgren: Move most of remaining omap iommu code to drivers/iommu. This is needed for the multiplatform kernels as the plat and mach headers cannot be included. These changes were agreed to be merged via the arm-soc tree by Joerg and Ohad as these will cause some merge conflicts with the other related clean-up branches. So omap-for-v3.8/cleanup-headers-iommu should be added as one of the depends branches for arm-soc. * tag 'omap-for-v3.8/cleanup-headers-iommu-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP2+: Move iommu/iovmm headers to platform_data ARM: OMAP2+: Make some definitions local ARM: OMAP2+: Move iommu2 to drivers/iommu/omap-iommu2.c ARM: OMAP2+: Move plat/iovmm.h to include/linux/omap-iommu.h ARM: OMAP2+: Move iopgtable header to drivers/iommu/ ARM: OMAP: Merge iommu2.h into iommu.h Conflicts due to surrounding changes in: arch/arm/mach-omap2/omap_hwmod_44xx_data.c drivers/media/platform/omap3isp/ispvideo.c Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-at91/board-rm9200dk.c')
0 files changed, 0 insertions, 0 deletions