Changeset 7943c43 in mainline for uspace/drv/nic/rtl8139/general.c

Timestamp:

2012-01-16T22:45:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

32817cc, 3fe58d3c

Parents:

9117ef9b (diff), 3ea725e (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 mainline changes.

File:

• uspace/drv/nic/rtl8139/general.c (modified) (1 diff)

uspace/drv/nic/rtl8139/general.c

@@ -32 +32 @@
  */
 
-#include "rtl8139_general.h"
+#include "general.h"
 
 #include <mem.h>