projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
gpu
/
drm
/
cirrus
/
cirrus_drv.c
diff --git
a/drivers/gpu/drm/cirrus/cirrus_drv.c
b/drivers/gpu/drm/cirrus/cirrus_drv.c
index dcd1a8c029ebb8958ab617e03dd53768c8b71e2d..8ecb601152effe17019967c559e48cddfac2f7b4 100644
(file)
--- a/
drivers/gpu/drm/cirrus/cirrus_drv.c
+++ b/
drivers/gpu/drm/cirrus/cirrus_drv.c
@@
-56,8
+56,8
@@
static int cirrus_kick_out_firmware_fb(struct pci_dev *pdev)
return 0;
}
-static int
__devinit
-
cirrus_pci_probe(struct pci_dev *pdev,
const struct pci_device_id *ent)
+static int
cirrus_pci_probe(struct pci_dev *pdev,
+
const struct pci_device_id *ent)
{
int ret;