Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86

[linux-2.6] / drivers / net / slhc.c

diff --git a/drivers/net/slhc.c b/drivers/net/slhc.c
index 24bbe00852b29388c5b0cfc78269ce17bd88f0a4..0adab709ab68ecdfa2c56dc0367736681369b2ea 100644 (file)
--- a/drivers/net/slhc.c
+++ b/drivers/net/slhc.c
@@ -42,7 +42,7 @@
  *                      Modularization.
  *     - Jan 1995      Bjorn Ekwall
  *                     Use ip_fast_csum from ip.h
- *     - July 1995     Christos A. Polyzols 
+ *     - July 1995     Christos A. Polyzols
  *                     Spotted bug in tcp option checking
  *
  *
@@ -238,10 +238,10 @@ slhc_compress(struct slcompress *comp, unsigned char *icp, int isize,
        /*
         *      Don't play with runt packets.
         */
-        
+
        if(isize<sizeof(struct iphdr))
                return isize;
-               
+
        ip = (struct iphdr *) icp;
 
        /* Bail if this packet isn't TCP, or is an IP fragment */
@@ -696,20 +696,6 @@ EXPORT_SYMBOL(slhc_compress);
 EXPORT_SYMBOL(slhc_uncompress);
 EXPORT_SYMBOL(slhc_toss);
 
-#ifdef MODULE
-
-int init_module(void)
-{
-       printk(KERN_INFO "CSLIP: code copyright 1989 Regents of the University of California\n");
-       return 0;
-}
-
-void cleanup_module(void)
-{
-       return;
-}
-
-#endif /* MODULE */
 #else /* CONFIG_INET */