diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-13 14:06:52 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-13 14:06:52 +1000 |
| commit | 8debae6516475849bc04c26eb1af1ecfaace7867 (patch) | |
| tree | 9bbaeaa2bd65d8256acc3588074233bf2b21f31c /drivers/staging/batman-adv/hard-interface.h | |
| parent | b05cf6f03073a7411127da92363330a19fc57d49 (diff) | |
| parent | a6bff488e7267b65d7c6b2e0d5d2dd2257e65ea4 (diff) | |
Merge remote branch 'staging-next/staging-next'
Conflicts:
drivers/staging/batman-adv/bat_sysfs.c
drivers/staging/batman-adv/device.c
drivers/staging/cx25821/cx25821-audups11.c
Diffstat (limited to 'drivers/staging/batman-adv/hard-interface.h')
| -rw-r--r-- | drivers/staging/batman-adv/hard-interface.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/staging/batman-adv/hard-interface.h b/drivers/staging/batman-adv/hard-interface.h index 1e5fc3e720f4..d5640b045cb3 100644 --- a/drivers/staging/batman-adv/hard-interface.h +++ b/drivers/staging/batman-adv/hard-interface.h @@ -19,6 +19,9 @@ * */ +#ifndef _NET_BATMAN_ADV_HARD_INTERFACE_H_ +#define _NET_BATMAN_ADV_HARD_INTERFACE_H_ + #define IF_NOT_IN_USE 0 #define IF_TO_BE_REMOVED 1 #define IF_INACTIVE 2 @@ -38,3 +41,5 @@ int batman_skb_recv(struct sk_buff *skb, struct net_device *orig_dev); int hardif_min_mtu(void); void update_min_mtu(void); + +#endif /* _NET_BATMAN_ADV_HARD_INTERFACE_H_ */ |