[src/trunk]: src/sys/dev/pci The WM_F_EEPROM_EERDEEWR is not required on iNVM...

[msaitoh <msaitoh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/41fd468e811b
branches:  trunk
changeset: 809595:41fd468e811b
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Thu Jul 23 08:24:07 2015 +0000

description:
The WM_F_EEPROM_EERDEEWR is not required on iNVM device.

diffstat:

 sys/dev/pci/if_wm.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 16c2d57d61f4 -r 41fd468e811b sys/dev/pci/if_wm.c
--- a/sys/dev/pci/if_wm.c       Thu Jul 23 08:03:24 2015 +0000
+++ b/sys/dev/pci/if_wm.c       Thu Jul 23 08:24:07 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_wm.c,v 1.342 2015/07/22 11:14:13 knakahara Exp $    */
+/*     $NetBSD: if_wm.c,v 1.343 2015/07/23 08:24:07 msaitoh Exp $      */
 
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -81,7 +81,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.342 2015/07/22 11:14:13 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.343 2015/07/23 08:24:07 msaitoh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
@@ -2036,7 +2036,7 @@
                } else {
                        sc->sc_nvm_wordsize = INVM_SIZE;
                        sc->sc_flags |= WM_F_EEPROM_INVM;
-                       sc->sc_flags |= WM_F_EEPROM_EERDEEWR | WM_F_LOCK_SWFW;
+                       sc->sc_flags |= WM_F_LOCK_SWFW;
                }
                break;
        default: