Skip to content

L
linux
Commit 24201e26 authored by Doug Ledford's avatar Doug Ledford
Browse files
Options

Merge aladin.rdu.redhat.com:/usr/local/home/dledford/bk/linus-2.5 

into aladin.rdu.redhat.com:/usr/src/2.5
parents f7efec4a 3f4f4e5c
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
drivers/message/fusion/mptscsih.h
View file @ 24201e26
...@@ -230,8 +230,8 @@ extern int x_scsi_host_reset(Scsi_Cmnd *); ...@@ -230,8 +230,8 @@ extern int x_scsi_host_reset(Scsi_Cmnd *);
extern int x_scsi_old_abort(Scsi_Cmnd *); extern int x_scsi_old_abort(Scsi_Cmnd *);
extern int x_scsi_old_reset(Scsi_Cmnd *, unsigned int); extern int x_scsi_old_reset(Scsi_Cmnd *, unsigned int);
#endif #endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,28) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,45)
extern int x_scsi_bios_param(Disk *, struct block_device *, int *); extern int x_scsi_bios_param(Scsi_Device *, struct block_device *, sector_t, int[]);
#else #else
extern int x_scsi_bios_param(Disk *, kdev_t, int *); extern int x_scsi_bios_param(Disk *, kdev_t, int *);
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7