[IPV6] ADDRCONF: Fix conflicts in DEVCONF_xxx constant.
authorYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Tue, 29 May 2007 20:23:34 +0000 (13:23 -0700)
committerDavid S. Miller <davem@sunset.davemloft.net>
Thu, 31 May 2007 08:23:36 +0000 (01:23 -0700)
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/linux/ipv6.h

Simple merge