diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-09 08:55:53 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-09 08:55:53 -0800 |
| commit | ac111bfaa6b0b3c0edc63c27bd9617d6b08851ff (patch) | |
| tree | 69c98b53ce9f269952d3e6f1f39fdba4b3d96544 /arch/arm/mach-s3c2410/mach-rx3715.c | |
| parent | 19da9b8b6ef80e4b1f870c0d270df32571fdaad6 (diff) | |
| parent | 861e37ad5969f764574722f4cfc0734511cbac7f (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
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 24d69019a84..f8d86d1e16b 100644 --- a/arch/arm/mach-s3c2410/mach-rx3715.c +++ b/arch/arm/mach-s3c2410/mach-rx3715.c @@ -56,8 +56,17 @@ static struct map_desc rx3715_iodesc[] __initdata = { /* dump ISA space somewhere unused */ - { (u32)S3C24XX_VA_ISA_WORD, S3C2410_CS3, SZ_16M, MT_DEVICE }, - { (u32)S3C24XX_VA_ISA_BYTE, S3C2410_CS3, SZ_16M, MT_DEVICE }, + { + .virtual = (u32)S3C24XX_VA_ISA_WORD, + .pfn = __phys_to_pfn(S3C2410_CS3), + .length = SZ_1M, + .type = MT_DEVICE, + }, { + .virtual = (u32)S3C24XX_VA_ISA_BYTE, + .pfn = __phys_to_pfn(S3C2410_CS3), + .length = SZ_1M, + .type = MT_DEVICE, + }, }; |