diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 18:48:57 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 18:48:57 -0400 |
| commit | 596c96ba06e5d56e72451e02f93f4e15e17458df (patch) | |
| tree | 78bc640acacb8faeb621c51296e99dbb0533a147 /arch/arm/mach-clps711x/ceiva.c | |
| parent | ad18b0ea089928367185e13d11424aea91d4b41f (diff) | |
| parent | 20731945ae743034353a88c307920d1f16cf8ac8 (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/arm/mach-clps711x/ceiva.c')
| -rw-r--r-- | arch/arm/mach-clps711x/ceiva.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/arch/arm/mach-clps711x/ceiva.c b/arch/arm/mach-clps711x/ceiva.c index 780d91805984..35d51a759b59 100644 --- a/arch/arm/mach-clps711x/ceiva.c +++ b/arch/arm/mach-clps711x/ceiva.c | |||
| @@ -37,11 +37,13 @@ | |||
| 37 | #include "common.h" | 37 | #include "common.h" |
| 38 | 38 | ||
| 39 | static struct map_desc ceiva_io_desc[] __initdata = { | 39 | static struct map_desc ceiva_io_desc[] __initdata = { |
| 40 | /* virtual, physical, length, type */ | 40 | /* SED1355 controlled video RAM & registers */ |
| 41 | 41 | { | |
| 42 | /* SED1355 controlled video RAM & registers */ | 42 | .virtual = CEIVA_VIRT_SED1355, |
| 43 | { CEIVA_VIRT_SED1355, CEIVA_PHYS_SED1355, SZ_2M, MT_DEVICE } | 43 | .pfn = __phys_to_pfn(CEIVA_PHYS_SED1355), |
| 44 | 44 | .length = SZ_2M, | |
| 45 | .type = MT_DEVICE | ||
| 46 | } | ||
| 45 | }; | 47 | }; |
| 46 | 48 | ||
| 47 | 49 | ||