aboutsummaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2012-09-12 13:54:10 -0600
committerBjorn Helgaas <bhelgaas@google.com>2012-09-12 13:54:10 -0600
commit1959ec5f82acbdf91425b41600f119ebecb5f6a8 (patch)
treeb54bc758f10632e991a3a80a94b05f3940b6651c /drivers/media
parenta63ab613ff48c593f4e9ace2d111978e35a202e4 (diff)
parent1d3520357df99baf4ad89f86268ac96cd38092d9 (diff)
downloadlinux-linaro-stable-1959ec5f82acbdf91425b41600f119ebecb5f6a8.tar.gz
Merge branch 'pci/stephen-const' into next
* pci/stephen-const: make drivers with pci error handlers const scsi: make pci error handlers const netdev: make pci_error_handlers const PCI: Make pci_error_handlers const
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/dvb/ngene/ngene-cards.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb/ngene/ngene-cards.c b/drivers/media/dvb/ngene/ngene-cards.c
index 72ee8de02260..0a497be97af8 100644
--- a/drivers/media/dvb/ngene/ngene-cards.c
+++ b/drivers/media/dvb/ngene/ngene-cards.c
@@ -524,7 +524,7 @@ static void ngene_resume(struct pci_dev *dev)
printk(KERN_INFO DEVICE_NAME ": resume\n");
}
-static struct pci_error_handlers ngene_errors = {
+static const struct pci_error_handlers ngene_errors = {
.error_detected = ngene_error_detected,
.link_reset = ngene_link_reset,
.slot_reset = ngene_slot_reset,