From 3779b1cf0be55e0affcff56379cdfb8a07fdd840 Mon Sep 17 00:00:00 2001 From: merge Date: Mon, 19 Jan 2009 00:47:51 +0000 Subject: 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 MERGE-via-stable-tracking-hist-fix-touchscreen-filter-include stable-tracking-hist top was fix-touchscreen-filter-include / bb151f28fc8e8923baad96e0f3e8f0ae57af95f5 ... parent commitmessage: From: Nelson Castillo Fix touchscreen filter includes Fix #includes to make the kernel compile again. Signed-off-by: Nelson Castillo --- drivers/ar6000/miscdrv/common_drv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/ar6000/miscdrv') 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; -- cgit v1.2.3