Changeset c621f4aa in mainline for kernel/genarch/src/ofw/pci.c


Ignore:
Timestamp:
2010-07-25T10:11:13Z (16 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
377cce8
Parents:
24a2517 (diff), a2da43c (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 with mainline.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • kernel/genarch/src/ofw/pci.c

    r24a2517 rc621f4aa  
    4141#include <arch/trap/interrupt.h>
    4242#include <arch/memstr.h>
    43 #include <string.h>
     43#include <str.h>
    4444#include <panic.h>
    4545#include <macros.h>
    4646
    4747#define PCI_SPACE_MASK          0x03000000
    48 #define PCI_ABS_MASK            0x80000000     
     48#define PCI_ABS_MASK            0x80000000
    4949#define PCI_REG_MASK            0x000000ff
    5050
Note: See TracChangeset for help on using the changeset viewer.