diff options
| author | Todd Poynor <toddpoynor@google.com> | 2013-01-16 12:57:27 -0800 |
|---|---|---|
| committer | Todd Poynor <toddpoynor@google.com> | 2013-01-16 12:58:11 -0800 |
| commit | 725f5f801458bda3b664686dea6127650829a5af (patch) | |
| tree | 9dca5675ff93755fb87ffc99cffe95e96c17bac9 /drivers/net/sky2.h | |
| parent | e687119f9ec43837ad610d41574dbda473355a1e (diff) | |
| parent | fbad46f30d0ccb24fcadf4fa129d917fd0bfa1fe (diff) | |
| download | kernel_samsung_tuna-725f5f801458bda3b664686dea6127650829a5af.zip kernel_samsung_tuna-725f5f801458bda3b664686dea6127650829a5af.tar.gz kernel_samsung_tuna-725f5f801458bda3b664686dea6127650829a5af.tar.bz2 | |
Merge branch 'android-3.0' into android-omap-3.0
Fixup incompatible code in opp.c: omap_init_opp_table()
Change-Id: Iac7d60b814a539285d00e0a3dbb6e3f0060cb683
Signed-off-by: Todd Poynor <toddpoynor@google.com>
Diffstat (limited to 'drivers/net/sky2.h')
| -rw-r--r-- | drivers/net/sky2.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/sky2.h b/drivers/net/sky2.h index 318c9ae..a79a166 100644 --- a/drivers/net/sky2.h +++ b/drivers/net/sky2.h @@ -2236,7 +2236,6 @@ struct sky2_port { u16 rx_pending; u16 rx_data_size; u16 rx_nfrags; - u16 rx_tag; struct { unsigned long last; |