Merge branch 'upstream' into upstream-jgarzik

[linux-2.6-omap-h63xx.git] / net / 802 / psnap.c

diff --git a/net/802/psnap.c b/net/802/psnap.c
index 270b9d2cae6589b983f9925ee728370aec74cec7..6e7c2120b83ff6a678ca0e3e33f377b713a711cf 100644 (file)
--- a/net/802/psnap.c
+++ b/net/802/psnap.c
@@ -117,7 +117,7 @@ module_exit(snap_exit);
  */
 struct datalink_proto *register_snap_client(unsigned char *desc,
                                            int (*rcvfunc)(struct sk_buff *,
-                                                          struct net_device *,
+                                                          struct net_device *,
                                                           struct packet_type *,
                                                           struct net_device *))
 {