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
dma-mapping: merge <linux/dma-contiguous.h> into <linux/dma-map-ops.h>
[linux-2.6-block.git]
/
arch
/
s390
/
kernel
/
setup.c
diff --git
a/arch/s390/kernel/setup.c
b/arch/s390/kernel/setup.c
index c2c1b4e723eafbd91ea7d0e9cbd4d2bd1f205167..151092565a27041be558ccf882448be8aa4581db 100644
(file)
--- a/
arch/s390/kernel/setup.c
+++ b/
arch/s390/kernel/setup.c
@@
-37,7
+37,7
@@
#include <linux/root_dev.h>
#include <linux/console.h>
#include <linux/kernel_stat.h>
-#include <linux/dma-
contiguou
s.h>
+#include <linux/dma-
map-op
s.h>
#include <linux/device.h>
#include <linux/notifier.h>
#include <linux/pfn.h>