Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f1493a6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6: (126 commits)
  sh_mobile_meram: Safely disable MERAM operation when not initialized
  video: mb862xxfb: add support for L1 displaying
  video: mb862xx: add support for controller's I2C bus adapter
  video: mb862xxfb: relocate register space to get contiguous vram
  video: mb862xxfb: use pre-initialized configuration for PCI GDCs
  video: mb862xxfb: correct fix.smem_len field initialization
  video: s3c-fb: correct transparency checking in 32bpp
  video: s3c-fb: add gpio setup function to resume function
  fbdev/amifb: Remove superfluous alignment of frame buffer memory
  fbdev/amifb: Do not call panic() if there's not enough Chip RAM
  fbdev/amifb: Correct check for video memory size
  video: mb862xxfb: Require either FB_MB862XX_PCI_GDC or FB_MB862XX_LIME
  video: s3c-fb: add window variant information for S5P
  video: s3c-fb: add additional validate bpps
  video: s3c-fb: correct window osd size offset values
  udlfb: include prefetch.h explicitly
  drivers/video/s3c2410fb.c: Convert release_resource to release_mem_region
  drivers/video/sm501fb.c: Convert release_resource to release_mem_region
  drivers/video: Convert release_resource to release_mem_region
  video, udlfb: Fix two build warnings about 'ignoring return value'
  ...
parents 023bc8e7 087faf77

arch/arm/mach-omap2/board-3430sdp.c

+2 −2
Original line number Diff line number Diff line
@@ -37,8 +37,8 @@ 
#include <plat/common.h>

#include <plat/dma.h>

#include <plat/gpmc.h>

#include <plat/display.h>

#include <plat/panel-generic-dpi.h>

#include <video/omapdss.h>

#include <video/omap-panel-generic-dpi.h>



#include <plat/gpmc-smc91x.h>

arch/arm/mach-omap2/board-4430sdp.c

+10 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
#include <plat/usb.h>

#include <plat/mmc.h>

#include <plat/omap4-keypad.h>

#include <plat/display.h>

#include <video/omapdss.h>



#include "mux.h"

#include "hsmmc.h"
@@ -680,6 +680,15 @@ static struct omap_dss_device sdp4430_hdmi_device = { 
	.name = "hdmi",

	.driver_name = "hdmi_panel",

	.type = OMAP_DISPLAY_TYPE_HDMI,

	.clocks	= {

		.dispc	= {

			.dispc_fclk_src	= OMAP_DSS_CLK_SRC_FCK,

		},

		.hdmi	= {

			.regn	= 15,

			.regm2	= 1,

		},

	},

	.platform_enable = sdp4430_panel_enable_hdmi,

	.platform_disable = sdp4430_panel_disable_hdmi,

	.channel = OMAP_DSS_CHANNEL_DIGIT,

arch/arm/mach-omap2/board-am3517evm.c

+2 −2
Original line number Diff line number Diff line
@@ -34,8 +34,8 @@ 
#include <plat/board.h>

#include <plat/common.h>

#include <plat/usb.h>

#include <plat/display.h>

#include <plat/panel-generic-dpi.h>

#include <video/omapdss.h>

#include <video/omap-panel-generic-dpi.h>



#include "mux.h"

#include "control.h"

arch/arm/mach-omap2/board-cm-t35.c

+2 −2
Original line number Diff line number Diff line
@@ -45,8 +45,8 @@ 
#include <plat/nand.h>

#include <plat/gpmc.h>

#include <plat/usb.h>

#include <plat/display.h>

#include <plat/panel-generic-dpi.h>

#include <video/omapdss.h>

#include <video/omap-panel-generic-dpi.h>

#include <plat/mcspi.h>



#include <mach/hardware.h>

arch/arm/mach-omap2/board-devkit8000.c

+2 −2
Original line number Diff line number Diff line
@@ -45,8 +45,8 @@ 
#include <plat/gpmc.h>

#include <plat/nand.h>

#include <plat/usb.h>

#include <plat/display.h>

#include <plat/panel-generic-dpi.h>

#include <video/omapdss.h>

#include <video/omap-panel-generic-dpi.h>



#include <plat/mcspi.h>

#include <linux/input/matrix_keypad.h>