Olof Johansson 794b175fc0 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. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAABAgAGBQJQrSVZAAoJEBvUPslcq6Vz6jwQAILCHwQK9P5Up2Fejxrz51SE GSuWjmo0+b1jfPphg9m7ctJCb5wCuVYgOf7d2XkZgHqjzop4fGX/bHYoviZRxBGl atqGH8velt9Jhr/FUo6KczgntGT339BXkdoN+WwP6VbM72mzReV0UOVq9II8BItK HyQNqJlcAZiPoIcpHnM6rYxJFXnBrlQKkJYlG9EaGNdEipeKsY+f8qOSq00gKgDp epfNaiCkinYwPXTRX3/NvFH3vwrKjvpDg7qTpUi/V1AebngH5GZrzfVLr3mWIRy6 vmMe/qu5tz55+opvuIN8AFDZA+DLie1YAOwgbNAQ6yHft3WwFT/8rB7+LnxFhFb0 cNc++NxsD9dJS5Hed1q02kDZ4mkN8Ss41mTzyK0g1sIQzdumDUMDo8SGprxRBfls RLVYWLEoGZ9gPmXwlUHD9+hEz6SrwDN0sUJRQH7omcyFT7oOfwocJaO+FzAZ9QE2 uPYF/h/k15rRlFt4wdGuhaYRXhayBrAnjr43FxfZiIbqdDWaz77j1cSbmkvaEAYE BQH8xWXmDjBIZIm0kxt3ajB7M+z+ZH/4D2pmHU7Ljd6ybewxrI+SasQ5ZJT+EJSH ZBSGVMsrgD/oesNr0GrA/l3Z+FTnRpWwEcXxydWZBcENRVALfBm+khE5jqSo+hag KAPEfoHBDyxQ91OFO8rb =yFcc -----END PGP SIGNATURE----- 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>		2012-11-30 21:38:59 -08:00
..
cfa_coef_table.h
gamma_table.h
isp.c	ARM: OMAP2+: Move plat/iovmm.h to include/linux/omap-iommu.h	2012-11-20 10:04:29 -08:00
isp.h	ARM: OMAP2+: Move plat/iovmm.h to include/linux/omap-iommu.h	2012-11-20 10:04:29 -08:00
ispccdc.c	ARM: OMAP2+: Move plat/iovmm.h to include/linux/omap-iommu.h	2012-11-20 10:04:29 -08:00
ispccdc.h
ispccp2.c
ispccp2.h
ispcsi2.c
ispcsi2.h
ispcsiphy.c
ispcsiphy.h
isph3a_aewb.c
isph3a_af.c
isph3a.h
isphist.c	ARM: OMAP2+: DMA: Moving OMAP2+ DMA channel definitions to mach-omap2	2012-10-15 14:03:51 -07:00
isphist.h
isppreview.c
isppreview.h
ispqueue.c
ispqueue.h
ispreg.h
ispresizer.c
ispresizer.h
ispstat.c	ARM: OMAP2+: Move plat/iovmm.h to include/linux/omap-iommu.h	2012-11-20 10:04:29 -08:00
ispstat.h	ARM: OMAP: DMA: Move plat/dma.h to plat-omap/dma-omap.h	2012-10-15 14:04:53 -07:00
ispvideo.c	Move most of remaining omap iommu code to drivers/iommu.	2012-11-30 21:38:59 -08:00
ispvideo.h
luma_enhance_table.h
Makefile
noise_filter_table.h