diff options
author | John W. Linville <linville@tuxdriver.com> | 2012-02-22 14:44:50 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-02-22 14:44:50 -0500 |
commit | 8715d941b2fa8591474e7d0dad66589fce1892d2 (patch) | |
tree | ec228ec158bb5b4424f898d336279c29de4cf81f /drivers/net/wireless/wl1251/boot.c | |
parent | ca994a36f585432458ead9133fcfe05440edbb7b (diff) | |
parent | 51c4ed95a857ded6017537fd53fa00db64908954 (diff) |
Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx
Diffstat (limited to 'drivers/net/wireless/wl1251/boot.c')
-rw-r--r-- | drivers/net/wireless/wl1251/boot.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/wireless/wl1251/boot.c b/drivers/net/wireless/wl1251/boot.c index d729daf8e841..a2e5241382da 100644 --- a/drivers/net/wireless/wl1251/boot.c +++ b/drivers/net/wireless/wl1251/boot.c | |||
@@ -464,8 +464,6 @@ static int wl1251_boot_upload_nvs(struct wl1251 *wl) | |||
464 | val = (nvs_ptr[0] | (nvs_ptr[1] << 8) | 464 | val = (nvs_ptr[0] | (nvs_ptr[1] << 8) |
465 | | (nvs_ptr[2] << 16) | (nvs_ptr[3] << 24)); | 465 | | (nvs_ptr[2] << 16) | (nvs_ptr[3] << 24)); |
466 | 466 | ||
467 | val = cpu_to_le32(val); | ||
468 | |||
469 | wl1251_debug(DEBUG_BOOT, | 467 | wl1251_debug(DEBUG_BOOT, |
470 | "nvs write table 0x%x: 0x%x", | 468 | "nvs write table 0x%x: 0x%x", |
471 | nvs_start, val); | 469 | nvs_start, val); |