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

85f2e689 · Linus Torvalds <[email protected]> · 2011-04-13 09:15:55 -07:00

* '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

Merge commit. Changes below are compared with the first parent: 66bbf58b.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
drivers/platform/x86/intel_pmic_gpio.c	modified	+1	−1	View file

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 @@ static struct irq_chip pmic_irqchip = {
 	.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,
 };
 