From ad0ea990e3130779e50cbaf01d0f67f25a4a0992 Mon Sep 17 00:00:00 2001
From: Philippe Langlais <philippe.langlais@stericsson.com>
Date: Mon, 17 Oct 2011 13:07:25 +0200
Subject: ARM: ux500: miltimedia: Replace mach prcmu driver with mainlined
 version

The prcmu driver now exists in drivers/mfd

Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32057
---
 drivers/staging/mmio/st_mmio.c       | 2 +-
 drivers/staging/nmf-cm/osal-kernel.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/mmio/st_mmio.c b/drivers/staging/mmio/st_mmio.c
index c79c2768d19..655f7ce3a93 100644
--- a/drivers/staging/mmio/st_mmio.c
+++ b/drivers/staging/mmio/st_mmio.c
@@ -17,7 +17,7 @@
 #include <linux/uaccess.h>
 #include <linux/vmalloc.h>
 #include <linux/workqueue.h>
-#include <mach/prcmu.h>
+#include <linux/mfd/dbx500-prcmu.h>
 #include "mmio.h"
 
 #define ISP_REGION_IO				(0xE0000000)
diff --git a/drivers/staging/nmf-cm/osal-kernel.h b/drivers/staging/nmf-cm/osal-kernel.h
index 7a3834fec59..7a71bdd591d 100644
--- a/drivers/staging/nmf-cm/osal-kernel.h
+++ b/drivers/staging/nmf-cm/osal-kernel.h
@@ -14,7 +14,7 @@
 #ifdef CONFIG_HAS_WAKELOCK
 #include <linux/wakelock.h>
 #endif
-#include <mach/prcmu.h>
+#include <linux/mfd/dbx500-prcmu.h>
 #include <cm/engine/api/channel_engine.h>
 #include <cm/engine/api/control/configuration_engine.h>
 #include <cm/engine/api/perfmeter_engine.h>
-- 
cgit v1.2.3