diff options
| author | Dave Jones <davej@redhat.com> | 2006-04-18 18:19:55 -0400 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-04-18 18:19:55 -0400 |
| commit | f1f76afd71e0f17af9a35fcb649f4bab53304a4d (patch) | |
| tree | a56257b13a0eda4a9b7e950c3b85adad16341b80 /drivers/media/video/planb.c | |
| parent | 530515a06f90c0831732709efee4a99497bd2b7c (diff) | |
| parent | 385910f2b275a636238f70844f1b6da9fda6f2da (diff) | |
Merge ../linus
Diffstat (limited to 'drivers/media/video/planb.c')
| -rw-r--r-- | drivers/media/video/planb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/planb.c b/drivers/media/video/planb.c index 522e9ddeb089..d9e3cada52f4 100644 --- a/drivers/media/video/planb.c +++ b/drivers/media/video/planb.c | |||
| @@ -2156,7 +2156,7 @@ static int find_planb(void) | |||
| 2156 | struct pci_dev *pdev; | 2156 | struct pci_dev *pdev; |
| 2157 | int rc; | 2157 | int rc; |
| 2158 | 2158 | ||
| 2159 | if (_machine != _MACH_Pmac) | 2159 | if (!machine_is(powermac)) |
| 2160 | return 0; | 2160 | return 0; |
| 2161 | 2161 | ||
| 2162 | planb_devices = find_devices("planb"); | 2162 | planb_devices = find_devices("planb"); |