diff options
author | Michal Marek <mmarek@suse.cz> | 2010-10-12 15:09:06 +0200 |
---|---|---|
committer | Michal Marek <mmarek@suse.cz> | 2010-10-12 15:09:06 +0200 |
commit | 239060b93bb30a4ad55f1ecaa512464a035cc5ba (patch) | |
tree | 77f79810e57d4fc24356eca0cd6db463e8994128 /drivers/staging/batman-adv/aggregation.h | |
parent | kconfig: Use PATH_MAX instead of 128 for path buffer sizes. (diff) | |
parent | kbuild: fix oldnoconfig to do the right thing (diff) | |
download | linux-dev-239060b93bb30a4ad55f1ecaa512464a035cc5ba.tar.xz linux-dev-239060b93bb30a4ad55f1ecaa512464a035cc5ba.zip |
Merge branch 'kbuild/rc-fixes' into kbuild/kconfig
We need to revert the temporary hack in 71ebc01, hence the merge.
Diffstat (limited to 'drivers/staging/batman-adv/aggregation.h')
-rw-r--r-- | drivers/staging/batman-adv/aggregation.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/staging/batman-adv/aggregation.h b/drivers/staging/batman-adv/aggregation.h index 84401ca24c35..71a91b3da913 100644 --- a/drivers/staging/batman-adv/aggregation.h +++ b/drivers/staging/batman-adv/aggregation.h @@ -19,6 +19,9 @@ * */ +#ifndef _NET_BATMAN_ADV_AGGREGATION_H_ +#define _NET_BATMAN_ADV_AGGREGATION_H_ + #include "main.h" /* is there another aggregated packet here? */ @@ -36,3 +39,5 @@ void add_bat_packet_to_list(struct bat_priv *bat_priv, unsigned long send_time); void receive_aggr_bat_packet(struct ethhdr *ethhdr, unsigned char *packet_buff, int packet_len, struct batman_if *if_incoming); + +#endif /* _NET_BATMAN_ADV_AGGREGATION_H_ */ |