aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilippe Langlais <philippe.langlais@linaro.org>2011-05-05 09:26:03 +0200
committerPhilippe Langlais <philippe.langlais@linaro.org>2011-05-05 09:26:03 +0200
commit926cd0da6b0ad504aff6cb4f22d5c04bccd752ac (patch)
treeec76776527aacf8547e963ebfaa6eed489255140
parentb94a02f05cd8021d835f607cecd87f3a6c8b9840 (diff)
u5500: Fix compilation errors after rmi4 ts driver moved in staging areaGLK-2.6.38_w118.5
Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
-rw-r--r--arch/arm/mach-ux500/board-u5500.c2
-rw-r--r--drivers/staging/ste_rmi4/synaptics_i2c_rmi4.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/board-u5500.c b/arch/arm/mach-ux500/board-u5500.c
index d09b2fb88ce..eee41c7974e 100644
--- a/arch/arm/mach-ux500/board-u5500.c
+++ b/arch/arm/mach-ux500/board-u5500.c
@@ -15,7 +15,7 @@
#include <linux/i2s/i2s.h>
#include <linux/mfd/abx500.h>
#include <linux/led-lm3530.h>
-#include <linux/input/synaptics_i2c_rmi4.h>
+#include <../../../drivers/staging/ste_rmi4/synaptics_i2c_rmi4.h>
#include <linux/input/matrix_keypad.h>
#include <asm/mach/arch.h>
diff --git a/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.h b/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.h
index 384436ef806..973abc97374 100644
--- a/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.h
+++ b/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.h
@@ -42,6 +42,7 @@ struct synaptics_rmi4_platform_data {
int irq_type;
bool x_flip;
bool y_flip;
+ bool regulator_en;
};
#endif