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

into kernel.bkbits.net:/home/davem/sparc-2.6

Merge davem@nuts.davemloft.net:/disk1/BK/sparc-2.6
into kernel.bkbits.net:/home/davem/sparc-2.6
317d912c · David S. Miller · 5fcf9e32 · 23583e1d · 317d912c
Commit 317d912c authored Aug 23, 2004 by David S. Miller
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

arch/sparc64/defconfig arch/sparc64/defconfig +1 -0

No files found.
--- a/arch/sparc64/defconfig
+++ b/arch/sparc64/defconfig
@@ -880,6 +880,7 @@ CONFIG_NS83820=m
 CONFIG_HAMACHI=m
 CONFIG_YELLOWFIN=m
 CONFIG_R8169=m
+CONFIG_R8169_NAPI=y
 CONFIG_SK98LIN=m
 CONFIG_TIGON3=m