linux-next: build failure after merge of the final tree (akpm andmoduleh trees related)

[Stephen Rothwell]

Hi all,

After merging the final tree, today's linux-next build (sparc64 defconfig)
failed like this:

kernel/printk.c:536:35: error: expected ')' before string constant
kernel/printk.c:1116:35: error: expected ')' before string constant

Caused by commits 8a04dedc045d ("We are enabling some power features on
medfield.  To test suspend-2-RAM") and d09d67ec904c (same - the following
commit) from the akpm tree interacting with commit a25ffe9fafa1 ("kernel:
Map most files to use export.h instead of module.h") from the moduleh
tree.  This file now needs module.h, not just export.h since
MODULE_PARM_DESC if defined there.

I have applied a merge fixup patch to change export.h back to module.h.

P.S. Andrew, these commits could do with better subject lines :-(
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature