diff options
| author | merge <null@invalid> | 2009-01-19 00:47:51 +0000 |
|---|---|---|
| committer | Andy Green <agreen@octopus.localdomain> | 2009-01-19 00:47:51 +0000 |
| commit | 3779b1cf0be55e0affcff56379cdfb8a07fdd840 (patch) | |
| tree | f7b05d2e2188885a37ac3be6fd3c0bf075fe05ac /drivers/ar6000 | |
| parent | 3a01f98ede89d2d0791393c43625e824f03c3065 (diff) | |
MERGE-via-pending-tracking-hist-MERGE-via-stable-tracking-fix-touchscreen-filter-include-1232325217
pending-tracking-hist top was MERGE-via-stable-tracking-fix-touchscreen-filter-include-1232325217 / d063e8c6d85c48de80b3d158bfa98d5a97149711 ... parent commitmessage:
From: merge <null@invalid>
MERGE-via-stable-tracking-hist-fix-touchscreen-filter-include
stable-tracking-hist top was fix-touchscreen-filter-include / bb151f28fc8e8923baad96e0f3e8f0ae57af95f5 ... parent commitmessage:
From: Nelson Castillo <arhuaco@freaks-unidos.net>
Fix touchscreen filter includes
Fix #includes to make the kernel compile again.
Signed-off-by: Nelson Castillo <arhuaco@freaks-unidos.net>
Diffstat (limited to 'drivers/ar6000')
| -rw-r--r-- | drivers/ar6000/htc/ar6k.c | 2 | ||||
| -rw-r--r-- | drivers/ar6000/htc/ar6k_events.c | 2 | ||||
| -rw-r--r-- | drivers/ar6000/miscdrv/common_drv.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ar6000/htc/ar6k.c b/drivers/ar6000/htc/ar6k.c index 0fd671ab064..72472abb0d8 100644 --- a/drivers/ar6000/htc/ar6k.c +++ b/drivers/ar6000/htc/ar6k.c @@ -723,7 +723,7 @@ static A_STATUS GetCredits(AR6K_DEVICE *pDev, int mbox, int *pCredits) } /* delay a little, target may not be ready */ - A_MDELAY(1000); + msleep(1000); } diff --git a/drivers/ar6000/htc/ar6k_events.c b/drivers/ar6000/htc/ar6k_events.c index fbbcd51896e..91b29af3711 100644 --- a/drivers/ar6000/htc/ar6k_events.c +++ b/drivers/ar6000/htc/ar6k_events.c @@ -131,7 +131,7 @@ A_STATUS DevPollMboxMsgRecv(AR6K_DEVICE *pDev, } /* delay a little */ - A_MDELAY(DELAY_PER_INTERVAL_MS); + msleep(DELAY_PER_INTERVAL_MS); AR_DEBUG_PRINTF(ATH_DEBUG_RECV,(" Retry Mbox Poll : %d \n",timeout)); } diff --git a/drivers/ar6000/miscdrv/common_drv.c b/drivers/ar6000/miscdrv/common_drv.c index 2b0dfd32931..4f127346665 100644 --- a/drivers/ar6000/miscdrv/common_drv.c +++ b/drivers/ar6000/miscdrv/common_drv.c @@ -311,7 +311,7 @@ ar6000_reset_device_skipflash(HIF_DEVICE *hifDevice) } } - A_MDELAY(50); /* delay to allow dragon to come to BMI phase */ + msleep(50); /* delay to allow dragon to come to BMI phase */ return A_OK; } @@ -350,7 +350,7 @@ A_STATUS ar6000_reset_device(HIF_DEVICE *hifDevice, A_UINT32 TargetType) * Read back the RESET CAUSE register to ensure that the cold reset * went through. */ - A_MDELAY(2000); /* 2 second delay to allow things to settle down */ + msleep(2000); /* 2 second delay to allow things to settle down */ // address = RESET_CAUSE_ADDRESS; |