diff --git a/[refs] b/[refs]
index 32257aa1f932..27269ac89645 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9e265aa7ac493aa0a3de80aa3092d8677b3e8546
+refs/heads/master: fcbcea93abbe361e14dd458d0a5a3e9dadaa5ba9
diff --git a/trunk/arch/arm/mach-omap2/board-zoom-debugboard.c b/trunk/arch/arm/mach-omap2/board-zoom-debugboard.c
index bb4018b60642..e15d2e87cfc1 100644
--- a/trunk/arch/arm/mach-omap2/board-zoom-debugboard.c
+++ b/trunk/arch/arm/mach-omap2/board-zoom-debugboard.c
@@ -96,7 +96,7 @@ static struct plat_serial8250_port serial_platform_data[] = {
 
 static struct platform_device zoom_debugboard_serial_device = {
 	.name			= "serial8250",
-	.id			= 3,
+	.id			= PLAT8250_DEV_PLATFORM,
 	.dev			= {
 		.platform_data	= serial_platform_data,
 	},