diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-11 23:12:57 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-11 23:12:57 -0400 |
| commit | af3b146d26550f0c8e0d77b2117c6f8aec5d8146 (patch) | |
| tree | e8078b0d760cd2a2488d3755b7dee341f3ea61b3 /drivers | |
| parent | c5b7bede71853d92fc747cdc12fa5234b6045731 (diff) | |
| parent | fd4ba7e2b7ce9a48b8c60d5fcd65feda5746812e (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (23 commits)
[POWERPC] Add arch/powerpc support for the Motorola PrPMC2800
[POWERPC] Add bootwrapper support for Motorola PrPMC2800 platform
[POWERPC] Add DTS file for the Motorola PrPMC2800 platform
[POWERPC] Check cache coherency of kernel vs firmware
[POWERPC] Add Marvell mv64x60 PCI bridge support
[POWERPC] Create Marvell mv64x60 I2C platform_data
[POWERPC] Create Marvell mv64x60 ethernet platform_data
[POWERPC] Create Marvell mv64x60 MPSC (serial) platform_data
[POWERPC] Add interrupt support for Marvell mv64x60 chips
[POWERPC] Add bootwrapper support for Marvell/mv64x60 I2C
[POWERPC] Add bootwrapper support for Marvell MPSC
[POWERPC] Add bootwrapper support for Marvell/mv64x60 hostbridge
[POWERPC] Add Makefile rules to wrap dts file in zImage
[POWERPC] Spelling fixes: arch/ppc/
[POWERPC] U-boot passes the initrd as start/end, not start/size.
[POWERPC] PS3: Update ps3_defconfig
[POWERPC] PS3: Fix request_irq warning
[POWERPC] Don't complain if size-cells == 0 in prom_parse()
[POWERPC] Simplify smp_space_timers
[POWERPC] Trivial ps3 warning fixes
...
Diffstat (limited to 'drivers')
| -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 8a7f9e9fb8d8..fb99cd445504 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
| @@ -2303,7 +2303,7 @@ config UGETH_TX_ON_DEMAND | |||
| 2303 | 2303 | ||
| 2304 | config MV643XX_ETH | 2304 | config MV643XX_ETH |
| 2305 | tristate "MV-643XX Ethernet support" | 2305 | tristate "MV-643XX Ethernet support" |
| 2306 | depends on MOMENCO_OCELOT_C || MOMENCO_JAGUAR_ATX || MV64360 || MOMENCO_OCELOT_3 || (PPC_MULTIPLATFORM && PPC32) | 2306 | depends on MOMENCO_OCELOT_C || MOMENCO_JAGUAR_ATX || MV64360 || MV64X60 || MOMENCO_OCELOT_3 || (PPC_MULTIPLATFORM && PPC32) |
| 2307 | select MII | 2307 | select MII |
| 2308 | help | 2308 | help |
| 2309 | This driver supports the gigabit Ethernet on the Marvell MV643XX | 2309 | This driver supports the gigabit Ethernet on the Marvell MV643XX |