Merge branch 'next' into for-linus

[cascardo/linux.git] / arch / arm / mach-davinci / board-da850-evm.c

diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
index 8a24b6c..bea6793 100644 (file)
--- a/arch/arm/mach-davinci/board-da850-evm.c
+++ b/arch/arm/mach-davinci/board-da850-evm.c
@@ -985,7 +985,6 @@ static struct regulator_init_data tps65070_regulator_data[] = {
 static struct touchscreen_init_data tps6507x_touchscreen_data = {
        .poll_period =  30,     /* ms between touch samples */
        .min_pressure = 0x30,   /* minimum pressure to trigger touch */
-       .vref = 0,              /* turn off vref when not using A/D */
        .vendor = 0,            /* /sys/class/input/input?/id/vendor */
        .product = 65070,       /* /sys/class/input/input?/id/product */
        .version = 0x100,       /* /sys/class/input/input?/id/version */