Changeset 694ca93f in mainline for uspace/srv/devmap

Timestamp:

2011-05-01T19:34:26Z (15 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

0e26444

Parents:

1ff896e (diff), 042fbe0 (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

Location:

uspace/srv/devmap

Files:

• Makefile (modified) (1 diff)
• devmap.c (modified) (1 diff)

uspace/srv/devmap/Makefile

@@ -30 +30 @@
 USPACE_PREFIX = ../..
 BINARY = devmap
+STATIC_NEEDED = y
 
 SOURCES = \

uspace/srv/devmap/devmap.c

@@ -551 +551 @@
         if (devmap_device_find_name(namespace->name, device->name) != NULL) {
                 printf("%s: Device '%s/%s' already registered\n", NAME,
-                    device->namespace->name, device->name);
+                    namespace->name, device->name);
                 devmap_namespace_destroy(namespace);
                 fibril_mutex_unlock(&devices_list_mutex);