diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-06-23 06:51:46 +0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-06-23 06:51:46 +0400 |
| commit | dbe1ab9514c231c9b062140a107d9dea0eabefcc (patch) | |
| tree | 0001c7143cf923fc704215f0a0e54221e9e5cbb9 /include/net/sctp/sctp.h | |
| parent | 612eff0e3715a6faff5ba1b74873b99e036c59fe (diff) | |
| parent | d588fcbe5a7ba8bba2cebf7799ab2d573717a806 (diff) | |
| download | linux-dbe1ab9514c231c9b062140a107d9dea0eabefcc.tar.xz | |
Merge branch 'master' into upstream
Diffstat (limited to 'include/net/sctp/sctp.h')
| -rw-r--r-- | include/net/sctp/sctp.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h index b2b40f951ae6..a9663b49ea54 100644 --- a/include/net/sctp/sctp.h +++ b/include/net/sctp/sctp.h @@ -63,7 +63,6 @@ */ -#include <linux/config.h> #ifdef TEST_FRAME #undef CONFIG_PROC_FS @@ -255,7 +254,7 @@ extern int sctp_debug_flag; #define SCTP_DEBUG_PRINTK_IPADDR(whatever...) #define SCTP_ENABLE_DEBUG #define SCTP_DISABLE_DEBUG -#define SCTP_ASSERT(expr, str, func) BUG_ON(!(expr)) +#define SCTP_ASSERT(expr, str, func) #endif /* SCTP_DEBUG */ |