diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2012-03-20 20:33:19 +0100 |
|---|---|---|
| committer | Rob Herring <rob.herring@calxeda.com> | 2012-03-25 21:36:31 +0200 |
| commit | 23019a733bb83c8499f192fb428b7e6e81c95a34 (patch) | |
| tree | 710285ef4691a54bb2ca9a5ceb4f82474f55a638 /drivers | |
| parent | ARM: dma-mapping: convert ARCH_HAS_DMA_SET_COHERENT_MASK to kconfig symbol (diff) | |
| download | linux-23019a733bb83c8499f192fb428b7e6e81c95a34.tar.xz 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 'drivers')
| -rw-r--r-- | drivers/rtc/rtc-sa1100.c | 1 | ||||
| -rw-r--r-- | drivers/watchdog/sa1100_wdt.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/rtc/rtc-sa1100.c b/drivers/rtc/rtc-sa1100.c index cb9a585312cc..398ab7a7ceca 100644 --- a/drivers/rtc/rtc-sa1100.c +++ b/drivers/rtc/rtc-sa1100.c @@ -30,6 +30,7 @@ #include <linux/string.h> #include <linux/pm.h> #include <linux/bitops.h> +#include <linux/io.h> #include <mach/hardware.h> #include <asm/irq.h> diff --git a/drivers/watchdog/sa1100_wdt.c b/drivers/watchdog/sa1100_wdt.c index 016245419fad..a3ff321af4f2 100644 --- a/drivers/watchdog/sa1100_wdt.c +++ b/drivers/watchdog/sa1100_wdt.c @@ -25,6 +25,7 @@ #include <linux/miscdevice.h> #include <linux/watchdog.h> #include <linux/init.h> +#include <linux/io.h> #include <linux/bitops.h> #include <linux/uaccess.h> #include <linux/timex.h> |