summaryrefslogtreecommitdiffstats
path: root/abs/core-testing/kernel26/config
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2009-07-04 23:05:09 (GMT)
committerJames Meyer <james.meyer@operamail.com>2009-07-04 23:05:09 (GMT)
commit879da47e831fa0c5dc443f1059717af8184cb6d8 (patch)
tree08892860acda11a7594788c8687ec960dac4b68d /abs/core-testing/kernel26/config
parent19e8f207678d02f9a912aa0728b90a4c63d82c82 (diff)
parent21f912004613ab41436b36b424f943f3c5bfbf83 (diff)
downloadlinhes_pkgbuild-879da47e831fa0c5dc443f1059717af8184cb6d8.zip
linhes_pkgbuild-879da47e831fa0c5dc443f1059717af8184cb6d8.tar.gz
linhes_pkgbuild-879da47e831fa0c5dc443f1059717af8184cb6d8.tar.bz2
Merge branch 'HEAD' of ssh://jams@knoppmyth.net/mount/repository/LinHES-PKGBUILD
Conflicts: abs/core-testing/LinHES-config/PKGBUILD
Diffstat (limited to 'abs/core-testing/kernel26/config')
-rw-r--r--abs/core-testing/kernel26/config4
1 files changed, 2 insertions, 2 deletions
diff --git a/abs/core-testing/kernel26/config b/abs/core-testing/kernel26/config
index 676616c..b188b73 100644
--- a/abs/core-testing/kernel26/config
+++ b/abs/core-testing/kernel26/config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.28
-# Sun Jun 21 21:20:09 2009
+# Wed Jul 1 14:07:15 2009
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -1611,7 +1611,7 @@ CONFIG_IGB_DCA=y
CONFIG_NS83820=y
CONFIG_HAMACHI=m
CONFIG_YELLOWFIN=m
-CONFIG_R8169=m
+CONFIG_R8169=y
CONFIG_R8169_VLAN=y
CONFIG_SIS190=y
CONFIG_SKGE=y