From 0288e5f90d9eb446ce82b9e9470f009ff79e7d23 Mon Sep 17 00:00:00 2001
From: Greg Ungerer <gerg@uclinux.org>
Date: Tue, 17 Apr 2012 16:58:35 +1000
Subject: [PATCH] --- yaml --- r: 299371 b: refs/heads/master c:
 bfdd769ac51cb68cb99902192fac81bc67cb23b0 h: refs/heads/master i:   299369:
 e488e68ce0b7416d748ab307458fcc3be28d8115   299367:
 2aacaddc0675a265338983d9728fa16f8a60ccf2 v: v3

---
 [refs]                                     | 2 +-
 trunk/arch/m68k/platform/coldfire/device.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f551abe170b8..477173978c0b 100644
--- 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
index fa50c48292ff..7af97362b95c 100644
--- 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,
 };