aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorDaniel Hillenbrand <codeworkx@cyanogenmod.org>2013-05-25 10:53:54 +0200
committerDaniel Hillenbrand <codeworkx@cyanogenmod.org>2013-05-25 10:53:54 +0200
commit05f0203060035bd2cb8c8f98b8b466b934b1c45b (patch)
tree051a8c9d1a431b27fb5d4fecaf5417487857a400 /include/linux
parentab6dfccd8d126b50059d39d031cfa1ddc8f32b84 (diff)
downloadkernel_samsung_smdk4412-05f0203060035bd2cb8c8f98b8b466b934b1c45b.zip
kernel_samsung_smdk4412-05f0203060035bd2cb8c8f98b8b466b934b1c45b.tar.gz
kernel_samsung_smdk4412-05f0203060035bd2cb8c8f98b8b466b934b1c45b.tar.bz2
u1: import from CyanogenMod/android_kernel_samsung_smdk4210
Change-Id: I9629a4060538c9c4c6a43a86a56826cd7123d1b5
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/i2c/touchkey_i2c.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/i2c/touchkey_i2c.h b/include/linux/i2c/touchkey_i2c.h
index 71ec0b1..be989b5 100644
--- a/include/linux/i2c/touchkey_i2c.h
+++ b/include/linux/i2c/touchkey_i2c.h
@@ -88,6 +88,7 @@
/* Autocalibration */
#if defined(CONFIG_TARGET_LOCALE_NAATT)\
+ || defined(CONFIG_TARGET_LOCALE_NAATT_TEMP)\
|| defined(CONFIG_TARGET_LOCALE_NA)\
|| defined(CONFIG_MACH_Q1_BD)\
|| defined(CONFIG_MACH_M0)\
@@ -116,7 +117,8 @@
#define TK_HAS_FIRMWARE_UPDATE
#endif
-#if defined(CONFIG_TARGET_LOCALE_NAATT)
+#if defined(CONFIG_TARGET_LOCALE_NAATT) \
+ || defined(CONFIG_TARGET_LOCALE_NAATT_TEMP)
#define TK_USE_4KEY_TYPE_ATT
#elif defined(CONFIG_MACH_LOCALE_NA) \
|| defined(CONFIG_MACH_U1_NA_SPR) \