---

yaml --- r: 299371 b: refs/heads/master c: bfdd769 h: refs/heads/master i: 299369: e488e68 299367: 2aacadd v: v3
git-mirror · Apr 17, 2012 · 0288e5f · 0288e5f
1 parent 02452a5
commit 0288e5f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 89d786011fcbc89eedca8b6bf9b7c11bbbde350a
+refs/heads/master: bfdd769ac51cb68cb99902192fac81bc67cb23b0
diff --git a/trunk/arch/m68k/platform/coldfire/device.c b/trunk/arch/m68k/platform/coldfire/device.c
@@ -114,7 +114,7 @@ static struct resource mcf_fec1_resources[] = {
 
 static struct platform_device mcf_fec1 = {
 	.name			= "fec",
-	.id			= 0,
+	.id			= 1,
 	.num_resources		= ARRAY_SIZE(mcf_fec1_resources),
 	.resource		= mcf_fec1_resources,
 };