diff options
| author | Arjan van de Ven <arjan@linux.intel.com> | 2008-10-17 12:20:26 -0400 |
|---|---|---|
| committer | Arjan van de Ven <arjan@linux.intel.com> | 2008-10-17 12:20:26 -0400 |
| commit | 651dab4264e4ba0e563f5ff56f748127246e9065 (patch) | |
| tree | 016630974bdcb00fe529b673f96d389e0fd6dc94 /include/asm-mips/mach-lasat/mach-gt64120.h | |
| parent | 40b8606253552109815786e5d4b0de98782d31f5 (diff) | |
| parent | 2e532d68a2b3e2aa6b19731501222069735c741c (diff) | |
Merge commit 'linus/master' into merge-linus
Conflicts:
arch/x86/kvm/i8254.c
Diffstat (limited to 'include/asm-mips/mach-lasat/mach-gt64120.h')
| -rw-r--r-- | include/asm-mips/mach-lasat/mach-gt64120.h | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/include/asm-mips/mach-lasat/mach-gt64120.h b/include/asm-mips/mach-lasat/mach-gt64120.h deleted file mode 100644 index 1a9ad45cc135..000000000000 --- a/include/asm-mips/mach-lasat/mach-gt64120.h +++ /dev/null | |||
| @@ -1,27 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * This is a direct copy of the ev96100.h file, with a global | ||
| 3 | * search and replace. The numbers are the same. | ||
| 4 | * | ||
| 5 | * The reason I'm duplicating this is so that the 64120/96100 | ||
| 6 | * defines won't be confusing in the source code. | ||
| 7 | */ | ||
| 8 | #ifndef _ASM_GT64120_LASAT_GT64120_DEP_H | ||
| 9 | #define _ASM_GT64120_LASAT_GT64120_DEP_H | ||
| 10 | |||
| 11 | /* | ||
| 12 | * GT64120 config space base address on Lasat 100 | ||
| 13 | */ | ||
| 14 | #define GT64120_BASE (KSEG1ADDR(0x14000000)) | ||
| 15 | |||
| 16 | /* | ||
| 17 | * PCI Bus allocation | ||
| 18 | * | ||
| 19 | * (Guessing ...) | ||
| 20 | */ | ||
| 21 | #define GT_PCI_MEM_BASE 0x12000000UL | ||
| 22 | #define GT_PCI_MEM_SIZE 0x02000000UL | ||
| 23 | #define GT_PCI_IO_BASE 0x10000000UL | ||
| 24 | #define GT_PCI_IO_SIZE 0x02000000UL | ||
| 25 | #define GT_ISA_IO_BASE PCI_IO_BASE | ||
| 26 | |||
| 27 | #endif /* _ASM_GT64120_LASAT_GT64120_DEP_H */ | ||