summaryrefslogtreecommitdiff
path: root/arch/um/drivers/net_user.c
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2005-06-13 13:25:38 -0500
committerSteve French <sfrench@us.ibm.com>2005-06-13 13:25:38 -0500
commit5893a65711164e42fea4a58bb8adf47c2fac8a4b (patch)
tree31b5f20e314aae236b06998de3fffeb729581af5 /arch/um/drivers/net_user.c
parentd6e04ae64c6b06ef76a5d4fb49106b393b7fa50a (diff)
parentc0105338eb4e61e537ca34ae06921177cb6efcf0 (diff)
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git
Diffstat (limited to 'arch/um/drivers/net_user.c')
-rw-r--r--arch/um/drivers/net_user.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/drivers/net_user.c b/arch/um/drivers/net_user.c
index 47229fe4a813..3730d4f12713 100644
--- a/arch/um/drivers/net_user.c
+++ b/arch/um/drivers/net_user.c
@@ -32,7 +32,7 @@ int tap_open_common(void *dev, char *gate_addr)
return(0);
}
-void tap_check_ips(char *gate_addr, char *eth_addr)
+void tap_check_ips(char *gate_addr, unsigned char *eth_addr)
{
int tap_addr[4];