aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorarun c <arunedarath@mistralsolutions.com>2009-09-22 16:46:59 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-23 07:39:50 -0700
commit5910d35cd6c0122a490000a6de0774ac7ebcc2de (patch)
tree7c9a99ca946b94323fd864a79a48ff4d51d90ef6 /arch
parentb6c2b66d353dba229ce167acef49639b9ddf90d9 (diff)
omapfb: fix coding style / remove dead line
- use __iomem type attribute where appropriate - expand (a ? : b) to (a ? a : b) As suggested by Russel King <linux@arm.linux.org.uk> - remove a dead line from omapfb_main.c Signed-off-by: Arun C <arunedarath@mistralsolutions.com> Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Imre Deak <imre.deak@nokia.com> Acked-by: Krzysztof Helt <krzysztof.h1@wp.pl> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/plat-omap/include/mach/omapfb.h4
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 7b74d1255e0..b226bdf4573 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 *,
void *fbi);
struct omapfb_mem_region {
- dma_addr_t paddr;
- void *vaddr;
+ u32 paddr;
+ void __iomem *vaddr;
unsigned long size;
u8 type; /* OMAPFB_PLANE_MEM_* */
unsigned alloc:1; /* allocated by the driver */