diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-13 09:15:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-13 09:15:55 -0700 |
| commit | 85f2e689a5c8fb6ed8fdbee00109e7f6e5fefcb6 (patch) | |
| tree | 02b1115ecf8c8ca438e50e34458b8005b04d8b42 | |
| parent | 66bbf58b55619061b110460ee1c5485137fdf0e0 (diff) | |
| parent | 21a8d026e0721f90ae03084e96a215632c80fc13 (diff) | |
| download | kernel_samsung_aries-85f2e689a5c8fb6ed8fdbee00109e7f6e5fefcb6.zip kernel_samsung_aries-85f2e689a5c8fb6ed8fdbee00109e7f6e5fefcb6.tar.gz kernel_samsung_aries-85f2e689a5c8fb6ed8fdbee00109e7f6e5fefcb6.tar.bz2 | |
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
| -rw-r--r-- | drivers/platform/x86/intel_pmic_gpio.c | 2 |
1 files changed, 1 insertions, 1 deletions
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, }; |