Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...

[pandora-kernel.git] / arch / arm / mach-orion5x / db88f5281-setup.c

diff --git a/arch/arm/mach-orion5x/db88f5281-setup.c b/arch/arm/mach-orion5x/db88f5281-setup.c
index 3fee400..88405e7 100644 (file)
--- a/arch/arm/mach-orion5x/db88f5281-setup.c
+++ b/arch/arm/mach-orion5x/db88f5281-setup.c
@@ -286,7 +286,6 @@ subsys_initcall(db88f5281_pci_init);
  ****************************************************************************/
 static struct mv643xx_eth_platform_data db88f5281_eth_data = {
        .phy_addr       = 8,
-       .force_phy_addr = 1,
 };
 
 /*****************************************************************************
@@ -331,7 +330,7 @@ static void __init db88f5281_init(void)
        orion5x_init();
 
        orion5x_mpp_conf(db88f5281_mpp_modes);
-       orion5x_write(MPP_DEV_CTRL, 0);         /* DEV_D[31:16] */
+       writel(0, MPP_DEV_CTRL);                /* DEV_D[31:16] */
 
        /*
         * Configure peripherals.