diff --git a/[refs] b/[refs]
index 1ff692278208..be3773fd611a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a63172a8abc135791c73fc418a20ea379745ae6
+refs/heads/master: 0316b89ae0de139875594d7fa0527cb5af69bd69
diff --git a/trunk/drivers/media/video/davinci/vpif_capture.c b/trunk/drivers/media/video/davinci/vpif_capture.c
index f31c1661cd56..bce31ea55dc4 100644
--- a/trunk/drivers/media/video/davinci/vpif_capture.c
+++ b/trunk/drivers/media/video/davinci/vpif_capture.c
@@ -2189,7 +2189,7 @@ static __init int vpif_probe(struct platform_device *pdev)
 	k = 0;
 	while ((res = platform_get_resource(pdev, IORESOURCE_IRQ, k))) {
 		for (i = res->start; i <= res->end; i++) {
-			if (request_irq(i, vpif_channel_isr, IRQF_DISABLED,
+			if (request_irq(i, vpif_channel_isr, IRQF_SHARED,
 					"VPIF_Capture",
 				(void *)(&vpif_obj.dev[k]->channel_id))) {
 				err = -EBUSY;
diff --git a/trunk/drivers/media/video/davinci/vpif_display.c b/trunk/drivers/media/video/davinci/vpif_display.c
index 8d8f3b4e558f..1d0c18ab7922 100644
--- a/trunk/drivers/media/video/davinci/vpif_display.c
+++ b/trunk/drivers/media/video/davinci/vpif_display.c
@@ -1709,7 +1709,7 @@ static __init int vpif_probe(struct platform_device *pdev)
 	k = 0;
 	while ((res = platform_get_resource(pdev, IORESOURCE_IRQ, k))) {
 		for (i = res->start; i <= res->end; i++) {
-			if (request_irq(i, vpif_channel_isr, IRQF_DISABLED,
+			if (request_irq(i, vpif_channel_isr, IRQF_SHARED,
 					"VPIF_Display",
 				(void *)(&vpif_obj.dev[k]->channel_id))) {
 				err = -EBUSY;