Merge branch 'omap-pool'

[linux-2.6-omap-h63xx.git] / drivers / staging / meilhaus / me4600_ai.h

diff --git a/drivers/staging/meilhaus/me4600_ai.h b/drivers/staging/meilhaus/me4600_ai.h
index 1d5a1b9c6f91e63004b3596b97505d344f78fa04..106e1959f9f13021ade6e19ee8e84715e9ecaaee 100644 (file)
--- a/drivers/staging/meilhaus/me4600_ai.h
+++ b/drivers/staging/meilhaus/me4600_ai.h
@@ -139,11 +139,7 @@ typedef struct me4600_ai_subdevice {
        wait_queue_head_t wait_queue;                                   /**< Wait queue to put on tasks waiting for data to arrive. */
 
        struct workqueue_struct *me4600_workqueue;
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
-       struct work_struct ai_control_task;
-#else
        struct delayed_work ai_control_task;
-#endif
 
        volatile int ai_control_task_flag;                              /**< Flag controling reexecuting of control task */