commit 85f2e689a5c8fb6ed8fdbee00109e7f6e5fefcb6
author Linus Torvalds <torvalds@linux-foundation.org> Wed Apr 13 09:15:55 2011 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Wed Apr 13 09:15:55 2011 -0700
tree 02b1115ecf8c8ca438e50e34458b8005b04d8b42
parent 66bbf58b55619061b110460ee1c5485137fdf0e0
parent 21a8d026e0721f90ae03084e96a215632c80fc13

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86:
  x86 platform drivers: Build fix for intel_pmic_gpio

drivers/platform/x86/intel_pmic_gpio.c

diff --git a/drivers/platform/x86/intel_pmic_gpio.c b/drivers/platform/x86/intel_pmic_gpio.c
index 7bbb538..464bb3f 100644
--- a/drivers/platform/x86/intel_pmic_gpio.c
+++ b/drivers/platform/x86/intel_pmic_gpio.c
@@ -209,7 +209,7 @@
 	.irq_mask		= pmic_irq_mask,
 	.irq_unmask		= pmic_irq_unmask,
 	.irq_set_type		= pmic_irq_type,
-	.irq_bus_lock		= pmic_irq_buslock,
+	.irq_bus_lock		= pmic_bus_lock,
 	.irq_bus_sync_unlock	= pmic_bus_sync_unlock,
 };