diff --git a/[refs] b/[refs]
index 7f0984d6b80b..062e55a6c2b2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8c528d5e51af26fd71ca6b5e39dfd1b4bd34c505
+refs/heads/master: 9cd49719fda38613e9d7c712b11a54ea4ea005dc
diff --git a/trunk/drivers/mfd/timberdale.c b/trunk/drivers/mfd/timberdale.c
index 69272e4e3459..696879e2eef7 100644
--- a/trunk/drivers/mfd/timberdale.c
+++ b/trunk/drivers/mfd/timberdale.c
@@ -287,12 +287,8 @@ static __devinitdata struct i2c_board_info timberdale_saa7706_i2c_board_info = {
 static __devinitdata struct timb_radio_platform_data
 	timberdale_radio_platform_data = {
 	.i2c_adapter = 0,
-	.tuner = {
-		.info = &timberdale_tef6868_i2c_board_info
-	},
-	.dsp = {
-		.info = &timberdale_saa7706_i2c_board_info
-	}
+	.tuner = &timberdale_tef6868_i2c_board_info,
+	.dsp = &timberdale_saa7706_i2c_board_info
 };
 
 static const __devinitconst struct resource timberdale_video_resources[] = {
diff --git a/trunk/include/media/timb_radio.h b/trunk/include/media/timb_radio.h
index a59a84854dc1..a40a6a348d21 100644
--- a/trunk/include/media/timb_radio.h
+++ b/trunk/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