* 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. Tony From: Tony Lindgren <tony@xxxxxxxxxxx> Date: Tue, 5 Jun 2012 01:20:55 -0700 Subject: [PATCH] OMAPDSS: Fix compile for dss_debugfs_create_file Otherwise we get: 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 Reported-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx> Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx> --- a/drivers/video/omap2/dss/core.c +++ b/drivers/video/omap2/dss/core.c @@ -194,7 +194,7 @@ static inline int dss_initialize_debugfs(void) static inline void dss_uninitialize_debugfs(void) { } -static inline int dss_debugfs_create_file(const char *name, +int dss_debugfs_create_file(const char *name, void (*write)(struct seq_file *)) { return 0; -- 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