git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'external-indirect' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
drivers
/
net
/
pch_gbe
/
pch_gbe_main.c
diff --git
a/drivers/net/pch_gbe/pch_gbe_main.c
b/drivers/net/pch_gbe/pch_gbe_main.c
index
b99e90a
..
8c66e22
100644
(file)
--- a/
drivers/net/pch_gbe/pch_gbe_main.c
+++ b/
drivers/net/pch_gbe/pch_gbe_main.c
@@
-2446,7
+2446,7
@@
static struct pci_driver pch_gbe_pcidev = {
.id_table = pch_gbe_pcidev_id,
.probe = pch_gbe_probe,
.remove = pch_gbe_remove,
-#ifdef CONFIG_PM
_OPS
+#ifdef CONFIG_PM
.driver.pm = &pch_gbe_pm_ops,
#endif
.shutdown = pch_gbe_shutdown,