diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-21 02:42:24 +0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-21 02:42:24 +0400 |
| commit | f907ab06bb021bcb91d39c8d1b36536ebdb318fa (patch) | |
| tree | 6020618997a6ea1b5f5b59c89df35344023f7c82 /drivers/mfd/wm8350-irq.c | |
| parent | 7cc026f21e2acdcea8640df5da470c6fdca92911 (diff) | |
| parent | 489e7bece7f6859a7df484a4dce08fa51fb0d876 (diff) | |
| download | linux-f907ab06bb021bcb91d39c8d1b36536ebdb318fa.tar.xz | |
Merge branch 'next/fixes-non-critical' into next/drivers
Conflicts:
arch/arm/mach-lpc32xx/clock.c
arch/arm/mach-pxa/pxa25x.c
arch/arm/mach-pxa/pxa27x.c
The conflicts with pxa are non-obvious, we have multiple branches
adding and removing the same clock settings. According to
Haojian Zhuang, removing the sa1100 rtc dummy clock is the correct
fix here.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
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, mutex_init(&wm8350->irq_lock); wm8350->chip_irq = irq; - wm8350->irq_base = pdata->irq_base; if (pdata && pdata->irq_base > 0) irq_base = pdata->irq_base; |