diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/net/wan/cosa.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'drivers/net/wan/cosa.c')
| -rw-r--r-- | drivers/net/wan/cosa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wan/cosa.c b/drivers/net/wan/cosa.c index 10bafd59f9c..6fb6f8e667d 100644 --- a/drivers/net/wan/cosa.c +++ b/drivers/net/wan/cosa.c | |||
| @@ -329,7 +329,7 @@ static int startmicrocode(struct cosa_data *cosa, int address); | |||
| 329 | static int readmem(struct cosa_data *cosa, char __user *data, int addr, int len); | 329 | static int readmem(struct cosa_data *cosa, char __user *data, int addr, int len); |
| 330 | static int cosa_reset_and_read_id(struct cosa_data *cosa, char *id); | 330 | static int cosa_reset_and_read_id(struct cosa_data *cosa, char *id); |
| 331 | 331 | ||
| 332 | /* Auxilliary functions */ | 332 | /* Auxiliary functions */ |
| 333 | static int get_wait_data(struct cosa_data *cosa); | 333 | static int get_wait_data(struct cosa_data *cosa); |
| 334 | static int put_wait_data(struct cosa_data *cosa, int data); | 334 | static int put_wait_data(struct cosa_data *cosa, int data); |
| 335 | static int puthexnumber(struct cosa_data *cosa, int number); | 335 | static int puthexnumber(struct cosa_data *cosa, int number); |