On Mon, 2012-06-11 at 17:06 +0100, Russell King - ARM Linux wrote: > On Tue, Jun 05, 2012 at 04:20:00PM +0300, Tomi Valkeinen wrote: > > 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. > > So... where are we with this? Apparantly not much further forward; > it seems to be in linux-next but still not in mainline, and mainline > continues to be broken. The fixes have been pulled into fbdev tree, but it missed the -rc2. Fbdev maintainer said "I merged this some days ago. Sorry that I didn't realize that rc2 would be released early and hence didn't manage to get it in." Tomi
Attachment:
signature.asc
Description: This is a digitally signed message part
