From 45ef501b26fab6ebe97c13bd8b0285adc4e03bd8 Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven@narfation.org>
Date: Sun, 10 Jun 2012 23:58:51 +0200
Subject: [PATCH] --- yaml --- r: 314955 b: refs/heads/master c:
 b706b13b6cfde22d1f4adc540fd89426247c1e3e h: refs/heads/master i:   314953:
 d42edd5bba311a7c98a9aa6d31a9eaf1af4845e9   314951:
 cac0d7f9a5977a22fa2ca8e662026dab5e7f4657 v: v3

---
 [refs]                                            | 2 +-
 trunk/net/batman-adv/Makefile                     | 4 ++--
 trunk/net/batman-adv/{bat_debugfs.c => debugfs.c} | 2 +-
 trunk/net/batman-adv/{bat_debugfs.h => debugfs.h} | 0
 trunk/net/batman-adv/gateway_client.c             | 2 +-
 trunk/net/batman-adv/hard-interface.c             | 2 +-
 trunk/net/batman-adv/main.c                       | 4 ++--
 trunk/net/batman-adv/soft-interface.c             | 4 ++--
 trunk/net/batman-adv/{bat_sysfs.c => sysfs.c}     | 2 +-
 trunk/net/batman-adv/{bat_sysfs.h => sysfs.h}     | 0
 10 files changed, 11 insertions(+), 11 deletions(-)
 rename trunk/net/batman-adv/{bat_debugfs.c => debugfs.c} (99%)
 rename trunk/net/batman-adv/{bat_debugfs.h => debugfs.h} (100%)
 rename trunk/net/batman-adv/{bat_sysfs.c => sysfs.c} (99%)
 rename trunk/net/batman-adv/{bat_sysfs.h => sysfs.h} (100%)

diff --git a/[refs] b/[refs]
index 394c36c399f5..d155fc6926c8 100644
--- 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
index 6d5c1940667d..8676d2b1d574 100644
--- 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 b/trunk/net/batman-adv/debugfs.c
similarity index 99%
rename from trunk/net/batman-adv/bat_debugfs.c
rename to trunk/net/batman-adv/debugfs.c
index acf33e265f9c..e45cf0e884cc 100644
--- a/trunk/net/batman-adv/bat_debugfs.c
+++ b/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 b/trunk/net/batman-adv/debugfs.h
similarity index 100%
rename from trunk/net/batman-adv/bat_debugfs.h
rename to trunk/net/batman-adv/debugfs.h
diff --git a/trunk/net/batman-adv/gateway_client.c b/trunk/net/batman-adv/gateway_client.c
index 43b9c1763fff..b421cc49d2cd 100644
--- 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
index eb765a778ba0..60f50c5426a8 100644
--- 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
index 17dcdd90cb74..13c88b25ab31 100644
--- 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
index 7a7d82185393..b7c655cf626a 100644
--- 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 b/trunk/net/batman-adv/sysfs.c
similarity index 99%
rename from trunk/net/batman-adv/bat_sysfs.c
rename to trunk/net/batman-adv/sysfs.c
index a0a9ea43157c..66518c75c217 100644
--- a/trunk/net/batman-adv/bat_sysfs.c
+++ b/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 b/trunk/net/batman-adv/sysfs.h
similarity index 100%
rename from trunk/net/batman-adv/bat_sysfs.h
rename to trunk/net/batman-adv/sysfs.h