diff options
| author | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-22 09:48:20 +0200 |
|---|---|---|
| committer | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-22 14:02:16 +0200 |
| commit | 2489007e7d740ccbc3e0a202914e243ad5178787 (patch) | |
| tree | b8e6380ea7b1da63474ad68a5dba997e01146043 /drivers/input/touchscreen/mms100_ISC_download.c | |
| parent | 5f67568eb31e3a813c7c52461dcf66ade15fc2e7 (diff) | |
| download | kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.zip kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.gz kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.bz2 | |
merge opensource jb u5
Change-Id: I1aaec157aa196f3448eff8636134fce89a814cf2
Diffstat (limited to 'drivers/input/touchscreen/mms100_ISC_download.c')
| -rw-r--r-- | drivers/input/touchscreen/mms100_ISC_download.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/input/touchscreen/mms100_ISC_download.c b/drivers/input/touchscreen/mms100_ISC_download.c index c423ba3..5c35448 100644 --- a/drivers/input/touchscreen/mms100_ISC_download.c +++ b/drivers/input/touchscreen/mms100_ISC_download.c @@ -48,7 +48,7 @@ UINT8 ucInitial_Download = FALSE; extern void mcsdl_delay(UINT32 nCount); -#if defined(CONFIG_MACH_C1CTC) || defined(CONFIG_MACH_M0_CHNOPEN) ||\ +#if defined(CONFIG_MACH_M0_CHNOPEN) || \ defined(CONFIG_MACH_M0_CMCC) || defined(CONFIG_MACH_M0_CTC) extern unsigned int lcdtype; #endif @@ -241,8 +241,7 @@ int mms100_ISC_download_binary_data(struct melfas_tsi_platform_data *ts_data) if (dl_enable_bit & (1 << i)) { if (i < 2) { /* 0: core, 1: private custom */ -#if defined(CONFIG_MACH_C1CTC) || defined(CONFIG_MACH_M0_CHNOPEN) ||\ - defined(CONFIG_MACH_M0_CTC) +#if defined(CONFIG_MACH_M0_CHNOPEN) || defined(CONFIG_MACH_M0_CTC) if (lcdtype == 0x20) { nRet = mms100_ISC_download((const UINT8*) MELFAS_binary_4_65, |