Signed-off-by: Alexey Dobriyan <adobriyan@xxxxxxxxx> --- drivers/scsi/gdth.c | 12 ------------ drivers/scsi/gdth_ioctl.h | 8 -------- 2 files changed, 20 deletions(-) diff -uprN linux-vanilla/drivers/scsi/gdth.c linux-gdth/drivers/scsi/gdth.c --- linux-vanilla/drivers/scsi/gdth.c 2005-08-08 02:16:47.000000000 +0400 +++ linux-gdth/drivers/scsi/gdth.c 2005-08-08 02:19:59.000000000 +0400 @@ -5411,18 +5411,6 @@ static int gdth_ioctl(struct inode *inod return -EFAULT; break; } - - case GDTIOCTL_OSVERS: - { - gdth_ioctl_osvers osv; - - osv.version = (unchar)(LINUX_VERSION_CODE >> 16); - osv.subversion = (unchar)(LINUX_VERSION_CODE >> 8); - osv.revision = (ushort)(LINUX_VERSION_CODE & 0xff); - if (copy_to_user(argp, &osv, sizeof(gdth_ioctl_osvers))) - return -EFAULT; - break; - } case GDTIOCTL_CTRTYPE: { diff -uprN linux-vanilla/drivers/scsi/gdth_ioctl.h linux-gdth/drivers/scsi/gdth_ioctl.h --- linux-vanilla/drivers/scsi/gdth_ioctl.h 2005-08-08 02:16:47.000000000 +0400 +++ linux-gdth/drivers/scsi/gdth_ioctl.h 2005-08-08 02:20:19.000000000 +0400 @@ -10,7 +10,6 @@ #define GDTIOCTL_GENERAL (GDTIOCTL_MASK | 0) /* general IOCTL */ #define GDTIOCTL_DRVERS (GDTIOCTL_MASK | 1) /* get driver version */ #define GDTIOCTL_CTRTYPE (GDTIOCTL_MASK | 2) /* get controller type */ -#define GDTIOCTL_OSVERS (GDTIOCTL_MASK | 3) /* get OS version */ #define GDTIOCTL_HDRLIST (GDTIOCTL_MASK | 4) /* get host drive list */ #define GDTIOCTL_CTRCNT (GDTIOCTL_MASK | 5) /* get controller count */ #define GDTIOCTL_LOCKDRV (GDTIOCTL_MASK | 6) /* lock host drive */ @@ -296,13 +295,6 @@ typedef struct { unchar channel; /* channel */ } gdth_ioctl_lockchn; -/* GDTIOCTL_OSVERS */ -typedef struct { - unchar version; /* OS version */ - unchar subversion; /* OS subversion */ - ushort revision; /* revision */ -} gdth_ioctl_osvers; - /* GDTIOCTL_CTRTYPE */ typedef struct { ushort ionode; /* controller number */ - : send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html