---

yaml --- r: 154289 b: refs/heads/master c: f696a10 h: refs/heads/master i: 154287: 8744cac v: v3
git-mirror · Jun 24, 2009 · e2b0bab · e2b0bab
1 parent 84a7728
commit e2b0bab
Show file tree

Hide file tree

Showing 11 changed files with 391 additions and 397 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 773cb77d0e32f0a3c36edf5aaeb9642c18038cd2
+refs/heads/master: f696a10838ffab85e5bc07e7cff0d0e1870a30d7
diff --git a/trunk/drivers/staging/octeon/Makefile b/trunk/drivers/staging/octeon/Makefile
@@ -12,7 +12,6 @@
 obj-${CONFIG_OCTEON_ETHERNET} :=  octeon-ethernet.o
 
 octeon-ethernet-objs := ethernet.o
-octeon-ethernet-objs += ethernet-common.o
 octeon-ethernet-objs += ethernet-mdio.o
 octeon-ethernet-objs += ethernet-mem.o
 octeon-ethernet-objs += ethernet-proc.o

diff --git a/trunk/drivers/staging/octeon/ethernet-common.c b/trunk/drivers/staging/octeon/ethernet-common.c
diff --git a/trunk/drivers/staging/octeon/ethernet-common.h b/trunk/drivers/staging/octeon/ethernet-common.h