diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-05 18:55:00 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-05 18:55:00 -0400 |
| commit | 0dac723e5c15ddb9bd26c1db21ee64ab71ae4925 (patch) | |
| tree | ce19d6114a07cf32c821090c5f7b53685cff28a0 /drivers/net | |
| parent | 87a927c715789853cc8331d76039a2fd657a832a (diff) | |
| parent | 795bb15e0735bd2b0015ca333fa157399b72c168 (diff) | |
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 | |||
| 1187 | 1187 | ||
| 1188 | config IBM_EMAC | 1188 | config IBM_EMAC |
| 1189 | tristate "PowerPC 4xx on-chip Ethernet support" | 1189 | tristate "PowerPC 4xx on-chip Ethernet support" |
| 1190 | depends on 4xx | 1190 | depends on 4xx && !PPC_MERGE |
| 1191 | help | 1191 | help |
| 1192 | This driver supports the PowerPC 4xx EMAC family of on-chip | 1192 | This driver supports the PowerPC 4xx EMAC family of on-chip |
| 1193 | Ethernet controllers. | 1193 | Ethernet controllers. |