---

yaml --- r: 314955 b: refs/heads/master c: b706b13 h: refs/heads/master i: 314953: d42edd5 314951: cac0d7f v: v3
git-mirror · Jul 1, 2012 · 45ef501 · 45ef501
1 parent e093c37
commit 45ef501
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a8a0a62d1f173620f150830db437ddd65a103d49
+refs/heads/master: b706b13b6cfde22d1f4adc540fd89426247c1e3e
diff --git a/trunk/net/batman-adv/Makefile b/trunk/net/batman-adv/Makefile
@@ -19,11 +19,10 @@
 #
 
 obj-$(CONFIG_BATMAN_ADV) += batman-adv.o
-batman-adv-y += bat_debugfs.o
 batman-adv-y += bat_iv_ogm.o
-batman-adv-y += bat_sysfs.o
 batman-adv-y += bitarray.o
 batman-adv-$(CONFIG_BATMAN_ADV_BLA) += bridge_loop_avoidance.o
+batman-adv-y += debugfs.o
 batman-adv-y += gateway_client.o
 batman-adv-y += gateway_common.o
 batman-adv-y += hard-interface.o
@@ -35,6 +34,7 @@ batman-adv-y += ring_buffer.o
 batman-adv-y += routing.o
 batman-adv-y += send.o
 batman-adv-y += soft-interface.o
+batman-adv-y += sysfs.o
 batman-adv-y += translation-table.o
 batman-adv-y += unicast.o
 batman-adv-y += vis.o
diff --git a/trunk/net/batman-adv/bat_debugfs.c → trunk/net/batman-adv/debugfs.c b/trunk/net/batman-adv/bat_debugfs.c → trunk/net/batman-adv/debugfs.c
@@ -21,7 +21,7 @@
 
 #include <linux/debugfs.h>
 
-#include "bat_debugfs.h"
+#include "debugfs.h"
 #include "translation-table.h"
 #include "originator.h"
 #include "hard-interface.h"

diff --git a/trunk/net/batman-adv/bat_debugfs.h → trunk/net/batman-adv/debugfs.h b/trunk/net/batman-adv/bat_debugfs.h → trunk/net/batman-adv/debugfs.h
diff --git a/trunk/net/batman-adv/gateway_client.c b/trunk/net/batman-adv/gateway_client.c
@@ -18,7 +18,7 @@
  */
 
 #include "main.h"
-#include "bat_sysfs.h"
+#include "sysfs.h"
 #include "gateway_client.h"
 #include "gateway_common.h"
 #include "hard-interface.h"

diff --git a/trunk/net/batman-adv/hard-interface.c b/trunk/net/batman-adv/hard-interface.c
@@ -23,7 +23,7 @@
 #include "send.h"
 #include "translation-table.h"
 #include "routing.h"
-#include "bat_sysfs.h"
+#include "sysfs.h"
 #include "originator.h"
 #include "hash.h"
 #include "bridge_loop_avoidance.h"

diff --git a/trunk/net/batman-adv/main.c b/trunk/net/batman-adv/main.c
@@ -18,8 +18,8 @@
  */
 
 #include "main.h"
-#include "bat_sysfs.h"
-#include "bat_debugfs.h"
+#include "sysfs.h"
+#include "debugfs.h"
 #include "routing.h"
 #include "send.h"
 #include "originator.h"

diff --git a/trunk/net/batman-adv/soft-interface.c b/trunk/net/batman-adv/soft-interface.c
@@ -22,12 +22,12 @@
 #include "hard-interface.h"
 #include "routing.h"
 #include "send.h"
-#include "bat_debugfs.h"
+#include "debugfs.h"
 #include "translation-table.h"
 #include "hash.h"
 #include "gateway_common.h"
 #include "gateway_client.h"
-#include "bat_sysfs.h"
+#include "sysfs.h"
 #include "originator.h"
 #include <linux/slab.h>
 #include <linux/ethtool.h>

diff --git a/trunk/net/batman-adv/bat_sysfs.c → trunk/net/batman-adv/sysfs.c b/trunk/net/batman-adv/bat_sysfs.c → trunk/net/batman-adv/sysfs.c
@@ -18,7 +18,7 @@
  */
 
 #include "main.h"
-#include "bat_sysfs.h"
+#include "sysfs.h"
 #include "translation-table.h"
 #include "originator.h"
 #include "hard-interface.h"

diff --git a/trunk/net/batman-adv/bat_sysfs.h → trunk/net/batman-adv/sysfs.h b/trunk/net/batman-adv/bat_sysfs.h → trunk/net/batman-adv/sysfs.h