diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
| commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
| tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /drivers/net/ps3_gelic_wireless.h | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'drivers/net/ps3_gelic_wireless.h')
| -rw-r--r-- | drivers/net/ps3_gelic_wireless.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ps3_gelic_wireless.h b/drivers/net/ps3_gelic_wireless.h index 5b631c6c9775..0a88b535197a 100644 --- a/drivers/net/ps3_gelic_wireless.h +++ b/drivers/net/ps3_gelic_wireless.h | |||
| @@ -199,7 +199,7 @@ struct gelic_eurus_rssi_info { | |||
| 199 | /* for 'stat' member of gelic_wl_info */ | 199 | /* for 'stat' member of gelic_wl_info */ |
| 200 | enum gelic_wl_info_status_bit { | 200 | enum gelic_wl_info_status_bit { |
| 201 | GELIC_WL_STAT_CONFIGURED, | 201 | GELIC_WL_STAT_CONFIGURED, |
| 202 | GELIC_WL_STAT_CH_INFO, /* ch info aquired */ | 202 | GELIC_WL_STAT_CH_INFO, /* ch info acquired */ |
| 203 | GELIC_WL_STAT_ESSID_SET, /* ESSID specified by userspace */ | 203 | GELIC_WL_STAT_ESSID_SET, /* ESSID specified by userspace */ |
| 204 | GELIC_WL_STAT_BSSID_SET, /* BSSID specified by userspace */ | 204 | GELIC_WL_STAT_BSSID_SET, /* BSSID specified by userspace */ |
| 205 | GELIC_WL_STAT_WPA_PSK_SET, /* PMK specified by userspace */ | 205 | GELIC_WL_STAT_WPA_PSK_SET, /* PMK specified by userspace */ |