[vdr] Multiproto compile fails again

[Seppo Ingalsuo]

Hi,

Lauri Tischler wrote:
> /usr/src/multiproto/v4l/cx25840-core.c:71: error: conflicting type
> qualifiers for 'addr_data'
> /usr/src/multiproto/v4l/../linux/include/media/v4l2-i2c-drv-legacy.h:41:
> error: previous declaration of 'addr_data' was here
>   
Please try this found from linux-dvb ml:

---

Now I found a little patch which brought me over this compile error: 
http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.24-rc4/2.6.24-rc4-mm1/broken-out/fix-jdelvare-i2c-i2c-constify-client-address-data.patch 
From: Andrew Morton <akpm at 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 at linux-fr.org> Signed-off-by: Andrew Morton 
<akpm at 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]; Now 
I'm a step further. Thanks Philipp
-- The more I learn about people, the more I like my dog!


---

BR,
Seppo