Macro should be CONFIG_OF and not OF_CONFIG. Signed-off-by: Amy Maloche <amaloche@codeaurora.org> (cherry picked from commit 56cb58c1b832760adfe382b845e52837b7ea7e85) Conflicts: drivers/input/touchscreen/atmel_mxt_ts.c Signed-off-by: Sudhir Sharma <sudsha@codeaurora.org> (cherry picked from commit 54d1b97939cab0482aa5f4549e81ecf3599e2024) Change-Id: I102d6871958a03ca596c7c538c539fcc27a4e14d Signed-off-by: Sudhir Sharma <sudsha@codeaurora.org>