From 624697ac9ea1f594b5bc172edb536b6a57441315 Mon Sep 17 00:00:00 2001
From: Mike Miller <mike.miller@hp.com>
Date: Mon, 27 Jun 2005 14:36:49 -0700
Subject: [PATCH] --- yaml --- r: 3648 b: refs/heads/master c:
 cd6fb584cf7f18ec6b221192b57d712ecc8c1859 h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/block/cciss.c       | 1 +
 trunk/include/linux/cciss_ioctl.h | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 734c40725404..1b2ab389d871 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3de0a70bd926ff974adb27a38d4fd1049f05e54e
+refs/heads/master: cd6fb584cf7f18ec6b221192b57d712ecc8c1859
diff --git a/trunk/drivers/block/cciss.c b/trunk/drivers/block/cciss.c
index 0cd606ce222a..d5d0fa538f12 100644
--- a/trunk/drivers/block/cciss.c
+++ b/trunk/drivers/block/cciss.c
@@ -638,6 +638,7 @@ static int cciss_ioctl(struct inode *inode, struct file *filep,
 		cciss_pci_info_struct pciinfo;
 
 		if (!arg) return -EINVAL;
+		pciinfo.domain = pci_domain_nr(host->pdev->bus);
 		pciinfo.bus = host->pdev->bus->number;
 		pciinfo.dev_fn = host->pdev->devfn;
 		pciinfo.board_id = host->board_id;
diff --git a/trunk/include/linux/cciss_ioctl.h b/trunk/include/linux/cciss_ioctl.h
index ee0c6e8995da..424d5e622b43 100644
--- a/trunk/include/linux/cciss_ioctl.h
+++ b/trunk/include/linux/cciss_ioctl.h
@@ -10,6 +10,7 @@
 typedef struct _cciss_pci_info_struct
 {
 	unsigned char 	bus;
+	unsigned short	domain;
 	unsigned char 	dev_fn;
 	__u32 		board_id;
 } cciss_pci_info_struct;