Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

1 files changed, 1 insertions, 12 deletions

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 57edae4790e8..1958d9e16a3a 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1203,7 +1203,7 @@ config IBM_EMAC_RX_SKB_HEADROOM
 
 config IBM_EMAC_PHY_RX_CLK_FIX
         bool "PHY Rx clock workaround"
-        depends on IBM_EMAC && (405EP || 440GX || 440EP)
+        depends on IBM_EMAC && (405EP || 440GX || 440EP || 440GR)
         help
           Enable this if EMAC attached to a PHY which doesn't generate
           RX clock if there is no link, if this is the case, you will 
@@ -2258,17 +2258,6 @@ config S2IO_NAPI
 
           If in doubt, say N.
 
-config 2BUFF_MODE
-        bool "Use 2 Buffer Mode on Rx side."
-        depends on S2IO
-        ---help---
-        On enabling the 2 buffer mode, the received frame will be
-        split into 2 parts before being DMA'ed to the hosts memory.
-        The parts are the ethernet header and ethernet payload. 
-        This is useful on systems where DMA'ing to to unaligned 
-        physical memory loactions comes with a heavy price.
-        If not sure please say N.
-
 endmenu
 
 if !UML