diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-07 20:20:19 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-07 20:20:19 +0300 |
| commit | c0ab85267e25e34ce8b7e4429f0ef01fa0795b80 (patch) | |
| tree | 26bdf432b4812e67ffd6cf4abe08c4bb9cc2dddc /arch/microblaze/include/asm/pci.h | |
| parent | d987f62cce3289e42b83eb6c110c4745ea781bdf (diff) | |
| parent | a7a9e2f0410ddf9ec7491fca0c91fcb4c5c30cbb (diff) | |
| download | linux-c0ab85267e25e34ce8b7e4429f0ef01fa0795b80.tar.xz | |
Merge tag 'microblaze-v4.18-rc1' of git://git.monstr.eu/linux-2.6-microblaze
Pull microblaze updates from Michal Simek:
- Fix simpleImage format generation
- Remove earlyprintk support and replace it by earlycon
* tag 'microblaze-v4.18-rc1' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze: dts: replace 'linux,stdout-path' with 'stdout-path'
microblaze: remove redundant early_printk support
microblaze: remove unnecessary prom.h includes
microblaze: Fix simpleImage format generation
Diffstat (limited to 'arch/microblaze/include/asm/pci.h')
| -rw-r--r-- | arch/microblaze/include/asm/pci.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/microblaze/include/asm/pci.h b/arch/microblaze/include/asm/pci.h index 00337861472e..66cf3a5a2f83 100644 --- 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 |