summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2008-09-04 11:36:28 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2008-09-04 11:36:28 +1000
commite16a412bebfcdc949014de925445db8cc35a42b6 (patch)
treea9460f9fad960ebb17ac560816471a26967a6380 /net
parent242f9ed64918c712f88df3a279dbc5d14eb2cceb (diff)
parent961b49bafa56f4eaf3856db75c237b909ef2beb1 (diff)
Merge branch 'quilt/driver-core'
Diffstat (limited to 'net')
-rw-r--r--net/netfilter/nf_conntrack_pptp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/nf_conntrack_pptp.c b/net/netfilter/nf_conntrack_pptp.c
index 97e54b0e43a3..7fea30443052 100644
--- a/net/netfilter/nf_conntrack_pptp.c
+++ b/net/netfilter/nf_conntrack_pptp.c
@@ -65,7 +65,7 @@ void
struct nf_conntrack_expect *exp) __read_mostly;
EXPORT_SYMBOL_GPL(nf_nat_pptp_hook_expectfn);
-#ifdef DEBUG
+#if defined(DEBUG) || defined(CONFIG_DYNAMIC_PRINTK_DEBUG)
/* PptpControlMessageType names */
const char *const pptp_msg_name[] = {
"UNKNOWN_MESSAGE",