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 'davinci-fixes' of git://gitorious.org/linux-davinci/linux-davinci into...
[pandora-kernel.git]
/
drivers
/
pci
/
pci-driver.c
diff --git
a/drivers/pci/pci-driver.c
b/drivers/pci/pci-driver.c
index
d86ea8b
..
135df16
100644
(file)
--- a/
drivers/pci/pci-driver.c
+++ b/
drivers/pci/pci-driver.c
@@
-781,7
+781,7
@@
static int pci_pm_resume(struct device *dev)
#endif /* !CONFIG_SUSPEND */
#endif /* !CONFIG_SUSPEND */
-#ifdef CONFIG_HIBERNAT
ION
+#ifdef CONFIG_HIBERNAT
E_CALLBACKS
static int pci_pm_freeze(struct device *dev)
{
static int pci_pm_freeze(struct device *dev)
{
@@
-970,7
+970,7
@@
static int pci_pm_restore(struct device *dev)
return error;
}
return error;
}
-#else /* !CONFIG_HIBERNAT
ION
*/
+#else /* !CONFIG_HIBERNAT
E_CALLBACKS
*/
#define pci_pm_freeze NULL
#define pci_pm_freeze_noirq NULL
#define pci_pm_freeze NULL
#define pci_pm_freeze_noirq NULL
@@
-981,7
+981,7
@@
static int pci_pm_restore(struct device *dev)
#define pci_pm_restore NULL
#define pci_pm_restore_noirq NULL
#define pci_pm_restore NULL
#define pci_pm_restore_noirq NULL
-#endif /* !CONFIG_HIBERNAT
ION
*/
+#endif /* !CONFIG_HIBERNAT
E_CALLBACKS
*/
#ifdef CONFIG_PM_RUNTIME
#ifdef CONFIG_PM_RUNTIME