projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[linux-2.6-block.git]
/
arch
/
x86
/
pci
/
irq.c
diff --git
a/arch/x86/pci/irq.c
b/arch/x86/pci/irq.c
index 77148eccdf234297bad6970888c3de4168760705..5dc6ca5e174131d2c7208ea1ed86739ef4532d22 100644
(file)
--- a/
arch/x86/pci/irq.c
+++ b/
arch/x86/pci/irq.c
@@
-1260,7
+1260,7
@@
bool mp_should_keep_irq(struct device *dev)
{
if (dev->power.is_prepared)
return true;
-#ifdef CONFIG_PM
_RUNTIME
+#ifdef CONFIG_PM
if (dev->power.runtime_status == RPM_SUSPENDING)
return true;
#endif