dib7000m/p: struct alignment fix

Commit Message

Robin Humble Jan. 12, 2011, 1:17 p.m. UTC

None

Patch

diff --git a/drivers/media/dvb/frontends/dib7000m.h b/drivers/media/dvb/frontends/dib7000m.h
index 113819c..de82f8b 100644
--- a/drivers/media/dvb/frontends/dib7000m.h
+++ b/drivers/media/dvb/frontends/dib7000m.h
@@ -4,16 +4,13 @@ 
 #include "dibx000_common.h"
 
 struct dib7000m_config {
-	u8 dvbt_mode;
 	u8 output_mpeg2_in_188_bytes;
 	u8 hostbus_diversity;
 	u8 tuner_is_baseband;
-	u8 mobile_mode;
 	int (*update_lna) (struct dvb_frontend *, u16 agc_global);
 
 	u8 agc_config_count;
 	struct dibx000_agc_config *agc;
-
 	struct dibx000_bandwidth_config *bw;
 
 #define DIB7000M_GPIO_DEFAULT_DIRECTIONS 0xffff
@@ -31,9 +28,16 @@  struct dib7000m_config {
 
 	u8 quartz_direct;
 
+	int (*agc_control) (struct dvb_frontend *, u8 before);
+
+/* keep the above in sync with dib7000p_config and the below the same size */
+
 	u8 input_clk_is_div_2;
+	u8 mobile_mode;
+	u8 dvbt_mode;
 
-	int (*agc_control) (struct dvb_frontend *, u8 before);
+	u8 pad1;
+	u8 pad2;
 };
 
 #define DEFAULT_DIB7000M_I2C_ADDRESS 18
diff --git a/drivers/media/dvb/frontends/dib7000p.h b/drivers/media/dvb/frontends/dib7000p.h
index da17345..9c34485 100644
--- a/drivers/media/dvb/frontends/dib7000p.h
+++ b/drivers/media/dvb/frontends/dib7000p.h
@@ -28,16 +28,16 @@  struct dib7000p_config {
 
 	u8 quartz_direct;
 
-	u8 spur_protect;
-
 	int (*agc_control) (struct dvb_frontend *, u8 before);
 
+/* keep the above in sync with dib7000m_config and the below the same size */
+
+	u8 spur_protect;
 	u8 output_mode;
 	u8 disable_sample_and_hold : 1;
 
 	u8 enable_current_mirror : 1;
 	u8 diversity_delay;
-
 };
 
 #define DEFAULT_DIB7000P_I2C_ADDRESS 18