diff options
| author | Dan Murphy <dmurphy@ti.com> | 2011-09-12 07:44:11 -0500 |
|---|---|---|
| committer | Dan Murphy <dmurphy@ti.com> | 2011-09-12 07:44:11 -0500 |
| commit | 17b9e750326684a6b386b7a384ad0d5083bca1bc (patch) | |
| tree | d7530e105f067dafdb5a43bbf126d0b5a0502527 /drivers/rpmsg | |
| parent | ddd4f8877e00dcc6a20687f62aaaef2be89c7d7f (diff) | |
| parent | 2f04ad886cfa3b7305d81764dca5c051c7871acf (diff) | |
| download | kernel_samsung_espresso10-17b9e750326684a6b386b7a384ad0d5083bca1bc.zip kernel_samsung_espresso10-17b9e750326684a6b386b7a384ad0d5083bca1bc.tar.gz kernel_samsung_espresso10-17b9e750326684a6b386b7a384ad0d5083bca1bc.tar.bz2 | |
Merge branch 'android-omap-3.0' into p-android-omap-3.0
Conflicts:
net/netfilter/xt_qtaguid.c
Signed-off-by: Dan Murphy <dmurphy@ti.com>
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 61c2e34..34ab83a 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) |