summaryrefslogtreecommitdiffstats
path: root/drivers/net/wimax
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2009-03-13 22:44:51 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-03-13 22:44:51 +0100
commit97fb44eb6bc01f4ffed4300e475aa15e44877375 (patch)
tree481ed6efd0babe7185cae04f2fd295426b36411d /drivers/net/wimax
parent[ARM] 5422/1: ARM: MMU: add a Non-cacheable Normal executable memory type (diff)
parentqong: basic support for Dave/DENX QongEVB-LITE board (diff)
downloadlinux-97fb44eb6bc01f4ffed4300e475aa15e44877375.tar.xz
linux-97fb44eb6bc01f4ffed4300e475aa15e44877375.zip
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel
Conflicts: arch/arm/mach-at91/gpio.c
Diffstat (limited to 'drivers/net/wimax')
-rw-r--r--drivers/net/wimax/i2400m/i2400m.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wimax/i2400m/i2400m.h b/drivers/net/wimax/i2400m/i2400m.h
index 067c871cc226..3b9d27ea2950 100644
--- a/drivers/net/wimax/i2400m/i2400m.h
+++ b/drivers/net/wimax/i2400m/i2400m.h
@@ -157,7 +157,7 @@ enum {
/* Firmware version we request when pulling the fw image file */
-#define I2400M_FW_VERSION "1.3"
+#define I2400M_FW_VERSION "1.4"
/**