OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'pci/aspm', 'pci/enumeration', 'pci/hotplug', 'pci/misc', 'pci/msi...
[uclinux-h8/linux.git]
/
arch
/
s390
/
kernel
/
suspend.c
diff --git
a/arch/s390/kernel/suspend.c
b/arch/s390/kernel/suspend.c
index
d3236c9
..
39e2f41
100644
(file)
--- a/
arch/s390/kernel/suspend.c
+++ b/
arch/s390/kernel/suspend.c
@@
-9,10
+9,10
@@
#include <linux/pfn.h>
#include <linux/suspend.h>
#include <linux/mm.h>
+#include <linux/pci.h>
#include <asm/ctl_reg.h>
#include <asm/ipl.h>
#include <asm/cio.h>
-#include <asm/pci.h>
#include <asm/sections.h>
#include "entry.h"