projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'iwlwifi-next-for-kalle-2014-12-30' of https://git.kernel.org/pub/scm/linux...
[cascardo/linux.git]
/
arch
/
powerpc
/
platforms
/
powernv
/
pci.c
diff --git
a/arch/powerpc/platforms/powernv/pci.c
b/arch/powerpc/platforms/powernv/pci.c
index
4b20f2c
..
4945e87
100644
(file)
--- a/
arch/powerpc/platforms/powernv/pci.c
+++ b/
arch/powerpc/platforms/powernv/pci.c
@@
-16,7
+16,6
@@
#include <linux/delay.h>
#include <linux/string.h>
#include <linux/init.h>
#include <linux/delay.h>
#include <linux/string.h>
#include <linux/init.h>
-#include <linux/bootmem.h>
#include <linux/irq.h>
#include <linux/io.h>
#include <linux/msi.h>
#include <linux/irq.h>
#include <linux/io.h>
#include <linux/msi.h>
@@
-90,7
+89,7
@@
static int pnv_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)
return rc;
}
irq_set_msi_desc(virq, entry);
return rc;
}
irq_set_msi_desc(virq, entry);
- write_msi_msg(virq, &msg);
+
pci_
write_msi_msg(virq, &msg);
}
return 0;
}
}
return 0;
}