diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-10 11:32:52 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-10 11:32:52 +0200 |
| commit | e92b4fdacc6a7d8cc7895b81347671d5fcd6c5e1 (patch) | |
| tree | 4f84567261682d8ec2ad4102bce1ff970a6eed1a /drivers/s390/cio/device.h | |
| parent | x86: unused variable in dma_alloc_coherent_gfp_flags() (diff) | |
| parent | Linux 2.6.27-rc6 (diff) | |
| download | linux-e92b4fdacc6a7d8cc7895b81347671d5fcd6c5e1.tar.xz linux-e92b4fdacc6a7d8cc7895b81347671d5fcd6c5e1.zip | |
Merge commit 'v2.6.27-rc6' into x86/iommu
Diffstat (limited to 'drivers/s390/cio/device.h')
| -rw-r--r-- | drivers/s390/cio/device.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/cio/device.h b/drivers/s390/cio/device.h index 9800a8335a3f..6f5c3f2b3587 100644 --- a/drivers/s390/cio/device.h +++ b/drivers/s390/cio/device.h @@ -72,7 +72,6 @@ dev_fsm_final_state(struct ccw_device *cdev) } extern struct workqueue_struct *ccw_device_work; -extern struct workqueue_struct *ccw_device_notify_work; extern wait_queue_head_t ccw_device_init_wq; extern atomic_t ccw_device_init_count; @@ -120,6 +119,7 @@ int ccw_device_stlck(struct ccw_device *); void ccw_device_trigger_reprobe(struct ccw_device *); void ccw_device_kill_io(struct ccw_device *); int ccw_device_notify(struct ccw_device *, int); +void ccw_device_set_notoper(struct ccw_device *cdev); /* qdio needs this. */ void ccw_device_set_timeout(struct ccw_device *, int); |