diff options
author | Michael Hanson <mihanson@linhes.org> | 2011-11-04 19:21:13 (GMT) |
---|---|---|
committer | Michael Hanson <mihanson@linhes.org> | 2011-11-04 19:21:13 (GMT) |
commit | 94f21428c8ed60129ee5e14b1914a8cfe1bcdb2a (patch) | |
tree | 27c63c2fa679256dbc46bbff241c41db98e9d244 /abs/extra/v4l-dvb-dvico2/fix-jdelvare-i2c-i2c-constify-client-address-data.patch | |
parent | e3a0f9ba95aa059d76a57c7821a5ccc6a80a5f84 (diff) | |
parent | 67989fe1be117ac23fa3a98acbc2794a17d7d0ed (diff) | |
download | linhes_pkgbuild-94f21428c8ed60129ee5e14b1914a8cfe1bcdb2a.zip linhes_pkgbuild-94f21428c8ed60129ee5e14b1914a8cfe1bcdb2a.tar.gz linhes_pkgbuild-94f21428c8ed60129ee5e14b1914a8cfe1bcdb2a.tar.bz2 |
Merge branch 'testing' of knoppmyth.net:linhes_pkgbuild into testing
Diffstat (limited to 'abs/extra/v4l-dvb-dvico2/fix-jdelvare-i2c-i2c-constify-client-address-data.patch')
-rw-r--r-- | abs/extra/v4l-dvb-dvico2/fix-jdelvare-i2c-i2c-constify-client-address-data.patch | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/abs/extra/v4l-dvb-dvico2/fix-jdelvare-i2c-i2c-constify-client-address-data.patch b/abs/extra/v4l-dvb-dvico2/fix-jdelvare-i2c-i2c-constify-client-address-data.patch deleted file mode 100644 index 8c603f6..0000000 --- a/abs/extra/v4l-dvb-dvico2/fix-jdelvare-i2c-i2c-constify-client-address-data.patch +++ /dev/null @@ -1,25 +0,0 @@ -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]; - -_ |