summaryrefslogtreecommitdiffstats
path: root/drivers/net/tokenring
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2006-02-17 16:20:30 -0500
committerJeff Garzik <jgarzik@pobox.com>2006-02-17 16:20:30 -0500
commitb04a92e1601eb6df3a3b6599e7fb7ee021eef2cb (patch)
treef190980d5bffae81a67c0cea0d913ed2444ceb0c /drivers/net/tokenring
parent70c07e02625ec46d0ffbfce1acef42d660803528 (diff)
parentf5e2a7b22e7d7dfda8794906d0fddeaaa09bb944 (diff)
downloadlinux-b04a92e1601eb6df3a3b6599e7fb7ee021eef2cb.tar.gz
linux-b04a92e1601eb6df3a3b6599e7fb7ee021eef2cb.tar.bz2
linux-b04a92e1601eb6df3a3b6599e7fb7ee021eef2cb.zip
Merge branch 'upstream-fixes'
Diffstat (limited to 'drivers/net/tokenring')
-rw-r--r--drivers/net/tokenring/smctr.h2
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 {
__u16 functional_address[2];
__u16 bitwise_group_address[2];
- __u8 *ptr_ucode;
+ const __u8 *ptr_ucode;
__u8 cleanup;