Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platf...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 Apr 2011 16:15:55 +0000 (09:15 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 Apr 2011 16:15:55 +0000 (09:15 -0700)
* '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

index 7bbb538..464bb3f 100644 (file)
@@ -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,
 };