Changeset 371bd7d in mainline for kernel/genarch/src/ofw

Timestamp:

2010-03-27T09:22:17Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

36a75a2

Parents:

cd82bb1 (diff), eaf22d4 (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:

kernel/genarch/src/ofw

Files:

• ebus.c (modified) (1 diff)
• fhc.c (modified) (1 diff)
• ofw_tree.c (modified) (1 diff)
• pci.c (modified) (1 diff)

kernel/genarch/src/ofw/ebus.c

@@ -40 +40 @@
 #include <genarch/ofw/pci.h>
 #include <arch/memstr.h>
-#include <string.h>
+#include <str.h>
 #include <panic.h>
 #include <debug.h>

kernel/genarch/src/ofw/fhc.c

@@ -40 +40 @@
 #include <arch/drivers/fhc.h>
 #include <arch/memstr.h>
-#include <string.h>
+#include <str.h>
 #include <panic.h>
 #include <macros.h>

kernel/genarch/src/ofw/ofw_tree.c

@@ -39 +39 @@
 #include <arch/memstr.h>
 #include <mm/slab.h>
-#include <string.h>
+#include <str.h>
 #include <panic.h>
 #include <print.h>

kernel/genarch/src/ofw/pci.c

@@ -41 +41 @@
 #include <arch/trap/interrupt.h>
 #include <arch/memstr.h>
-#include <string.h>
+#include <str.h>
 #include <panic.h>
 #include <macros.h>
 
 #define PCI_SPACE_MASK          0x03000000
-#define PCI_ABS_MASK            0x80000000      
+#define PCI_ABS_MASK            0x80000000
 #define PCI_REG_MASK            0x000000ff