diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-03-24 17:45:03 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-03-24 17:54:19 +1100 |
| commit | d3584a613fa53cd012fbb459ffc37496d0dad45b (patch) | |
| tree | 356a6f171d69d97911d75e5132c0cdae349fc32b /net/netfilter/nf_conntrack_pptp.c | |
| parent | f0c589ae0af67c056ca1339c91f6e5bc5237b3a9 (diff) | |
| parent | c41050ad4560ef43e699dd1fc8161a63638fb1db (diff) | |
Merge branch 'quilt/driver-core'
Conflicts:
drivers/media/video/v4l2-device.c
drivers/net/wimax/i2400m/usb-notif.c
drivers/sh/maple/maple.c
Diffstat (limited to 'net/netfilter/nf_conntrack_pptp.c')
| -rw-r--r-- | net/netfilter/nf_conntrack_pptp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/nf_conntrack_pptp.c b/net/netfilter/nf_conntrack_pptp.c index 72cca638a82d..3807ac7faf4c 100644 --- a/net/netfilter/nf_conntrack_pptp.c +++ b/net/netfilter/nf_conntrack_pptp.c @@ -66,7 +66,7 @@ void struct nf_conntrack_expect *exp) __read_mostly; EXPORT_SYMBOL_GPL(nf_nat_pptp_hook_expectfn); -#if defined(DEBUG) || defined(CONFIG_DYNAMIC_PRINTK_DEBUG) +#if defined(DEBUG) || defined(CONFIG_DYNAMIC_DEBUG) /* PptpControlMessageType names */ const char *const pptp_msg_name[] = { "UNKNOWN_MESSAGE", |