From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 14 Jan 2012 23:11:19 +0000 (-0800)
Subject: Merge branch 'fbdev-next' of git://github.com/schandinat/linux-2.6
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=51be08419dc86c72486ac556aa39bc01026a403d;p=~shefty%2Frdma-dev.git

Merge branch 'fbdev-next' of git://github.com/schandinat/linux-2.6

* 'fbdev-next' of git://github.com/schandinat/linux-2.6: (175 commits)
  module_param: make bool parameters really bool (drivers/video/i810)
  Revert "atmel_lcdfb: Adjust HFP calculation so it matches the manual."
  OMAPDSS: HDMI: Disable DDC internal pull up
  OMAPDSS: HDMI: Move duplicate code from boardfile
  OMAPDSS: add OrtusTech COM43H4M10XTC display support
  OMAP: DSS2: Support for UMSH-8173MD TFT panel
  ASoC: OMAP: HDMI: Move HDMI codec trigger function to generic HDMI driver
  OMAPDSS: HDMI: Create function to enable HDMI audio
  ASoC: OMAP: HDMI: Correct signature of ASoC functions
  ASoC: OMAP: HDMI: Introduce driver data for audio codec
  grvga: fix section mismatch warnings
  video: s3c-fb: Don't keep device runtime active when open
  video: s3c-fb: Hold runtime PM references when touching registers
  video: s3c-fb: Take a runtime PM reference when unblanked
  video: s3c-fb: Disable runtime PM in error paths from probe
  video: s3c-fb: Use s3c_fb_enable() to enable the framebuffer
  video: s3c-fb: Make runtime PM functional again
  drivers/video: fsl-diu-fb: merge fsl_diu_alloc() into map_video_memory()
  drivers/video: fsl-diu-fb: add default platform ops functions
  drivers/video: fsl-diu-fb: remove broken reference count enabling the display
  ...
---

51be08419dc86c72486ac556aa39bc01026a403d
diff --cc arch/arm/mach-omap2/display.c
index bc6cf863a56,ffd9bd98302..3c446d1a178
--- a/arch/arm/mach-omap2/display.c
+++ b/arch/arm/mach-omap2/display.c
@@@ -28,8 -27,9 +28,9 @@@
  #include <plat/omap_hwmod.h>
  #include <plat/omap_device.h>
  #include <plat/omap-pm.h>
 -#include <plat/common.h>
 +#include "common.h"
  
+ #include "mux.h"
  #include "control.h"
  #include "display.h"