summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-05 15:55:00 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-05 15:55:00 -0700
commit0dac723e5c15ddb9bd26c1db21ee64ab71ae4925 (patch)
treece19d6114a07cf32c821090c5f7b53685cff28a0 /drivers
parent87a927c715789853cc8331d76039a2fd657a832a (diff)
parent795bb15e0735bd2b0015ca333fa157399b72c168 (diff)
downloadlinux-3.10-0dac723e5c15ddb9bd26c1db21ee64ab71ae4925.tar.gz
linux-3.10-0dac723e5c15ddb9bd26c1db21ee64ab71ae4925.tar.bz2
linux-3.10-0dac723e5c15ddb9bd26c1db21ee64ab71ae4925.zip
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [POWERPC] Update defconfigs [POWERPC] Uninline and export virq_to_hw() for the pasemi_mac driver [POWERPC] Fix PMI breakage in cbe_cbufreq driver [POWERPC] Disable old EMAC driver in arch/powerpc
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 7d57f4a25dc..b49375abb5f 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1187,7 +1187,7 @@ config IBMVETH
config IBM_EMAC
tristate "PowerPC 4xx on-chip Ethernet support"
- depends on 4xx
+ depends on 4xx && !PPC_MERGE
help
This driver supports the PowerPC 4xx EMAC family of on-chip
Ethernet controllers.