diff --git a/[refs] b/[refs]
index 41c700ceb8d0..0f8f0e242beb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc4ce6cd9855dcd1151a9afc067ea354179089f9
+refs/heads/master: 220be77c6e4302207c34afc78a98b4994f92f6e5
diff --git a/trunk/drivers/media/video/au0828/au0828-cards.c b/trunk/drivers/media/video/au0828/au0828-cards.c
index e10b1b9221e0..0516c060810e 100644
--- a/trunk/drivers/media/video/au0828/au0828-cards.c
+++ b/trunk/drivers/media/video/au0828/au0828-cards.c
@@ -195,7 +195,7 @@ void au0828_card_setup(struct au0828_dev *dev)
 		break;
 	}
 
-	if (dev->board.input != NULL) {
+	if (AUVI_INPUT(0).type != AU0828_VMUX_UNDEFINED) {
 		/* Load the analog demodulator driver (note this would need to
 		   be abstracted out if we ever need to support a different
 		   demod) */
diff --git a/trunk/drivers/media/video/au0828/au0828-core.c b/trunk/drivers/media/video/au0828/au0828-core.c
index 2b5ade626e57..5199c8aa5888 100644
--- a/trunk/drivers/media/video/au0828/au0828-core.c
+++ b/trunk/drivers/media/video/au0828/au0828-core.c
@@ -146,7 +146,7 @@ static void au0828_usb_disconnect(struct usb_interface *interface)
 	/* Digital TV */
 	au0828_dvb_unregister(dev);
 
-	if (dev->board.input != NULL)
+	if (AUVI_INPUT(0).type != AU0828_VMUX_UNDEFINED)
 		au0828_analog_unregister(dev);
 
 	/* I2C */
@@ -205,7 +205,7 @@ static int au0828_usb_probe(struct usb_interface *interface,
 	au0828_card_setup(dev);
 
 	/* Analog TV */
-	if (dev->board.input != NULL)
+	if (AUVI_INPUT(0).type != AU0828_VMUX_UNDEFINED)
 		au0828_analog_register(dev, interface);
 
 	/* Digital TV */
diff --git a/trunk/drivers/media/video/au0828/au0828.h b/trunk/drivers/media/video/au0828/au0828.h
index d2e54c8e18c4..590d15e461dc 100644
--- a/trunk/drivers/media/video/au0828/au0828.h
+++ b/trunk/drivers/media/video/au0828/au0828.h
@@ -66,7 +66,8 @@
 #define AU0828_MAX_INPUT        4
 
 enum au0828_itype {
-	AU0828_VMUX_COMPOSITE = 1,
+	AU0828_VMUX_UNDEFINED = 0,
+	AU0828_VMUX_COMPOSITE,
 	AU0828_VMUX_SVIDEO,
 	AU0828_VMUX_CABLE,
 	AU0828_VMUX_TELEVISION,