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/misc/es305.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/misc/es305.c')
-rw-r--r-- | drivers/misc/es305.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/misc/es305.c b/drivers/misc/es305.c index f3f3cd0..0c1b469 100644 --- a/drivers/misc/es305.c +++ b/drivers/misc/es305.c @@ -28,11 +28,7 @@ #include <linux/firmware.h> #include <linux/i2c/es305.h> -#ifdef CONFIG_MACH_C1VZW -#define ES305_FIRMWARE_NAME "audience/es305_fw_c1vzw.bin" -#else #define ES305_FIRMWARE_NAME "audience/es305_fw.bin" -#endif static struct i2c_client *this_client; static struct es305_platform_data *pdata; @@ -55,11 +51,7 @@ unsigned char es305_sleep_cmd[] = { }; unsigned char es305_bypass_data[] = { -#ifdef CONFIG_MACH_C1VZW - 0x80, 0x52, 0x00, 0x48, -#else 0x80, 0x52, 0x00, 0x4C, -#endif 0x80, 0x10, 0x00, 0x01, }; |