aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-11-18 13:49:44 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-18 13:49:44 -0800
commitbcd039b230f738243193ef7dbb03298d967b8370 (patch)
treebec1988fa1d7f8dbcd445a82ad68c27330df03a9 /include
parente67b23c71cb9ee02d65a74c3858716ba2dedd554 (diff)
parent6f5a0f7c955d3567f800fa36f978758cb5b99aa2 (diff)
Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block
Diffstat (limited to 'include')
-rw-r--r--include/linux/cciss_ioctl.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/cciss_ioctl.h b/include/linux/cciss_ioctl.h
index 424d5e622b4..6e27f42e3a5 100644
--- a/include/linux/cciss_ioctl.h
+++ b/include/linux/cciss_ioctl.h
@@ -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;