UAPI: Split trivial #if defined(__KERNEL__) && X conditionals

[sfrench/cifs-2.6.git] / include / linux / mroute6.h

diff --git a/include/linux/mroute6.h b/include/linux/mroute6.h
index a3759cb0ac10560bc58a30341d228041afcac8f7..6d8c7251eb8d4147968c6a146473868caa0eebbc 100644 (file)
--- a/include/linux/mroute6.h
+++ b/include/linux/mroute6.h
@@ -43,9 +43,11 @@ typedef unsigned short mifi_t;
 typedef        __u32           if_mask;
 #define NIFBITS (sizeof(if_mask) * 8)        /* bits per mask */
 
-#if !defined(__KERNEL__) && !defined(DIV_ROUND_UP)
+#if !defined(__KERNEL__)
+#if !defined(DIV_ROUND_UP)
 #define        DIV_ROUND_UP(x,y)       (((x) + ((y) - 1)) / (y))
 #endif
+#endif
 
 typedef struct if_set {
        if_mask ifs_bits[DIV_ROUND_UP(IF_SETSIZE, NIFBITS)];