linux-next: build failure after merge of the staging tree

From: Stephen Rothwell
Date: Mon Jan 07 2013 - 21:23:59 EST

Hi Greg,

After merging the staging tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/staging/comedi/comedi_fops.c: In function 'comedi_unlocked_ioctl':
drivers/staging/comedi/comedi_fops.c:1665:4: error: 'dev_file_info' undeclared (first use in this function)

Caused by commit 4da5fa9a439f ("staging: comedi: use comedi_dev_from_minor
()") interacting with commit 7d3135af399e ("staging: comedi: prevent
auto-unconfig of manually configured devices") from the staging.current

I just reverted the latter commit in the hope that the bug is fixed in
some other way in the staging tree.
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature