diff --git a/[refs] b/[refs]
index 159ba49534f9..2d157a6083c2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 40e03b581a8a0b638bc1e9b957ae0536a4a00ad3
+refs/heads/master: c640e1cb45cb9ff6b02f5f130a4f2a58ab9ebe55
diff --git a/trunk/arch/arm/mach-pxa/treo680.c b/trunk/arch/arm/mach-pxa/treo680.c
index a06f19edebb3..753ec4df17b9 100644
--- a/trunk/arch/arm/mach-pxa/treo680.c
+++ b/trunk/arch/arm/mach-pxa/treo680.c
@@ -409,7 +409,7 @@ static int treo680_irda_startup(struct device *dev)
 
 static void treo680_irda_shutdown(struct device *dev)
 {
-	gpio_free(GPIO_NR_TREO680_AMP_EN);
+	gpio_free(GPIO_NR_TREO680_IR_EN);
 }
 
 static struct pxaficp_platform_data treo680_ficp_info = {