Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ide-2.6

[karo-tx-linux.git] / include / media / tw9910.h

diff --git a/include/media/tw9910.h b/include/media/tw9910.h
index 73231e7880d80dcdc72c015f2cfa9047039cea51..5e2895a05e6b258e42bb74fdef9af3e4f4044098 100644 (file)
--- a/include/media/tw9910.h
+++ b/include/media/tw9910.h
@@ -32,7 +32,6 @@ enum tw9910_mpout_pin {
 struct tw9910_video_info {
        unsigned long          buswidth;
        enum tw9910_mpout_pin  mpout;
-       struct soc_camera_link link;
 };