--- arch/arm/mach-msm/htc_battery.c

+++ arch/arm/mach-msm/htc_battery.c

@@ -30,8 +30,10 @@

#include <mach/msm_fb.h> /* Jay, to register display notifier */

#include <mach/htc_battery.h>

#include <linux/rtc.h>

+#ifdef CONFIG_MACH_SUPERSONIC

#include <linux/workqueue.h>

#include <linux/tps65200.h>

+#endif

#ifdef CONFIG_HTC_BATTCHG_SMEM

#include "smd_private.h"

#endif

@@ -1380,6 +1382,7 @@ dont_need_update:

return i;

}

+#ifdef CONFIG_MACH_SUPERSONIC

static irqreturn_t tps65200_int_detection(int irq, void *data)

{

struct htc_battery_tps65200_int *ip = data;

@@ -1462,6 +1465,7 @@ static void htc_battery_tps65200_int_fun

break;

}

}

+#endif

static int htc_battery_core_probe(struct platform_device *pdev)

{

@@ -1673,6 +1677,7 @@ static int htc_battery_probe(struct plat

ds2746_register_notifier(&ds2784_notifier);

#endif

+#ifdef CONFIG_MACH_SUPERSONIC

if (system_rev >= 1) {

if (pdata->int_data.chg_int) {

BATT_LOG("init over voltage interrupt detection.");

@@ -1691,8 +1696,8 @@ static int htc_battery_probe(struct plat

}

}

}

-

- return 0;

+#endif

+ return rc;

}

int get_cable_status(void)