From: Andrew Morton <akpm@linux-foundation.org> drivers/media/video/tvaudio.c:147: error: conflicting type qualifiers for 'addr_data' include/media/v4l2-i2c-drv-legacy.h:37: error: previous declaration of 'addr_data' was here Cc: Jean Delvare <khali@linux-fr.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> --- include/media/v4l2-i2c-drv-legacy.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN include/media/v4l2-i2c-drv-legacy.h~fix-jdelvare-i2c-i2c-constify-client-address-data include/media/v4l2-i2c-drv-legacy.h --- a/include/media/v4l2-i2c-drv-legacy.h~fix-jdelvare-i2c-i2c-constify-client-address-data +++ a/include/media/v4l2-i2c-drv-legacy.h @@ -34,7 +34,7 @@ struct v4l2_i2c_driver_data { }; static struct v4l2_i2c_driver_data v4l2_i2c_data; -static struct i2c_client_address_data addr_data; +static const struct i2c_client_address_data addr_data; static struct i2c_driver v4l2_i2c_driver_legacy; static char v4l2_i2c_drv_name_legacy[32]; _