Skip to content

Commit

Permalink
Merge tag 'omap-for-v3.8/cleanup-fixes-signed' of git://git.kernel.or…
Browse files Browse the repository at this point in the history
…g/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>
  • Loading branch information
Arnd Bergmann committed Nov 15, 2012
2 parents 9265c6a + e05cf58 commit 809a322
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
1 change: 0 additions & 1 deletion arch/arm/mach-omap2/board-overo.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/plat-omap/debug-leds.c
Original file line number Diff line number Diff line change
Expand Up @@ -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++) {
Expand Down

0 comments on commit 809a322

Please sign in to comment.