diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2017-04-04 11:31:12 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2017-04-04 11:31:12 +0200 |
| commit | 38bffdac071b720db627bfd2b125a2802a04d419 (patch) | |
| tree | c2e9cf66fa6ff1cc3092079e3eedeb4e6c402227 /drivers/scsi/scsi_priv.h | |
| parent | locking/ww-mutex: Limit stress test to 2 seconds (diff) | |
| parent | sched/fair: Optimize ___update_sched_avg() (diff) | |
| download | linux-38bffdac071b720db627bfd2b125a2802a04d419.tar.xz linux-38bffdac071b720db627bfd2b125a2802a04d419.zip | |
Merge branch 'sched/core' into locking/core
Required for the rtmutex/sched_deadline patches which depend on both
branches
Diffstat (limited to 'drivers/scsi/scsi_priv.h')
| -rw-r--r-- | drivers/scsi/scsi_priv.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/scsi/scsi_priv.h b/drivers/scsi/scsi_priv.h index 99bfc985e190..f11bd102d6d5 100644 --- a/drivers/scsi/scsi_priv.h +++ b/drivers/scsi/scsi_priv.h @@ -188,8 +188,5 @@ static inline void scsi_dh_remove_device(struct scsi_device *sdev) { } */ #define SCSI_DEVICE_BLOCK_MAX_TIMEOUT 600 /* units in seconds */ -extern int scsi_internal_device_block(struct scsi_device *sdev); -extern int scsi_internal_device_unblock(struct scsi_device *sdev, - enum scsi_device_state new_state); #endif /* _SCSI_PRIV_H */ |