diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-03-14 14:22:22 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-03-14 14:22:22 -0400 |
| commit | 05f689400ea5fa3d71af82f910c8b140f87ad1f3 (patch) | |
| tree | 39fa8ddb5163661361dbc5b2ab11f4e331492ead /arch/arm/plat-omap/include/plat | |
| parent | 17fe12c5a7bd674c1e6dca9cf1e250f9cd7b96b1 (diff) | |
| parent | 02b7b94ee98a0a463195d148e5c5885a218ee16f (diff) | |
Merge branches 'devel-mux' and 'devel-misc' into omap-for-linus
Diffstat (limited to 'arch/arm/plat-omap/include/plat')
| -rw-r--r-- | arch/arm/plat-omap/include/plat/iovmm.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/plat-omap/include/plat/iovmm.h b/arch/arm/plat-omap/include/plat/iovmm.h index bdc7ce5d7a4..32a2f6c4d39 100644 --- a/arch/arm/plat-omap/include/plat/iovmm.h +++ b/arch/arm/plat-omap/include/plat/iovmm.h | |||
| @@ -71,8 +71,6 @@ struct iovm_struct { | |||
| 71 | #define IOVMF_LINEAR_MASK (3 << (2 + IOVMF_SW_SHIFT)) | 71 | #define IOVMF_LINEAR_MASK (3 << (2 + IOVMF_SW_SHIFT)) |
| 72 | 72 | ||
| 73 | #define IOVMF_DA_FIXED (1 << (4 + IOVMF_SW_SHIFT)) | 73 | #define IOVMF_DA_FIXED (1 << (4 + IOVMF_SW_SHIFT)) |
| 74 | #define IOVMF_DA_ANON (2 << (4 + IOVMF_SW_SHIFT)) | ||
| 75 | #define IOVMF_DA_MASK (3 << (4 + IOVMF_SW_SHIFT)) | ||
| 76 | 74 | ||
| 77 | 75 | ||
| 78 | extern struct iovm_struct *find_iovm_area(struct iommu *obj, u32 da); | 76 | extern struct iovm_struct *find_iovm_area(struct iommu *obj, u32 da); |