git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
[sfrench/cifs-2.6.git]
/
drivers
/
pci
/
hotplug
/
shpchprm_nonacpi.c
diff --git
a/drivers/pci/hotplug/shpchprm_nonacpi.c
b/drivers/pci/hotplug/shpchprm_nonacpi.c
index d70fe5408417a169a66505e49cb136d0846b29e3..c6b40998eeb31cd3a9cc461e0df0b9f4460f3bc8 100644
(file)
--- a/
drivers/pci/hotplug/shpchprm_nonacpi.c
+++ b/
drivers/pci/hotplug/shpchprm_nonacpi.c
@@
-32,6
+32,8
@@
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/pci.h>
+#include <linux/slab.h>
+
#include "shpchp.h"
int shpchprm_get_physical_slot_number(struct controller *ctrl, u32 *sun, u8 busnum, u8 devnum)