summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-kirkwood/board-ib62x0.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-11-30 21:38:59 -0800
committerOlof Johansson <olof@lixom.net>2012-11-30 21:38:59 -0800
commit794b175fc0c0c4844dbb7b137a73bbfd01f6c608 (patch)
tree69b9394b5b09118f9877cd02838a7cd2d7c4f63c /arch/arm/mach-kirkwood/board-ib62x0.c
parent4fabb6332a2b747c7f6783f146a8fb3d2f88d91c (diff)
parent2ab7c84815cffd5fe4946a472fc67fefa8ac3c29 (diff)
downloadtalos-op-linux-794b175fc0c0c4844dbb7b137a73bbfd01f6c608.tar.gz
talos-op-linux-794b175fc0c0c4844dbb7b137a73bbfd01f6c608.zip
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/cleanup
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 fixed up 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-kirkwood/board-ib62x0.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud