Merge branch 'upstream-fixes'

2006-02-17 16:20:30 -05:00
parent 70c07e0262 f5e2a7b22e
commit b04a92e160
436 changed files with 6443 additions and 4219 deletions
--- 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;