diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-20 05:13:31 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-20 05:13:31 -0500 |
| commit | ff607748590fba14aecedb0d50edc4ada98d4302 (patch) | |
| tree | 986e0a3abe922713069a8e8bc913043fed89a39a /drivers/net/tokenring | |
| parent | db024d5398cd332023896caf70530564b15ec88e (diff) | |
| parent | 6aff8f1f07a7fff48121d1ad4a550f3af24ccc81 (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'drivers/net/tokenring')
| -rw-r--r-- | drivers/net/tokenring/smctr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/tokenring/smctr.h b/drivers/net/tokenring/smctr.h index b306c7e4c793..88dfa2e01d6e 100644 --- a/drivers/net/tokenring/smctr.h +++ b/drivers/net/tokenring/smctr.h | |||
| @@ -1042,7 +1042,7 @@ typedef struct net_local { | |||
| 1042 | __u16 functional_address[2]; | 1042 | __u16 functional_address[2]; |
| 1043 | __u16 bitwise_group_address[2]; | 1043 | __u16 bitwise_group_address[2]; |
| 1044 | 1044 | ||
| 1045 | __u8 *ptr_ucode; | 1045 | const __u8 *ptr_ucode; |
| 1046 | 1046 | ||
| 1047 | __u8 cleanup; | 1047 | __u8 cleanup; |
| 1048 | 1048 | ||