linux/drivers/video/omap
Linus Torvalds acff987d94 Merge branch 'fbdev-next' of git://github.com/schandinat/linux-2.6
* 'fbdev-next' of git://github.com/schandinat/linux-2.6: (270 commits)
  video: platinumfb: Add __devexit_p at necessary place
  drivers/video: fsl-diu-fb: merge diu_pool into fsl_diu_data
  drivers/video: fsl-diu-fb: merge diu_hw into fsl_diu_data
  drivers/video: fsl-diu-fb: only DIU modes 0 and 1 are supported
  drivers/video: fsl-diu-fb: remove unused panel operating mode support
  drivers/video: fsl-diu-fb: use an enum for the AOI index
  drivers/video: fsl-diu-fb: add several new video modes
  drivers/video: fsl-diu-fb: remove broken screen blanking support
  drivers/video: fsl-diu-fb: move some definitions out of the header file
  drivers/video: fsl-diu-fb: fix some ioctls
  video: da8xx-fb: Increased resolution configuration of revised LCDC IP
  OMAPDSS: picodlp: add missing #include <linux/module.h>
  fb: fix au1100fb bitrot.
  mx3fb: fix NULL pointer dereference in screen blanking.
  video: irq: Remove IRQF_DISABLED
  smscufx: change edid data to u8 instead of char
  OMAPDSS: DISPC: zorder support for DSS overlays
  OMAPDSS: DISPC: VIDEO3 pipeline support
  OMAPDSS/OMAP_VOUT: Fix incorrect OMAP3-alpha compatibility setting
  video/omap: fix build dependencies
  ...

Fix up conflicts in:
 - drivers/staging/xgifb/XGI_main_26.c
	Changes to XGIfb_pan_var()
 - drivers/video/omap/{lcd_apollon.c,lcd_ldp.c,lcd_overo.c}
	Removed (or in the case of apollon.c, merged into the generic
	DSS panel in drivers/video/omap2/displays/panel-generic-dpi.c)
2011-10-30 15:30:01 -07:00
..
blizzard.c omap: use list_move() instead of list_del()/list_add() combination 2011-03-22 15:13:35 +09:00
dispc.c OMAPFB: fix wrong clock aliases and device name 2011-05-12 19:39:49 +03:00
dispc.h omapfb: dispc: allow multiple external IRQ handlers 2009-09-23 07:39:50 -07:00
hwa742.c omap: use list_move() instead of list_del()/list_add() combination 2011-03-22 15:13:35 +09:00
Kconfig OMAPFB: Remove unused lcd drivers 2011-09-30 16:17:28 +03:00
lcd_ams_delta.c omapfb: lcd_ams_delta: add support for contrast control 2010-02-12 12:46:07 +02:00
lcd_h3.c ARM: gpio: omap: convert drivers to use asm/gpio.h rather than mach/gpio.h 2011-08-08 14:27:44 +01:00
lcd_htcherald.c video/omap: add __init/__exit macros to drivers/video/omap/lcd_htcherald.c 2010-01-11 14:45:25 +02:00
lcd_inn1510.c OMAP: OMAPFB: split omapfb.h 2009-12-09 12:04:06 +02:00
lcd_inn1610.c ARM: gpio: omap: convert drivers to use asm/gpio.h rather than mach/gpio.h 2011-08-08 14:27:44 +01:00
lcd_mipid.c workqueue: convert cancel_rearming_delayed_work[queue]() users to cancel_delayed_work_sync() 2010-12-15 10:56:11 +01:00
lcd_osk.c ARM: gpio: omap: convert drivers to use asm/gpio.h rather than mach/gpio.h 2011-08-08 14:27:44 +01:00
lcd_palmte.c OMAP: OMAPFB: split omapfb.h 2009-12-09 12:04:06 +02:00
lcd_palmtt.c ARM: gpio: omap: convert drivers to use asm/gpio.h rather than mach/gpio.h 2011-08-08 14:27:44 +01:00
lcd_palmz71.c OMAP: OMAPFB: split omapfb.h 2009-12-09 12:04:06 +02:00
lcdc.c OMAPFB: LCDC: change update_mode to DISABLED when going suspend 2010-06-15 10:17:19 +03:00
lcdc.h
Makefile OMAPDSS: Port the Apollon display driver to DSS2 2011-09-30 16:17:29 +03:00
omapfb_main.c OMAPFB: fix wrong clock aliases and device name 2011-05-12 19:39:49 +03:00
omapfb.h OMAP: OMAPFB: fix clk_get for RFBI 2010-01-11 13:33:09 +02:00
rfbi.c OMAPFB: fix wrong clock aliases and device name 2011-05-12 19:39:49 +03:00
sossi.c OMAP: OMAPFB: split omapfb.h 2009-12-09 12:04:06 +02:00