From 2489007e7d740ccbc3e0a202914e243ad5178787 Mon Sep 17 00:00:00 2001
From: codeworkx <codeworkx@cyanogenmod.com>
Date: Sat, 22 Sep 2012 09:48:20 +0200
Subject: merge opensource jb u5

Change-Id: I1aaec157aa196f3448eff8636134fce89a814cf2
---
 drivers/misc/es305.c | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'drivers/misc/es305.c')

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,
 };
 
-- 
cgit v1.1