summaryrefslogtreecommitdiffstats
path: root/arch/arm/boards/karo-tx51
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2012-05-16 20:23:44 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2012-05-16 20:23:44 +0200
commite741110f5a4089f22dbaae97443753acd4851bdd (patch)
tree86acf2e6c390d633da5be4a4ea4e1c6d024c4bec /arch/arm/boards/karo-tx51
parent9115339720c3df3c9b40dae7adbef137362efcc0 (diff)
parent0d188aca536284f3c9650d8857c43c0dd5a81c2c (diff)
downloadbarebox-e741110f5a4089f22dbaae97443753acd4851bdd.tar.gz
barebox-e741110f5a4089f22dbaae97443753acd4851bdd.tar.xz
Merge branch 'master' into next
Diffstat (limited to 'arch/arm/boards/karo-tx51')
-rw-r--r--arch/arm/boards/karo-tx51/tx51.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boards/karo-tx51/tx51.c b/arch/arm/boards/karo-tx51/tx51.c
index 38aefed056..096683a1ad 100644
--- a/arch/arm/boards/karo-tx51/tx51.c
+++ b/arch/arm/boards/karo-tx51/tx51.c
@@ -210,7 +210,7 @@ static inline void tx51_fec_init(void)
gpio_set_value(TX51_FEC_PHY_PWR, 1);
/*
- * Wait some time to let the phy activate the internal regulator
+ * Wait some time to let the phy activate the internal regulator
*/
mdelay(10);