diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2012-03-20 15:33:19 -0400 |
|---|---|---|
| committer | Rob Herring <rob.herring@calxeda.com> | 2012-03-25 15:36:31 -0400 |
| commit | 23019a733bb83c8499f192fb428b7e6e81c95a34 (patch) | |
| tree | 710285ef4691a54bb2ca9a5ceb4f82474f55a638 /arch/arm/mach-pxa/clock-pxa2xx.c | |
| parent | 58af4a244fa9f7ef86f45aa9f8fa835a89274bdd (diff) | |
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/clock-pxa2xx.c')
| -rw-r--r-- | arch/arm/mach-pxa/clock-pxa2xx.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/clock-pxa2xx.c b/arch/arm/mach-pxa/clock-pxa2xx.c index 1d5859d9a0e3..9ee2ad6a0a07 100644 --- a/arch/arm/mach-pxa/clock-pxa2xx.c +++ b/arch/arm/mach-pxa/clock-pxa2xx.c | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | #include <linux/module.h> | 9 | #include <linux/module.h> |
| 10 | #include <linux/kernel.h> | 10 | #include <linux/kernel.h> |
| 11 | #include <linux/init.h> | 11 | #include <linux/init.h> |
| 12 | #include <linux/io.h> | ||
| 12 | #include <linux/syscore_ops.h> | 13 | #include <linux/syscore_ops.h> |
| 13 | 14 | ||
| 14 | #include <mach/pxa2xx-regs.h> | 15 | #include <mach/pxa2xx-regs.h> |