Commit 809a3226 authored Nov 15, 2012 by Arnd Bergmann

Merge tag 'omap-for-v3.8/cleanup-fixes-signed' of...

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>

parents 9265c6a1 e05cf58d

arch/arm/mach-omap2/board-overo.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -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>

arch/arm/plat-omap/debug-leds.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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++) {