Merge branch 'upstream' into upstream-jgarzik

[linux-2.6-omap-h63xx.git] / net / bridge / netfilter / ebt_ulog.c

diff --git a/net/bridge/netfilter/ebt_ulog.c b/net/bridge/netfilter/ebt_ulog.c
index 2e4cb24e191a38143532bbd2056a8463bd13321a..8e15cc47f6c0995b714727cf9f8d319ad5b6c5da 100644 (file)
--- a/net/bridge/netfilter/ebt_ulog.c
+++ b/net/bridge/netfilter/ebt_ulog.c
@@ -323,7 +323,7 @@ static void __exit ebt_ulog_fini(void)
        ebt_ulog_buff_t *ub;
        int i;
 
-       nf_log_unregister_logger(&ebt_ulog_logger);
+       nf_log_unregister(&ebt_ulog_logger);
        ebt_unregister_watcher(&ulog);
        for (i = 0; i < EBT_ULOG_MAXNLGROUPS; i++) {
                ub = &ulog_buffers[i];