patch-2.4.10 linux/net/netrom/af_netrom.c

Next file: linux/net/netsyms.c
Previous file: linux/net/lapb/lapb_iface.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.9/linux/net/netrom/af_netrom.c linux/net/netrom/af_netrom.c
@@ -435,7 +435,7 @@
 			return -ENOPROTOOPT;
 	}
 
-	len = min(unsigned int, len, sizeof(int));
+	len = min_t(unsigned int, len, sizeof(int));
 
 	if (put_user(len, optlen))
 		return -EFAULT;
@@ -1262,7 +1262,7 @@
 
 static struct net_device *dev_nr;
 
-static const char banner[] __initdata = KERN_INFO "G4KLX NET/ROM for Linux. Version 0.7 for AX25.037 Linux 2.4\n";
+static char banner[] __initdata = KERN_INFO "G4KLX NET/ROM for Linux. Version 0.7 for AX25.037 Linux 2.4\n";
 
 static int __init nr_proto_init(void)
 {

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)