Changeset 46c20c8 in mainline for kernel/arch/sparc64/src/drivers/pci.c

Timestamp:

2010-11-26T20:08:10Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

45df59a

Parents:

fb150d78 (diff), ffdd2b9 (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:

• kernel/arch/sparc64/src/drivers/pci.c (modified) (2 diffs)

kernel/arch/sparc64/src/drivers/pci.c

@@ -41 +41 @@
 #include <mm/page.h>
 #include <mm/slab.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <debug.h>
 #include <print.h>
-#include <string.h>
+#include <str.h>
 #include <arch/asm.h>
 #include <sysinfo/sysinfo.h>
 
 #define SABRE_INTERNAL_REG      0
-#define PSYCHO_INTERNAL_REG     2       
+#define PSYCHO_INTERNAL_REG     2
 
 #define OBIO_IMR_BASE   0x200
@@ -211 +211 @@
                  * Unsupported model.
                  */
-                printf("Unsupported PCI controller model (%s).\n", prop->value);
+                printf("Unsupported PCI controller model (%s).\n",
+                    (char *) prop->value);
         }