From 597abc98e0de6b974ed3fd2f3071014010a6660b Mon Sep 17 00:00:00 2001
From: Matt Porter <mporter@ti.com>
Date: Mon, 8 Oct 2012 09:54:42 -0400
Subject: [PATCH] --- yaml --- r: 340182 b: refs/heads/master c:
 ae41d17a76338ed4cb2ab2c7db2b5de9f9524609 h: refs/heads/master v: v3

---
 [refs]                                        | 2 +-
 trunk/arch/arm/mach-davinci/board-da850-evm.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 51163e9df7e4..e991cbfc4880 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6809084ab20bd1364085e2a49854bd3631c3bd8a
+refs/heads/master: ae41d17a76338ed4cb2ab2c7db2b5de9f9524609
diff --git a/trunk/arch/arm/mach-davinci/board-da850-evm.c b/trunk/arch/arm/mach-davinci/board-da850-evm.c
index 500c0b17b58a..d4f4dbfc0e59 100644
--- a/trunk/arch/arm/mach-davinci/board-da850-evm.c
+++ b/trunk/arch/arm/mach-davinci/board-da850-evm.c
@@ -31,6 +31,7 @@
 #include <linux/platform_data/mtd-davinci.h>
 #include <linux/platform_data/mtd-davinci-aemif.h>
 #include <linux/platform_data/spi-davinci.h>
+#include <linux/platform_data/uio_pruss.h>
 #include <linux/regulator/machine.h>
 #include <linux/regulator/tps6507x.h>
 #include <linux/spi/spi.h>
@@ -1516,6 +1517,11 @@ static __init void da850_evm_init(void)
 		pr_warning("da850_evm_init: lcdcntl mux setup failed: %d\n",
 				ret);
 
+	ret = da8xx_register_uio_pruss();
+	if (ret)
+		pr_warn("da850_evm_init: pruss initialization failed: %d\n",
+				ret);
+
 	/* Handle board specific muxing for LCD here */
 	ret = davinci_cfg_reg_list(da850_evm_lcdc_pins);
 	if (ret)