projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'bitmap-6.0-rc1' of https://github.com/norov/linux
[linux-2.6-microblaze.git]
/
arch
/
powerpc
/
include
/
asm
/
pci.h
diff --git
a/arch/powerpc/include/asm/pci.h
b/arch/powerpc/include/asm/pci.h
index
915d6ee
..
289f1ec
100644
(file)
--- a/
arch/powerpc/include/asm/pci.h
+++ b/
arch/powerpc/include/asm/pci.h
@@
-14,7
+14,6
@@
#include <asm/machdep.h>
#include <asm/io.h>
#include <asm/machdep.h>
#include <asm/io.h>
-#include <asm/prom.h>
#include <asm/pci-bridge.h>
/* Return values for pci_controller_ops.probe_mode function */
#include <asm/pci-bridge.h>
/* Return values for pci_controller_ops.probe_mode function */
@@
-39,7
+38,6
@@
#define pcibios_assign_all_busses() \
(pci_has_flag(PCI_REASSIGN_ALL_BUS))
#define pcibios_assign_all_busses() \
(pci_has_flag(PCI_REASSIGN_ALL_BUS))
-#define HAVE_ARCH_PCI_GET_LEGACY_IDE_IRQ
static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
{
if (ppc_md.pci_get_legacy_ide_irq)
static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
{
if (ppc_md.pci_get_legacy_ide_irq)