diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-09-28 22:07:14 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-09-28 22:07:14 +0200 |
commit | b98138e00d96abc85b100c9b6886f105d9868ab5 (patch) | |
tree | 407c24077573368925ede8ff8309d67ea84e9981 /drivers/video/riva/rivafb.h | |
parent | 0b40b4b44378f18b3c76384fa1380c24b5cd0f52 (diff) | |
parent | ac3524b7f5a6b9a744fb7ea19991355354c09afb (diff) |
Merge branch 'cleanup/__iomem' into next/cleanup2
* cleanup/__iomem:
ARM: Orion5x: ts78xx: Add IOMEM for virtual addresses.
ARM: ux500: use __iomem pointers for MMIO
Two new cleanup patches that were not already part of the
first cleanup branch.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/video/riva/rivafb.h')
0 files changed, 0 insertions, 0 deletions