commit 0139fd7c2ffd830e571d56f60198306ac24b726e
author Roland Dreier <rolandd@cisco.com> Wed Jan 06 13:16:47 2010 -0800
committer Roland Dreier <rolandd@cisco.com> Wed Jan 06 13:16:47 2010 -0800
tree 64526574eeeced6ababb769f72a1ee7a93c091d3
parent fd4582a3999e03fa9eae315bf14c88fd32d44035
parent b4f77264cd1a858ee09da8dba5a2711a649adbf3

Merge branches 'misc' and 'mlx4' into for-next

drivers/infiniband/core/cma.c

diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index fbdd731..cc9b594 100644
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -2083,7 +2083,7 @@
 static int cma_check_linklocal(struct rdma_dev_addr *dev_addr,
 			       struct sockaddr *addr)
 {
-#if defined(CONFIG_IPv6) || defined(CONFIG_IPV6_MODULE)
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
 	struct sockaddr_in6 *sin6;
 
 	if (addr->sa_family != AF_INET6)