diff options
Diffstat (limited to 'arch/arm/mach-orion5x/tsx09-common.c')
-rw-r--r-- | arch/arm/mach-orion5x/tsx09-common.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-orion5x/tsx09-common.c b/arch/arm/mach-orion5x/tsx09-common.c index 83feac3147a6..c9abb8fbfa70 100644 --- a/arch/arm/mach-orion5x/tsx09-common.c +++ b/arch/arm/mach-orion5x/tsx09-common.c | |||
@@ -16,6 +16,7 @@ | |||
16 | #include <linux/timex.h> | 16 | #include <linux/timex.h> |
17 | #include <linux/serial_reg.h> | 17 | #include <linux/serial_reg.h> |
18 | #include "tsx09-common.h" | 18 | #include "tsx09-common.h" |
19 | #include "common.h" | ||
19 | 20 | ||
20 | /***************************************************************************** | 21 | /***************************************************************************** |
21 | * QNAP TS-x09 specific power off method via UART1-attached PIC | 22 | * QNAP TS-x09 specific power off method via UART1-attached PIC |
@@ -26,7 +27,7 @@ | |||
26 | void qnap_tsx09_power_off(void) | 27 | void qnap_tsx09_power_off(void) |
27 | { | 28 | { |
28 | /* 19200 baud divisor */ | 29 | /* 19200 baud divisor */ |
29 | const unsigned divisor = ((ORION5X_TCLK + (8 * 19200)) / (16 * 19200)); | 30 | const unsigned divisor = ((orion5x_tclk + (8 * 19200)) / (16 * 19200)); |
30 | 31 | ||
31 | pr_info("%s: triggering power-off...\n", __func__); | 32 | pr_info("%s: triggering power-off...\n", __func__); |
32 | 33 | ||
@@ -48,7 +49,7 @@ void qnap_tsx09_power_off(void) | |||
48 | ****************************************************************************/ | 49 | ****************************************************************************/ |
49 | 50 | ||
50 | struct mv643xx_eth_platform_data qnap_tsx09_eth_data = { | 51 | struct mv643xx_eth_platform_data qnap_tsx09_eth_data = { |
51 | .phy_addr = 8, | 52 | .phy_addr = MV643XX_ETH_PHY_ADDR(8), |
52 | }; | 53 | }; |
53 | 54 | ||
54 | static int __init qnap_tsx09_parse_hex_nibble(char n) | 55 | static int __init qnap_tsx09_parse_hex_nibble(char n) |