diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2011-11-04 08:26:47 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2011-11-04 08:26:47 -0400 |
| commit | 7b0cc2278dffcf7a403d3dfa30c33dba0b3d7794 (patch) | |
| tree | 31143a31cee0acbab626342497111cda4a6182c2 /config-generic | |
| parent | ad5ad18ea224ba1d4e9765192cde8cdd8de0653a (diff) | |
| download | kernel-7b0cc2278dffcf7a403d3dfa30c33dba0b3d7794.tar.gz kernel-7b0cc2278dffcf7a403d3dfa30c33dba0b3d7794.tar.xz kernel-7b0cc2278dffcf7a403d3dfa30c33dba0b3d7794.zip | |
Linux 3.1-git6 (upstream 1a67a573b8d)
Make CONFIG_EDAC_SBRIDGE only build on x86_64 since it has 64-bit divide errors
on 32-bit kernels.
Diffstat (limited to 'config-generic')
| -rw-r--r-- | config-generic | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/config-generic b/config-generic index 6ae1e84b3..9ae4301fb 100644 --- a/config-generic +++ b/config-generic @@ -1370,13 +1370,15 @@ CONFIG_8139TOO=m CONFIG_8139TOO_8129=y # CONFIG_8139_OLD_RX_RESET is not set CONFIG_R8169=m -CONFIG_SC92031=m CONFIG_NET_VENDOR_RDC=y CONFIG_R6040=m # CONFIG_NET_VENDOR_SEEQ is not set +CONFIG_NET_VENDOR_SILAN=y +CONFIG_SC92031=m + CONFIG_NET_VENDOR_SIS=y CONFIG_SIS900=m CONFIG_SIS190=m |