aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wimax/cmc7xx/download.h
diff options
context:
space:
mode:
authorKalimochoAz <calimochoazucarado@gmail.com>2012-07-20 18:02:09 +0200
committerKalimochoAz <calimochoazucarado@gmail.com>2012-07-20 18:02:09 +0200
commit4439c06398d46eafc69ea52414418d3ffb27bfe7 (patch)
treeb82f0eac135eb0ea9f60b829ece153ac62bff6ad /drivers/net/wimax/cmc7xx/download.h
parent632456bcbac1cacb988883c915174cf841a883f8 (diff)
parentd45c5b0622ff2099402a09eae29a01e9fdb96bdf (diff)
downloadkernel_samsung_crespo-4439c06398d46eafc69ea52414418d3ffb27bfe7.zip
kernel_samsung_crespo-4439c06398d46eafc69ea52414418d3ffb27bfe7.tar.gz
kernel_samsung_crespo-4439c06398d46eafc69ea52414418d3ffb27bfe7.tar.bz2
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/wimax/cmc7xx/download.h')
-rwxr-xr-xdrivers/net/wimax/cmc7xx/download.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wimax/cmc7xx/download.h b/drivers/net/wimax/cmc7xx/download.h
index f99de4a..34851e0 100755
--- a/drivers/net/wimax/cmc7xx/download.h
+++ b/drivers/net/wimax/cmc7xx/download.h
@@ -24,7 +24,8 @@
#define MAX_IMAGE_DATA_LENGTH 3564
#define MAX_IMAGE_DATA_MSG_LENGTH 4096
-#define FWDOWNLOAD_TIMEOUT 5
+#define MODEM_RESP_RETRY 15
+#define FWDOWNLOAD_TIMEOUT 12
#define MAX_WIMAXFW_SIZE 2100000
/* used for host boot (firmware download) */