diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-07-27 13:36:54 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-07-27 13:36:54 -0400 |
| commit | c2834cf4746cf13501efc3489b1895bce58a4ccb (patch) | |
| tree | 13614c2ed7ec156d8518fd5bff4e1c252fb05792 /include/scsi/scsi_host.h | |
| parent | 05cb784c81a0fd1f97732156ea464bd392ce875a (diff) | |
| parent | 9e566d8bd61f939b7f5d7d969f5b178571471cf9 (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'include/scsi/scsi_host.h')
| -rw-r--r-- | include/scsi/scsi_host.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h index db9914adeac9..81d5234f6771 100644 --- a/include/scsi/scsi_host.h +++ b/include/scsi/scsi_host.h | |||
| @@ -641,12 +641,6 @@ static inline void scsi_assign_lock(struct Scsi_Host *shost, spinlock_t *lock) | |||
| 641 | shost->host_lock = lock; | 641 | shost->host_lock = lock; |
| 642 | } | 642 | } |
| 643 | 643 | ||
| 644 | static inline void scsi_set_device(struct Scsi_Host *shost, | ||
| 645 | struct device *dev) | ||
| 646 | { | ||
| 647 | shost->shost_gendev.parent = dev; | ||
| 648 | } | ||
| 649 | |||
| 650 | static inline struct device *scsi_get_device(struct Scsi_Host *shost) | 644 | static inline struct device *scsi_get_device(struct Scsi_Host *shost) |
| 651 | { | 645 | { |
| 652 | return shost->shost_gendev.parent; | 646 | return shost->shost_gendev.parent; |