From: Linus Torvalds Date: Sun, 30 Oct 2011 22:30:01 +0000 (-0700) Subject: Merge branch 'fbdev-next' of git://github.com/schandinat/linux-2.6 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=acff987d94cbdb4049f3706bed1f1792f8ef6837;p=linux-beck.git 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 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) --- acff987d94cbdb4049f3706bed1f1792f8ef6837 diff --cc MAINTAINERS index 07e5dbd14273,5f57e66ed072..2014c1ff8197 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -5968,8 -5928,14 +5968,14 @@@ SMSC9420 PCI ETHERNET DRIVE M: Steve Glendinning L: netdev@vger.kernel.org S: Supported -F: drivers/net/smsc9420.* +F: drivers/net/ethernet/smsc/smsc9420.* + SMSC UFX6000 and UFX7000 USB to VGA DRIVER + M: Steve Glendinning + L: linux-fbdev@vger.kernel.org + S: Supported + F: drivers/video/smscufx.c + SN-IA64 (Itanium) SUB-PLATFORM M: Jes Sorensen L: linux-altix@sgi.com diff --cc arch/arm/mach-shmobile/board-mackerel.c index 4de92dc570b0,c5497ac9936b..3689ad2e9156 --- a/arch/arm/mach-shmobile/board-mackerel.c +++ b/arch/arm/mach-shmobile/board-mackerel.c @@@ -1597,16 -1587,8 +1597,17 @@@ static void __init mackerel_init(void sh7372_add_device_to_domain(&sh7372_a4lc, &lcdc_device); sh7372_add_device_to_domain(&sh7372_a4lc, &hdmi_lcdc_device); + sh7372_add_device_to_domain(&sh7372_a4lc, &meram_device); sh7372_add_device_to_domain(&sh7372_a4mp, &fsi_device); + sh7372_add_device_to_domain(&sh7372_a3sp, &usbhs0_device); + sh7372_add_device_to_domain(&sh7372_a3sp, &usbhs1_device); + sh7372_add_device_to_domain(&sh7372_a3sp, &sh_mmcif_device); + sh7372_add_device_to_domain(&sh7372_a3sp, &sdhi0_device); +#if !defined(CONFIG_MMC_SH_MMCIF) && !defined(CONFIG_MMC_SH_MMCIF_MODULE) + sh7372_add_device_to_domain(&sh7372_a3sp, &sdhi1_device); +#endif + sh7372_add_device_to_domain(&sh7372_a3sp, &sdhi2_device); + sh7372_add_device_to_domain(&sh7372_a4r, &ceu_device); hdmi_init_pm_clock(); sh7372_pm_init(); diff --cc drivers/staging/xgifb/XGI_main_26.c index 36db231cd804,f8b88add9520..277e408c39c5 --- a/drivers/staging/xgifb/XGI_main_26.c +++ b/drivers/staging/xgifb/XGI_main_26.c @@@ -1300,9 -1363,9 +1300,9 @@@ static int XGIfb_do_set_var(struct fb_v return 0; } - static int XGIfb_pan_var(struct xgifb_video_info *xgifb_info, - struct fb_var_screeninfo *var) -#ifdef XGIFB_PAN + static int XGIfb_pan_var(struct fb_var_screeninfo *var, struct fb_info *info) { ++ struct xgifb_video_info *xgifb_info = info->par; unsigned int base; /* printk("Inside pan_var"); */