Changeset c47e1a8 in mainline for uspace/srv/drivers/rootia32/rootia32.c

Timestamp:

2010-05-21T07:50:04Z (15 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

d51ee2b

Parents:

cf8cc36 (diff), 15b592b (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 (rev. 451)

File:

• uspace/srv/drivers/rootia32/rootia32.c (modified) (2 diffs)

uspace/srv/drivers/rootia32/rootia32.c

@@ -42 +42 @@
 #include <fibril_synch.h>
 #include <stdlib.h>
-#include <string.h>
+#include <str.h>
 #include <ctype.h>
 #include <macros.h>
@@ -60 +60 @@
 
 static int rootia32_add_device(device_t *dev);
-static bool rootia32_init();
+static void root_ia32_init(void);
 
 /** The root device driver's standard operations.