Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into...

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

diff --git a/include/media/timb_radio.h b/include/media/timb_radio.h
index a59a84854dc1959d5ef2e6c7d4e4f261fcc2d5ce..a40a6a348d21b10ba5d75f439bcd8805ee8342fa 100644 (file)
--- a/include/media/timb_radio.h
+++ b/include/media/timb_radio.h
@@ -23,13 +23,8 @@
 
 struct timb_radio_platform_data {
        int i2c_adapter; /* I2C adapter where the tuner and dsp are attached */
-       struct {
-               struct i2c_board_info *info;
-       } tuner;
-       struct {
-               const char *module_name;
-               struct i2c_board_info *info;
-       } dsp;
+       struct i2c_board_info *tuner;
+       struct i2c_board_info *dsp;
 };
 
 #endif