* Tomi Valkeinen <tomi.valkeinen@xxxxxx> [120605 06:24]: > Hi, > > On Tue, 2012-06-05 at 01:22 -0700, Tony Lindgren wrote: > > * Russell King - ARM Linux <linux@xxxxxxxxxxxxxxxx> [120603 11:05]: > > > Looks like the DSS stuff has broken OMAP builds again during this > > > merge window: > > > > > > drivers/video/omap2/dss/core.c:197: error: static declaration of 'dss_debugfs_create_file' follows non-static declaration > > > drivers/video/omap2/dss/dss.h:166: error: previous declaration of 'dss_debugfs_create_file' was here > > > > > > Both the OMAP3 and OMAP4 builds break with these two errors. > > > > Here's a patch for Tomi to fix this one. > > I have a patch for this in my for-rc branch. It just missed the main > merge. I'll send this and a few other fixes today for the next rc. > > Btw, it compiles if you have debugfs and DSS_DEBUG_SUPPORT enabled. > That's why I didn't notice it until too late. Tomi, please have your patches sitting in linux next for at least a week before they get merged. That usually shakes down bugs like these before the merge window. Regards, Tony -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
