Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...

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

diff --git a/include/linux/sockios.h b/include/linux/sockios.h
index e6b9d1d36ea262f7c9032b6308f19144fc948bcb..abef7596655a2dfc4c7a933b02c035dd98ed097b 100644 (file)
--- a/include/linux/sockios.h
+++ b/include/linux/sockios.h
@@ -72,8 +72,8 @@
 #define SIOCGIFTXQLEN  0x8942          /* Get the tx queue length      */
 #define SIOCSIFTXQLEN  0x8943          /* Set the tx queue length      */
 
-#define SIOCGIFDIVERT  0x8944          /* Frame diversion support */
-#define SIOCSIFDIVERT  0x8945          /* Set frame diversion options */
+/* SIOCGIFDIVERT was:  0x8944          Frame diversion support */
+/* SIOCSIFDIVERT was:  0x8945          Set frame diversion options */
 
 #define SIOCETHTOOL    0x8946          /* Ethtool interface            */