diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-10-04 04:41:53 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 11:15:14 -0400 |
commit | 11966adc33fa1504c2d9a78e6fc129e5c87bdee1 (patch) | |
tree | ec736d135f96c5c5eb8e7457b5db91fbbc9f5998 /drivers/rtc | |
parent | e30fdb1e026c2d05f216d2e5a25bfafdfd261ec2 (diff) |
[PATCH] RTC: build fixes
Fix obvious build breakage revealed by 'make allyesconfig'
in current -git.
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/rtc')
-rw-r--r-- | drivers/rtc/rtc-ds1307.c | 6 | ||||
-rw-r--r-- | drivers/rtc/rtc-ds1672.c | 4 | ||||
-rw-r--r-- | drivers/rtc/rtc-rs5c372.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c index cc5032b6f42a..3f0f7b8fa813 100644 --- a/drivers/rtc/rtc-ds1307.c +++ b/drivers/rtc/rtc-ds1307.c | |||
@@ -141,9 +141,9 @@ static int ds1307_set_time(struct device *dev, struct rtc_time *t) | |||
141 | 141 | ||
142 | dev_dbg(dev, "%s secs=%d, mins=%d, " | 142 | dev_dbg(dev, "%s secs=%d, mins=%d, " |
143 | "hours=%d, mday=%d, mon=%d, year=%d, wday=%d\n", | 143 | "hours=%d, mday=%d, mon=%d, year=%d, wday=%d\n", |
144 | "write", dt->tm_sec, dt->tm_min, | 144 | "write", t->tm_sec, t->tm_min, |
145 | dt->tm_hour, dt->tm_mday, | 145 | t->tm_hour, t->tm_mday, |
146 | dt->tm_mon, dt->tm_year, dt->tm_wday); | 146 | t->tm_mon, t->tm_year, t->tm_wday); |
147 | 147 | ||
148 | *buf++ = 0; /* first register addr */ | 148 | *buf++ = 0; /* first register addr */ |
149 | buf[DS1307_REG_SECS] = BIN2BCD(t->tm_sec); | 149 | buf[DS1307_REG_SECS] = BIN2BCD(t->tm_sec); |
diff --git a/drivers/rtc/rtc-ds1672.c b/drivers/rtc/rtc-ds1672.c index 9c68ec99afa5..67e816a9a39f 100644 --- a/drivers/rtc/rtc-ds1672.c +++ b/drivers/rtc/rtc-ds1672.c | |||
@@ -55,7 +55,7 @@ static int ds1672_get_datetime(struct i2c_client *client, struct rtc_time *tm) | |||
55 | } | 55 | } |
56 | 56 | ||
57 | dev_dbg(&client->dev, | 57 | dev_dbg(&client->dev, |
58 | "%s: raw read data - counters=%02x,%02x,%02x,%02x\n" | 58 | "%s: raw read data - counters=%02x,%02x,%02x,%02x\n", |
59 | __FUNCTION__, buf[0], buf[1], buf[2], buf[3]); | 59 | __FUNCTION__, buf[0], buf[1], buf[2], buf[3]); |
60 | 60 | ||
61 | time = (buf[3] << 24) | (buf[2] << 16) | (buf[1] << 8) | buf[0]; | 61 | time = (buf[3] << 24) | (buf[2] << 16) | (buf[1] << 8) | buf[0]; |
@@ -96,7 +96,7 @@ static int ds1672_set_datetime(struct i2c_client *client, struct rtc_time *tm) | |||
96 | unsigned long secs; | 96 | unsigned long secs; |
97 | 97 | ||
98 | dev_dbg(&client->dev, | 98 | dev_dbg(&client->dev, |
99 | "%s: secs=%d, mins=%d, hours=%d, ", | 99 | "%s: secs=%d, mins=%d, hours=%d, " |
100 | "mday=%d, mon=%d, year=%d, wday=%d\n", | 100 | "mday=%d, mon=%d, year=%d, wday=%d\n", |
101 | __FUNCTION__, | 101 | __FUNCTION__, |
102 | tm->tm_sec, tm->tm_min, tm->tm_hour, | 102 | tm->tm_sec, tm->tm_min, tm->tm_hour, |
diff --git a/drivers/rtc/rtc-rs5c372.c b/drivers/rtc/rtc-rs5c372.c index bbdad099471d..2a86632580f1 100644 --- a/drivers/rtc/rtc-rs5c372.c +++ b/drivers/rtc/rtc-rs5c372.c | |||
@@ -91,7 +91,7 @@ static int rs5c372_set_datetime(struct i2c_client *client, struct rtc_time *tm) | |||
91 | unsigned char buf[8] = { RS5C372_REG_BASE }; | 91 | unsigned char buf[8] = { RS5C372_REG_BASE }; |
92 | 92 | ||
93 | dev_dbg(&client->dev, | 93 | dev_dbg(&client->dev, |
94 | "%s: secs=%d, mins=%d, hours=%d ", | 94 | "%s: secs=%d, mins=%d, hours=%d " |
95 | "mday=%d, mon=%d, year=%d, wday=%d\n", | 95 | "mday=%d, mon=%d, year=%d, wday=%d\n", |
96 | __FUNCTION__, tm->tm_sec, tm->tm_min, tm->tm_hour, | 96 | __FUNCTION__, tm->tm_sec, tm->tm_min, tm->tm_hour, |
97 | tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday); | 97 | tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday); |
@@ -126,7 +126,7 @@ static int rs5c372_get_trim(struct i2c_client *client, int *osc, int *trim) | |||
126 | return -EIO; | 126 | return -EIO; |
127 | } | 127 | } |
128 | 128 | ||
129 | dev_dbg(&client->dev, "%s: raw trim=%x\n", __FUNCTION__, trim); | 129 | dev_dbg(&client->dev, "%s: raw trim=%x\n", __FUNCTION__, *trim); |
130 | 130 | ||
131 | if (osc) | 131 | if (osc) |
132 | *osc = (buf & RS5C372_TRIM_XSL) ? 32000 : 32768; | 132 | *osc = (buf & RS5C372_TRIM_XSL) ? 32000 : 32768; |