fbdev: fix fb_compat_ioctl() deadlocks

[linux-2.6-omap-h63xx.git] / arch / arm / mach-orion5x / kurobox_pro-setup.c

diff --git a/arch/arm/mach-orion5x/kurobox_pro-setup.c b/arch/arm/mach-orion5x/kurobox_pro-setup.c
index e321ec331839c1f8e68959bbe8a3ff1e44030f54..dfbb68df7b0986de42918ef5a6222eb0e337e940 100644 (file)
--- a/arch/arm/mach-orion5x/kurobox_pro-setup.c
+++ b/arch/arm/mach-orion5x/kurobox_pro-setup.c
@@ -161,7 +161,7 @@ subsys_initcall(kurobox_pro_pci_init);
  ****************************************************************************/
 
 static struct mv643xx_eth_platform_data kurobox_pro_eth_data = {
-       .phy_addr       = 8,
+       .phy_addr       = MV643XX_ETH_PHY_ADDR(8),
 };
 
 /*****************************************************************************
@@ -293,7 +293,7 @@ static void kurobox_pro_power_off(void)
        const unsigned char shutdownwait[]      = {0x00, 0x0c};
        const unsigned char poweroff[]          = {0x00, 0x06};
        /* 38400 baud divisor */
-       const unsigned divisor = ((ORION5X_TCLK + (8 * 38400)) / (16 * 38400));
+       const unsigned divisor = ((orion5x_tclk + (8 * 38400)) / (16 * 38400));
 
        pr_info("%s: triggering power-off...\n", __func__);