Zubair Lutfullah Kakakhel 6fb8a163fc mips: pci: Add ifdef around pci_proc_domain ... Without these, there are multiple definitions of pci_proc_domain() and pci_domain_nr() if linux/pci.h and asm/pci.h are included. Add #ifdefs around them Signed-off-by: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com> Reviewed-by: Markos Chandras <Markos.Chandras@imgtec.com> Cc: Markos.Chandras@imgtec.com Cc: linux-mips@linux-mips.org Cc: linux-kernel@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/8670/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>		2015-02-20 13:16:14 +01:00
..
asm	mips: pci: Add ifdef around pci_proc_domain	2015-02-20 13:16:14 +01:00
uapi/asm	Merge branch 'mipsr6-for-3.20' of git://git.linux-mips.org/pub/scm/mchandras/linux into mips-for-linux-next	2015-02-19 16:00:34 +01:00