diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-15 16:14:08 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-15 16:14:08 -0700 |
commit | 4ff4275b24fdcca189b33f9a73fe7abef1dc84bc (patch) | |
tree | d78f65e793d80e3a4c454d37e710f182de4bf34e /include/asm-mips/mips-boards/msc01_pci.h | |
parent | e00eea42f24550beb9940e641402450f695c888a (diff) | |
parent | 7b4f4ec21038ac13c63d130357d1c3015ec3f3e8 (diff) |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] Fix builds where MSC01E_xxx is undefined.
[MIPS] Separate performance counter interrupts
[MIPS] Malta: Fix for SOCitSC based Maltas
Diffstat (limited to 'include/asm-mips/mips-boards/msc01_pci.h')
-rw-r--r-- | include/asm-mips/mips-boards/msc01_pci.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-mips/mips-boards/msc01_pci.h b/include/asm-mips/mips-boards/msc01_pci.h index 8eaefb837b9..e036b7dd6de 100644 --- a/include/asm-mips/mips-boards/msc01_pci.h +++ b/include/asm-mips/mips-boards/msc01_pci.h @@ -208,6 +208,7 @@ * latter, they should be moved elsewhere. */ #define MIPS_MSC01_PCI_REG_BASE 0x1bd00000 +#define MIPS_SOCITSC_PCI_REG_BASE 0x1ff10000 extern unsigned long _pcictrl_msc; |