projects
/
platform
/
kernel
/
kernel-mfld-blackbay.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7357031
)
stmmac: fixed a compilation error when use the external timer
author
Giuseppe CAVALLARO
<peppe.cavallaro@st.com>
Sun, 22 Nov 2009 22:58:40 +0000
(22:58 +0000)
committer
David S. Miller
<davem@davemloft.net>
Mon, 23 Nov 2009 18:37:47 +0000
(10:37 -0800)
Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/stmmac/stmmac_timer.c
patch
|
blob
|
history
diff --git
a/drivers/net/stmmac/stmmac_timer.c
b/drivers/net/stmmac/stmmac_timer.c
index
b838c65
..
679f61f
100644
(file)
--- a/
drivers/net/stmmac/stmmac_timer.c
+++ b/
drivers/net/stmmac/stmmac_timer.c
@@
-63,7
+63,7
@@
int stmmac_open_ext_timer(struct net_device *dev, struct stmmac_timer *tm)
stmmac_rtc = rtc_class_open(CONFIG_RTC_HCTOSYS_DEVICE);
if (stmmac_rtc == NULL) {
- pr_err
or
("open rtc device failed\n");
+ pr_err("open rtc device failed\n");
return -ENODEV;
}
@@
-71,7
+71,7
@@
int stmmac_open_ext_timer(struct net_device *dev, struct stmmac_timer *tm)
/* Periodic mode is not supported */
if ((rtc_irq_set_freq(stmmac_rtc, &stmmac_task, tm->freq) < 0)) {
- pr_err
or
("set periodic failed\n");
+ pr_err("set periodic failed\n");
rtc_irq_unregister(stmmac_rtc, &stmmac_task);
rtc_class_close(stmmac_rtc);
return -1;