Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier...

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin:
  Blackfin: fix inverted anomaly 05000481 logic
  Blackfin: drop unused irq_panic()/DEBUG_ICACHE_CHECK
  Blackfin: ppi/spi/twi headers: add missing __BFP undef
  Blackfin: update defconfigs
  Blackfin: bfin_twi.h: start a common TWI header
  netdev: bfin_mac: push settings to platform resources

diff --combined drivers/net/Kconfig
index 702f598f4953ef8bc6a964e2ab4a384c4f1b9f61,c598fe008e37f77a06e96daf365f0a27426a2ed1..86fe67fd49ba0c1dd8d794de61839766c2efacb5
--- 1/drivers/net/Kconfig
--- 2/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@@ -883,14 -883,6 +883,6 @@@ config BFIN_RX_DESC_NU
        help
          Set the number of buffer packets used in driver.
  
- config BFIN_MAC_RMII
-       bool "RMII PHY Interface"
-       depends on BFIN_MAC
-       default y if BFIN527_EZKIT
-       default n if BFIN537_STAMP
-       help
-         Use Reduced PHY MII Interface
- 
  config BFIN_MAC_USE_HWSTAMP
        bool "Use IEEE 1588 hwstamp"
        depends on BFIN_MAC && BF518
@@@ -954,8 -946,6 +946,8 @@@ config NET_NET
  config TI_DAVINCI_EMAC
        tristate "TI DaVinci EMAC Support"
        depends on ARM && ( ARCH_DAVINCI || ARCH_OMAP3 )
 +      select TI_DAVINCI_MDIO
 +      select TI_DAVINCI_CPDMA
        select PHYLIB
        help
          This driver supports TI's DaVinci Ethernet .
@@@ -963,25 -953,6 +955,25 @@@
          To compile this driver as a module, choose M here: the module
          will be called davinci_emac_driver.  This is recommended.
  
 +config TI_DAVINCI_MDIO
 +      tristate "TI DaVinci MDIO Support"
 +      depends on ARM && ( ARCH_DAVINCI || ARCH_OMAP3 )
 +      select PHYLIB
 +      help
 +        This driver supports TI's DaVinci MDIO module.
 +
 +        To compile this driver as a module, choose M here: the module
 +        will be called davinci_mdio.  This is recommended.
 +
 +config TI_DAVINCI_CPDMA
 +      tristate "TI DaVinci CPDMA Support"
 +      depends on ARM && ( ARCH_DAVINCI || ARCH_OMAP3 )
 +      help
 +        This driver supports TI's DaVinci CPDMA dma engine.
 +
 +        To compile this driver as a module, choose M here: the module
 +        will be called davinci_cpdma.  This is recommended.
 +
  config DM9000
        tristate "DM9000 support"
        depends on ARM || BLACKFIN || MIPS