diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-03-14 19:22:22 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-03-14 19:22:22 +0100 |
| commit | 05f689400ea5fa3d71af82f910c8b140f87ad1f3 (patch) | |
| tree | 39fa8ddb5163661361dbc5b2ab11f4e331492ead /arch/arm/plat-omap/include | |
| parent | omap4: mux: Remove duplicate mux modes (diff) | |
| parent | omap: zoom: host should not pull up wl1271's irq line (diff) | |
| download | linux-05f689400ea5fa3d71af82f910c8b140f87ad1f3.tar.xz linux-05f689400ea5fa3d71af82f910c8b140f87ad1f3.zip | |
Merge branches 'devel-mux' and 'devel-misc' into omap-for-linus
Diffstat (limited to 'arch/arm/plat-omap/include')
| -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 bdc7ce5d7a4a..32a2f6c4d39e 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 { #define IOVMF_LINEAR_MASK (3 << (2 + IOVMF_SW_SHIFT)) #define IOVMF_DA_FIXED (1 << (4 + IOVMF_SW_SHIFT)) -#define IOVMF_DA_ANON (2 << (4 + IOVMF_SW_SHIFT)) -#define IOVMF_DA_MASK (3 << (4 + IOVMF_SW_SHIFT)) extern struct iovm_struct *find_iovm_area(struct iommu *obj, u32 da); |