Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 187499
b: refs/heads/master
c: 1f2ddd6
h: refs/heads/master
i:
  187497: a4ff80c
  187495: d420d61
v: v3
  • Loading branch information
Uwe Kleine-König committed Jan 8, 2010
1 parent 152ad67 commit 9fd909e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 321ed164369bb5e4888eb24d70ebc64c232ffc31
refs/heads/master: 1f2ddd64da6e53365102d831aa9e0446b78f0300
5 changes: 5 additions & 0 deletions trunk/arch/arm/plat-mxc/include/mach/hardware.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@

#include <asm/sizes.h>

#define IMX_IO_ADDRESS(addr, module) \
((void __force __iomem *) \
(((unsigned long)((addr) - (module ## _BASE_ADDR)) < module ## _SIZE) ?\
(addr) - (module ## _BASE_ADDR) + (module ## _BASE_ADDR_VIRT) : 0))

#ifdef CONFIG_ARCH_MX3
#include <mach/mx3x.h>
#include <mach/mx31.h>
Expand Down

0 comments on commit 9fd909e

Please sign in to comment.