diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-13 12:15:55 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-13 12:15:55 -0400 |
| commit | 85f2e689a5c8fb6ed8fdbee00109e7f6e5fefcb6 (patch) | |
| tree | 02b1115ecf8c8ca438e50e34458b8005b04d8b42 /drivers | |
| parent | 66bbf58b55619061b110460ee1c5485137fdf0e0 (diff) | |
| parent | 21a8d026e0721f90ae03084e96a215632c80fc13 (diff) | |
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
Diffstat (limited to 'drivers')
| -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 7bbb5388e564..464bb3fc4d88 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 = { | |||
| 209 | .irq_mask = pmic_irq_mask, | 209 | .irq_mask = pmic_irq_mask, |
| 210 | .irq_unmask = pmic_irq_unmask, | 210 | .irq_unmask = pmic_irq_unmask, |
| 211 | .irq_set_type = pmic_irq_type, | 211 | .irq_set_type = pmic_irq_type, |
| 212 | .irq_bus_lock = pmic_irq_buslock, | 212 | .irq_bus_lock = pmic_bus_lock, |
| 213 | .irq_bus_sync_unlock = pmic_bus_sync_unlock, | 213 | .irq_bus_sync_unlock = pmic_bus_sync_unlock, |
| 214 | }; | 214 | }; |
| 215 | 215 | ||