diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-05-22 02:36:56 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-05-22 02:36:56 -0400 |
| commit | cf9b59e9d3e008591d1f54830f570982bb307a0d (patch) | |
| tree | 113478ce8fd8c832ba726ffdf59b82cb46356476 /drivers/net/sfc/workarounds.h | |
| parent | 44504b2bebf8b5823c59484e73096a7d6574471d (diff) | |
| parent | f4b87dee923342505e1ddba8d34ce9de33e75050 (diff) | |
Merge remote branch 'origin' into secretlab/next-devicetree
Merging in current state of Linus' tree to deal with merge conflicts and
build failures in vio.c after merge.
Conflicts:
drivers/i2c/busses/i2c-cpm.c
drivers/i2c/busses/i2c-mpc.c
drivers/net/gianfar.c
Also fixed up one line in arch/powerpc/kernel/vio.c to use the
correct node pointer.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/net/sfc/workarounds.h')
| -rw-r--r-- | drivers/net/sfc/workarounds.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sfc/workarounds.h b/drivers/net/sfc/workarounds.h index acd9c734e483..518f7fc91473 100644 --- a/drivers/net/sfc/workarounds.h +++ b/drivers/net/sfc/workarounds.h | |||
| @@ -37,7 +37,7 @@ | |||
| 37 | /* Truncated IPv4 packets can confuse the TX packet parser */ | 37 | /* Truncated IPv4 packets can confuse the TX packet parser */ |
| 38 | #define EFX_WORKAROUND_15592 EFX_WORKAROUND_FALCON_AB | 38 | #define EFX_WORKAROUND_15592 EFX_WORKAROUND_FALCON_AB |
| 39 | /* Legacy ISR read can return zero once */ | 39 | /* Legacy ISR read can return zero once */ |
| 40 | #define EFX_WORKAROUND_15783 EFX_WORKAROUND_SIENA | 40 | #define EFX_WORKAROUND_15783 EFX_WORKAROUND_ALWAYS |
| 41 | /* Legacy interrupt storm when interrupt fifo fills */ | 41 | /* Legacy interrupt storm when interrupt fifo fills */ |
| 42 | #define EFX_WORKAROUND_17213 EFX_WORKAROUND_SIENA | 42 | #define EFX_WORKAROUND_17213 EFX_WORKAROUND_SIENA |
| 43 | 43 | ||