diff -urN /mnt/disk/linux/drivers/net/shaper.c /linux/drivers/net/shaper.c
--- /mnt/disk/linux/drivers/net/shaper.c	Thu Nov 16 22:57:22 2000
+++ /linux/drivers/net/shaper.c	Sun Nov 19 18:33:42 2000
@@ -254,7 +254,7 @@
 	}
 #endif 	
 	if(sh_debug)
- 		printk("Frame queued.\n");
+ 		printk(KERN_DEBUG "Frame queued.\n");
  	if(skb_queue_len(&shaper->sendq)>SHAPER_QLEN)
  	{
  		ptr=skb_dequeue(&shaper->sendq);
@@ -273,13 +273,13 @@
 {
 	struct sk_buff *newskb=skb_clone(skb, GFP_ATOMIC);
 	if(sh_debug)
-		printk("Kick frame on %p\n",newskb);
+		printk(KERN_DEBUG "Kick frame on %p\n",newskb);
 	if(newskb)
 	{
 		newskb->dev=shaper->dev;
 		newskb->priority=2;
 		if(sh_debug)
-			printk("Kick new frame to %s, %d\n",
+			printk(KERN_DEBUG "Kick new frame to %s, %d\n",
 				shaper->dev->name,newskb->priority);
 		dev_queue_xmit(newskb);
 
@@ -287,7 +287,7 @@
 		shaper->stats.tx_packets++;
 
                 if(sh_debug)
-			printk("Kicked new frame out.\n");
+			printk(KERN_DEBUG "Kicked new frame out.\n");
 		dev_kfree_skb(skb);
 	}
 }
@@ -318,7 +318,7 @@
 	if (test_and_set_bit(0, &shaper->locked))
 	{
 		if(sh_debug)
-			printk("Shaper locked.\n");
+			printk(KERN_DEBUG "Shaper locked.\n");
 		mod_timer(&shaper->timer, jiffies);
 		return;
 	}
@@ -336,7 +336,7 @@
 		 */
 		 
 		if(sh_debug)
-			printk("Clock = %d, jiffies = %ld\n", SHAPERCB(skb)->shapeclock, jiffies);
+			printk(KERN_DEBUG "Clock = %d, jiffies = %ld\n", SHAPERCB(skb)->shapeclock, jiffies);
 		if(time_before_eq(SHAPERCB(skb)->shapeclock - jiffies, SHAPER_BURST))
 		{
 			/*
@@ -448,7 +448,7 @@
 	struct shaper *sh=dev->priv;
 	int v;
 	if(sh_debug)
-		printk("Shaper header\n");
+		printk(KERN_DEBUG "Shaper header\n");
 	skb->dev=sh->dev;
 	v=sh->hard_header(skb,sh->dev,type,daddr,saddr,len);
 	skb->dev=dev;
@@ -461,7 +461,7 @@
 	struct net_device *dev=skb->dev;
 	int v;
 	if(sh_debug)
-		printk("Shaper rebuild header\n");
+		printk(KERN_DEBUG "Shaper rebuild header\n");
 	skb->dev=sh->dev;
 	v=sh->rebuild_header(skb);
 	skb->dev=dev;
@@ -475,7 +475,7 @@
 	struct net_device *tmp;
 	int ret;
 	if(sh_debug)
-		printk("Shaper header cache bind\n");
+		printk(KERN_DEBUG "Shaper header cache bind\n");
 	tmp=neigh->dev;
 	neigh->dev=sh->dev;
 	ret=sh->hard_header_cache(neigh,hh);
@@ -488,7 +488,7 @@
 {
 	struct shaper *sh=dev->priv;
 	if(sh_debug)
-		printk("Shaper cache update\n");
+		printk(KERN_DEBUG "Shaper cache update\n");
 	sh->header_cache_update(hh, sh->dev, haddr);
 }
 #endif
@@ -687,23 +687,17 @@
  
 #ifdef MODULE
 
-static struct net_device dev_shape = 
-{
-	"",
-	0, 0, 0, 0,
-	0, 0,
-	0, 0, 0, NULL, shaper_probe 
-};
+static struct net_device dev_shape = { init: shaper_probe };
 
 int init_module(void)
 {
 	int err=dev_alloc_name(&dev_shape,"shaper%d");
 	if(err<0)
 		return err;
-	printk(SHAPER_BANNER);	
+	printk(KERN_INFO SHAPER_BANNER);	
 	if (register_netdev(&dev_shape) != 0)
 		return -EIO;
-	printk("Traffic shaper initialised.\n");
+	printk(KERN_INFO "Traffic shaper initialised.\n");
 	return 0;
 }
 
@@ -728,38 +722,27 @@
 
 #else
 
-static struct net_device dev_sh0 = 
-{
-	"shaper0",
-	0, 0, 0, 0,
-	0, 0,
-	0, 0, 0, NULL, shaper_probe 
+static struct net_device dev_sh0 = {
+	name: "shaper0",
+	init: shaper_probe,
 };
 
 
-static struct net_device dev_sh1 = 
-{
-	"shaper1",
-	0, 0, 0, 0,
-	0, 0,
-	0, 0, 0, NULL, shaper_probe 
+static struct net_device dev_sh1 = {
+	name: "shaper1",
+	init: shaper_probe,
 };
 
 
-static struct net_device dev_sh2 = 
-{
-	"shaper2",
-	0, 0, 0, 0,
-	0, 0,
-	0, 0, 0, NULL, shaper_probe 
+static struct net_device dev_sh2 = {
+	name: "shaper2",
+	init: shaper_probe,
 };
 
 static struct net_device dev_sh3 = 
 {
-	"shaper3",
-	0, 0, 0, 0,
-	0, 0,
-	0, 0, 0, NULL, shaper_probe 
+	name: "shaper3",
+	init: shaper_probe,
 };
 
 void shaper_init(void)