← Back to branch summary

~ubuntu-branches/ubuntu/vivid/virtualbox/vivid

« back to all changes in this revision

Viewing changes to src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c

  • Committer: Package Import Robot
  • Author(s): Felix Geyer
  • Date: 2011-12-29 12:29:25 UTC
  • mfrom: (3.1.8 sid)
  • Revision ID: package-import@ubuntu.com-20111229122925-8ota2o33fuk0bkf8
Tags: 4.1.8-dfsg-1
* New upstream release.
* Move all transitional packages to section oldlibs and priority extra.
* Refresh 16-no-update.patch.
* Drop 36-kernel-3.2.patch, applied upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
36
36
# include <linux/dmar.h>
37
37
# include <linux/intel-iommu.h>
38
38
# include <linux/pci.h>
39
 
# if LINUX_VERSION_CODE < KERNEL_VERSION(3, 1, 0)
 
39
# if LINUX_VERSION_CODE < KERNEL_VERSION(3, 1, 0) && \
 
40
     (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 41) || LINUX_VERSION_CODE >= KERNEL_VERSION(3, 0, 0))
40
41
#  include <asm/amd_iommu.h>
41
42
# else
42
43
#  include <linux/amd-iommu.h>