Merge commit 'origin'

[safe/jmp/linux-2.6] / drivers / net / ibm_newemac / Kconfig

diff --git a/drivers/net/ibm_newemac/Kconfig b/drivers/net/ibm_newemac/Kconfig
index 44e5a0e..78a1628 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