From 3d2d69999a7de330c9c1e85fcedb094d4f160e16 Mon Sep 17 00:00:00 2001
From: Joel A Fernandes <joelagnel@ti.com>
Date: Wed, 30 Nov 2011 15:02:17 +0100
Subject: [PATCH 07/26] tscadc: Add board file mfd support, fix warning

Signed-off-by: Joel A Fernandes <joelagnel@ti.com>

Conflicts:

	arch/arm/mach-omap2/board-am335xevm.c
---
 arch/arm/mach-omap2/board-am335xevm.c |    2 +-
 drivers/input/touchscreen/ti_tscadc.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c
index 5ab9c18..2597650 100644
--- a/arch/arm/mach-omap2/board-am335xevm.c
+++ b/arch/arm/mach-omap2/board-am335xevm.c
@@ -2245,7 +2245,7 @@ static struct evm_dev_cfg beaglebone_old_dev_cfg[] = {
 	{i2c2_init,	DEV_ON_BASEBOARD, PROFILE_NONE},
 	{mmc0_init,	DEV_ON_BASEBOARD, PROFILE_NONE},
 	{boneleds_init,	DEV_ON_BASEBOARD, PROFILE_ALL},
-	{tsc_init, 	DEV_ON_BASEBOARD, PROFILE_ALL},
+	{bone_tsc_init, 	DEV_ON_BASEBOARD, PROFILE_ALL},
 	{NULL, 0, 0},
 };
 
diff --git a/drivers/input/touchscreen/ti_tscadc.c b/drivers/input/touchscreen/ti_tscadc.c
index 2f38c0c..5070450 100644
--- a/drivers/input/touchscreen/ti_tscadc.c
+++ b/drivers/input/touchscreen/ti_tscadc.c
@@ -468,7 +468,7 @@ static irqreturn_t tsc_interrupt(int irq, void *dev)
 static	int __devinit tscadc_probe(struct platform_device *pdev)
 {
 	struct tscadc			*ts_dev;
-	struct input_dev		*input_dev;
+	struct input_dev		*input_dev = NULL;
 	int				err;
 	int				clk_value;
 	int				clock_rate, irqenable, ctrl;
-- 
1.7.9.5

