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

[Stephen Rothwell]

Hi all,

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

drivers/regulator/act8865-regulator.c: In function 'act8865_pmic_probe':
drivers/regulator/act8865-regulator.c:291:13: error: 'act8846_matches' undeclared (first use in this function)
   matches = act8846_matches;
             ^
drivers/regulator/act8865-regulator.c:291:13: note: each undeclared identifier is reported only once for each function it appears in
drivers/regulator/act8865-regulator.c:296:13: error: 'act8865_matches' undeclared (first use in this function)
   matches = act8865_matches;
             ^
drivers/regulator/act8865-regulator.c:311:9: error: too many arguments to function 'act8865_pdata_from_dt'
   ret = act8865_pdata_from_dt(dev, of_node, &pdata_of, matches,
         ^
drivers/regulator/act8865-regulator.c:239:19: note: declared here
 static inline int act8865_pdata_from_dt(struct device *dev,
                   ^

Caused by commit 7160912a8c55 ("regulator: act8865: add support for
act8846").

I have used the regulator tree from next-20140707 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: signature.asc
Description: PGP signature