Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf293769 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'sh/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 

* 'sh/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
  clocksource: sh_cmt: Fix up bogus shift value.
  arch/sh/mm: Eliminate a double lock
  sh: Fix up IORESOURCE_PCI_FIXED usage in pcibios_fixup_device_resources().
  sh: remove duplicated #include
parents 1a5f20fe 5967d33c

arch/sh/boards/mach-ecovec24/setup.c

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
#include <linux/spi/spi.h>

#include <linux/spi/sh_msiof.h>

#include <linux/spi/mmc_spi.h>

#include <linux/mmc/host.h>

#include <linux/input.h>

#include <linux/input/sh_keysc.h>

#include <video/sh_mobile_lcdc.h>

arch/sh/drivers/pci/pci.c

+0 −2
Original line number Diff line number Diff line
@@ -139,8 +139,6 @@ static void pcibios_fixup_device_resources(struct pci_dev *dev, 
	for (i = 0; i < PCI_NUM_RESOURCES; i++) {

		if (!dev->resource[i].start)

			continue;

		if (dev->resource[i].flags & IORESOURCE_PCI_FIXED)

			continue;

		if (dev->resource[i].flags & IORESOURCE_IO)

			offset = hose->io_offset;

		else if (dev->resource[i].flags & IORESOURCE_MEM)

arch/sh/mm/pmb.c

+1 −1
Original line number Diff line number Diff line
@@ -770,7 +770,7 @@ static void __init pmb_resize(void) 
		spin_unlock_irqrestore(&pmbe->lock, flags);

	}



	read_lock(&pmb_rwlock);

	read_unlock(&pmb_rwlock);

}

#endif

drivers/clocksource/sh_cmt.c

+1 −1
Original line number Diff line number Diff line
@@ -449,7 +449,7 @@ static int sh_cmt_register_clocksource(struct sh_cmt_priv *p, 
	clk_disable(p->clk);



	/* TODO: calculate good shift from rate and counter bit width */

	cs->shift = 10;

	cs->shift = 0;

	cs->mult = clocksource_hz2mult(p->rate, cs->shift);



	dev_info(&p->pdev->dev, "used as clock source\n");