From e8ad9e4129d121605c0781b2c9f7428ee549b814 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Wed, 24 Aug 2011 18:40:48 +0000
Subject: [PATCH] --- yaml --- r: 265539 b: refs/heads/master c:
 22ad72b0277b02d4b4dee99ae69a58f616a46435 h: refs/heads/master i:   265537:
 c21361436f6e04e1e4fe4eab8db41bc01f7ea446   265535:
 1c30f5bd6b499b43fdaac385e4180419fd3e965a v: v3

---
 [refs]                         | 2 +-
 trunk/include/linux/if_pppox.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5a7314892664..01acdd481965 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0856a304091b33a8e8f9f9c98e776f425af2b625
+refs/heads/master: 22ad72b0277b02d4b4dee99ae69a58f616a46435
diff --git a/trunk/include/linux/if_pppox.h b/trunk/include/linux/if_pppox.h
index 397921b09ef9..60e5558045c8 100644
--- a/trunk/include/linux/if_pppox.h
+++ b/trunk/include/linux/if_pppox.h
@@ -20,8 +20,8 @@
 #include <linux/types.h>
 #include <asm/byteorder.h>
 
-#ifdef  __KERNEL__
 #include <linux/if_ether.h>
+#ifdef  __KERNEL__
 #include <linux/if.h>
 #include <linux/netdevice.h>
 #include <linux/ppp_channel.h>