---

yaml --- r: 182118 b: refs/heads/master c: 559e25a h: refs/heads/master v: v3
git-mirror · Feb 27, 2010 · c35643b · c35643b
1 parent 6dd98d4
commit c35643b
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 179 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec977c5b473e29dbfdac8f2c7477eccc2142e3bc
+refs/heads/master: 559e25a5e3efe60a22b7f96ea4ad2eb09d996e97
diff --git a/trunk/drivers/staging/octeon/Makefile b/trunk/drivers/staging/octeon/Makefile
@@ -14,7 +14,6 @@ obj-${CONFIG_OCTEON_ETHERNET} :=  octeon-ethernet.o
 octeon-ethernet-objs := ethernet.o
 octeon-ethernet-objs += ethernet-mdio.o
 octeon-ethernet-objs += ethernet-mem.o
-octeon-ethernet-objs += ethernet-proc.o
 octeon-ethernet-objs += ethernet-rgmii.o
 octeon-ethernet-objs += ethernet-rx.o
 octeon-ethernet-objs += ethernet-sgmii.o

diff --git a/trunk/drivers/staging/octeon/ethernet-proc.c b/trunk/drivers/staging/octeon/ethernet-proc.c
diff --git a/trunk/drivers/staging/octeon/ethernet-proc.h b/trunk/drivers/staging/octeon/ethernet-proc.h
diff --git a/trunk/drivers/staging/octeon/ethernet.c b/trunk/drivers/staging/octeon/ethernet.c
@@ -42,8 +42,6 @@
 #include "ethernet-tx.h"
 #include "ethernet-mdio.h"
 #include "ethernet-util.h"
-#include "ethernet-proc.h"
-
 
 #include "cvmx-pip.h"
 #include "cvmx-pko.h"
@@ -621,7 +619,6 @@ static int __init cvm_oct_init_module(void)
 		return -ENOMEM;
 	}
 
-	cvm_oct_proc_initialize();
 	cvm_oct_configure_common_hw();
 
 	cvmx_helper_initialize_packet_io_global();
@@ -828,7 +825,6 @@ static void __exit cvm_oct_cleanup_module(void)
 	destroy_workqueue(cvm_oct_poll_queue);
 
 	cvmx_pko_shutdown();
-	cvm_oct_proc_shutdown();
 
 	cvmx_ipd_free_ptr();