git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
arch
/
ppc
/
8260_io
/
fcc_enet.c
diff --git
a/arch/ppc/8260_io/fcc_enet.c
b/arch/ppc/8260_io/fcc_enet.c
index
d56a031
..
a38487b
100644
(file)
--- a/
arch/ppc/8260_io/fcc_enet.c
+++ b/
arch/ppc/8260_io/fcc_enet.c
@@
-34,12
+34,12
@@
#include <linux/etherdevice.h>
#include <linux/skbuff.h>
#include <linux/spinlock.h>
#include <linux/etherdevice.h>
#include <linux/skbuff.h>
#include <linux/spinlock.h>
+#include <linux/bitops.h>
#include <asm/immap_cpm2.h>
#include <asm/pgtable.h>
#include <asm/mpc8260.h>
#include <asm/irq.h>
#include <asm/immap_cpm2.h>
#include <asm/pgtable.h>
#include <asm/mpc8260.h>
#include <asm/irq.h>
-#include <asm/bitops.h>
#include <asm/uaccess.h>
#include <asm/cpm2.h>
#include <asm/uaccess.h>
#include <asm/cpm2.h>
@@
-1986,9
+1986,9
@@
fcc_restart(struct net_device *dev, int duplex)
fccp = fcp->fccp;
if (duplex)
fccp = fcp->fccp;
if (duplex)
- fccp->fcc_fpsmr |= FCC_PSMR_FDE;
+ fccp->fcc_fpsmr |= FCC_PSMR_FDE
| FCC_PSMR_LPB
;
else
else
- fccp->fcc_fpsmr &= ~
FCC_PSMR_FDE
;
+ fccp->fcc_fpsmr &= ~
(FCC_PSMR_FDE | FCC_PSMR_LPB)
;
/* Enable transmit/receive */
fccp->fcc_gfmr |= FCC_GFMR_ENR | FCC_GFMR_ENT;
/* Enable transmit/receive */
fccp->fcc_gfmr |= FCC_GFMR_ENR | FCC_GFMR_ENT;