Merge branch 'for-2.6.26' of git://git.farnsworth.org/dale/linux-2.6-mv643xx_eth...

diff --combined arch/arm/mach-orion5x/common.c
index 968deb58be01f7c9dd42905c486897feb5634928,2bedf71659cbbc94caf1732554786939513a1b42..0ecff5a619723a468c5e4c9410c244abe56d602c
--- 1/arch/arm/mach-orion5x/common.c
--- 2/arch/arm/mach-orion5x/common.c
+++ b/arch/arm/mach-orion5x/common.c
@@@ -132,7 -132,7 +132,7 @@@ static struct platform_device orion5x_u
  static struct resource orion5x_ehci0_resources[] = {
        {
                .start  = ORION5X_USB0_PHYS_BASE,
 -              .end    = ORION5X_USB0_PHYS_BASE + SZ_4K,
 +              .end    = ORION5X_USB0_PHYS_BASE + SZ_4K - 1,
                .flags  = IORESOURCE_MEM,
        },
        {
@@@ -145,7 -145,7 +145,7 @@@
  static struct resource orion5x_ehci1_resources[] = {
        {
                .start  = ORION5X_USB1_PHYS_BASE,
 -              .end    = ORION5X_USB1_PHYS_BASE + SZ_4K,
 +              .end    = ORION5X_USB1_PHYS_BASE + SZ_4K - 1,
                .flags  = IORESOURCE_MEM,
        },
        {
@@@ -223,7 -223,9 +223,9 @@@ static struct platform_device orion5x_e
  
  void __init orion5x_eth_init(struct mv643xx_eth_platform_data *eth_data)
  {
+       eth_data->shared = &orion5x_eth_shared;
        orion5x_eth.dev.platform_data = eth_data;
+ 
        platform_device_register(&orion5x_eth_shared);
        platform_device_register(&orion5x_eth);
  }
@@@ -317,7 -319,7 +319,7 @@@ struct sys_timer orion5x_timer = 
   ****************************************************************************/
  
  /*
 - * Identify device ID and rev from PCIE configuration header space '0'.
 + * Identify device ID and rev from PCIe configuration header space '0'.
   */
  static void __init orion5x_id(u32 *dev, u32 *rev, char **dev_name)
  {