summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorNitin Kumbhar <nkumbhar@nvidia.com>2010-12-15 18:58:18 +0530
committerNitin Kumbhar <nkumbhar@nvidia.com>2010-12-15 18:58:18 +0530
commit51137becfb544f2569d6cc9130f395f7f1aef93c (patch)
tree271b9e62d503bc9c9c5109a506029c5449317be7 /drivers/net
parentf22a0367722d2c24fee84dcb23dc47a042d42108 (diff)
parent8afb3d34090820f4128e6e2182a7231423c47b28 (diff)
merging android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36
Change-Id: I84ac6254ede2e88e8141e6ffd630eb753d9b1d91
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/bcm4329/include/epivers.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wireless/bcm4329/include/epivers.h b/drivers/net/wireless/bcm4329/include/epivers.h
index 062df0480357..6d5adf258ef8 100644
--- a/drivers/net/wireless/bcm4329/include/epivers.h
+++ b/drivers/net/wireless/bcm4329/include/epivers.h
@@ -33,16 +33,16 @@
#define EPI_RC_NUMBER 248
-#define EPI_INCREMENTAL_NUMBER 15
+#define EPI_INCREMENTAL_NUMBER 17
#define EPI_BUILD_NUMBER 0
-#define EPI_VERSION 4, 218, 248, 15
+#define EPI_VERSION 4, 218, 248, 17
-#define EPI_VERSION_NUM 0x04daf80f
+#define EPI_VERSION_NUM 0x04daf811
-#define EPI_VERSION_STR "4.218.248.15"
-#define EPI_ROUTER_VERSION_STR "4.219.248.15"
+#define EPI_VERSION_STR "4.218.248.17"
+#define EPI_ROUTER_VERSION_STR "4.219.248.17"
#endif