rpms/kernel/FC-4 linux-2.6-scsi-cciss-ioctl-unbreak.patch, NONE, 1.1 kernel-2.6.spec, 1.1518, 1.1519

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv14651

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-scsi-cciss-ioctl-unbreak.patch 
Log Message:
* Mon Nov 28 2005 Dave Jones <davej at redhat.com>
- Unbreak the cciss cli tools. (#170351)


linux-2.6-scsi-cciss-ioctl-unbreak.patch:
 cciss_ioctl.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-scsi-cciss-ioctl-unbreak.patch ---
--- linux-2.6.14/include/linux/cciss_ioctl.h~	2005-11-28 16:11:18.000000000 -0500
+++ linux-2.6.14/include/linux/cciss_ioctl.h	2005-11-28 16:11:28.000000000 -0500
@@ -10,8 +10,8 @@
 typedef struct _cciss_pci_info_struct
 {
 	unsigned char 	bus;
-	unsigned short	domain;
 	unsigned char 	dev_fn;
+	unsigned short	domain;
 	__u32 		board_id;
 } cciss_pci_info_struct; 
 


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1518
retrieving revision 1.1519
diff -u -r1.1518 -r1.1519
--- kernel-2.6.spec	27 Nov 2005 08:19:29 -0000	1.1518
+++ kernel-2.6.spec	28 Nov 2005 21:12:58 -0000	1.1519
@@ -291,6 +291,7 @@
 Patch1101: linux-2.6-scsi-advansys-enabler.patch
 Patch1102: linux-2.6-scsi-megaraid-legacy.patch
 Patch1103: linux-2.6-scsi-advansys-pcitable.patch
+Patch1104: linux-2.6-scsi-cciss-ioctl-unbreak.patch
 
 # NFS bits.
 Patch1200: linux-2.6-NFSD-non-null-getxattr.patch
@@ -693,6 +694,8 @@
 %patch1102 -p1
 # Add a pci table to advansys driver.
 %patch1103 -p1
+# Unbreak cciss command line tools.
+%patch1104 -p1
 
 #
 # Various upstream NFS/NFSD fixes.
@@ -1256,6 +1259,9 @@
 %endif
 
 %changelog
+* Mon Nov 28 2005 Dave Jones <davej at redhat.com>
+- Unbreak the cciss cli tools. (#170351)
+
 * Sun Nov 27 2005 Dave Jones <davej at redhat.com> [2.6.14-1.1644_FC4]
 - Port a change_page_attr() fix from x86-64 to i386.