projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-4.2/sg' of git://git.kernel.dk/linux-block
[firefly-linux-kernel-4.4.55.git]
/
arch
/
mn10300
/
include
/
asm
/
pci.h
diff --git
a/arch/mn10300/include/asm/pci.h
b/arch/mn10300/include/asm/pci.h
index c222d1792d5b57681b37f3188d287237a90b74fd..be3debb8fc02b1a1befbe6230249a6733aa98cfb 100644
(file)
--- a/
arch/mn10300/include/asm/pci.h
+++ b/
arch/mn10300/include/asm/pci.h
@@
-55,7
+55,7
@@
void pcibios_set_master(struct pci_dev *dev);
#include <linux/types.h>
#include <linux/slab.h>
-#include <
asm
/scatterlist.h>
+#include <
linux
/scatterlist.h>
#include <linux/string.h>
#include <asm/io.h>