diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-01-07 10:29:26 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-01-07 10:29:26 +0900 |
| commit | 5e93c6b4ecd78b1bab49bad1dc2f6ed7ec0115ee (patch) | |
| tree | 4f4e321a1ca0baf64d8af528080c71f93495a7d7 /net/tipc/discover.h | |
| parent | 98d27b8abf413a310df6676f7d2128ada1cccc08 (diff) | |
| parent | 3c0cb7c31c206aaedb967e44b98442bbeb17a6c4 (diff) | |
| download | talos-op-linux-5e93c6b4ecd78b1bab49bad1dc2f6ed7ec0115ee.tar.gz talos-op-linux-5e93c6b4ecd78b1bab49bad1dc2f6ed7ec0115ee.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into rmobile-latest
Conflicts:
arch/arm/mach-shmobile/Kconfig
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'net/tipc/discover.h')
| -rw-r--r-- | net/tipc/discover.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/tipc/discover.h b/net/tipc/discover.h index f8e750636123..d2c3cffb79fc 100644 --- a/net/tipc/discover.h +++ b/net/tipc/discover.h @@ -37,8 +37,6 @@ #ifndef _TIPC_DISCOVER_H #define _TIPC_DISCOVER_H -#include "core.h" - struct link_req; struct link_req *tipc_disc_init_link_req(struct bearer *b_ptr, |
