diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2011-10-17 13:07:25 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@linaro.org> | 2012-03-19 09:02:21 +0100 |
| commit | 0a23b44c85e7c214fcba6153310668b24a9c6e02 (patch) | |
| tree | 16fc12f475fb1eda42a54893a4c7e628ac05ee16 | |
| parent | b045624dec091d196e26d43d4a064e9f661c17f9 (diff) | |
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
| -rw-r--r-- | drivers/staging/mmio/st_mmio.c | 2 | ||||
| -rw-r--r-- | 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> |