Merge branch 'linus' into x86/x2apic

This commit is contained in:
Ingo Molnar
2008-07-22 09:06:21 +02:00
2481 changed files with 197427 additions and 119111 deletions

View File

@@ -37,7 +37,7 @@
#include "intel-iommu.h"
#include <asm/proto.h> /* force_iommu in this header in x86-64*/
#include <asm/cacheflush.h>
#include <asm/gart.h>
#include <asm/iommu.h>
#include "pci.h"
#define IS_GFX_DEVICE(pdev) ((pdev->class >> 16) == PCI_BASE_CLASS_DISPLAY)