diff options
| author | Daniel Hillenbrand <codeworkx@cyanogenmod.org> | 2013-05-25 10:53:54 +0200 |
|---|---|---|
| committer | Daniel Hillenbrand <codeworkx@cyanogenmod.org> | 2013-05-25 10:53:54 +0200 |
| commit | 05f0203060035bd2cb8c8f98b8b466b934b1c45b (patch) | |
| tree | 051a8c9d1a431b27fb5d4fecaf5417487857a400 /include | |
| parent | ab6dfccd8d126b50059d39d031cfa1ddc8f32b84 (diff) | |
| download | kernel_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')
| -rw-r--r-- | include/linux/i2c/touchkey_i2c.h | 4 | ||||
| -rw-r--r-- | include/media/s5k5bafx_platform.h | 1 |
2 files changed, 4 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) \ diff --git a/include/media/s5k5bafx_platform.h b/include/media/s5k5bafx_platform.h index 18ebb2b..9bd284f 100644 --- a/include/media/s5k5bafx_platform.h +++ b/include/media/s5k5bafx_platform.h @@ -37,6 +37,7 @@ struct s5k5bafx_platform_data { /* This SoC supports Parallel & CSI-2 */ u32 is_mipi; /* set to 1 if mipi */ s32 streamoff_delay; /* ms, type is signed */ + bool init_streamoff; u8 dbg_level; }; |