diff options
| author | David S. Miller <davem@davemloft.net> | 2010-03-22 23:05:26 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-03-22 23:05:26 -0400 |
| commit | 91c030b4d6445ebe9fbddb86d584441f300df15c (patch) | |
| tree | e8a48e3ad9e0448c690268175e555fa651983546 /arch/powerpc/kernel/iommu.c | |
| parent | 7c3456fdb503071787f7f972de1069b9cacd16f0 (diff) | |
| parent | ae6be51ed01d6c4aaf249a207b4434bc7785853b (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'arch/powerpc/kernel/iommu.c')
| -rw-r--r-- | arch/powerpc/kernel/iommu.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/powerpc/kernel/iommu.c b/arch/powerpc/kernel/iommu.c index 5547ae6e6b0b..ec94f906ea43 100644 --- a/arch/powerpc/kernel/iommu.c +++ b/arch/powerpc/kernel/iommu.c | |||
| @@ -42,12 +42,7 @@ | |||
| 42 | 42 | ||
| 43 | #define DBG(...) | 43 | #define DBG(...) |
| 44 | 44 | ||
| 45 | #ifdef CONFIG_IOMMU_VMERGE | 45 | static int novmerge; |
| 46 | static int novmerge = 0; | ||
| 47 | #else | ||
| 48 | static int novmerge = 1; | ||
| 49 | #endif | ||
| 50 | |||
| 51 | static int protect4gb = 1; | 46 | static int protect4gb = 1; |
| 52 | 47 | ||
| 53 | static void __iommu_free(struct iommu_table *, dma_addr_t, unsigned int); | 48 | static void __iommu_free(struct iommu_table *, dma_addr_t, unsigned int); |