git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'microblaze-v4.18-rc1' of git://git.monstr.eu/linux-2.6-microblaze
[sfrench/cifs-2.6.git]
/
arch
/
microblaze
/
include
/
asm
/
pci.h
diff --git
a/arch/microblaze/include/asm/pci.h
b/arch/microblaze/include/asm/pci.h
index 00337861472ef8771be262acf36da9be5cc5de87..66cf3a5a2f831adb9709636a5d74441b9750477b 100644
(file)
--- a/
arch/microblaze/include/asm/pci.h
+++ b/
arch/microblaze/include/asm/pci.h
@@
-19,7
+19,6
@@
#include <linux/scatterlist.h>
#include <asm/io.h>
-#include <asm/prom.h>
#include <asm/pci-bridge.h>
#define PCIBIOS_MIN_IO 0x1000