projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
[firefly-linux-kernel-4.4.55.git]
/
arch
/
powerpc
/
platforms
/
pseries
/
pci.c
diff --git
a/arch/powerpc/platforms/pseries/pci.c
b/arch/powerpc/platforms/pseries/pci.c
index fa59124ce3febe98fe6c8015f071cb12e003b5bd..2c6ded29f73d3d5afbcdef6bd9719d777da0cd12 100644
(file)
--- a/
arch/powerpc/platforms/pseries/pci.c
+++ b/
arch/powerpc/platforms/pseries/pci.c
@@
-25,6
+25,7
@@
#include <linux/pci.h>
#include <linux/string.h>
#include <linux/pci.h>
#include <linux/string.h>
+#include <asm/eeh.h>
#include <asm/pci-bridge.h>
#include <asm/prom.h>
#include <asm/ppc-pci.h>
#include <asm/pci-bridge.h>
#include <asm/prom.h>
#include <asm/ppc-pci.h>
@@
-39,7
+40,7
@@
void pcibios_name_device(struct pci_dev *dev)
*/
dn = pci_device_to_OF_node(dev);
if (dn) {
*/
dn = pci_device_to_OF_node(dev);
if (dn) {
- c
har *loc_code =
get_property(dn, "ibm,loc-code", 0);
+ c
onst char *loc_code = of_
get_property(dn, "ibm,loc-code", 0);
if (loc_code) {
int loc_len = strlen(loc_code);
if (loc_len < sizeof(dev->dev.name)) {
if (loc_code) {
int loc_len = strlen(loc_code);
if (loc_len < sizeof(dev->dev.name)) {