git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
[pandora-kernel.git]
/
drivers
/
pci
/
hotplug
/
acpiphp_ibm.c
diff --git
a/drivers/pci/hotplug/acpiphp_ibm.c
b/drivers/pci/hotplug/acpiphp_ibm.c
index
aa5df48
..
6ecbfb2
100644
(file)
--- a/
drivers/pci/hotplug/acpiphp_ibm.c
+++ b/
drivers/pci/hotplug/acpiphp_ibm.c
@@
-26,6
+26,7
@@
*/
#include <linux/init.h>
+#include <linux/slab.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <acpi/acpi_bus.h>