| Message ID | 1360849767-1463135-11-git-send-email-arnd@arndb.de |
|---|---|
| State | Awaiting Upstream |
| Headers | show |
On Thu, Feb 14, 2013 at 02:49:26PM +0100, Arnd Bergmann wrote: > A recent cleanup to the mach-osiris.c file is causing build errors > because the i2c-s3c2410.h header file is included before we see > the definition for platform_device. The fix is to make the header file > more robust against inclusion from other places. While this should > normally go through the i2c tree, the bug only exists in arm-soc > at the moment, so it's easier to fix it there before it goes upstream. > > Without this patch, building s3c2410_defconfig results in: > > arch/arm/mach-s3c24xx/mach-osiris.c:34:0: > include/linux/platform_data/i2c-s3c2410.h:37:26: warning: 'struct platform_device' declared inside parameter list [enabled by default] > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Fine with me: Acked-by: Wolfram Sang <wsa@the-dreams.de> -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/include/linux/platform_data/i2c-s3c2410.h b/include/linux/platform_data/i2c-s3c2410.h index 51d52e7..2a50048 100644 --- a/include/linux/platform_data/i2c-s3c2410.h +++ b/include/linux/platform_data/i2c-s3c2410.h @@ -15,6 +15,8 @@ #define S3C_IICFLG_FILTER (1<<0) /* enable s3c2440 filter */ +struct platform_device; + /** * struct s3c2410_platform_i2c - Platform data for s3c I2C. * @bus_num: The bus number to use (if possible).
A recent cleanup to the mach-osiris.c file is causing build errors because the i2c-s3c2410.h header file is included before we see the definition for platform_device. The fix is to make the header file more robust against inclusion from other places. While this should normally go through the i2c tree, the bug only exists in arm-soc at the moment, so it's easier to fix it there before it goes upstream. Without this patch, building s3c2410_defconfig results in: arch/arm/mach-s3c24xx/mach-osiris.c:34:0: include/linux/platform_data/i2c-s3c2410.h:37:26: warning: 'struct platform_device' declared inside parameter list [enabled by default] Signed-off-by: Arnd Bergmann <arnd@arndb.de> Cc: linux-i2c@vger.kernel.org Cc: Wolfram Sang <w.sang@pengutronix.de> Cc: Ben Dooks <ben-linux@fluff.org> Cc: Kukjin Kim <kgene.kim@samsung.com> --- include/linux/platform_data/i2c-s3c2410.h | 2 ++ 1 file changed, 2 insertions(+)