diff options
| author | Ingo Molnar <mingo@elte.hu> | 2012-03-14 02:44:11 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2012-03-14 02:44:11 -0400 |
| commit | cd593accdcc27ccbe6498d9ad1c2b6cc8e1d830d (patch) | |
| tree | 9424d3ac86e753706cc6c3d7e6072d2a73711e29 /drivers/mfd/wm8350-irq.c | |
| parent | 11b91d6fe7272452c999573bab33c15c2f03dc31 (diff) | |
| parent | fde7d9049e55ab85a390be7f415d74c9f62dd0f9 (diff) | |
Merge tag 'v3.3-rc7' into x86/mce
Merge reason: Update from an ancient -rc1 base to an almost-final stable kernel.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/mfd/wm8350-irq.c')
| -rw-r--r-- | drivers/mfd/wm8350-irq.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/mfd/wm8350-irq.c b/drivers/mfd/wm8350-irq.c index 8a1fafd0bf7d..9fd01bf63c51 100644 --- a/drivers/mfd/wm8350-irq.c +++ b/drivers/mfd/wm8350-irq.c | |||
| @@ -496,7 +496,6 @@ int wm8350_irq_init(struct wm8350 *wm8350, int irq, | |||
| 496 | 496 | ||
| 497 | mutex_init(&wm8350->irq_lock); | 497 | mutex_init(&wm8350->irq_lock); |
| 498 | wm8350->chip_irq = irq; | 498 | wm8350->chip_irq = irq; |
| 499 | wm8350->irq_base = pdata->irq_base; | ||
| 500 | 499 | ||
| 501 | if (pdata && pdata->irq_base > 0) | 500 | if (pdata && pdata->irq_base > 0) |
| 502 | irq_base = pdata->irq_base; | 501 | irq_base = pdata->irq_base; |