diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-05-31 00:57:05 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-05-31 00:57:05 -0400 |
| commit | 5bc65793cbf8da0d35f19ef025dda22887e79e80 (patch) | |
| tree | 8291998abd73055de6f487fafa174ee2a5d3afee /include/asm-arm/arch-s3c2410/map.h | |
| parent | 6edae708bf77e012d855a7e2c7766f211d234f4f (diff) | |
| parent | 3f0a6766e0cc5a577805732e5adb50a585c58175 (diff) | |
[SCSI] Merge up to linux-2.6 head
Conflicts:
drivers/scsi/jazz_esp.c
Same changes made by both SCSI and SPARC trees: problem with UTF-8
conversion in the copyright.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'include/asm-arm/arch-s3c2410/map.h')
| -rw-r--r-- | include/asm-arm/arch-s3c2410/map.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-arm/arch-s3c2410/map.h b/include/asm-arm/arch-s3c2410/map.h index 4505aefbad17..19e77f038042 100644 --- a/include/asm-arm/arch-s3c2410/map.h +++ b/include/asm-arm/arch-s3c2410/map.h | |||
| @@ -153,6 +153,10 @@ | |||
| 153 | #define S3C2440_PA_AC97 (0x5B000000) | 153 | #define S3C2440_PA_AC97 (0x5B000000) |
| 154 | #define S3C2440_SZ_AC97 SZ_1M | 154 | #define S3C2440_SZ_AC97 SZ_1M |
| 155 | 155 | ||
| 156 | /* S3C2443 High-speed SD/MMC */ | ||
| 157 | #define S3C2443_PA_HSMMC (0x4A800000) | ||
| 158 | #define S3C2443_SZ_HSMMC (256) | ||
| 159 | |||
| 156 | /* ISA style IO, for each machine to sort out mappings for, if it | 160 | /* ISA style IO, for each machine to sort out mappings for, if it |
| 157 | * implements it. We reserve two 16M regions for ISA. | 161 | * implements it. We reserve two 16M regions for ISA. |
| 158 | */ | 162 | */ |