Merge branch 'for-linus' of git://repo.or.cz/cris-mirror

[mv-sheeva.git] / drivers / staging / meilhaus / me6000_ao.h

diff --git a/drivers/staging/meilhaus/me6000_ao.h b/drivers/staging/meilhaus/me6000_ao.h
index 9629649cd4103bcafab2b4fb5246ba1ba92cf1ed..ef4d0189bdea4a35c2e2a39e366e0e864b1da279 100644 (file)
--- a/drivers/staging/meilhaus/me6000_ao.h
+++ b/drivers/staging/meilhaus/me6000_ao.h
@@ -160,11 +160,7 @@ typedef struct me6000_ao_subdevice {
        wait_queue_head_t wait_queue;                   /**< Wait queue to put on tasks waiting for data to arrive. */
 
        struct workqueue_struct *me6000_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 */