Messages in this thread | | | Date | Tue, 31 Jul 2012 15:14:52 +1000 | From | Stephen Rothwell <> | Subject | linux-next: build failure after merge of the final tree |
| |
Hi all,
After merging the final tree, today's linux-next build (powerpc allyesconfig) failed like this:
drivers/regulator/s5m8767.c: In function 's5m8767_pmic_probe': drivers/regulator/s5m8767.c:575:2: error: implicit declaration of function 's5m_reg_write' [-Werror=implicit-function-declaration]
Caused by a mismerge in Linus' tree between commits c848bc8538cd ("regulator: s5m8767a: Support AP watchdog reset operation") and 63063bfbffe9 ("mfd: Modify samsung mfd driver for common api").
Fixed by commit 938e05bf1313 ("regulator: Fix an s5m8767 build failure") from Linus' tree which I have cherry picked for today.
This was reported a couple of weeks ago when it caused a merge conflict in linux-next.
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |