diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-19 01:28:40 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-19 01:28:40 +0000 |
| commit | 8abb719409c9060a7c0676f76e9182c1e0b8ca46 (patch) | |
| tree | b88cc5a6cd513a04a512b7e6215c873c90a1c5dd /include/asm-sparc | |
| parent | f01bd7aeafd95a08aafc9e3636bb26974df69d82 (diff) | |
Merge with 2.3.99-pre1.
Diffstat (limited to 'include/asm-sparc')
| -rw-r--r-- | include/asm-sparc/ide.h | 2 | ||||
| -rw-r--r-- | include/asm-sparc/vaddrs.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-sparc/ide.h b/include/asm-sparc/ide.h index 3a4ac776a..25451ae0e 100644 --- a/include/asm-sparc/ide.h +++ b/include/asm-sparc/ide.h @@ -1,4 +1,4 @@ -/* $Id: ide.h,v 1.3 2000/03/10 04:46:47 davem Exp $ +/* $Id: ide.h,v 1.4 2000/03/12 03:56:12 davem Exp $ * ide.h: SPARC PCI specific IDE glue. * * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu) diff --git a/include/asm-sparc/vaddrs.h b/include/asm-sparc/vaddrs.h index 7f5c464a4..1c76a9b9d 100644 --- a/include/asm-sparc/vaddrs.h +++ b/include/asm-sparc/vaddrs.h @@ -1,4 +1,4 @@ -/* $Id: vaddrs.h,v 1.22 1999/04/20 13:22:55 anton Exp $ */ +/* $Id: vaddrs.h,v 1.23 2000/03/12 04:10:46 davem Exp $ */ #ifndef _SPARC_VADDRS_H #define _SPARC_VADDRS_H @@ -20,8 +20,8 @@ #define IOBASE_LEN 0x00300000 /* Length of the IO area */ #define IOBASE_END 0xfe300000 #define DVMA_VADDR 0xfff00000 /* Base area of the DVMA on suns */ -#define DVMA_LEN 0x00040000 /* Size of the DVMA address space */ -#define DVMA_END 0xfff40000 +#define DVMA_LEN 0x000c0000 /* Size of the DVMA address space */ +#define DVMA_END 0xfffc0000 /* IOMMU Mapping area, must be on a 16MB boundary! Note this * doesn't count the DVMA areas, the prom lives between the |