Pull video into test branch

[linux-2.6-omap-h63xx.git] / net / ipv4 / tcp_veno.c

diff --git a/net/ipv4/tcp_veno.c b/net/ipv4/tcp_veno.c
index 11b42a7135c19ef7241584752dd39be97c1bf444..ce57bf302f6cc802493ae568966a401d45f9bbf3 100644 (file)
--- a/net/ipv4/tcp_veno.c
+++ b/net/ipv4/tcp_veno.c
@@ -9,7 +9,6 @@
  *     See http://www.ntu.edu.sg/home5/ZHOU0022/papers/CPFu03a.pdf
  */
 
-#include <linux/config.h>
 #include <linux/mm.h>
 #include <linux/module.h>
 #include <linux/skbuff.h>
@@ -213,7 +212,7 @@ static struct tcp_congestion_ops tcp_veno = {
 
 static int __init tcp_veno_register(void)
 {
-       BUG_ON(sizeof(struct veno) > ICSK_CA_PRIV_SIZE);
+       BUILD_BUG_ON(sizeof(struct veno) > ICSK_CA_PRIV_SIZE);
        tcp_register_congestion_control(&tcp_veno);
        return 0;
 }