Merge branch 'for-2.6.25' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerp...

diff --combined drivers/net/Kconfig
index 7d170cd381c39191d7d9bfae65b296026de49934,5cac0914a9790482f25f9227b85f92d3e8215335..9cc25fd80b605c742411b3042c27808976199453
--- 1/drivers/net/Kconfig
--- 2/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@@ -920,7 -920,8 +920,7 @@@ config ENC28J6
        ---help---
          Support for the Microchip EN28J60 ethernet chip.
  
 -        To compile this driver as a module, choose M here and read
 -        <file:Documentation/networking/net-modules.txt>.  The module will be
 +        To compile this driver as a module, choose M here. The module will be
          called enc28j60.
  
  config ENC28J60_WRITEVERIFY
@@@ -1737,10 -1738,8 +1737,8 @@@ config SC9203
  
  config CPMAC
        tristate "TI AR7 CPMAC Ethernet support (EXPERIMENTAL)"
-       depends on NET_ETHERNET && EXPERIMENTAL && AR7
+       depends on NET_ETHERNET && EXPERIMENTAL && AR7 && BROKEN
        select PHYLIB
-       select FIXED_PHY
-       select FIXED_MII_100_FDX
        help
          TI AR7 CPMAC Ethernet support
  
@@@ -2040,7 -2039,8 +2038,7 @@@ config IG
           More specific information on configuring the driver is in
           <file:Documentation/networking/e1000.txt>.
  
 -         To compile this driver as a module, choose M here and read
 -         <file:Documentation/networking/net-modules.txt>.  The module
 +         To compile this driver as a module, choose M here. The module
           will be called igb.
  
  source "drivers/net/ixp2000/Kconfig"