diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
| commit | 23fd07750a789a66fe88cf173d52a18f1a387da4 (patch) | |
| tree | 06fdd6df35fdb835abdaa9b754d62f6b84b97250 /drivers/pcmcia/au1000_generic.h | |
| parent | bd787d438a59266af3c9f6351644c85ef1dd21fe (diff) | |
| parent | ed28f96ac1960f30f818374d65be71d2fdf811b0 (diff) | |
Merge ../linux-2.6 by hand
Diffstat (limited to 'drivers/pcmcia/au1000_generic.h')
| -rw-r--r-- | drivers/pcmcia/au1000_generic.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pcmcia/au1000_generic.h b/drivers/pcmcia/au1000_generic.h index d5122b1ea94b..b0e7908392a7 100644 --- a/drivers/pcmcia/au1000_generic.h +++ b/drivers/pcmcia/au1000_generic.h | |||
| @@ -44,13 +44,13 @@ | |||
| 44 | /* pcmcia socket 1 needs external glue logic so the memory map | 44 | /* pcmcia socket 1 needs external glue logic so the memory map |
| 45 | * differs from board to board. | 45 | * differs from board to board. |
| 46 | */ | 46 | */ |
| 47 | #if defined(CONFIG_MIPS_PB1000) || defined(CONFIG_MIPS_PB1100) || defined(CONFIG_MIPS_PB1500) || defined(CONFIG_MIPS_PB1550) | 47 | #if defined(CONFIG_MIPS_PB1000) || defined(CONFIG_MIPS_PB1100) || defined(CONFIG_MIPS_PB1500) || defined(CONFIG_MIPS_PB1550) || defined(CONFIG_MIPS_PB1200) |
| 48 | #define AU1X_SOCK1_IO 0xF08000000 | 48 | #define AU1X_SOCK1_IO 0xF08000000 |
| 49 | #define AU1X_SOCK1_PHYS_ATTR 0xF48000000 | 49 | #define AU1X_SOCK1_PHYS_ATTR 0xF48000000 |
| 50 | #define AU1X_SOCK1_PHYS_MEM 0xF88000000 | 50 | #define AU1X_SOCK1_PHYS_MEM 0xF88000000 |
| 51 | #define AU1X_SOCK1_PSEUDO_PHYS_ATTR 0xF4800000 | 51 | #define AU1X_SOCK1_PSEUDO_PHYS_ATTR 0xF4800000 |
| 52 | #define AU1X_SOCK1_PSEUDO_PHYS_MEM 0xF8800000 | 52 | #define AU1X_SOCK1_PSEUDO_PHYS_MEM 0xF8800000 |
| 53 | #elif defined(CONFIG_MIPS_DB1000) || defined(CONFIG_MIPS_DB1100) || defined(CONFIG_MIPS_DB1500) || defined(CONFIG_MIPS_DB1550) | 53 | #elif defined(CONFIG_MIPS_DB1000) || defined(CONFIG_MIPS_DB1100) || defined(CONFIG_MIPS_DB1500) || defined(CONFIG_MIPS_DB1550) || defined(CONFIG_MIPS_DB1200) |
| 54 | #define AU1X_SOCK1_IO 0xF04000000 | 54 | #define AU1X_SOCK1_IO 0xF04000000 |
| 55 | #define AU1X_SOCK1_PHYS_ATTR 0xF44000000 | 55 | #define AU1X_SOCK1_PHYS_ATTR 0xF44000000 |
| 56 | #define AU1X_SOCK1_PHYS_MEM 0xF84000000 | 56 | #define AU1X_SOCK1_PHYS_MEM 0xF84000000 |