aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/video/saa5246a.c4
-rw-r--r--drivers/media/video/saa5249.c4
-rw-r--r--drivers/misc/sony-laptop.c2
-rw-r--r--drivers/video/vermilion/vermilion.c4
-rw-r--r--drivers/video/vermilion/vermilion.h2
5 files changed, 8 insertions, 8 deletions
diff --git a/drivers/media/video/saa5246a.c b/drivers/media/video/saa5246a.c
index e20aa3612a7c..ad0232935df6 100644
--- a/drivers/media/video/saa5246a.c
+++ b/drivers/media/video/saa5246a.c
@@ -196,10 +196,10 @@ static int i2c_senddata(struct saa5246a_device *t, ...)
196 return i2c_sendbuf(t, buf[0], ct-1, buf+1); 196 return i2c_sendbuf(t, buf[0], ct-1, buf+1);
197} 197}
198 198
199/* Get count number of bytes from I²C-device at address adr, store them in buf. 199/* Get count number of bytes from I²C-device at address adr, store them in buf.
200 * Start & stop handshaking is done by this routine, ack will be sent after the 200 * Start & stop handshaking is done by this routine, ack will be sent after the
201 * last byte to inhibit further sending of data. If uaccess is 'true', data is 201 * last byte to inhibit further sending of data. If uaccess is 'true', data is
202 * written to user-space with put_user. Returns -1 if I²C-device didn't send 202 * written to user-space with put_user. Returns -1 if I²C-device didn't send
203 * acknowledge, 0 otherwise 203 * acknowledge, 0 otherwise
204 */ 204 */
205static int i2c_getdata(struct saa5246a_device *t, int count, u8 *buf) 205static int i2c_getdata(struct saa5246a_device *t, int count, u8 *buf)
diff --git a/drivers/media/video/saa5249.c b/drivers/media/video/saa5249.c
index 17f1e2e9a66b..94bb59a32b17 100644
--- a/drivers/media/video/saa5249.c
+++ b/drivers/media/video/saa5249.c
@@ -291,10 +291,10 @@ static int i2c_senddata(struct saa5249_device *t, ...)
291 return i2c_sendbuf(t, buf[0], ct-1, buf+1); 291 return i2c_sendbuf(t, buf[0], ct-1, buf+1);
292} 292}
293 293
294/* Get count number of bytes from I²C-device at address adr, store them in buf. Start & stop 294/* Get count number of bytes from I²C-device at address adr, store them in buf. Start & stop
295 * handshaking is done by this routine, ack will be sent after the last byte to inhibit further 295 * handshaking is done by this routine, ack will be sent after the last byte to inhibit further
296 * sending of data. If uaccess is 'true', data is written to user-space with put_user. 296 * sending of data. If uaccess is 'true', data is written to user-space with put_user.
297 * Returns -1 if I²C-device didn't send acknowledge, 0 otherwise 297 * Returns -1 if I²C-device didn't send acknowledge, 0 otherwise
298 */ 298 */
299 299
300static int i2c_getdata(struct saa5249_device *t, int count, u8 *buf) 300static int i2c_getdata(struct saa5249_device *t, int count, u8 *buf)
diff --git a/drivers/misc/sony-laptop.c b/drivers/misc/sony-laptop.c
index fc70fbab7beb..bb13858f60a1 100644
--- a/drivers/misc/sony-laptop.c
+++ b/drivers/misc/sony-laptop.c
@@ -14,7 +14,7 @@
14 * 14 *
15 * Copyright (C) 2005 Narayanan R S <nars@kadamba.org> 15 * Copyright (C) 2005 Narayanan R S <nars@kadamba.org>
16 * 16 *
17 * Copyright (C) 2001-2002 Alcôve <www.alcove.com> 17 * Copyright (C) 2001-2002 Alcôve <www.alcove.com>
18 * 18 *
19 * Copyright (C) 2001 Michael Ashley <m.ashley@unsw.edu.au> 19 * Copyright (C) 2001 Michael Ashley <m.ashley@unsw.edu.au>
20 * 20 *
diff --git a/drivers/video/vermilion/vermilion.c b/drivers/video/vermilion/vermilion.c
index ff9e805c43bc..c31f549ebea0 100644
--- a/drivers/video/vermilion/vermilion.c
+++ b/drivers/video/vermilion/vermilion.c
@@ -23,8 +23,8 @@
23 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA 23 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
24 * 24 *
25 * Authors: 25 * Authors:
26 * Thomas Hellström <thomas-at-tungstengraphics-dot-com> 26 * Thomas Hellström <thomas-at-tungstengraphics-dot-com>
27 * Michel Dänzer <michel-at-tungstengraphics-dot-com> 27 * Michel Dänzer <michel-at-tungstengraphics-dot-com>
28 * Alan Hourihane <alanh-at-tungstengraphics-dot-com> 28 * Alan Hourihane <alanh-at-tungstengraphics-dot-com>
29 */ 29 */
30 30
diff --git a/drivers/video/vermilion/vermilion.h b/drivers/video/vermilion/vermilion.h
index 1fc6695a49d2..c4aba59d4809 100644
--- a/drivers/video/vermilion/vermilion.h
+++ b/drivers/video/vermilion/vermilion.h
@@ -23,7 +23,7 @@
23 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA 23 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
24 * 24 *
25 * Authors: 25 * Authors:
26 * Thomas Hellström <thomas-at-tungstengraphics-dot-com> 26 * Thomas Hellström <thomas-at-tungstengraphics-dot-com>
27 */ 27 */
28 28
29#ifndef _VERMILION_H_ 29#ifndef _VERMILION_H_