diff options
| author | Iliyan Malchev <malchev@google.com> | 2011-09-09 12:25:29 -0700 |
|---|---|---|
| committer | Iliyan Malchev <malchev@google.com> | 2011-09-09 12:25:29 -0700 |
| commit | 4f9ca3f05f183c3515f1967badcd60693c4061b2 (patch) | |
| tree | 7f84738f09d87ed06a8291ef90df685df2a01c72 /drivers/rpmsg/rpmsg_omx.c | |
| parent | cc4e8d3f6cbfc9671d579f2db7b2e8132f527124 (diff) | |
| parent | 46a416e609b67e4fe19faa9b66edc3594fbf8674 (diff) | |
| download | kernel_samsung_tuna-4f9ca3f05f183c3515f1967badcd60693c4061b2.zip kernel_samsung_tuna-4f9ca3f05f183c3515f1967badcd60693c4061b2.tar.gz kernel_samsung_tuna-4f9ca3f05f183c3515f1967badcd60693c4061b2.tar.bz2 | |
Merge branch 'android-omap-3.0' into android-omap-tuna-3.0
Diffstat (limited to 'drivers/rpmsg/rpmsg_omx.c')
| -rw-r--r-- | drivers/rpmsg/rpmsg_omx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rpmsg/rpmsg_omx.c b/drivers/rpmsg/rpmsg_omx.c index b3a8b7e..bd417c4 100644 --- a/drivers/rpmsg/rpmsg_omx.c +++ b/drivers/rpmsg/rpmsg_omx.c @@ -111,7 +111,7 @@ static LIST_HEAD(rpmsg_omx_services_list); */ #define TILER_START 0x60000000 #define TILER_END 0x80000000 -#define ION_1D_START 0xBDF00000 +#define ION_1D_START 0xBA300000 #define ION_1D_END 0xBFD00000 #define ION_1D_VA 0x88000000 static u32 _rpmsg_pa_to_da(u32 pa) |