diff options
Diffstat (limited to 'include/asm-powerpc')
-rw-r--r-- | include/asm-powerpc/iommu.h | 2 | ||||
-rw-r--r-- | include/asm-powerpc/mmu_context.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-powerpc/iommu.h b/include/asm-powerpc/iommu.h index 870967e47204..4a82fdccee92 100644 --- a/include/asm-powerpc/iommu.h +++ b/include/asm-powerpc/iommu.h | |||
@@ -26,9 +26,9 @@ | |||
26 | #include <linux/spinlock.h> | 26 | #include <linux/spinlock.h> |
27 | #include <linux/device.h> | 27 | #include <linux/device.h> |
28 | #include <linux/dma-mapping.h> | 28 | #include <linux/dma-mapping.h> |
29 | #include <linux/bitops.h> | ||
29 | #include <asm/machdep.h> | 30 | #include <asm/machdep.h> |
30 | #include <asm/types.h> | 31 | #include <asm/types.h> |
31 | #include <asm/bitops.h> | ||
32 | 32 | ||
33 | #define IOMMU_PAGE_SHIFT 12 | 33 | #define IOMMU_PAGE_SHIFT 12 |
34 | #define IOMMU_PAGE_SIZE (ASM_CONST(1) << IOMMU_PAGE_SHIFT) | 34 | #define IOMMU_PAGE_SIZE (ASM_CONST(1) << IOMMU_PAGE_SHIFT) |
diff --git a/include/asm-powerpc/mmu_context.h b/include/asm-powerpc/mmu_context.h index f863ac21409e..9102b8bf0ead 100644 --- a/include/asm-powerpc/mmu_context.h +++ b/include/asm-powerpc/mmu_context.h | |||
@@ -8,7 +8,7 @@ | |||
8 | 8 | ||
9 | #ifndef CONFIG_PPC64 | 9 | #ifndef CONFIG_PPC64 |
10 | #include <asm/atomic.h> | 10 | #include <asm/atomic.h> |
11 | #include <asm/bitops.h> | 11 | #include <linux/bitops.h> |
12 | 12 | ||
13 | /* | 13 | /* |
14 | * On 32-bit PowerPC 6xx/7xx/7xxx CPUs, we use a set of 16 VSIDs | 14 | * On 32-bit PowerPC 6xx/7xx/7xxx CPUs, we use a set of 16 VSIDs |