Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9304d162 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

x86/PCI: Remove duplicate defines 



For some historic reason these defines are duplicated and also available in
arch/x86/include/asm/pci_x86.h,

Remove them.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarBjorn Helgaas <helgaas@kernel.org>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: linux-pci@vger.kernel.org
Link: http://lkml.kernel.org/r/20170316215056.967808646@linutronix.de


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent bb9b8fd2

arch/x86/include/asm/pci.h

+1 −7
Original line number Diff line number Diff line
@@ -77,14 +77,8 @@ static inline bool is_vmd(struct pci_bus *bus) 


extern unsigned int pcibios_assign_all_busses(void);

extern int pci_legacy_init(void);

# ifdef CONFIG_ACPI

#  define x86_default_pci_init pci_acpi_init

# else

#  define x86_default_pci_init pci_legacy_init

# endif

#else

# define pcibios_assign_all_busses()	0

# define x86_default_pci_init		NULL

static inline int pcibios_assign_all_busses(void) { return 0; }

#endif



extern unsigned long pci_mem_start;