diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-11-15 17:06:40 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-11-15 17:06:40 +0100 |
| commit | 809a3226ad7cf0807f79ddc31ed2094dbb9911fd (patch) | |
| tree | 7f16a2ee50e02d58d3f2f1b057153ed58a4eeffb | |
| parent | 9265c6a186ca19a57ab6ddd0b0f3644f85c6f2f1 (diff) | |
| parent | e05cf58d50e3ce3601ebf753728eee0df759e38f (diff) | |
| download | blackbird-op-linux-809a3226ad7cf0807f79ddc31ed2094dbb9911fd.tar.gz blackbird-op-linux-809a3226ad7cf0807f79ddc31ed2094dbb9911fd.zip | |
Merge tag 'omap-for-v3.8/cleanup-fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup
From: Tony Lindgren <tony@atomide.com>:
Minor fixes to the clean-up done for ARM common multi-platform
support for omaps.
* tag 'omap-for-v3.8/cleanup-fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP2+: remove duplicated include from board-overo.c
ARM: OMAP: debug-leds: Use resource_size instead of hard coded macro
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | arch/arm/mach-omap2/board-overo.c | 1 | ||||
| -rw-r--r-- | arch/arm/plat-omap/debug-leds.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c index 1cfb0374f5e2..f5ba43fa0400 100644 --- a/arch/arm/mach-omap2/board-overo.c +++ b/arch/arm/mach-omap2/board-overo.c @@ -45,7 +45,6 @@ #include <asm/mach/flash.h> #include <asm/mach/map.h> -#include "common.h" #include <video/omapdss.h> #include <video/omap-panel-generic-dpi.h> #include <video/omap-panel-tfp410.h> diff --git a/arch/arm/plat-omap/debug-leds.c b/arch/arm/plat-omap/debug-leds.c index c43ea21f33b4..aa7ebc6bcd65 100644 --- a/arch/arm/plat-omap/debug-leds.c +++ b/arch/arm/plat-omap/debug-leds.c @@ -111,7 +111,7 @@ static int fpga_probe(struct platform_device *pdev) if (!iomem) return -ENODEV; - fpga = ioremap(iomem->start, H2P2_DBG_FPGA_SIZE); + fpga = ioremap(iomem->start, resource_size(iomem)); __raw_writew(0xff, &fpga->leds); for (i = 0; i < ARRAY_SIZE(dbg_leds); i++) { |
