git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 2.0 rc7
[linux-2.6.git]
/
drivers
/
media
/
video
/
cx88
/
cx88-i2c.c
diff --git
a/drivers/media/video/cx88/cx88-i2c.c
b/drivers/media/video/cx88/cx88-i2c.c
index
36b0dbb
..
0725b12
100644
(file)
--- a/
drivers/media/video/cx88/cx88-i2c.c
+++ b/
drivers/media/video/cx88/cx88-i2c.c
@@
-1,5
+1,5
@@
/*
/*
- $Id: cx88-i2c.c,v 1.
18 2004/10/13 10:39:00
kraxel Exp $
+ $Id: cx88-i2c.c,v 1.
20 2005/02/15 15:59:35
kraxel Exp $
cx88-i2c.c -- all the i2c code is here
cx88-i2c.c -- all the i2c code is here
@@
-25,6
+25,7
@@
*/
#include <linux/module.h>
*/
#include <linux/module.h>
+#include <linux/moduleparam.h>
#include <linux/init.h>
#include <asm/io.h>
#include <linux/init.h>
#include <asm/io.h>
@@
-44,7
+45,7
@@
MODULE_PARM_DESC(i2c_scan,"scan i2c bus at insmod time");
/* ----------------------------------------------------------------------- */
/* ----------------------------------------------------------------------- */
-void cx8800_bit_setscl(void *data, int state)
+
static
void cx8800_bit_setscl(void *data, int state)
{
struct cx88_core *core = data;
{
struct cx88_core *core = data;
@@
-56,7
+57,7
@@
void cx8800_bit_setscl(void *data, int state)
cx_read(MO_I2C);
}
cx_read(MO_I2C);
}
-void cx8800_bit_setsda(void *data, int state)
+
static
void cx8800_bit_setsda(void *data, int state)
{
struct cx88_core *core = data;
{
struct cx88_core *core = data;
@@
-141,7
+142,6
@@
static struct i2c_adapter cx8800_i2c_adap_template = {
static struct i2c_client cx8800_i2c_client_template = {
I2C_DEVNAME("cx88xx internal"),
static struct i2c_client cx8800_i2c_client_template = {
I2C_DEVNAME("cx88xx internal"),
- .id = -1,
};
static char *i2c_devs[128] = {
};
static char *i2c_devs[128] = {