diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-24 16:22:33 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-24 16:22:33 -0400 |
| commit | baea7b946f00a291b166ccae7fcfed6c01530cc6 (patch) | |
| tree | 4aa275fbdbec9c7b9b4629e8bee2bbecd3c6a6af /arch/arm/plat-omap/include/mach/omapfb.h | |
| parent | ae19ffbadc1b2100285a5b5b3d0a4e0a11390904 (diff) | |
| parent | 94e0fb086fc5663c38bbc0fe86d698be8314f82f (diff) | |
Merge branch 'origin' into for-linus
Conflicts:
MAINTAINERS
Diffstat (limited to 'arch/arm/plat-omap/include/mach/omapfb.h')
| -rw-r--r-- | arch/arm/plat-omap/include/mach/omapfb.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-omap/include/mach/omapfb.h b/arch/arm/plat-omap/include/mach/omapfb.h index 7b74d1255e0b..b226bdf45739 100644 --- a/arch/arm/plat-omap/include/mach/omapfb.h +++ b/arch/arm/plat-omap/include/mach/omapfb.h | |||
| @@ -276,8 +276,8 @@ typedef int (*omapfb_notifier_callback_t)(struct notifier_block *, | |||
| 276 | void *fbi); | 276 | void *fbi); |
| 277 | 277 | ||
| 278 | struct omapfb_mem_region { | 278 | struct omapfb_mem_region { |
| 279 | dma_addr_t paddr; | 279 | u32 paddr; |
| 280 | void *vaddr; | 280 | void __iomem *vaddr; |
| 281 | unsigned long size; | 281 | unsigned long size; |
| 282 | u8 type; /* OMAPFB_PLANE_MEM_* */ | 282 | u8 type; /* OMAPFB_PLANE_MEM_* */ |
| 283 | unsigned alloc:1; /* allocated by the driver */ | 283 | unsigned alloc:1; /* allocated by the driver */ |