linux-next: build failure after merge of the v4l-dvb tree

[Stephen Rothwell]

Hi Mauro,

After merging the v4l-dvb tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

drivers/input/input.c: In function 'input_default_setkeycode':
drivers/input/input.c:691: error: 'keycode' undeclared (first use in this function)

Caused by commit df7ad46fc171965103f02649f6c2f02c6ca8b331 ("Merge branch
'master' of /home/v4l/bare_trees/v4l-dvb").  The merge resolution is not
quite right.

I have used the v4l-dvb tree from next-20100409 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature