drm/i915: fix merge alignment issue

Signed-off-by: Xavier Boudet <x-boudet@ti.com>
UBUNTU: Initial Debianization

Signed-off-by: Xavier Boudet <x-boudet@ti.com>
KBuild: Allow scripts/* to be cross compiled

Cross compiling the binaries in scripts/* is not possible
because various makefiles assume that $(obj)/whatever is
executable on the build host.

This patch introduces a new variable called KBUILD_SCRIPTROOT
that points to script/binaries to use while cross compiling.

Usage:

Build scripts for the build host:
	make O=path/to/buildhost/buildscripts \
		silentoldconfig prepare scripts
Then cross build script for target:
	make O=path/to/target/buildscripts \
		HOSTCC=$CROSS_COMPILE \
		KBUILD_SCRIPTROOT=path/to/buildhost/buildscripts
		silentoldconfig prepare scripts

This patch does not use KBUILD_SCRIPTROOT for all script invocations
it only redefines the following if KBUILD_SCRIPTROOT is defined.

scripts/Makefile.build
	scripts/basic/fixdep --> $(KBUILD_SCRIPTROOT)/scripts/basic/fixdep

scripts/kconfig/Makefile
	$(obj)/conf --> $(KBUILD_SCRIPTROOT)/scripts/kconfig/conf

scripts/mod/Makefile
	$(obj)mk_elfconfig --> $(KBUILD_SCRIPTROOT)/scripts/mod/mk_elfconfig

Signed-off-by: John Rigby <john.rigby@linaro.org>
LINARO: Use KBUILD_SCRIPTROOT to cross build scripts

Signed-off-by: Xavier Boudet <x-boudet@ti.com>
UBUNTU: Do not generate udebs packages

Signed-off-by: Xavier Boudet <x-boudet@ti.com>
UBUNTU: add omap_drv.h and omap_drm.h to linux-headers-<abi>-omap4

Add sym link for omap_drm.h and omap_drv.h in include/linux
Force delivery of the 2 files into drivers/staging/omapdrm

Signed-off-by: Xavier Boudet <x-boudet@ti.com>
UBUNTU: remove file localversion-wireless

Signed-off-by: Xavier Boudet <x-boudet@ti.com>
staging: drm/omap: Disable SYNCDBG traces

Signed-off-by: Xavier Boudet <x-boudet@ti.com>
HACK: Remove devices

Signed-off-by: Xavier Boudet <x-boudet@ti.com>
omap4: fix omap44xx_gpu_hwmod definition

Signed-off-by: Xavier Boudet <x-boudet@ti.com>
staging: drm/omap: fix NULL pointer dereference

Make sure we do not dereference NULL pointers when things go wrong in
omap_framebuffer_replace.

Signed-off-by: Vincent Stehlé <v-stehle@ti.com>
omap4iss: dmabuf support
v4l:vb2: Add dma-contig allocator as dma_buf user

This patch makes changes for adding dma-contig as a dma_buf user. It provides
function implementations for the {import, acquire, release, put}_dmabuf()
mem_ops of DMABUF memory type.

Signed-off-by: Sumit Semwal <sumit.semwal@ti.com>
v4l:vb2: add support for shared buffer (dma_buf)

This patch adds support for DMABUF memory type in videobuf2. It calls relevant
APIs of dma_buf for v4l reqbuf / qbuf / dqbuf operations.

Signed-off-by: Sumit Semwal <sumit.semwal@ti.com>

Conflicts:

	drivers/media/video/videobuf2-core.c
v4l2 dmabuf fixes.. squash back
more v4l2 dmabuf fixes.. squash back
vb2 dmabuf fixes
videobuf2-dma-contig.c

Signed-off-by: Xavier Boudet <x-boudet@ti.com>
v4l: Add DMABUF as a memory type

Adds DMABUF memory type to v4l framework. Also adds the related file
descriptor in v4l2_plane and v4l2_buffer.

Signed-off-by: Sumit Semwal <sumit.semwal@ti.com>
OMAP4460: Enable half L2 cache on 4460 ES1.0

Enabling half of L2 cache WA only applies to 4460 ES1.0

Signed-off-by: Sebastien Jan <s-jan@ti.com>

Conflicts:

	arch/arm/mach-omap2/omap4-common.c

Conflicts:

	arch/arm/mach-omap2/omap4-common.c