diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-17 08:41:25 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-17 08:41:25 -0800 |
| commit | 7b286af3921e13da4838cdb451639b959c187c82 (patch) | |
| tree | bd995c9219e69823d09fd222c6ebeb05dd225c43 /include | |
| parent | 6e3013932e97a0e034d55419c60ae4a8a229ceb8 (diff) | |
| parent | bbaf238b5f910f8f3dda4b96cf844f50b2dcc6fa (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] Ensure that ST0_FR is never set on a 32 bit kernel
[MIPS] time: Delete weak definition of plat_time_init() due to gcc bug.
[MIPS] PCI: Make pcibios_fixup_device_resources ignore legacy resources.
[MIPS] Atlas, Malta: Don't free firmware memory on free_initmem.
[MIPS] Alchemy: fix off by two error in __fixup_bigphys_addr()
[MIPS] Alchemy: fix PCI resource conflict
[MIPS] time: Set up Cobalt's mips_hpt_frequency
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-mips/mach-au1x00/au1000.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/asm-mips/mach-au1x00/au1000.h b/include/asm-mips/mach-au1x00/au1000.h index bf7701243d7..cb18af98964 100644 --- a/include/asm-mips/mach-au1x00/au1000.h +++ b/include/asm-mips/mach-au1x00/au1000.h @@ -1680,10 +1680,11 @@ enum soc_au1200_ints { #define Au1500_PCI_MEM_START 0x440000000ULL #define Au1500_PCI_MEM_END 0x44FFFFFFFULL -#define PCI_IO_START (Au1500_PCI_IO_START + 0x1000) -#define PCI_IO_END (Au1500_PCI_IO_END) -#define PCI_MEM_START (Au1500_PCI_MEM_START) -#define PCI_MEM_END (Au1500_PCI_MEM_END) +#define PCI_IO_START 0x00001000 +#define PCI_IO_END 0x000FFFFF +#define PCI_MEM_START 0x40000000 +#define PCI_MEM_END 0x4FFFFFFF + #define PCI_FIRST_DEVFN (0<<3) #define PCI_LAST_DEVFN (19<<3) |