From d0bb50c5be02616b5babaaed59997842805058b8 Mon Sep 17 00:00:00 2001
From: Mats Erik Andersson <mats.andersson64@comhem.se>
Date: Thu, 17 Jul 2008 01:05:43 +0200
Subject: [PATCH] --- yaml --- r: 111821 b: refs/heads/master c:
 da8de3929da9396977b3c9096f36b173f3d9085a h: refs/heads/master i:   111819:
 45232e14494b067dfca6a3770d4ceb2e89899a12 v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/net/8139too.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6bf63b34f1f4..0f9e5816cfb3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cd0fce0322cd10ab39ace584be12f809988a1b9a
+refs/heads/master: da8de3929da9396977b3c9096f36b173f3d9085a
diff --git a/trunk/drivers/net/8139too.c b/trunk/drivers/net/8139too.c
index f6ca99774cc2..32e66f0d4344 100644
--- a/trunk/drivers/net/8139too.c
+++ b/trunk/drivers/net/8139too.c
@@ -309,7 +309,7 @@ enum RTL8139_registers {
 	Cfg9346		= 0x50,
 	Config0		= 0x51,
 	Config1		= 0x52,
-	FlashReg	= 0x54,
+	TimerInt	= 0x54,
 	MediaStatus	= 0x58,
 	Config3		= 0x59,
 	Config4		= 0x5A,	 /* absent on RTL-8139A */
@@ -325,6 +325,7 @@ enum RTL8139_registers {
 	FIFOTMS		= 0x70,	 /* FIFO Control and test. */
 	CSCR		= 0x74,	 /* Chip Status and Configuration Register. */
 	PARA78		= 0x78,
+	FlashReg	= 0xD4,	/* Communication with Flash ROM, four bytes. */
 	PARA7c		= 0x7c,	 /* Magic transceiver parameter register. */
 	Config5		= 0xD8,	 /* absent on RTL-8139A */
 };