Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6

[linux-2.6] / drivers / media / common / tuners / mxl5005s.h

diff --git a/drivers/media/common/tuners/mxl5005s.h b/drivers/media/common/tuners/mxl5005s.h
index 687cf146c2a0cfca0060b3d4081696cd683ac0c8..396db150bf0c7a3ca9d294a8eb6c1e7ee26559cb 100644 (file)
--- a/drivers/media/common/tuners/mxl5005s.h
+++ b/drivers/media/common/tuners/mxl5005s.h
@@ -23,10 +23,11 @@
 #ifndef __MXL5005S_H
 #define __MXL5005S_H
 
-#include <linux/dvb/frontend.h>
+#include <linux/i2c.h>
+#include "dvb_frontend.h"
+
+struct mxl5005s_config {
 
-struct mxl5005s_config
-{
        /* 7 bit i2c address */
        u8 i2c_address;