diff options
| author | Vitaly Bordug <vbordug@ru.mvista.com> | 2006-01-20 22:22:36 +0300 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-02-07 22:36:33 +1100 |
| commit | 42dc75c4b97922d3d7707ac0b097fbeeca20b108 (patch) | |
| tree | 9b643a303ef555057def71b588a556da4c7942ff /arch/ppc/platforms/fads.h | |
| parent | b92891751600a1677c2b7f611f8b1e58d53388dc (diff) | |
| download | linux-3.10-42dc75c4b97922d3d7707ac0b097fbeeca20b108.tar.gz linux-3.10-42dc75c4b97922d3d7707ac0b097fbeeca20b108.tar.bz2 linux-3.10-42dc75c4b97922d3d7707ac0b097fbeeca20b108.zip | |
[PATCH] ppc32: MPC885ADS, MPC866ADS and MPC8272ADS-specific platform stuff for fs_enet
Added proper ppc_sys identification and fs_platform_info's for MPC 885ADS,
866ADS and 8272ADS, utilizing function assignment to remove/do not use
platform devices which conflict with PD-incompatible drivers.
Signed-off-by: Vitaly Bordug <vbordug@ru.mvista.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/ppc/platforms/fads.h')
| -rw-r--r-- | arch/ppc/platforms/fads.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc/platforms/fads.h b/arch/ppc/platforms/fads.h index a48fb8d723e..e1c0b1b6dcb 100644 --- a/arch/ppc/platforms/fads.h +++ b/arch/ppc/platforms/fads.h @@ -112,7 +112,7 @@ /* CPM Ethernet through SCC1 or SCC2 */ -#ifdef CONFIG_SCC1_ENET /* Probably 860 variant */ +#if defined(CONFIG_SCC1_ENET) || defined(CONFIG_MPC8xx_SECOND_ETH_SCC1) /* Probably 860 variant */ /* Bits in parallel I/O port registers that have to be set/cleared * to configure the pins for SCC1 use. * TCLK - CLK1, RCLK - CLK2. |