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 branch 'for-4.2/sg' of git://git.kernel.dk/linux-block
[uclinux-h8/linux.git]
/
arch
/
alpha
/
include
/
asm
/
pci.h
diff --git
a/arch/alpha/include/asm/pci.h
b/arch/alpha/include/asm/pci.h
index
8b02afe
..
98f2eee
100644
(file)
--- a/
arch/alpha/include/asm/pci.h
+++ b/
arch/alpha/include/asm/pci.h
@@
-5,7
+5,7
@@
#include <linux/spinlock.h>
#include <linux/dma-mapping.h>
-#include <
asm
/scatterlist.h>
+#include <
linux
/scatterlist.h>
#include <asm/machvec.h>
#include <asm-generic/pci-bridge.h>