diff options
| author | James Meyer <james.meyer@operamail.com> | 2009-03-09 14:15:17 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2009-03-09 14:15:17 (GMT) |
| commit | 9a44255ba27e549106e4199cda5d30e1a5035f76 (patch) | |
| tree | 8b47cffe9e36e733d3d52ff9b61a9d16f1f78b4d /abs/extra-testing/v4l-dvb-dvico2/fix-jdelvare-i2c-i2c-constify-client-address-data.patch | |
| parent | dbfd9598e7acac8ad2ad8b9501859d07a51ae4e6 (diff) | |
| parent | 1d197919d5899c4a133e609116fec381157bc870 (diff) | |
| download | linhes_pkgbuild-9a44255ba27e549106e4199cda5d30e1a5035f76.zip linhes_pkgbuild-9a44255ba27e549106e4199cda5d30e1a5035f76.tar.gz linhes_pkgbuild-9a44255ba27e549106e4199cda5d30e1a5035f76.tar.bz2 | |
Merge branch 'HEAD' of ssh://jams@knoppmyth.net/mount/repository/LinHES-PKGBUILD.git
Diffstat (limited to 'abs/extra-testing/v4l-dvb-dvico2/fix-jdelvare-i2c-i2c-constify-client-address-data.patch')
| -rw-r--r-- | abs/extra-testing/v4l-dvb-dvico2/fix-jdelvare-i2c-i2c-constify-client-address-data.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/abs/extra-testing/v4l-dvb-dvico2/fix-jdelvare-i2c-i2c-constify-client-address-data.patch b/abs/extra-testing/v4l-dvb-dvico2/fix-jdelvare-i2c-i2c-constify-client-address-data.patch new file mode 100644 index 0000000..8c603f6 --- /dev/null +++ b/abs/extra-testing/v4l-dvb-dvico2/fix-jdelvare-i2c-i2c-constify-client-address-data.patch @@ -0,0 +1,25 @@ +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]; + +_ |