diff options
| author |   Joerg Roedel <joerg.roedel@amd.com> | 2009-08-26 12:10:19 +0200 |
|---|---|---|
| committer | Joerg Roedel <joerg.roedel@amd.com> | 2009-09-03 15:49:55 +0200 |
| commit | f2430bd104bec2706315e9e983a9d9f828ff9565 (patch) | |
| tree | 1edd5111f0418505a030cfe699cded518c2ea220 /arch/x86/kernel/amd_iommu.c | |
| parent | autofs4 - fix missed case when changing to use struct path (diff) | |
| download | linux-dev-f2430bd104bec2706315e9e983a9d9f828ff9565.tar.xz linux-dev-f2430bd104bec2706315e9e983a9d9f828ff9565.zip | |
x86/amd-iommu: Remove some merge helper code
This patch removes some left-overs which where put into the code to
simplify merging code which also depends on changes in other trees.
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Diffstat (limited to 'arch/x86/kernel/amd_iommu.c')
| -rw-r--r-- | arch/x86/kernel/amd_iommu.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c index 6c99f5037801..70fdef54e066 100644 --- a/arch/x86/kernel/amd_iommu.c +++ b/arch/x86/kernel/amd_iommu.c @@ -41,9 +41,7 @@ static DEFINE_RWLOCK(amd_iommu_devtable_lock); static LIST_HEAD(iommu_pd_list); static DEFINE_SPINLOCK(iommu_pd_list_lock); -#ifdef CONFIG_IOMMU_API static struct iommu_ops amd_iommu_ops; -#endif /* * general struct to manage commands send to an IOMMU @@ -62,10 +60,6 @@ static void dma_ops_reserve_addresses(struct dma_ops_domain *dom, unsigned long start_page, unsigned int pages); -#ifndef BUS_NOTIFY_UNBOUND_DRIVER -#define BUS_NOTIFY_UNBOUND_DRIVER 0x0005 -#endif - #ifdef CONFIG_AMD_IOMMU_STATS /* |