summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2004-09-23 16:45:47 +0000
committerChris Larson <clarson@kergoth.com>2004-09-23 16:45:47 +0000
commitacb6c8a7af682a9eda471568141e641defbc70ec (patch)
tree833e8d4b799e8ddaabea101202f358b33c28665d /BitKeeper
parent6454a46033107d7f70f13961615cb947297602e3 (diff)
Merge
2004/09/21 17:35:15-04:00 rant-central.com!roy 2.4.22 patch to remove bad symbols from usbnet.c. USB net modules will now compile and actually un, but depmod still doesn't like them. You have to insmod manually to get the modules to load. I only tested the ax8817x module, since that's the only USBnet adaptor (Linksys USB200M) I have. BKrev: 4152fdbbHi9c6Qdvr2fSj4RfR_mm6w
Diffstat (limited to 'BitKeeper')
-rw-r--r--BitKeeper/etc/ignore2
-rw-r--r--BitKeeper/etc/logging_ok1
2 files changed, 3 insertions, 0 deletions
diff --git a/BitKeeper/etc/ignore b/BitKeeper/etc/ignore
index 9ea0d96409..33685b89fc 100644
--- a/BitKeeper/etc/ignore
+++ b/BitKeeper/etc/ignore
@@ -7,3 +7,5 @@ qtopia/qtopia_1_7_0.oe.~1~
opie-opiealarm/.opie-opiealarm_cvs.oe.swp
kdepimpi/libmicrokdelibs_cvs.oe
meta/meta-opie-failed
+linux/nslu2-openslug-2.6.7/defconfig.orig
+linux/nslu2-linksys-2.4.22/nslu2/defconfig.safe
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index b487d7d9c7..cfbe793596 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -58,6 +58,7 @@ phillim@linux.local
ral@alwin.at.home
red@quarm.(none)
reenoo@sugarcube.dyndns.org
+roy@rant-central.com
rwhitby@home.(none)
schurig@mnz66.mn-logistik.de
schurig@schurig.homelinux.net