diff options
author | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:51:56 -0800 |
---|---|---|
committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:51:56 -0800 |
commit | 68529c0f36074be88ee937634fb9433e69c96388 (patch) | |
tree | 00c842c0eff6a2b946e1c11a1bdf2d632535e0a7 /drivers/net/wireless/bcm4329/include/epivers.h | |
parent | f9a10833c7a12ce1244685eba88848bb88bbd43f (diff) | |
parent | 3ac6e2e8106ac304c56b9435c907b2b3bda27a09 (diff) |
Merge branch 'korg-android-tegra-3.1' into after-upstream-android
Conflicts:
arch/arm/mach-tegra/Kconfig
arch/arm/mach-tegra/board-ventana.c
drivers/misc/Kconfig
drivers/video/tegra/dc/hdmi.c
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>
Diffstat (limited to 'drivers/net/wireless/bcm4329/include/epivers.h')
-rw-r--r-- | drivers/net/wireless/bcm4329/include/epivers.h | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/drivers/net/wireless/bcm4329/include/epivers.h b/drivers/net/wireless/bcm4329/include/epivers.h new file mode 100644 index 000000000000..cd66a9501cb6 --- /dev/null +++ b/drivers/net/wireless/bcm4329/include/epivers.h @@ -0,0 +1,48 @@ +/* + * Copyright (C) 1999-2010, Broadcom Corporation + * + * 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 + * following added to such license: + * + * As a special exception, the copyright holders of this software give you + * permission to link this software with independent modules, and to copy and + * distribute the resulting executable under terms of your choice, provided that + * you also meet, for each linked independent module, the terms and conditions of + * the license of that module. An independent module is a module which is not + * derived from this software. The special exception does not apply to any + * modifications of the software. + * + * Notwithstanding the above, under no circumstances may you combine this + * 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: epivers.h.in,v 13.25 2005/10/28 18:35:33 Exp $ + * +*/ + + +#ifndef _epivers_h_ +#define _epivers_h_ + +#define EPI_MAJOR_VERSION 4 + +#define EPI_MINOR_VERSION 218 + +#define EPI_RC_NUMBER 248 + +#define EPI_INCREMENTAL_NUMBER 23 + +#define EPI_BUILD_NUMBER 0 + +#define EPI_VERSION 4, 218, 248, 23 + +#define EPI_VERSION_NUM 0x04daf817 + + +#define EPI_VERSION_STR "4.218.248.23" +#define EPI_ROUTER_VERSION_STR "4.219.248.23" + +#endif |