diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-07 15:25:23 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-07 15:25:23 +1000 |
| commit | 1b7aed7de4705eb4cb545850778a429cecc02068 (patch) | |
| tree | 718655d69ac6711dfe1cc13e8e21f0a72c97124f /drivers/staging/vt6655/wpactl.h | |
| parent | 0cbca3ed3c8213acd20c8586cfe68e83d85976e3 (diff) | |
| parent | 12513b76a021e5b41a9d5d5981da75dfd6480890 (diff) | |
Merge remote branch 'staging-next/staging-next'
Conflicts:
drivers/staging/batman-adv/bat_sysfs.c
drivers/staging/batman-adv/device.c
drivers/staging/cx25821/cx25821-audups11.c
Diffstat (limited to 'drivers/staging/vt6655/wpactl.h')
| -rw-r--r-- | drivers/staging/vt6655/wpactl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/vt6655/wpactl.h b/drivers/staging/vt6655/wpactl.h index b0d92d51a2a6..52bc7e3dbb48 100644 --- a/drivers/staging/vt6655/wpactl.h +++ b/drivers/staging/vt6655/wpactl.h @@ -54,7 +54,7 @@ typedef enum { KEY_MGMT_802_1X, KEY_MGMT_CCKM,KEY_MGMT_PSK, KEY_MGMT_NONE, -typedef ULONGLONG NDIS_802_11_KEY_RSC; +typedef unsigned long long NDIS_802_11_KEY_RSC; /*--------------------- Export Classes ----------------------------*/ |