git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...
[sfrench/cifs-2.6.git]
/
net
/
bluetooth
/
6lowpan.c
diff --git
a/net/bluetooth/6lowpan.c
b/net/bluetooth/6lowpan.c
index d906016f3c6bd5219cbc23e175681044a444f199..8796ffa08b43b4f57ae1485f4a5867c0f532807c 100644
(file)
--- a/
net/bluetooth/6lowpan.c
+++ b/
net/bluetooth/6lowpan.c
@@
-27,7
+27,7
@@
#include "6lowpan.h"
-#include
"../ieee802154/6lowpan.h"
/* for the compression support */
+#include
<net/6lowpan.h>
/* for the compression support */
#define IFACE_NAME_TEMPLATE "bt%d"
#define EUI64_ADDR_LEN 8