diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-08-17 13:16:28 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-08-17 13:16:28 -0400 |
| commit | 29c08460d472e427cec5e5dcb12ec74c923f8250 (patch) | |
| tree | 9d8557fe9cf123920c3ceb023274e763e5f208b0 /arch/arm/mach-s3c2412/s3c2412.c | |
| parent | 9b2616c2e8cc98ca98bbb40cad83a8d3d859e840 (diff) | |
| parent | baa28e3530375e0bef2c53243634a1c78f5c02f3 (diff) | |
Merge branch 'next-s3c' of git://aeryn.fluff.org.uk/bjdooks/linux into devel-stable
Diffstat (limited to 'arch/arm/mach-s3c2412/s3c2412.c')
| -rw-r--r-- | arch/arm/mach-s3c2412/s3c2412.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c2412/s3c2412.c b/arch/arm/mach-s3c2412/s3c2412.c index 5b5aba69ec3f..bef39f77729d 100644 --- a/arch/arm/mach-s3c2412/s3c2412.c +++ b/arch/arm/mach-s3c2412/s3c2412.c | |||
| @@ -69,6 +69,18 @@ static struct map_desc s3c2412_iodesc[] __initdata = { | |||
| 69 | IODESC_ENT(CLKPWR), | 69 | IODESC_ENT(CLKPWR), |
| 70 | IODESC_ENT(TIMER), | 70 | IODESC_ENT(TIMER), |
| 71 | IODESC_ENT(WATCHDOG), | 71 | IODESC_ENT(WATCHDOG), |
| 72 | { | ||
| 73 | .virtual = (unsigned long)S3C2412_VA_SSMC, | ||
| 74 | .pfn = __phys_to_pfn(S3C2412_PA_SSMC), | ||
| 75 | .length = SZ_1M, | ||
| 76 | .type = MT_DEVICE, | ||
| 77 | }, | ||
| 78 | { | ||
| 79 | .virtual = (unsigned long)S3C2412_VA_EBI, | ||
| 80 | .pfn = __phys_to_pfn(S3C2412_PA_EBI), | ||
| 81 | .length = SZ_1M, | ||
| 82 | .type = MT_DEVICE, | ||
| 83 | }, | ||
| 72 | }; | 84 | }; |
| 73 | 85 | ||
| 74 | /* uart registration process */ | 86 | /* uart registration process */ |