diff --git a/[refs] b/[refs]
index 0053648ca182..84351f63b07f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2ccbec05ac9917a09aeb2f647667b734b4f02ce1
+refs/heads/master: 7ae70c8b8c8c22d4a4f333fa132b01da3c25a453
diff --git a/trunk/drivers/staging/cx25821/cx25821.h b/trunk/drivers/staging/cx25821/cx25821.h
index 6230243e2ccb..a282592a827e 100644
--- a/trunk/drivers/staging/cx25821/cx25821.h
+++ b/trunk/drivers/staging/cx25821/cx25821.h
@@ -179,15 +179,17 @@ struct cx25821_input {
 	u32 gpio0, gpio1, gpio2, gpio3;
 };
 
-typedef enum {
+enum port {
 	CX25821_UNDEFINED = 0,
 	CX25821_RAW,
 	CX25821_264
-} port_t;
+};
 
 struct cx25821_board {
 	char *name;
-	port_t porta, portb, portc;
+	enum port porta;
+	enum port portb;
+	enum port portc;
 	unsigned int tuner_type;
 	unsigned int radio_type;
 	unsigned char tuner_addr;