linux.git/include/video, branch v3.3-rc2

Merge branch 'for-next' of git://git.infradead.org/users/dhowells/linux-headers

2012-01-15T02:03:30+00:00

* 'for-next' of git://git.infradead.org/users/dhowells/linux-headers:
  UAPI: Split trivial #if defined(__KERNEL__) && X conditionals
  UAPI: Don't have a #elif clause in a __KERNEL__ guard in linux/soundcard.h
  UAPI: Fix AHZ multiple inclusion when __KERNEL__ is removed
  UAPI: Make linux/patchkey.h easier to parse
  UAPI: Fix nested __KERNEL__ guards in video/edid.h
  UAPI: Alter the S390 asm include guards to be recognisable by the UAPI splitter
  UAPI: Guard linux/cuda.h
  UAPI: Guard linux/pmu.h
  UAPI: Guard linux/isdn_divertif.h
  UAPI: Guard linux/sound.h
  UAPI: Rearrange definition of HZ in asm-generic/param.h
  UAPI: Make FRV use asm-generic/param.h
  UAPI: Make M32R use asm-generic/param.h
  UAPI: Make MN10300 use asm-generic/param.h
  UAPI: elf_read_implies_exec() is a kernel-only feature - so hide from userspace
  UAPI: Don't include linux/compat.h in sparc's asm/siginfo.h
  UAPI: Fix arch/mips/include/asm/Kbuild to have separate header-y lines

Merge branch 'for-florian' of git://gitorious.org/linux-omap-dss2/linux into fbdev-next

2012-01-08T15:30:34+00:00

OMAPDSS: HDMI: Disable DDC internal pull up

2012-01-05T08:34:50+00:00

Disables the internal pull resistor for SDA and SCL which are enabled by
default, as there are external pull up's in 4460 and 4430 ES2.3
SDP, Blaze and Panda Boards, It is done to avoid the EDID read failure.

Signed-off-by: Ricardo Salveti de Araujo 
Signed-off-by: Mythri P K 
Signed-off-by: Tomi Valkeinen

OMAPDSS: HDMI: Move duplicate code from boardfile

2012-01-05T08:34:49+00:00

Move duplicate HDMI mux_init code from omap4 and panda board file
to display file.

Signed-off-by: Mythri P K 
Signed-off-by: Tomi Valkeinen

fbdev: sh_mobile_lcdc: Support FOURCC-based format API

2011-12-19T20:07:13+00:00

Signed-off-by: Laurent Pinchart 
Signed-off-by: Florian Tobias Schandinat

Merge commit 'v3.2-rc6' into fbdev-next

2011-12-17T22:00:49+00:00

UAPI: Fix nested KERNEL guards in video/edid.h

2011-12-13T09:26:45+00:00

Fix nested __KERNEL__ guards in video/edid.h to make parsing easier.

Signed-off-by: David Howells

OMAPDSS: Add comments about blocking of ovl/mgr functions

2011-12-02T06:54:52+00:00

Add comments specifying what ovl/mgr functions may block.

Signed-off-by: Tomi Valkeinen

OMAPDSS: APPLY: remove device_changed field

2011-12-02T06:54:49+00:00

omap_overlay_manager contains device_changed field, which no longer has
any use. So remove the field and the few places where it is touched.

Signed-off-by: Tomi Valkeinen

OMAPDSS: APPLY: move channel-field to extra_info set

2011-12-02T06:54:47+00:00

Setting overlay's output channel is currently handled at the same time
as other overlay attributes. This is not right, as the normal attributes
should only affect one overlay and manager, but changing the channel
affects two managers.

This patch moves the channel field into the "extra_info" set, handled
together with enabled-status.

Signed-off-by: Tomi Valkeinen