diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-03 01:33:37 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-03 01:33:37 +0400 |
| commit | eb1574270a6de8fb8d31ffc3b021e30df0afcda3 (patch) | |
| tree | d154ba369f222f5108ed1a2462d815d7faadc2e5 /arch/m68k/platform/527x/config.c | |
| parent | aac10aaa8cc65a6fef6f5bc7d0b96035b0225a61 (diff) | |
| parent | 69964ea4c7b68c9399f7977aa5b9aa6539a6a98a (diff) | |
| download | linux-eb1574270a6de8fb8d31ffc3b021e30df0afcda3.tar.xz | |
Merge 3.4-rc5 into driver-core-next
This was done to resolve a merge issue with the init/main.c file.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/m68k/platform/527x/config.c')
| -rw-r--r-- | arch/m68k/platform/527x/config.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/m68k/platform/527x/config.c b/arch/m68k/platform/527x/config.c index 7ed848c3b848..f91a53294c35 100644 --- a/arch/m68k/platform/527x/config.c +++ b/arch/m68k/platform/527x/config.c @@ -74,9 +74,7 @@ static void __init m527x_fec_init(void) writew(par | 0xf00, MCF_IPSBAR + 0x100082); v = readb(MCF_IPSBAR + 0x100078); writeb(v | 0xc0, MCF_IPSBAR + 0x100078); -#endif -#ifdef CONFIG_FEC2 /* Set multi-function pins to ethernet mode for fec1 */ par = readw(MCF_IPSBAR + 0x100082); writew(par | 0xa0, MCF_IPSBAR + 0x100082); |