git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
69e4e63
)
mips: pci: Add ifdef around pci_proc_domain
author
Zubair Lutfullah Kakakhel
<Zubair.Kakakhel@imgtec.com>
Fri, 12 Dec 2014 12:45:39 +0000
(12:45 +0000)
committer
Ralf Baechle
<ralf@linux-mips.org>
Fri, 20 Feb 2015 12:16:14 +0000
(13:16 +0100)
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>
arch/mips/include/asm/pci.h
patch
|
blob
|
history
diff --cc
arch/mips/include/asm/pci.h
Simple merge