The following commit has been merged in the merge/master branch: commit 03619f9888a74f99f1f2c67980ab983bb0ff1ad4 Author: Antonio Quartulli a@unstable.cc Date: Sat May 21 20:17:56 2016 +0800

batman-adv: move include line at the same place as other files

main.h is always included after the #ifdef guard except for bat_v_elp.h. Move it at the right place.

Signed-off-by: Antonio Quartulli a@unstable.cc Reviewed-by: Sven Eckelmann sven@narfation.org Signed-off-by: Marek Lindner mareklindner@neomailbox.ch

diff --git a/net/batman-adv/bat_v_elp.h b/net/batman-adv/bat_v_elp.h index cc130b2..be17c0b 100644 --- a/net/batman-adv/bat_v_elp.h +++ b/net/batman-adv/bat_v_elp.h @@ -15,11 +15,11 @@ * along with this program; if not, see http://www.gnu.org/licenses/. */

-#include "main.h" - #ifndef _NET_BATMAN_ADV_BAT_V_ELP_H_ #define _NET_BATMAN_ADV_BAT_V_ELP_H_

+#include "main.h" + struct sk_buff; struct work_struct;