Commit 317d912c authored by David S. Miller's avatar David S. Miller

Merge davem@nuts.davemloft.net:/disk1/BK/sparc-2.6

into kernel.bkbits.net:/home/davem/sparc-2.6
parents 5fcf9e32 23583e1d
...@@ -880,6 +880,7 @@ CONFIG_NS83820=m ...@@ -880,6 +880,7 @@ CONFIG_NS83820=m
CONFIG_HAMACHI=m CONFIG_HAMACHI=m
CONFIG_YELLOWFIN=m CONFIG_YELLOWFIN=m
CONFIG_R8169=m CONFIG_R8169=m
CONFIG_R8169_NAPI=y
CONFIG_SK98LIN=m CONFIG_SK98LIN=m
CONFIG_TIGON3=m CONFIG_TIGON3=m
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment