| commit | a88c3f88a7bfe1e20c7349e18f5311afc6a03620 | [log] [tgz] |
|---|---|---|
| author | Linux Build Service Account <lnxbuild@localhost> | Tue May 15 18:07:12 2012 -0700 |
| committer | QuIC Gerrit Code Review <code-review@localhost> | Tue May 15 18:07:12 2012 -0700 |
| tree | 7e348a6ebb1aad95bce72863d7872199c9405edf | |
| parent | 645ce60997803289b6557c574b81ef91ac6eb171 [diff] | |
| parent | eda295a1468ff13b6c64eb400c5b171ec892c4ee [diff] |
Merge "devices-8064: Enable Content Protection for 8064." into msm-3.0
diff --git a/arch/arm/mach-msm/devices-8064.c b/arch/arm/mach-msm/devices-8064.c index 2c533d9..f6eee76 100644 --- a/arch/arm/mach-msm/devices-8064.c +++ b/arch/arm/mach-msm/devices-8064.c
@@ -1066,6 +1066,7 @@ #ifdef CONFIG_MSM_MULTIMEDIA_USE_ION .memtype = ION_CP_MM_HEAP_ID, .enable_ion = 1, + .cp_enabled = 1, #else .memtype = MEMTYPE_EBI1, .enable_ion = 0,