diff options
| author | David S. Miller <davem@davemloft.net> | 2011-08-08 08:20:26 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-08-08 08:20:26 +0200 |
| commit | 19fd61785a580c60cba900c5171bfadb57dd5056 (patch) | |
| tree | 1e491fb014be0dc03f4b6755bb94e73afd38c455 /drivers/pci/hotplug/acpiphp_glue.c | |
| parent | netxen: add vlan LRO support (diff) | |
| parent | dp83640: increase receive time stamp buffer size (diff) | |
| download | linux-19fd61785a580c60cba900c5171bfadb57dd5056.tar.xz linux-19fd61785a580c60cba900c5171bfadb57dd5056.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/pci/hotplug/acpiphp_glue.c')
| -rw-r--r-- | drivers/pci/hotplug/acpiphp_glue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c index a70fa89f76fd..220285760b68 100644 --- a/drivers/pci/hotplug/acpiphp_glue.c +++ b/drivers/pci/hotplug/acpiphp_glue.c @@ -110,7 +110,7 @@ static int post_dock_fixups(struct notifier_block *nb, unsigned long val, } -static struct acpi_dock_ops acpiphp_dock_ops = { +static const struct acpi_dock_ops acpiphp_dock_ops = { .handler = handle_hotplug_event_func, }; |