summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/mfp-pxa2xx.c
diff options
context:
space:
mode:
authorRob Herring <rob.herring@calxeda.com>2012-03-20 14:33:19 -0500
committerRob Herring <rob.herring@calxeda.com>2012-03-25 14:36:31 -0500
commit23019a733bb83c8499f192fb428b7e6e81c95a34 (patch)
tree710285ef4691a54bb2ca9a5ceb4f82474f55a638 /arch/arm/mach-pxa/mfp-pxa2xx.c
parent58af4a244fa9f7ef86f45aa9f8fa835a89274bdd (diff)
downloadblackbird-op-linux-23019a733bb83c8499f192fb428b7e6e81c95a34.tar.gz
blackbird-op-linux-23019a733bb83c8499f192fb428b7e6e81c95a34.zip
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/mfp-pxa2xx.c')
-rw-r--r--arch/arm/mach-pxa/mfp-pxa2xx.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/mfp-pxa2xx.c b/arch/arm/mach-pxa/mfp-pxa2xx.c
index f14775536b83..b029562da41e 100644
--- a/arch/arm/mach-pxa/mfp-pxa2xx.c
+++ b/arch/arm/mach-pxa/mfp-pxa2xx.c
@@ -17,6 +17,7 @@
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/init.h>
+#include <linux/io.h>
#include <linux/syscore_ops.h>
#include <mach/pxa2xx-regs.h>
OpenPOWER on IntegriCloud