Merge branch 'fixes-2.6.39' into for-2.6.40

1 files changed, 1 insertions, 6 deletions

diff --git a/lib/show_mem.c b/lib/show_mem.c
index d8d602b58c31..90cbe4bb5960 100644
--- a/lib/show_mem.c
+++ b/lib/show_mem.c
@@ -9,7 +9,7 @@
 #include <linux/nmi.h>
 #include <linux/quicklist.h>
 
-void __show_mem(unsigned int filter)
+void show_mem(unsigned int filter)
 {
         pg_data_t *pgdat;
         unsigned long total = 0, reserved = 0, shared = 0,
@@ -61,8 +61,3 @@ void __show_mem(unsigned int filter)
                 quicklist_total_size());
 #endif
 }
-
-void show_mem(void)
-{
-        __show_mem(0);
-}