summaryrefslogtreecommitdiffstats
path: root/drivers/staging/vt6655/wmgr.c
diff options
context:
space:
mode:
authorCharles Clément <caratorn@gmail.com>2010-06-02 09:52:02 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2010-06-18 10:19:04 -0700
commite3fd16d0819e3b316a4fe316e5f32032df61e9db (patch)
tree1482a36469e09bc28d9bfa93b89c1b9b8cbafb2f /drivers/staging/vt6655/wmgr.c
parentb6e95cd52a81079abc1def7867e27bf541953089 (diff)
downloadlinux-stable-e3fd16d0819e3b316a4fe316e5f32032df61e9db.tar.gz
linux-stable-e3fd16d0819e3b316a4fe316e5f32032df61e9db.tar.bz2
linux-stable-e3fd16d0819e3b316a4fe316e5f32032df61e9db.zip
Staging: vt6655: remove custom ULONG typedef
Signed-off-by: Charles Clément <caratorn@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/vt6655/wmgr.c')
-rw-r--r--drivers/staging/vt6655/wmgr.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/vt6655/wmgr.c b/drivers/staging/vt6655/wmgr.c
index 093ccd3163e3..41f520afea11 100644
--- a/drivers/staging/vt6655/wmgr.c
+++ b/drivers/staging/vt6655/wmgr.c
@@ -393,18 +393,18 @@ vMgrTimerInit(
init_timer(&pMgmt->sTimerSecondCallback);
- pMgmt->sTimerSecondCallback.data = (ULONG)pDevice;
+ pMgmt->sTimerSecondCallback.data = (unsigned long) pDevice;
pMgmt->sTimerSecondCallback.function = (TimerFunction)BSSvSecondCallBack;
pMgmt->sTimerSecondCallback.expires = RUN_AT(HZ);
init_timer(&pDevice->sTimerCommand);
- pDevice->sTimerCommand.data = (ULONG)pDevice;
+ pDevice->sTimerCommand.data = (unsigned long) pDevice;
pDevice->sTimerCommand.function = (TimerFunction)vCommandTimer;
pDevice->sTimerCommand.expires = RUN_AT(HZ);
#ifdef TxInSleep
init_timer(&pDevice->sTimerTxData);
- pDevice->sTimerTxData.data = (ULONG)pDevice;
+ pDevice->sTimerTxData.data = (unsigned long) pDevice;
pDevice->sTimerTxData.function = (TimerFunction)BSSvSecondTxData;
pDevice->sTimerTxData.expires = RUN_AT(10*HZ); //10s callback
pDevice->fTxDataInSleep = FALSE;