summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/bcmdhd/include/proto/vlan.h
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2012-03-16 12:52:00 -0700
committerColin Cross <ccross@android.com>2012-04-09 13:58:03 -0700
commit832523286e7a5d2fb5ea9f4b87659508d44cdf45 (patch)
treed30a2afdbdf24f86dc2c062ee2dbfe35e8fdf157 /drivers/net/wireless/bcmdhd/include/proto/vlan.h
parente657952e41cf4d769206fb4cf1b3bf53189d5166 (diff)
net: wireless: bcmdhd: Update to version 6.10.67.2
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'drivers/net/wireless/bcmdhd/include/proto/vlan.h')
-rw-r--r--drivers/net/wireless/bcmdhd/include/proto/vlan.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/wireless/bcmdhd/include/proto/vlan.h b/drivers/net/wireless/bcmdhd/include/proto/vlan.h
index 27f00553760..9c94985cf95 100644
--- a/drivers/net/wireless/bcmdhd/include/proto/vlan.h
+++ b/drivers/net/wireless/bcmdhd/include/proto/vlan.h
@@ -1,9 +1,9 @@
/*
* 802.1Q VLAN protocol definitions
*
- * Copyright (C) 1999-2011, Broadcom Corporation
+ * Copyright (C) 1999-2012, Broadcom Corporation
*
- * Unless you and Broadcom execute a separate written software license
+ * Unless you and Broadcom execute a separate written software license
* agreement governing use of this software, this software is licensed to you
* under the terms of the GNU General Public License version 2 (the "GPL"),
* available at http://www.broadcom.com/licenses/GPLv2.php, with the
@@ -21,10 +21,9 @@
* software in any way with any other Broadcom software provided under a license
* other than the GPL, without Broadcom's express prior written consent.
*
- * $Id: vlan.h 277737 2011-08-16 17:54:59Z $
+ * $Id: vlan.h 241182 2011-02-17 21:50:03Z $
*/
-
#ifndef _vlan_h_
#define _vlan_h_