From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 3 Nov 2011 02:43:30 +0000 (+1100)
Subject: Merge remote-tracking branch 'galak/next'
X-Git-Tag: next-20111103~63
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=508fee405a4f035ea4053ff073e9dcf3a92ee84e;p=karo-tx-linux.git

Merge remote-tracking branch 'galak/next'
---

508fee405a4f035ea4053ff073e9dcf3a92ee84e
diff --cc arch/powerpc/platforms/85xx/p1022_ds.c
index c01c7277888c,6a0b9731b259..fda15716fada
--- a/arch/powerpc/platforms/85xx/p1022_ds.c
+++ b/arch/powerpc/platforms/85xx/p1022_ds.c
@@@ -127,9 -126,9 +127,9 @@@ static void p1022ds_set_gamma_table(enu
   * p1022ds_set_monitor_port: switch the output to a different monitor port
   *
   */
 -static void p1022ds_set_monitor_port(int monitor_port)
 +static void p1022ds_set_monitor_port(enum fsl_diu_monitor_port port)
  {
- 	struct device_node *pixis_node;
+ 	struct device_node *np;
  	void __iomem *pixis;
  	u8 __iomem *brdcfg1;