Merge branch 'master' into for-upstream

[linux-2.6-omap-h63xx.git] / drivers / net / ibm_newemac / Kconfig

diff --git a/drivers/net/ibm_newemac/Kconfig b/drivers/net/ibm_newemac/Kconfig
index 70a3272ee998d646abf7b1c870237d827bc2967f..78a1628c9892f71514cd781eed6a62b56fa0de48 100644 (file)
--- a/drivers/net/ibm_newemac/Kconfig
+++ b/drivers/net/ibm_newemac/Kconfig
@@ -1,6 +1,6 @@
 config IBM_NEW_EMAC
        tristate "IBM EMAC Ethernet support"
-       depends on PPC_DCR && PPC_MERGE
+       depends on PPC_DCR
        select CRC32
        help
          This driver supports the IBM EMAC family of Ethernet controllers
@@ -62,3 +62,15 @@ config IBM_NEW_EMAC_TAH
 config IBM_NEW_EMAC_EMAC4
        bool
        default n
+
+config IBM_NEW_EMAC_NO_FLOW_CTRL
+       bool
+       default n
+
+config IBM_NEW_EMAC_MAL_CLR_ICINTSTAT
+       bool
+       default n
+
+config IBM_NEW_EMAC_MAL_COMMON_ERR
+       bool
+       default n