On 12/14/2012 08:19 PM, Randy Dunlap wrote: > On 12/13/12 23:42, Stephen Rothwell wrote: >> Hi all, >> >> Changes since 20121213: >> >> Lots of conflicts are migrating between trees. >> > > on X86_32: > > drivers/net/can/sja1000/sja1000_of_platform.c: In function 'sja1000_ofp_probe': > drivers/net/can/sja1000/sja1000_of_platform.c:124:13: error: 'NO_IRQ' undeclared (first use in this function) > drivers/net/can/sja1000/sja1000_of_platform.c:124:13: note: each undeclared identifier is reported only once for each function it appears in > make[5]: *** [drivers/net/can/sja1000/sja1000_of_platform.o] Error 1 Thanks. Fixed, I'm going to send a pull-request to David Miller. Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917-5555 | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
Attachment:
signature.asc
Description: OpenPGP digital signature
