diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-06 00:55:00 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-06 00:55:00 +0200 |
| commit | 0dac723e5c15ddb9bd26c1db21ee64ab71ae4925 (patch) | |
| tree | ce19d6114a07cf32c821090c5f7b53685cff28a0 /drivers/net | |
| parent | Fix slab redzone alignment (diff) | |
| parent | [POWERPC] Update defconfigs (diff) | |
| download | linux-0dac723e5c15ddb9bd26c1db21ee64ab71ae4925.tar.xz linux-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/net')
| -rw-r--r-- | drivers/net/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 7d57f4a25dc1..b49375abb5f4 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. |