diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2012-04-08 21:48:52 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-04-08 21:48:52 +0200 |
| commit | e75d660672ddd11704b7f0fdb8ff21968587b266 (patch) | |
| tree | ccb9c107744c10b553c0373e450bee3971d16c00 /lib/iommu-helper.c | |
| parent | 61282f37927143e45b03153f3e7b48d6b702147a (diff) | |
| parent | 0034102808e0dbbf3a2394b82b1bb40b5778de9e (diff) | |
Merge branch 'master' into for-next
Merge with latest Linus' tree, as I have incoming patches
that fix code that is newer than current HEAD of for-next.
Conflicts:
drivers/net/ethernet/realtek/r8169.c
Diffstat (limited to 'lib/iommu-helper.c')
| -rw-r--r-- | lib/iommu-helper.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/iommu-helper.c b/lib/iommu-helper.c index da053313ee5..c27e269210c 100644 --- a/lib/iommu-helper.c +++ b/lib/iommu-helper.c @@ -2,8 +2,9 @@ * IOMMU helper functions for the free area management */ -#include <linux/module.h> +#include <linux/export.h> #include <linux/bitmap.h> +#include <linux/bug.h> int iommu_is_span_boundary(unsigned int index, unsigned int nr, unsigned long shift, |