Merge branch 'master' of /home/sam/kernel/linux-2.6/

[mv-sheeva.git] / net / rose / rose_dev.c

diff --git a/net/rose/rose_dev.c b/net/rose/rose_dev.c
index d297af737d1023a41c88f028a8628d91e52bc3eb..9d0bf2a1ea3f37e9d362d4ff6546f2d4c215a2cf 100644 (file)
--- a/net/rose/rose_dev.c
+++ b/net/rose/rose_dev.c
@@ -6,7 +6,6 @@
  *
  * Copyright (C) Jonathan Naylor G4KLX (g4klx@g4klx.demon.co.uk)
  */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/proc_fs.h>
 #include <linux/kernel.h>
@@ -135,7 +134,6 @@ static struct net_device_stats *rose_get_stats(struct net_device *dev)
 
 void rose_setup(struct net_device *dev)
 {
-       SET_MODULE_OWNER(dev);
        dev->mtu                = ROSE_MAX_PACKET_SIZE - 2;
        dev->hard_start_xmit    = rose_xmit;
        dev->open               = rose_open;