git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
include
/
linux
/
if_pppox.h
diff --git
a/include/linux/if_pppox.h
b/include/linux/if_pppox.h
index
40743e0
..
6fb7f17
100644
(file)
--- a/
include/linux/if_pppox.h
+++ b/
include/linux/if_pppox.h
@@
-24,7
+24,6
@@
#include <linux/if_ether.h>
#include <linux/if.h>
#include <linux/netdevice.h>
-#include <asm/semaphore.h>
#include <linux/ppp_channel.h>
#endif /* __KERNEL__ */
#include <linux/if_pppol2tp.h>