diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-06-21 17:47:44 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-06-21 17:47:44 +0900 |
| commit | 9dd056e9eba106ef622795b566f769a9ab0a49a8 (patch) | |
| tree | 390c07ea2c3b9631c2e8fe64c1a6feba0b503e8b /drivers/gpu/drm/drm_pci.c | |
| parent | 08ef2e427b59393d68a65b16e97e894b662a5573 (diff) | |
| parent | f2b9726105824fdeea32a339e5072a358f89a25b (diff) | |
| download | op-kernel-dev-9dd056e9eba106ef622795b566f769a9ab0a49a8.zip op-kernel-dev-9dd056e9eba106ef622795b566f769a9ab0a49a8.tar.gz | |
Merge branch 'sh/stable-updates' into sh-latest
Diffstat (limited to 'drivers/gpu/drm/drm_pci.c')
| -rw-r--r-- | drivers/gpu/drm/drm_pci.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c index e1aee4f..b6a19cb 100644 --- a/drivers/gpu/drm/drm_pci.c +++ b/drivers/gpu/drm/drm_pci.c @@ -251,7 +251,7 @@ err: } -int drm_pci_irq_by_busid(struct drm_device *dev, struct drm_irq_busid *p) +static int drm_pci_irq_by_busid(struct drm_device *dev, struct drm_irq_busid *p) { if ((p->busnum >> 8) != drm_get_pci_domain(dev) || (p->busnum & 0xff) != dev->pdev->bus->number || @@ -292,6 +292,7 @@ static struct drm_bus drm_pci_bus = { .get_name = drm_pci_get_name, .set_busid = drm_pci_set_busid, .set_unique = drm_pci_set_unique, + .irq_by_busid = drm_pci_irq_by_busid, .agp_init = drm_pci_agp_init, }; |
