]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
net: Update entry in af_family_clock_key_strings
authorOliver Hartkopp <oliver@hartkopp.net>
Wed, 23 Jul 2008 21:06:04 +0000 (14:06 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 23 Jul 2008 21:06:04 +0000 (14:06 -0700)
In the merge phase of the CAN subsystem the
af_family_clock_key_strings[] have been added to sock.c in commit
443aef0eddfa44c158d1b94ebb431a70638fcab4
(lockdep: fixup sk_callback_lock annotation). This trivial patch adds
the missing name for address family 29 (AF_CAN).

Signed-off-by: Oliver Hartkopp <oliver@hartkopp.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/core/sock.c

index 10a64d57078cc684e07d9d821845ed2de41de41b..91f8bbc93526523a2eaca207359951117712c577 100644 (file)
@@ -180,7 +180,7 @@ static const char *af_family_clock_key_strings[AF_MAX+1] = {
   "clock-AF_ASH"   , "clock-AF_ECONET"   , "clock-AF_ATMSVC"   ,
   "clock-21"       , "clock-AF_SNA"      , "clock-AF_IRDA"     ,
   "clock-AF_PPPOX" , "clock-AF_WANPIPE"  , "clock-AF_LLC"      ,
-  "clock-27"       , "clock-28"          , "clock-29"          ,
+  "clock-27"       , "clock-28"          , "clock-AF_CAN"      ,
   "clock-AF_TIPC"  , "clock-AF_BLUETOOTH", "clock-AF_IUCV"     ,
   "clock-AF_RXRPC" , "clock-AF_MAX"
 };