diff options
| author | Iliyan Malchev <malchev@google.com> | 2011-09-09 12:24:11 -0700 |
|---|---|---|
| committer | Iliyan Malchev <malchev@google.com> | 2011-09-09 12:24:11 -0700 |
| commit | 46a416e609b67e4fe19faa9b66edc3594fbf8674 (patch) | |
| tree | ec3f8bcdd7cb2142ec1733759b08ed32c60c0755 /drivers/rpmsg | |
| parent | 21fe46c428a24d6ad23e8e6a5c0adca5326067c6 (diff) | |
| parent | 597d07ce35b0be4de32939b2e8a1d4967eb4e27b (diff) | |
| download | kernel_samsung_tuna-46a416e609b67e4fe19faa9b66edc3594fbf8674.zip kernel_samsung_tuna-46a416e609b67e4fe19faa9b66edc3594fbf8674.tar.gz kernel_samsung_tuna-46a416e609b67e4fe19faa9b66edc3594fbf8674.tar.bz2 | |
Merge branch 'linux-omap-3.0' into android-omap-3.0
Diffstat (limited to 'drivers/rpmsg')
| -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 7ba93cb..972a918 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) |