aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilippe Langlais <philippe.langlais@linaro.org>2011-07-07 08:46:52 +0200
committerPhilippe Langlais <philippe.langlais@linaro.org>2011-07-22 15:52:34 +0200
commit8a257c0f9d42fa2d7beb836c24a760c7468bcbed (patch)
treebca92658ebedfe650febecc53a9e765227af6910
parentdd5061bf1eef22171e03797665c00209ab07035f (diff)
downloadlinux-3.0-lt-ux500-8a257c0f9d42fa2d7beb836c24a760c7468bcbed.tar.gz
u5500: mmio: fix after move of mmio.h from include/linux to staging directory
Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
-rw-r--r--arch/arm/mach-ux500/board-u5500-mmio.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-ux500/board-u5500-mmio.c b/arch/arm/mach-ux500/board-u5500-mmio.c
index e88dafb90e8..3326d69639d 100644
--- a/arch/arm/mach-ux500/board-u5500-mmio.c
+++ b/arch/arm/mach-ux500/board-u5500-mmio.c
@@ -14,7 +14,6 @@
#include <linux/init.h>
#include <linux/err.h>
#include <linux/gpio.h>
-#include <linux/mmio.h>
#include <linux/platform_device.h>
#include <linux/slab.h>
#include <linux/regulator/consumer.h>
@@ -23,6 +22,7 @@
#include <mach/gpio.h>
#include <mach/devices.h>
#include "board-u5500.h"
+#include "../drivers/staging/mmio/mmio.h"
struct mmio_board_data{
int number_of_regulators;
@@ -98,7 +98,6 @@ static int mmio_pin_cfg_init(struct mmio_platform_data *pdata)
static void mmio_pin_cfg_exit(struct mmio_platform_data *pdata)
{
- struct mmio_board_data *extra = pdata->extra;
}
/*