Merge mainline v2.6.27-rc2 tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap2 / board-n800.c

diff --git a/arch/arm/mach-omap2/board-n800.c b/arch/arm/mach-omap2/board-n800.c
index 433bd8e6b5a332275945d401ec7c50b9eb6cad1d..90909630b9200a131b7c5ffdcedd569dd559349e 100644 (file)
--- a/arch/arm/mach-omap2/board-n800.c
+++ b/arch/arm/mach-omap2/board-n800.c
@@ -645,7 +645,9 @@ extern struct tcm825x_platform_data n800_tcm825x_platform_data;
 static struct i2c_board_info __initdata_or_module n8x0_i2c_board_info_2[] = {
        {
                I2C_BOARD_INFO(TCM825X_NAME, TCM825X_I2C_ADDR),
+#if defined (CONFIG_VIDEO_TCM825X) || defined (CONFIG_VIDEO_TCM825X_MODULE)
                .platform_data = &n800_tcm825x_platform_data,
+#endif
        },
        {
                I2C_BOARD_INFO("tsl2563", 0x29),