diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-31 13:29:35 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-31 13:29:35 -0500 |
| commit | 0827f2b698735aee7cfb2990d393a82f6e1690eb (patch) | |
| tree | 5eb1fa871154ab36c38794c4dc488698f13c71e0 /arch | |
| parent | 70b4d63e98fd93fb9742708a54f872cba24e0fea (diff) | |
| parent | c6f0d75a2defe8c7d8bf9f78de891cedc46b4b3e (diff) | |
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ppc/syslib/mv64x60.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ppc/syslib/mv64x60.c b/arch/ppc/syslib/mv64x60.c index 94ea346b7b4b..1f01b7e2376b 100644 --- a/arch/ppc/syslib/mv64x60.c +++ b/arch/ppc/syslib/mv64x60.c | |||
| @@ -313,7 +313,7 @@ static struct platform_device mpsc1_device = { | |||
| 313 | }; | 313 | }; |
| 314 | #endif | 314 | #endif |
| 315 | 315 | ||
| 316 | #ifdef CONFIG_MV643XX_ETH | 316 | #if defined(CONFIG_MV643XX_ETH) || defined(CONFIG_MV643XX_ETH_MODULE) |
| 317 | static struct resource mv64x60_eth_shared_resources[] = { | 317 | static struct resource mv64x60_eth_shared_resources[] = { |
| 318 | [0] = { | 318 | [0] = { |
| 319 | .name = "ethernet shared base", | 319 | .name = "ethernet shared base", |
| @@ -456,7 +456,7 @@ static struct platform_device *mv64x60_pd_devs[] __initdata = { | |||
| 456 | &mpsc0_device, | 456 | &mpsc0_device, |
| 457 | &mpsc1_device, | 457 | &mpsc1_device, |
| 458 | #endif | 458 | #endif |
| 459 | #ifdef CONFIG_MV643XX_ETH | 459 | #if defined(CONFIG_MV643XX_ETH) || defined(CONFIG_MV643XX_ETH_MODULE) |
| 460 | &mv64x60_eth_shared_device, | 460 | &mv64x60_eth_shared_device, |
| 461 | #endif | 461 | #endif |
| 462 | #ifdef CONFIG_MV643XX_ETH_0 | 462 | #ifdef CONFIG_MV643XX_ETH_0 |