diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-29 23:04:53 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-29 23:04:53 -0400 |
| commit | 9ff9a26b786c35ee8d2a66222924a807ec851a9f (patch) | |
| tree | db432a17bccca1ca2c16907f0ee83ac449ed4012 /include/linux/ibmtr.h | |
| parent | 0a3108beea9143225119d5e7c72a8e2c64f3eb7d (diff) | |
| parent | 0d34fb8e93ceba7b6dad0062dbb4a0813bacd75b (diff) | |
Merge commit 'origin/master' into next
Manual merge of:
arch/powerpc/include/asm/elf.h
drivers/i2c/busses/i2c-mpc.c
Diffstat (limited to 'include/linux/ibmtr.h')
| -rw-r--r-- | include/linux/ibmtr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/ibmtr.h b/include/linux/ibmtr.h index 1c7a0dd5536a..06695b74d405 100644 --- a/include/linux/ibmtr.h +++ b/include/linux/ibmtr.h | |||
| @@ -207,7 +207,7 @@ struct tok_info { | |||
| 207 | unsigned short exsap_station_id; | 207 | unsigned short exsap_station_id; |
| 208 | unsigned short global_int_enable; | 208 | unsigned short global_int_enable; |
| 209 | struct sk_buff *current_skb; | 209 | struct sk_buff *current_skb; |
| 210 | struct net_device_stats tr_stats; | 210 | |
| 211 | unsigned char auto_speedsave; | 211 | unsigned char auto_speedsave; |
| 212 | open_state open_status, sap_status; | 212 | open_state open_status, sap_status; |
| 213 | enum {MANUAL, AUTOMATIC} open_mode; | 213 | enum {MANUAL, AUTOMATIC} open_mode; |