diff options
| author | KalimochoAz <calimochoazucarado@gmail.com> | 2012-07-20 18:02:09 +0200 |
|---|---|---|
| committer | KalimochoAz <calimochoazucarado@gmail.com> | 2012-07-20 18:02:09 +0200 |
| commit | 4439c06398d46eafc69ea52414418d3ffb27bfe7 (patch) | |
| tree | b82f0eac135eb0ea9f60b829ece153ac62bff6ad /drivers/net/wireless/bcmdhd/include/proto/ethernet.h | |
| parent | 632456bcbac1cacb988883c915174cf841a883f8 (diff) | |
| parent | d45c5b0622ff2099402a09eae29a01e9fdb96bdf (diff) | |
| download | kernel_samsung_crespo-4439c06398d46eafc69ea52414418d3ffb27bfe7.tar.gz kernel_samsung_crespo-4439c06398d46eafc69ea52414418d3ffb27bfe7.tar.bz2 kernel_samsung_crespo-4439c06398d46eafc69ea52414418d3ffb27bfe7.zip | |
Merge remote-tracking branch 'google/android-samsung-3.0-jb' into HEAD
Conflicts:
arch/arm/mach-s5pv210/mach-herring.c
drivers/media/video/samsung/fimc/fimc_dev.c
include/trace/events/cpufreq_interactive.h
Diffstat (limited to 'drivers/net/wireless/bcmdhd/include/proto/ethernet.h')
| -rw-r--r-- | drivers/net/wireless/bcmdhd/include/proto/ethernet.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/bcmdhd/include/proto/ethernet.h b/drivers/net/wireless/bcmdhd/include/proto/ethernet.h index 6a6dd14c1bb..20865dc5a23 100644 --- a/drivers/net/wireless/bcmdhd/include/proto/ethernet.h +++ b/drivers/net/wireless/bcmdhd/include/proto/ethernet.h @@ -21,7 +21,7 @@ * 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: ethernet.h,v 9.56 2009-10-15 22:54:58 Exp $ + * $Id: ethernet.h 285437 2011-09-21 22:16:56Z $ */ @@ -69,6 +69,7 @@ #define ETHER_TYPE_802_1X 0x888e #define ETHER_TYPE_802_1X_PREAUTH 0x88c7 #define ETHER_TYPE_WAI 0x88b4 +#define ETHER_TYPE_89_0D 0x890d |