diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2012-03-20 14:33:19 -0500 |
|---|---|---|
| committer | Rob Herring <rob.herring@calxeda.com> | 2012-03-25 14:36:31 -0500 |
| commit | 23019a733bb83c8499f192fb428b7e6e81c95a34 (patch) | |
| tree | 710285ef4691a54bb2ca9a5ceb4f82474f55a638 /arch/arm/mach-pxa/include/mach/hardware.h | |
| parent | 58af4a244fa9f7ef86f45aa9f8fa835a89274bdd (diff) | |
| download | linux-23019a733bb83c8499f192fb428b7e6e81c95a34.tar.bz2 | |
ARM: pxa: use common IOMEM definition
pxa was missed in the moving of IOMEM to a common definition, so lots of
IOMEM redefined warnings were introduced. So remove pxa IOMEM definition
and fix all the fallout.
Reported-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Cc: Eric Miao <eric.y.miao@gmail.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Haojian Zhuang <haojian.zhuang@marvell.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.de>
Cc: rtc-linux@googlegroups.com
Cc: alsa-devel@alsa-project.org
Diffstat (limited to 'arch/arm/mach-pxa/include/mach/hardware.h')
| -rw-r--r-- | arch/arm/mach-pxa/include/mach/hardware.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/include/mach/hardware.h b/arch/arm/mach-pxa/include/mach/hardware.h index 54b64eae3535..56d92e5cad85 100644 --- a/arch/arm/mach-pxa/include/mach/hardware.h +++ b/arch/arm/mach-pxa/include/mach/hardware.h @@ -40,7 +40,6 @@ #define io_p2v(x) IOMEM(0xf2000000 + ((x) & 0x01ffffff) + (((x) & 0x1c000000) >> 1)) #ifndef __ASSEMBLY__ -# define IOMEM(x) ((void __iomem *)(x)) # define __REG(x) (*((volatile u32 __iomem *)io_p2v(x))) /* With indexed regs we don't want to feed the index through io_p2v() @@ -52,7 +51,6 @@ #else -# define IOMEM(x) x # define __REG(x) io_p2v(x) # define __PREG(x) io_v2p(x) |