diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-15 01:33:11 -0500 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-15 01:33:11 -0500 |
| commit | 1bb95834bbcdc969e477a9284cf96c17a4c2616f (patch) | |
| tree | 9cf66b22a611bb6bc78778c05dac72263bb45a23 /drivers/net/sb1000.c | |
| parent | 85345517fe6d4de27b0d6ca19fef9d28ac947c4a (diff) | |
| parent | a41c73e04673b47730df682446f0d52f95e32a5b (diff) | |
Merge remote branch 'airlied/drm-fixes' into drm-intel-fixes
Diffstat (limited to 'drivers/net/sb1000.c')
| -rw-r--r-- | drivers/net/sb1000.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/sb1000.c b/drivers/net/sb1000.c index a9ae505e1baf..66c2f1a01963 100644 --- a/drivers/net/sb1000.c +++ b/drivers/net/sb1000.c | |||
| @@ -961,9 +961,9 @@ sb1000_open(struct net_device *dev) | |||
| 961 | lp->rx_error_count = 0; | 961 | lp->rx_error_count = 0; |
| 962 | lp->rx_error_dpc_count = 0; | 962 | lp->rx_error_dpc_count = 0; |
| 963 | lp->rx_session_id[0] = 0x50; | 963 | lp->rx_session_id[0] = 0x50; |
| 964 | lp->rx_session_id[0] = 0x48; | 964 | lp->rx_session_id[1] = 0x48; |
| 965 | lp->rx_session_id[0] = 0x44; | 965 | lp->rx_session_id[2] = 0x44; |
| 966 | lp->rx_session_id[0] = 0x42; | 966 | lp->rx_session_id[3] = 0x42; |
| 967 | lp->rx_frame_id[0] = 0; | 967 | lp->rx_frame_id[0] = 0; |
| 968 | lp->rx_frame_id[1] = 0; | 968 | lp->rx_frame_id[1] = 0; |
| 969 | lp->rx_frame_id[2] = 0; | 969 | lp->rx_frame_id[2] = 0; |