summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/smartpqi/smartpqi_sis.h
diff options
context:
space:
mode:
authorJani Nikula <jani.nikula@intel.com>2019-01-08 09:50:22 +0100
committerJani Nikula <jani.nikula@intel.com>2019-01-08 09:50:22 +0100
commit3eb0930a425b086bdab38156aa4708427479a201 (patch)
treeea0bceef5bd1f62e4993f8f2f22a81f9da5f1f09 /drivers/scsi/smartpqi/smartpqi_sis.h
parentMerge tag 'topic/drmp-cleanup-2019-01-02' of git://anongit.freedesktop.org/dr... (diff)
parentLinux 5.0-rc1 (diff)
downloadlinux-3eb0930a425b086bdab38156aa4708427479a201.tar.xz
linux-3eb0930a425b086bdab38156aa4708427479a201.zip
Merge drm/drm-next into drm-intel-next-queued
Generally catch up with 5.0-rc1, and specifically get the changes: 96d4f267e40f ("Remove 'type' argument from access_ok() function") 0b2c8f8b6b0c ("i915: fix missing user_access_end() in page fault exception case") 594cc251fdd0 ("make 'user_access_begin()' do 'access_ok()'") Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/scsi/smartpqi/smartpqi_sis.h')
-rw-r--r--drivers/scsi/smartpqi/smartpqi_sis.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/smartpqi/smartpqi_sis.h b/drivers/scsi/smartpqi/smartpqi_sis.h
index 2bf889dbf5ab..d018cb9c3f82 100644
--- a/drivers/scsi/smartpqi/smartpqi_sis.h
+++ b/drivers/scsi/smartpqi/smartpqi_sis.h
@@ -33,5 +33,6 @@ int sis_pqi_reset_quiesce(struct pqi_ctrl_info *ctrl_info);
int sis_reenable_sis_mode(struct pqi_ctrl_info *ctrl_info);
void sis_write_driver_scratch(struct pqi_ctrl_info *ctrl_info, u32 value);
u32 sis_read_driver_scratch(struct pqi_ctrl_info *ctrl_info);
+void sis_soft_reset(struct pqi_ctrl_info *ctrl_info);
#endif /* _SMARTPQI_SIS_H */