r8169: multicast register update (sync with Realtek's 8.004.00 8168 driver)

[linux-2.6-omap-h63xx.git] / kernel / marker.c

diff --git a/kernel/marker.c b/kernel/marker.c
index 005b959545933703bbb76e3f9720c5e42466df99..b5a9fe1d50d5ce1c480ca7ca1777e55e6deb485e 100644 (file)
--- a/kernel/marker.c
+++ b/kernel/marker.c
@@ -23,12 +23,13 @@
 #include <linux/rcupdate.h>
 #include <linux/marker.h>
 #include <linux/err.h>
+#include <linux/slab.h>
 
 extern struct marker __start___markers[];
 extern struct marker __stop___markers[];
 
 /* Set to 1 to enable marker debug output */
-const int marker_debug;
+static const int marker_debug;
 
 /*
  * markers_mutex nests inside module_mutex. Markers mutex protects the builtin