diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-11-10 09:29:07 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-11-10 09:29:07 -0500 |
| commit | 8a87a0b6313109d2fea87b1271d497c954ce2ca8 (patch) | |
| tree | 1b7ae51ff681e27118590e9cab4bf0ce38f5d80e /arch/arm/mach-s3c2410/mach-rx3715.c | |
| parent | e6a04466ba965875a6132700fabb2f2c0249c41a (diff) | |
| parent | 3b44f137b9a846c5452d9e6e1271b79b1dbcc942 (diff) | |
Merge by hand (whitespace conflicts in libata.h)
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'arch/arm/mach-s3c2410/mach-rx3715.c')
| -rw-r--r-- | arch/arm/mach-s3c2410/mach-rx3715.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c2410/mach-rx3715.c b/arch/arm/mach-s3c2410/mach-rx3715.c index 24d69019a843..f8d86d1e16b6 100644 --- a/arch/arm/mach-s3c2410/mach-rx3715.c +++ b/arch/arm/mach-s3c2410/mach-rx3715.c | |||
| @@ -56,8 +56,17 @@ | |||
| 56 | static struct map_desc rx3715_iodesc[] __initdata = { | 56 | static struct map_desc rx3715_iodesc[] __initdata = { |
| 57 | /* dump ISA space somewhere unused */ | 57 | /* dump ISA space somewhere unused */ |
| 58 | 58 | ||
| 59 | { (u32)S3C24XX_VA_ISA_WORD, S3C2410_CS3, SZ_16M, MT_DEVICE }, | 59 | { |
| 60 | { (u32)S3C24XX_VA_ISA_BYTE, S3C2410_CS3, SZ_16M, MT_DEVICE }, | 60 | .virtual = (u32)S3C24XX_VA_ISA_WORD, |
| 61 | .pfn = __phys_to_pfn(S3C2410_CS3), | ||
| 62 | .length = SZ_1M, | ||
| 63 | .type = MT_DEVICE, | ||
| 64 | }, { | ||
| 65 | .virtual = (u32)S3C24XX_VA_ISA_BYTE, | ||
| 66 | .pfn = __phys_to_pfn(S3C2410_CS3), | ||
| 67 | .length = SZ_1M, | ||
| 68 | .type = MT_DEVICE, | ||
| 69 | }, | ||
| 61 | }; | 70 | }; |
| 62 | 71 | ||
| 63 | 72 | ||