diff options
| author |   Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-18 13:49:44 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-18 13:49:44 -0800 |
| commit | bcd039b230f738243193ef7dbb03298d967b8370 (patch) | |
| tree | bec1988fa1d7f8dbcd445a82ad68c27330df03a9 /include | |
| parent | Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 (diff) | |
| parent | [PATCH 3/3] cciss: add put_disk into cleanup routines (diff) | |
| download | linux-dev-bcd039b230f738243193ef7dbb03298d967b8370.tar.xz linux-dev-bcd039b230f738243193ef7dbb03298d967b8370.zip | |
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.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/cciss_ioctl.h b/include/linux/cciss_ioctl.h index 424d5e622b43..6e27f42e3a57 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; |