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/sfrench/cifs-2.6
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
amd_iommu_init.c
diff --git
a/arch/x86/kernel/amd_iommu_init.c
b/arch/x86/kernel/amd_iommu_init.c
index
9dc91b4
..
42f5350
100644
(file)
--- a/
arch/x86/kernel/amd_iommu_init.c
+++ b/
arch/x86/kernel/amd_iommu_init.c
@@
-19,8
+19,8
@@
#include <linux/pci.h>
#include <linux/acpi.h>
#include <linux/pci.h>
#include <linux/acpi.h>
-#include <linux/gfp.h>
#include <linux/list.h>
#include <linux/list.h>
+#include <linux/slab.h>
#include <linux/sysdev.h>
#include <linux/interrupt.h>
#include <linux/msi.h>
#include <linux/sysdev.h>
#include <linux/interrupt.h>
#include <linux/msi.h>