diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-20 07:16:23 (GMT) |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-20 07:16:23 (GMT) |
commit | 5b2ffed906a3ebd4e52a5bbef06b99a517c53e4b (patch) | |
tree | 2f900f89d93db6b0822d8bdf4f49851c581c12a6 /drivers/net/tokenring | |
parent | f1b318793dcd2d9ff6b5ac06e7762098fa079cee (diff) | |
parent | bd71c2b17468a2531fb4c81ec1d73520845e97e1 (diff) | |
download | linux-fsl-qoriq-5b2ffed906a3ebd4e52a5bbef06b99a517c53e4b.tar.xz |
Merge branch 'master'
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 b306c7e..88dfa2e 100644 --- a/drivers/net/tokenring/smctr.h +++ b/drivers/net/tokenring/smctr.h @@ -1042,7 +1042,7 @@ typedef struct net_local { __u16 functional_address[2]; __u16 bitwise_group_address[2]; - __u8 *ptr_ucode; + const __u8 *ptr_ucode; __u8 cleanup; |