Changeset 8da2c60 in mainline for uspace/drv/nic/e1k/e1k.c

Timestamp:

2012-01-27T19:12:45Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

fe56c08a

Parents:

ea75ceb (diff), d81eaf94 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with mainline

File:

• uspace/drv/nic/e1k/e1k.c (modified) (2 diffs)

uspace/drv/nic/e1k/e1k.c

@@ -2057 +2057 @@
         case E1000_82545:
         case E1000_82546:
-        case E1000_82572:
                 e1000->info.eerd_start = 0x01;
                 e1000->info.eerd_done = 0x10;
@@ -2064 +2063 @@
                 break;
         case E1000_82547:
+        case E1000_82572:
         case E1000_80003ES2:
                 e1000->info.eerd_start = 0x01;