Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-28 13:51:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
fc7be130c7
linux/drivers/staging/xgifb
History
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
..
Kconfig
Makefile
TODO staging: xgifb: update TODO 2011-09-16 20:16:48 +02:00
vb_def.h staging: xgifb: delete Win9xDOSMode 2011-09-06 11:42:14 -07:00
vb_ext.c Remove unneeded version.h includes from drivers/staging/xgifb/ 2011-07-05 10:39:37 -07:00
vb_ext.h staging: xgifb: delete unused structs 2011-08-23 14:21:46 -07:00
vb_init.c staging: xgifb: make RAM type tables const 2011-10-12 09:51:49 -06:00
vb_init.h staging: xgifb: inline XGIfb_query_VGA_config_space() 2011-10-12 09:51:45 -06:00
vb_setmode.c staging: xgifb: make DAC tables const 2011-10-12 09:51:49 -06:00
vb_setmode.h
vb_struct.h staging: xgifb: move XGINew_DataBusWidth into vb_device_info 2011-10-12 09:51:48 -06:00
vb_table.h staging: xgifb: delete duplicated timing data 2011-09-06 11:42:13 -07:00
vb_util.c staging: xgifb: unify #include order 2011-09-16 20:16:48 +02:00
vb_util.h
vgatypes.h staging: xgifb: inline XGIfb_query_VGA_config_space() 2011-10-12 09:51:45 -06:00
XGI_main_26.c Merge branch 'fbdev-next' of git://github.com/schandinat/linux-2.6 2011-10-30 15:30:01 -07:00
XGI_main.h staging: xgifb: clean up 2nd display state 2011-10-12 09:51:49 -06:00
XGIfb.h staging: xgifb: clean up 2nd display state 2011-10-12 09:51:49 -06:00