From 7ceb4505453cc925e493d7cc6d056d85abc32921 Mon Sep 17 00:00:00 2001
From: planetbeing <planetbeing@gmail.com>
Date: Sun, 16 May 2010 23:15:22 -0400
Subject: [PATCH] iPhone: iPhone 3G should have PMU defined. Thanks to
 bluerise.

---
 arch/arm/mach-apple_iphone/iphone.c | 3 +++
 drivers/input/touchscreen/zephyr2.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/arch/arm/mach-apple_iphone/iphone.c b/arch/arm/mach-apple_iphone/iphone.c
index f66a3bf641f7f..911d0195cb055 100644
--- a/arch/arm/mach-apple_iphone/iphone.c
+++ b/arch/arm/mach-apple_iphone/iphone.c
@@ -214,6 +214,9 @@ static struct i2c_board_info __initdata iphone_i2c0[] = {
 	},
 #endif
 #ifdef CONFIG_IPHONE_3G
+	{
+		I2C_BOARD_INFO("iphone-pmu", 0xe6),
+	},
 	{
 		I2C_BOARD_INFO("wm8991", 0x36),
 	},
diff --git a/drivers/input/touchscreen/zephyr2.c b/drivers/input/touchscreen/zephyr2.c
index 3869f4cdd367b..3b4fed9e7f8d7 100644
--- a/drivers/input/touchscreen/zephyr2.c
+++ b/drivers/input/touchscreen/zephyr2.c
@@ -1033,9 +1033,9 @@ int z2_setup(const u8* constructedFirmware, int constructedFirmwareLen, const u8
 		kfree(GetResultPacket);
 		return err;
 	}
-#endif
 
 	printk("zephyr2: loaded %d byte proximity calibration data\n", prox_cal_size);
+#endif
 
 	if(!loadCal(cal, cal_size))
 	{