From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 28 Jun 2013 04:09:43 +0000 (+1000)
Subject: Merge remote-tracking branch 'fbdev/for-next'
X-Git-Tag: next-20130628~49
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e6b4a6a1da569887b31bcf94e5c6add37fd43be0;p=karo-tx-linux.git

Merge remote-tracking branch 'fbdev/for-next'

Conflicts:
	drivers/video/of_display_timing.c
---

e6b4a6a1da569887b31bcf94e5c6add37fd43be0
diff --cc drivers/video/of_display_timing.c
index 2894e0300a33,9c0f17b2e6fb..171821ddd78d
--- a/drivers/video/of_display_timing.c
+++ b/drivers/video/of_display_timing.c
@@@ -53,13 -53,12 +53,12 @@@ static int parse_timing_property(const 
  }
  
  /**
-  * of_get_display_timing - parse display_timing entry from device_node
+  * of_parse_display_timing - parse display_timing entry from device_node
   * @np: device_node with the properties
   **/
- static struct display_timing *of_get_display_timing(const struct device_node
- 						    *np)
 -static int of_parse_display_timing(struct device_node *np,
++static int of_parse_display_timing(const struct device_node *np,
+ 		struct display_timing *dt)
  {
- 	struct display_timing *dt;
  	u32 val = 0;
  	int ret = 0;