diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-04-12 16:18:44 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-04-12 16:18:44 -0400 |
| commit | 252f4bf400df1712408fe83ba199a66a1b57ab1d (patch) | |
| tree | e07fa00abdd55b31e22567786c78635f32c6a66c /drivers/net/wireless/wl1251/cmd.h | |
| parent | 6ba1037c3d871ab70e342631516dbf841c35b086 (diff) | |
| parent | b37e3b6d64358604960b35e8ecbb7aed22e0926e (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
drivers/net/wireless/ath/ar9170/main.c
drivers/net/wireless/ath/ar9170/phy.c
drivers/net/wireless/zd1211rw/zd_rf_rf2959.c
Diffstat (limited to 'drivers/net/wireless/wl1251/cmd.h')
| -rw-r--r-- | drivers/net/wireless/wl1251/cmd.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/wl1251/cmd.h b/drivers/net/wireless/wl1251/cmd.h index e5c74c63137..79ca5273c9e 100644 --- a/drivers/net/wireless/wl1251/cmd.h +++ b/drivers/net/wireless/wl1251/cmd.h | |||
| @@ -313,8 +313,8 @@ struct wl1251_cmd_vbm_update { | |||
| 313 | } __packed; | 313 | } __packed; |
| 314 | 314 | ||
| 315 | enum wl1251_cmd_ps_mode { | 315 | enum wl1251_cmd_ps_mode { |
| 316 | STATION_ACTIVE_MODE, | 316 | CHIP_ACTIVE_MODE, |
| 317 | STATION_POWER_SAVE_MODE | 317 | CHIP_POWER_SAVE_MODE |
| 318 | }; | 318 | }; |
| 319 | 319 | ||
| 320 | struct wl1251_cmd_ps_params { | 320 | struct wl1251_cmd_ps_params { |