diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 13:56:44 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 13:56:44 +0100 |
commit | 4045407fd7740642b18bc802e8bab064e79a61e5 (patch) | |
tree | 9412a38886bfad562bc5897c6e4c23bb88703204 /arch/arm/mach-mx5/board-mx53_evk.c | |
parent | Merge branch 'restart-cleanup' into restart (diff) | |
parent | Merge branch 'for-russell' of git://hansjkoch.de/git/linux-tcc into HEAD (diff) | |
download | linux-4045407fd7740642b18bc802e8bab064e79a61e5.tar.xz linux-4045407fd7740642b18bc802e8bab064e79a61e5.zip |
Merge branch 'restart-cleanup' into restart
Conflicts:
arch/arm/kernel/setup.c
Diffstat (limited to 'arch/arm/mach-mx5/board-mx53_evk.c')
-rw-r--r-- | arch/arm/mach-mx5/board-mx53_evk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mx5/board-mx53_evk.c b/arch/arm/mach-mx5/board-mx53_evk.c index 6bea31ab8f85..64bbfcea6f35 100644 --- a/arch/arm/mach-mx5/board-mx53_evk.c +++ b/arch/arm/mach-mx5/board-mx53_evk.c @@ -106,7 +106,7 @@ static inline void mx53_evk_fec_reset(void) gpio_set_value(MX53_EVK_FEC_PHY_RST, 1); } -static struct fec_platform_data mx53_evk_fec_pdata = { +static const struct fec_platform_data mx53_evk_fec_pdata __initconst = { .phy = PHY_INTERFACE_MODE_RMII, }; |