Merge branch 'omap-pool'

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

diff --git a/drivers/staging/meilhaus/me4600_ao.h b/drivers/staging/meilhaus/me4600_ao.h
index 6fbc4a2dd9ddaff886df2e5ae5357c6666edf419..7579435adc67cd09b493fa6778aef1aa52014207 100644 (file)
--- a/drivers/staging/meilhaus/me4600_ao.h
+++ b/drivers/staging/meilhaus/me4600_ao.h
@@ -225,11 +225,7 @@ typedef struct me4600_ao_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 ao_control_task;
-#else
        struct delayed_work ao_control_task;
-#endif
 
        volatile int ao_control_task_flag;                      /**< Flag controling reexecuting of control task */