aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm')
-rwxr-xr-xarch/arm/configs/tuna_defconfig2
-rw-r--r--arch/arm/mach-omap2/devices.c2
-rw-r--r--arch/arm/plat-omap/include/plat/gpu.h2
3 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/configs/tuna_defconfig b/arch/arm/configs/tuna_defconfig
index cc03bf8..b55edc5 100755
--- a/arch/arm/configs/tuna_defconfig
+++ b/arch/arm/configs/tuna_defconfig
@@ -1,5 +1,5 @@
CONFIG_EXPERIMENTAL=y
-CONFIG_LOCALVERSION="-Android-R0001"
+CONFIG_LOCALVERSION="-00002-OMAP-Android"
# CONFIG_LOCALVERSION_AUTO is not set
# CONFIG_SWAP is not set
CONFIG_SYSVIPC=y
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index 4f13bd8..5305782 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -16,6 +16,7 @@
#include <linux/clk.h>
#include <linux/err.h>
#include <linux/slab.h>
+#include <linux/mm.h>
#include <mach/hardware.h>
#include <mach/irqs.h>
@@ -923,6 +924,7 @@ static void omap_init_gpu(void)
pdata->device_shutdown = omap_device_shutdown;
pdata->opp_get_opp_count = opp_get_opp_count;
pdata->opp_find_freq_ceil = opp_find_freq_ceil;
+ pdata->access_process_vm = access_process_vm;
pdata->ovfreqs = 0;
if (cpu_is_omap446x())
diff --git a/arch/arm/plat-omap/include/plat/gpu.h b/arch/arm/plat-omap/include/plat/gpu.h
index ae6cf70..9d6de08 100644
--- a/arch/arm/plat-omap/include/plat/gpu.h
+++ b/arch/arm/plat-omap/include/plat/gpu.h
@@ -37,6 +37,8 @@ struct gpu_platform_data {
int (*opp_get_opp_count) (struct device *dev);
struct opp *(*opp_find_freq_ceil) (struct device *dev,
unsigned long *freq);
+ int (*access_process_vm) (struct task_struct *tsk, unsigned long addr,
+ void *buf, int len, int write);
};
#endif