summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Backlund <tmb@mageia.org>2012-10-21 18:44:15 +0000
committerThomas Backlund <tmb@mageia.org>2012-10-21 18:44:15 +0000
commit94b4741759cfc521a0d4b9693d8d9ccbd8adab68 (patch)
treee7b8b2eb3ea2a7d266a009f6d420ccc7a2af83c7
parentc8ff77003fa1d80931a37caa2ef179f0dbba6342 (diff)
downloaddrakx-94b4741759cfc521a0d4b9693d8d9ccbd8adab68.tar
drakx-94b4741759cfc521a0d4b9693d8d9ccbd8adab68.tar.gz
drakx-94b4741759cfc521a0d4b9693d8d9ccbd8adab68.tar.bz2
drakx-94b4741759cfc521a0d4b9693d8d9ccbd8adab68.tar.xz
drakx-94b4741759cfc521a0d4b9693d8d9ccbd8adab68.zip
add alx ethernet module (#7853)
-rw-r--r--images/Makefile2
-rw-r--r--images/NEWS4
-rw-r--r--kernel/list_modules.pm2
3 files changed, 6 insertions, 2 deletions
diff --git a/images/Makefile b/images/Makefile
index fb0121f96..84861a940 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -1,6 +1,6 @@
include ../Makefile.config
-VERSION=1.84
+VERSION=1.85
PRODUCT=drakx-installer-images
KERNELS=$(shell rpm -qf /lib/modules/3.*)
diff --git a/images/NEWS b/images/NEWS
index 2957b8bf4..156cf2aac 100644
--- a/images/NEWS
+++ b/images/NEWS
@@ -1,3 +1,7 @@
+Version 1.85 - 21 October 2012 by Thomas Backlund
+
+- add alx ethernet module (#7853)
+
Version 1.84 - 18 October 2012 by Thierry Vignaud
- include new drivers:
diff --git a/kernel/list_modules.pm b/kernel/list_modules.pm
index 0eb020044..8f2493a30 100644
--- a/kernel/list_modules.pm
+++ b/kernel/list_modules.pm
@@ -44,7 +44,7 @@ our %l = (
],
firewire => [ qw(eth1394 pcilynx) ],
gigabit => [
- qw(atl1 atl1c atl1e be2net bna bnx2 bnx2x cxgb cxgb3 cxgb4 dl2k e1000 e1000e et131x igb ipg ixgb ixgbe),
+ qw(alx atl1 atl1c atl1e be2net bna bnx2 bnx2x cxgb cxgb3 cxgb4 dl2k e1000 e1000e et131x igb ipg ixgb ixgbe),
qw(myri_sbus myri10ge netxen_nic ns83820 pch_gbe qla3xxx r8169 s2io sfc sxg_nic),
qw(sis190 sk98lin skge sky2 slicoss spidernet stmmac tehuti tg3 via-velocity virtio_net vxge yellowfin),
qw(bcm5820 bcm5700), #- encrypted