Merge branch 'for-linus' of gregkh@master.kernel.org:/pub/scm/linux/kernel/git/dtor...

[linux-2.6-omap-h63xx.git] / drivers / media / video / planb.c

diff --git a/drivers/media/video/planb.c b/drivers/media/video/planb.c
index 522e9ddeb08903db631aa237c46ded58716eb14c..3484e36b68016f4d2c58953ed9fa60dc3d4c6e7a 100644 (file)
--- a/drivers/media/video/planb.c
+++ b/drivers/media/video/planb.c
@@ -40,6 +40,7 @@
 #include <linux/mm.h>
 #include <linux/sched.h>
 #include <linux/videodev.h>
+#include <media/v4l2-common.h>
 #include <linux/wait.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
@@ -2156,7 +2157,7 @@ static int find_planb(void)
        struct pci_dev          *pdev;
        int rc;
 
-       if (_machine != _MACH_Pmac)
+       if (!machine_is(powermac))
                return 0;
 
        planb_devices = find_devices("planb");