|
From: Kenn H. <ke...@us...> - 2004-08-07 00:03:17
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/scsi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9657 Modified Files: scsi_ioctl.c Log Message: Way back, I wrapped this function in CONFIG_PCI to prevent a compilation error on our non-PCI VAXen. This isn't needed anymore Index: scsi_ioctl.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/scsi/scsi_ioctl.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- scsi_ioctl.c 28 Jul 2004 23:08:58 -0000 1.20 +++ scsi_ioctl.c 7 Aug 2004 00:03:09 -0000 1.21 @@ -351,7 +351,6 @@ return result; } -#ifdef CONFIG_PCI /* * The scsi_ioctl_get_pci() function places into arg the value * pci_dev::slot_name (8 characters) for the PCI device (if any). @@ -370,13 +369,6 @@ return -ENXIO; return copy_to_user(arg, dev->bus_id, sizeof(dev->bus_id))? -EFAULT: 0; } -#else -static int -scsi_ioctl_get_pci(Scsi_Device * dev, void *arg) -{ - return -ENXIO; -} -#endif /* * the scsi_ioctl() function differs from most ioctls in that it does |