Merge branch 'master' into csb1725

[mv-sheeva.git] / include / media / sh_vou.h

diff --git a/include/media/sh_vou.h b/include/media/sh_vou.h
index a3ef30242b00d8fe261e15cae33ebd5a556f1a0e..ec3ba9a597a28b9873852e80e9d81c0e8bdd0cbc 100644 (file)
--- a/include/media/sh_vou.h
+++ b/include/media/sh_vou.h
@@ -28,7 +28,6 @@ struct sh_vou_pdata {
        int i2c_adap;
        struct i2c_board_info *board_info;
        unsigned long flags;
-       char *module_name;
 };
 
 #endif