From: Tony Lindgren <tony@atomide.com>
Date: Thu, 3 Sep 2009 17:17:39 +0000 (-0700)
Subject: Merge branch '2_6_32_for_next' of git://git.pwsan.com/linux-2.6 into for-next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1f685b36dbf27db55072fb738aac57aaf37d2c71;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge branch '2_6_32_for_next' of git://git.pwsan.com/linux-2.6 into for-next
---

1f685b36dbf27db55072fb738aac57aaf37d2c71
diff --cc arch/arm/mach-omap2/serial.c
index 0f508109adcc,ca28424f2fbd..021130d830b5
--- a/arch/arm/mach-omap2/serial.c
+++ b/arch/arm/mach-omap2/serial.c
@@@ -565,20 -550,9 +565,20 @@@ static struct omap_uart_state omap_uart
  			},
  		},
  	},
 +#ifdef CONFIG_ARCH_OMAP4
 +	{
 +		.pdev = {
 +			.name			= "serial8250",
 +			.id			= 3
 +			.dev			= {
 +				.platform_data	= serial_platform_data3,
 +			},
 +		},
 +	},
 +#endif
  };
  
- void __init omap_serial_init(void)
+ void __init omap_serial_early_init(void)
  {
  	int i;
  	char name[16];