Linus,
This one slipped by me... a partial via-rhine change, resulting in build
breakage. This patch, with BK cset info, fixes.
There is also an automerged 8139too recalc_sigpending() change I caught
at the last minute, that you might get when you pull... your tree might
already have this. It's an ok change though, cset log included.
-- Jeff Garzik | "I went through my candy like hot oatmeal Building 1024 | through an internally-buttered weasel." MandrakeSoft | - goats.com
Pull from: http://gkernel.bkbits.net/net-drivers-2.5
--------------------------------------------------------------------------- ChangeSet@1.333, 2002-02-14 03:25:36-05:00, jgarzik@rum.normnet.org Add board id to via-rhine net driver, for board added in previous revision (thus fixing the build).
drivers/net/via-rhine.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletion(-)
ChangeSet@?????, jgarzik@rum.normnet.org Update 8139too net driver to new arg-free recalc_sigpending() API function
drivers/net/8139too.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-)
---------------------------------------------------------------------------
diff -Nru a/drivers/net/via-rhine.c b/drivers/net/via-rhine.c --- a/drivers/net/via-rhine.c Thu Feb 14 03:27:48 2002 +++ b/drivers/net/via-rhine.c Thu Feb 14 03:27:48 2002 @@ -321,6 +321,7 @@ VT86C100A = 0, VT6102, VT3043, + VT6105, }; struct via_rhine_chip_info { @@ -349,7 +350,7 @@ { "VIA VT6102 Rhine-II", RHINE_IOTYPE, 256, CanHaveMII | HasWOL }, { "VIA VT3043 Rhine", RHINE_IOTYPE, 128, - CanHaveMII | ReqTxAlign } + CanHaveMII | ReqTxAlign }, { "VIA VT6105 Rhine-III", RHINE_IOTYPE, 256, CanHaveMII | HasWOL }, };
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Fri Feb 15 2002 - 21:01:00 EST