Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (187 commits)
  sh: remove dead LED code for migo-r and ms7724se
  sh: ecovec build fix for CONFIG_I2C=n
  sh: ecovec r-standby support
  sh: ms7724se r-standby support
  sh: SH-Mobile R-standby register save/restore
  clocksource: Fix up a registration/IRQ race in the sh drivers.
  sh: ms7724: modify scan_timing for KEYSC
  sh: ms7724: Add sh_sir support
  sh: mach-ecovec24: Add sh_sir support
  sh: wire up SET/GET_UNALIGN_CTL.
  sh: allow alignment fault mode to be configured at kernel boot.
  sh: sh7724: Update FSI/SPU2 clock
  sh: always enable sh7724 vpu_clk and set to 166MHz on Ecovec
  sh: add sh7724 kick callback to clk_div4_table
  sh: introduce struct clk_div4_table
  sh: clock-cpg div4 set_rate() shift fix
  sh: Turn on speculative return for SH7785 and SH7786
  sh: Merge legacy and dynamic PMB modes.
  sh: Use uncached I/O helpers in PMB setup.
  sh: Provide uncached I/O helpers.
  ...

diff --cc arch/sh/drivers/pci/pci.c
index 96213fd172ce11236f5ab948d421c22b3fc625c1,41d8f014f1df6cbda35efacaf950ba3b216b5421..953af139e2300947ee9f76f1248c1f1267ac262c
--- 1/arch/sh/drivers/pci/pci.c
--- 2/arch/sh/drivers/pci/pci.c
+++ b/arch/sh/drivers/pci/pci.c
@@@ -148,11 -182,11 +182,11 @@@ void __devinit pcibios_fixup_bus(struc
   * addresses to be allocated in the 0x000-0x0ff region
   * modulo 0x400.
   */
 -void pcibios_align_resource(void *data, struct resource *res,
 -                          resource_size_t size, resource_size_t align)
 +resource_size_t pcibios_align_resource(void *data, const struct resource *res,
 +                              resource_size_t size, resource_size_t align)
  {
        struct pci_dev *dev = data;
-       struct pci_channel *chan = dev->sysdata;
+       struct pci_channel *hose = dev->sysdata;
        resource_size_t start = res->start;
  
        if (res->flags & IORESOURCE_IO) {
@@@ -162,16 -196,11 +196,11 @@@
                /*
                   * Put everything into 0x00-0xff region modulo 0x400.
                 */
-               if (start & 0x300) {
+               if (start & 0x300)
                        start = (start + 0x3ff) & ~0x3ff;
-                       res->start = start;
-               }
-       } else if (res->flags & IORESOURCE_MEM) {
-               if (start < PCIBIOS_MIN_MEM + chan->mem_resource->start)
-                       start = PCIBIOS_MIN_MEM + chan->mem_resource->start;
        }
  
 -      res->start = start;
 +      return start;
  }
  
  void pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region,